Merge jdk7-b96
authormikejwre
Wed, 02 Jun 2010 15:39:48 -0700
changeset 240051b9e5dbc2da
parent 2397 4255ca314883
parent 2399 a6276fa6643a
child 2401 050f05044e24
child 2456 fb56f86642d6
Merge
     1.1 --- a/make/common/Release.gmk	Thu May 27 10:57:25 2010 -0700
     1.2 +++ b/make/common/Release.gmk	Wed Jun 02 15:39:48 2010 -0700
     1.3 @@ -648,7 +648,9 @@
     1.4  JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/manifest.tmp
     1.5  $(JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
     1.6  	$(prep-target)
     1.7 -	$(SED) -e "s/@@RELEASE@@/$(RELEASE)/" $(MAINMANIFEST) >> $@
     1.8 +	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
     1.9 +	       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
    1.10 +	       $(MAINMANIFEST) >> $@
    1.11  	$(ECHO) >> $@
    1.12  	$(CAT) $(BEANMANIFEST) >> $@
    1.13  
     2.1 --- a/make/common/Subdirs.gmk	Thu May 27 10:57:25 2010 -0700
     2.2 +++ b/make/common/Subdirs.gmk	Wed Jun 02 15:39:48 2010 -0700
     2.3 @@ -19,7 +19,7 @@
     2.4  #
     2.5  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     2.6  # or visit www.oracle.com if you need additional information or have any
     2.7 -# have any questions
     2.8 +# questions.
     2.9  #
    2.10  
    2.11  #
     3.1 --- a/make/common/shared/Defs.gmk	Thu May 27 10:57:25 2010 -0700
     3.2 +++ b/make/common/shared/Defs.gmk	Wed Jun 02 15:39:48 2010 -0700
     3.3 @@ -214,7 +214,7 @@
     3.4    PRODUCT_NAME = Java(TM)
     3.5    PRODUCT_SUFFIX = SE Runtime Environment
     3.6    JDK_RC_PLATFORM_NAME = Platform SE
     3.7 -  COMPANY_NAME = Sun Microsystems, Inc.
     3.8 +  COMPANY_NAME = Oracle
     3.9  endif
    3.10  
    3.11  RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
     4.1 --- a/make/java/nio/Makefile	Thu May 27 10:57:25 2010 -0700
     4.2 +++ b/make/java/nio/Makefile	Wed Jun 02 15:39:48 2010 -0700
     4.3 @@ -818,7 +818,7 @@
     4.4  GENSOR_EXE = $(TEMPDIR)/genSocketOptionRegistry$(EXE_SUFFIX)
     4.5  
     4.6  SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \
     4.7 -	$(NAWK) '/^.*Copyright.*Sun/ { print $$3 }') 
     4.8 +	$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') 
     4.9  
    4.10  $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
    4.11  	$(install-non-module-file)
    4.12 @@ -830,7 +830,7 @@
    4.13  
    4.14  $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
    4.15  	$(prep-target)
    4.16 -	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(SOR_COPYRIGHT_YEARS) > $@
    4.17 +	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
    4.18  	$(GENSOR_EXE) >> $@
    4.19  
    4.20  #
    4.21 @@ -852,7 +852,7 @@
    4.22  GENUC_EXE = $(TEMPDIR)/genUnixConstants
    4.23  
    4.24  GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
    4.25 -	$(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
    4.26 +	$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
    4.27  
    4.28  $(GENUC_EXE) : $(GENUC_SRC)
    4.29  	$(prep-target)
    4.30 @@ -860,7 +860,7 @@
    4.31  
    4.32  $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
    4.33  	$(prep-target)
    4.34 -	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(GENUC_COPYRIGHT_YEARS) > $@
    4.35 +	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
    4.36  	$(GENUC_EXE) >> $@
    4.37  
    4.38  GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
    4.39 @@ -868,7 +868,7 @@
    4.40  GENSC_EXE = $(TEMPDIR)/genSolarisConstants
    4.41  
    4.42  GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
    4.43 -	$(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
    4.44 +	$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
    4.45  
    4.46  $(GENSC_EXE) : $(GENSC_SRC)
    4.47  	$(prep-target)
    4.48 @@ -876,7 +876,7 @@
    4.49  
    4.50  $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
    4.51  	$(prep-target)
    4.52 -	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(GENSC_COPYRIGHT_YEARS) > $@
    4.53 +	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
    4.54  	$(GENSC_EXE) >> $@
    4.55  
    4.56  .PHONY: sources 
     5.1 --- a/make/java/nio/addNotices.sh	Thu May 27 10:57:25 2010 -0700
     5.2 +++ b/make/java/nio/addNotices.sh	Wed Jun 02 15:39:48 2010 -0700
     5.3 @@ -28,7 +28,7 @@
     5.4  # a java comment block.  If this script is invoked with a copyright 
     5.5  # year/year range, the java comment block will contain a Sun copyright.
     5.6  
     5.7 -COPYRIGHT_YEARS=$1
     5.8 +COPYRIGHT_YEARS="$1"
     5.9  
    5.10  cat <<__END__
    5.11  /*
    5.12 @@ -36,10 +36,10 @@
    5.13  
    5.14  if [ "x$COPYRIGHT_YEARS" != x ]; then
    5.15    cat <<__END__
    5.16 - * Copyright $COPYRIGHT_YEARS Sun Microsystems, Inc.  All Rights Reserved.
    5.17 + * Copyright (c) $COPYRIGHT_YEARS Oracle and/or its affiliates. All rights reserved.
    5.18  __END__
    5.19  fi
    5.20  
    5.21 -$NAWK ' /^#.*Copyright.*Sun/ { next }
    5.22 +$NAWK ' /^#.*Copyright.*Oracle/ { next }
    5.23          /^#([^!]|$)/ { sub(/^#/, " *"); print }
    5.24          /^$/ { print " */"; exit } ' $0
     6.1 --- a/make/java/nio/genCharsetProvider.sh	Thu May 27 10:57:25 2010 -0700
     6.2 +++ b/make/java/nio/genCharsetProvider.sh	Wed Jun 02 15:39:48 2010 -0700
     6.3 @@ -36,7 +36,7 @@
     6.4  DST=$1; shift
     6.5  
     6.6  eval `$NAWK <$SPEC '
     6.7 -  /^[ \t]*copyright / { printf "COPYRIGHT_YEARS=%s\n", $2; }
     6.8 +  /^[ \t]*copyright / { printf "COPYRIGHT_YEARS=\"%s %s\"\n", $2, $3; }
     6.9    /^[ \t]*package / { printf "PKG=%s\n", $2; }
    6.10    /^[ \t]*class / { printf "CLASS=%s\n", $2; }
    6.11  '`
     7.1 --- a/make/tools/manifest.mf	Thu May 27 10:57:25 2010 -0700
     7.2 +++ b/make/tools/manifest.mf	Wed Jun 02 15:39:48 2010 -0700
     7.3 @@ -1,7 +1,7 @@
     7.4  Manifest-Version: 1.0
     7.5  Specification-Title: Java Platform API Specification
     7.6  Specification-Version: 1.6
     7.7 -Specification-Vendor: Sun Microsystems, Inc.
     7.8 +Specification-Vendor: Oracle
     7.9  Implementation-Title: Java Runtime Environment
    7.10  Implementation-Version: @@RELEASE@@
    7.11 -Implementation-Vendor: Sun Microsystems, Inc.
    7.12 +Implementation-Vendor: @@COMPANY_NAME@@
     8.1 --- a/src/share/classes/com/sun/jarsigner/package.html	Thu May 27 10:57:25 2010 -0700
     8.2 +++ b/src/share/classes/com/sun/jarsigner/package.html	Wed Jun 02 15:39:48 2010 -0700
     8.3 @@ -20,9 +20,9 @@
     8.4  2 along with this work; if not, write to the Free Software Foundation,
     8.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     8.6  
     8.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     8.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     8.9 -have any questions.
    8.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    8.11 +or visit www.oracle.com if you need additional information or have any
    8.12 +questions.
    8.13  -->
    8.14    <head>
    8.15      <title>Jarsigner Signing Mechanism Package</title>
     9.1 --- a/src/share/classes/com/sun/java/util/jar/pack/package.html	Thu May 27 10:57:25 2010 -0700
     9.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/package.html	Wed Jun 02 15:39:48 2010 -0700
     9.3 @@ -22,9 +22,9 @@
     9.4  2 along with this work; if not, write to the Free Software Foundation,
     9.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     9.6  
     9.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     9.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     9.9 -have any questions.
    9.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    9.11 +or visit www.oracle.com if you need additional information or have any
    9.12 +questions.
    9.13  -->
    9.14  </head>
    9.15  <body bgcolor="white">
    10.1 --- a/src/share/classes/com/sun/jdi/connect/package.html	Thu May 27 10:57:25 2010 -0700
    10.2 +++ b/src/share/classes/com/sun/jdi/connect/package.html	Wed Jun 02 15:39:48 2010 -0700
    10.3 @@ -22,9 +22,9 @@
    10.4  2 along with this work; if not, write to the Free Software Foundation,
    10.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    10.6  
    10.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    10.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    10.9 -have any questions.
   10.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   10.11 +or visit www.oracle.com if you need additional information or have any
   10.12 +questions.
   10.13  -->
   10.14  </head>
   10.15  <body bgcolor="white">
    11.1 --- a/src/share/classes/com/sun/jdi/connect/spi/package.html	Thu May 27 10:57:25 2010 -0700
    11.2 +++ b/src/share/classes/com/sun/jdi/connect/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
    11.3 @@ -22,9 +22,9 @@
    11.4  2 along with this work; if not, write to the Free Software Foundation,
    11.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    11.6  
    11.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    11.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    11.9 -have any questions.
   11.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   11.11 +or visit www.oracle.com if you need additional information or have any
   11.12 +questions.
   11.13  -->
   11.14  </head>
   11.15  <body bgcolor="white">
    12.1 --- a/src/share/classes/com/sun/jdi/event/package.html	Thu May 27 10:57:25 2010 -0700
    12.2 +++ b/src/share/classes/com/sun/jdi/event/package.html	Wed Jun 02 15:39:48 2010 -0700
    12.3 @@ -22,9 +22,9 @@
    12.4  2 along with this work; if not, write to the Free Software Foundation,
    12.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    12.6  
    12.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    12.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    12.9 -have any questions.
   12.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   12.11 +or visit www.oracle.com if you need additional information or have any
   12.12 +questions.
   12.13  -->
   12.14  </head>
   12.15  <body bgcolor="white">
    13.1 --- a/src/share/classes/com/sun/jdi/package.html	Thu May 27 10:57:25 2010 -0700
    13.2 +++ b/src/share/classes/com/sun/jdi/package.html	Wed Jun 02 15:39:48 2010 -0700
    13.3 @@ -22,9 +22,9 @@
    13.4  2 along with this work; if not, write to the Free Software Foundation,
    13.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    13.6  
    13.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    13.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    13.9 -have any questions.
   13.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   13.11 +or visit www.oracle.com if you need additional information or have any
   13.12 +questions.
   13.13  -->
   13.14  </head>
   13.15  <body bgcolor="white">
    14.1 --- a/src/share/classes/com/sun/jdi/request/package.html	Thu May 27 10:57:25 2010 -0700
    14.2 +++ b/src/share/classes/com/sun/jdi/request/package.html	Wed Jun 02 15:39:48 2010 -0700
    14.3 @@ -22,9 +22,9 @@
    14.4  2 along with this work; if not, write to the Free Software Foundation,
    14.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    14.6  
    14.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    14.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    14.9 -have any questions.
   14.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   14.11 +or visit www.oracle.com if you need additional information or have any
   14.12 +questions.
   14.13  -->
   14.14  </head>
   14.15  <body bgcolor="white">
    15.1 --- a/src/share/classes/com/sun/jmx/defaults/package.html	Thu May 27 10:57:25 2010 -0700
    15.2 +++ b/src/share/classes/com/sun/jmx/defaults/package.html	Wed Jun 02 15:39:48 2010 -0700
    15.3 @@ -22,9 +22,9 @@
    15.4  2 along with this work; if not, write to the Free Software Foundation,
    15.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    15.6  
    15.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    15.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    15.9 -have any questions.
   15.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   15.11 +or visit www.oracle.com if you need additional information or have any
   15.12 +questions.
   15.13  -->
   15.14  </head>
   15.15  <body bgcolor="white">
    16.1 --- a/src/share/classes/com/sun/jmx/interceptor/package.html	Thu May 27 10:57:25 2010 -0700
    16.2 +++ b/src/share/classes/com/sun/jmx/interceptor/package.html	Wed Jun 02 15:39:48 2010 -0700
    16.3 @@ -22,9 +22,9 @@
    16.4  2 along with this work; if not, write to the Free Software Foundation,
    16.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    16.6  
    16.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    16.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    16.9 -have any questions.
   16.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   16.11 +or visit www.oracle.com if you need additional information or have any
   16.12 +questions.
   16.13  -->
   16.14  </head>
   16.15  <body bgcolor="white">
    17.1 --- a/src/share/classes/com/sun/jmx/mbeanserver/package.html	Thu May 27 10:57:25 2010 -0700
    17.2 +++ b/src/share/classes/com/sun/jmx/mbeanserver/package.html	Wed Jun 02 15:39:48 2010 -0700
    17.3 @@ -22,9 +22,9 @@
    17.4  2 along with this work; if not, write to the Free Software Foundation,
    17.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    17.6  
    17.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    17.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    17.9 -have any questions.
   17.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   17.11 +or visit www.oracle.com if you need additional information or have any
   17.12 +questions.
   17.13  -->
   17.14  </head>
   17.15  <body bgcolor="white">
    18.1 --- a/src/share/classes/com/sun/jmx/remote/internal/package.html	Thu May 27 10:57:25 2010 -0700
    18.2 +++ b/src/share/classes/com/sun/jmx/remote/internal/package.html	Wed Jun 02 15:39:48 2010 -0700
    18.3 @@ -22,9 +22,9 @@
    18.4  2 along with this work; if not, write to the Free Software Foundation,
    18.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    18.6  
    18.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    18.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    18.9 -have any questions.
   18.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   18.11 +or visit www.oracle.com if you need additional information or have any
   18.12 +questions.
   18.13  -->
   18.14  </head>
   18.15  <body bgcolor="white">
    19.1 --- a/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html	Thu May 27 10:57:25 2010 -0700
    19.2 +++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html	Wed Jun 02 15:39:48 2010 -0700
    19.3 @@ -21,9 +21,9 @@
    19.4  2 along with this work; if not, write to the Free Software Foundation,
    19.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    19.6  
    19.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    19.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    19.9 -have any questions.
   19.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   19.11 +or visit www.oracle.com if you need additional information or have any
   19.12 +questions.
   19.13  -->
   19.14  </HEAD>
   19.15  <BODY>
    20.1 --- a/src/share/classes/com/sun/jmx/snmp/agent/package.html	Thu May 27 10:57:25 2010 -0700
    20.2 +++ b/src/share/classes/com/sun/jmx/snmp/agent/package.html	Wed Jun 02 15:39:48 2010 -0700
    20.3 @@ -21,9 +21,9 @@
    20.4  2 along with this work; if not, write to the Free Software Foundation,
    20.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    20.6  
    20.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    20.9 -have any questions.
   20.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   20.11 +or visit www.oracle.com if you need additional information or have any
   20.12 +questions.
   20.13  -->
   20.14  </HEAD>
   20.15  <BODY>
    21.1 --- a/src/share/classes/com/sun/jmx/snmp/daemon/package.html	Thu May 27 10:57:25 2010 -0700
    21.2 +++ b/src/share/classes/com/sun/jmx/snmp/daemon/package.html	Wed Jun 02 15:39:48 2010 -0700
    21.3 @@ -21,9 +21,9 @@
    21.4  2 along with this work; if not, write to the Free Software Foundation,
    21.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    21.6  
    21.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    21.9 -have any questions.
   21.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   21.11 +or visit www.oracle.com if you need additional information or have any
   21.12 +questions.
   21.13  -->
   21.14  </HEAD>
   21.15  <BODY>
    22.1 --- a/src/share/classes/com/sun/jmx/snmp/defaults/package.html	Thu May 27 10:57:25 2010 -0700
    22.2 +++ b/src/share/classes/com/sun/jmx/snmp/defaults/package.html	Wed Jun 02 15:39:48 2010 -0700
    22.3 @@ -21,9 +21,9 @@
    22.4  2 along with this work; if not, write to the Free Software Foundation,
    22.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    22.6  
    22.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    22.9 -have any questions.
   22.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   22.11 +or visit www.oracle.com if you need additional information or have any
   22.12 +questions.
   22.13  -->
   22.14  </HEAD>
   22.15  <BODY>
    23.1 --- a/src/share/classes/com/sun/jmx/snmp/internal/package.html	Thu May 27 10:57:25 2010 -0700
    23.2 +++ b/src/share/classes/com/sun/jmx/snmp/internal/package.html	Wed Jun 02 15:39:48 2010 -0700
    23.3 @@ -21,9 +21,9 @@
    23.4  2 along with this work; if not, write to the Free Software Foundation,
    23.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    23.6  
    23.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    23.9 -have any questions.
   23.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   23.11 +or visit www.oracle.com if you need additional information or have any
   23.12 +questions.
   23.13  -->
   23.14  </HEAD>
   23.15  <BODY>
    24.1 --- a/src/share/classes/com/sun/jmx/snmp/mpm/package.html	Thu May 27 10:57:25 2010 -0700
    24.2 +++ b/src/share/classes/com/sun/jmx/snmp/mpm/package.html	Wed Jun 02 15:39:48 2010 -0700
    24.3 @@ -21,9 +21,9 @@
    24.4  2 along with this work; if not, write to the Free Software Foundation,
    24.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    24.6  
    24.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    24.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    24.9 -have any questions.
   24.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   24.11 +or visit www.oracle.com if you need additional information or have any
   24.12 +questions.
   24.13  -->
   24.14  </HEAD>
   24.15  <BODY>
    25.1 --- a/src/share/classes/com/sun/jmx/snmp/package.html	Thu May 27 10:57:25 2010 -0700
    25.2 +++ b/src/share/classes/com/sun/jmx/snmp/package.html	Wed Jun 02 15:39:48 2010 -0700
    25.3 @@ -21,9 +21,9 @@
    25.4  2 along with this work; if not, write to the Free Software Foundation,
    25.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    25.6  
    25.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    25.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    25.9 -have any questions.
   25.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   25.11 +or visit www.oracle.com if you need additional information or have any
   25.12 +questions.
   25.13  -->
   25.14  </HEAD>
   25.15  <BODY>
    26.1 --- a/src/share/classes/com/sun/jmx/snmp/tasks/package.html	Thu May 27 10:57:25 2010 -0700
    26.2 +++ b/src/share/classes/com/sun/jmx/snmp/tasks/package.html	Wed Jun 02 15:39:48 2010 -0700
    26.3 @@ -21,9 +21,9 @@
    26.4  2 along with this work; if not, write to the Free Software Foundation,
    26.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    26.6  
    26.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    26.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    26.9 -have any questions.
   26.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   26.11 +or visit www.oracle.com if you need additional information or have any
   26.12 +questions.
   26.13  -->
   26.14  </HEAD>
   26.15  <BODY>
    27.1 --- a/src/share/classes/com/sun/management/mgmt-overview.html	Thu May 27 10:57:25 2010 -0700
    27.2 +++ b/src/share/classes/com/sun/management/mgmt-overview.html	Wed Jun 02 15:39:48 2010 -0700
    27.3 @@ -24,9 +24,9 @@
    27.4  2 along with this work; if not, write to the Free Software Foundation,
    27.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    27.6  
    27.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    27.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    27.9 -have any questions.
   27.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   27.11 +or visit www.oracle.com if you need additional information or have any
   27.12 +questions.
   27.13  -->
   27.14  
   27.15    </head>
    28.1 --- a/src/share/classes/com/sun/management/package.html	Thu May 27 10:57:25 2010 -0700
    28.2 +++ b/src/share/classes/com/sun/management/package.html	Wed Jun 02 15:39:48 2010 -0700
    28.3 @@ -22,9 +22,9 @@
    28.4  2 along with this work; if not, write to the Free Software Foundation,
    28.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    28.6  
    28.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    28.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    28.9 -have any questions.
   28.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   28.11 +or visit www.oracle.com if you need additional information or have any
   28.12 +questions.
   28.13  -->
   28.14  
   28.15  </head>
    29.1 --- a/src/share/classes/com/sun/net/ssl/package.html	Thu May 27 10:57:25 2010 -0700
    29.2 +++ b/src/share/classes/com/sun/net/ssl/package.html	Wed Jun 02 15:39:48 2010 -0700
    29.3 @@ -23,9 +23,9 @@
    29.4  2 along with this work; if not, write to the Free Software Foundation,
    29.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    29.6  
    29.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    29.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    29.9 -have any questions.
   29.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   29.11 +or visit www.oracle.com if you need additional information or have any
   29.12 +questions.
   29.13  
   29.14  -->
   29.15  
    30.1 --- a/src/share/classes/com/sun/rowset/providers/package.html	Thu May 27 10:57:25 2010 -0700
    30.2 +++ b/src/share/classes/com/sun/rowset/providers/package.html	Wed Jun 02 15:39:48 2010 -0700
    30.3 @@ -28,9 +28,9 @@
    30.4  2 along with this work; if not, write to the Free Software Foundation,
    30.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    30.6  
    30.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    30.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    30.9 -have any questions.
   30.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   30.11 +or visit www.oracle.com if you need additional information or have any
   30.12 +questions.
   30.13  -->
   30.14    <title>javax.sql.rowset.providers Package</title>
   30.15  </head>
    31.1 --- a/src/share/classes/com/sun/servicetag/package.html	Thu May 27 10:57:25 2010 -0700
    31.2 +++ b/src/share/classes/com/sun/servicetag/package.html	Wed Jun 02 15:39:48 2010 -0700
    31.3 @@ -21,9 +21,9 @@
    31.4  2 along with this work; if not, write to the Free Software Foundation,
    31.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    31.6  
    31.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    31.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    31.9 -have any questions.
   31.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   31.11 +or visit www.oracle.com if you need additional information or have any
   31.12 +questions.
   31.13  
   31.14  -->
   31.15  
    32.1 --- a/src/share/classes/com/sun/servicetag/resources/register.html	Thu May 27 10:57:25 2010 -0700
    32.2 +++ b/src/share/classes/com/sun/servicetag/resources/register.html	Wed Jun 02 15:39:48 2010 -0700
    32.3 @@ -25,9 +25,9 @@
    32.4  2 along with this work; if not, write to the Free Software Foundation,
    32.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    32.6  
    32.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    32.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    32.9 -have any questions.
   32.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   32.11 +or visit www.oracle.com if you need additional information or have any
   32.12 +questions.
   32.13  -->
   32.14  
   32.15  <style type="text/css">
    33.1 --- a/src/share/classes/com/sun/servicetag/resources/register_ja.html	Thu May 27 10:57:25 2010 -0700
    33.2 +++ b/src/share/classes/com/sun/servicetag/resources/register_ja.html	Wed Jun 02 15:39:48 2010 -0700
    33.3 @@ -25,9 +25,9 @@
    33.4  2 along with this work; if not, write to the Free Software Foundation,
    33.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    33.6  
    33.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    33.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    33.9 -have any questions.
   33.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   33.11 +or visit www.oracle.com if you need additional information or have any
   33.12 +questions.
   33.13  -->
   33.14  
   33.15  <style type="text/css">
    34.1 --- a/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html	Thu May 27 10:57:25 2010 -0700
    34.2 +++ b/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html	Wed Jun 02 15:39:48 2010 -0700
    34.3 @@ -25,9 +25,9 @@
    34.4  2 along with this work; if not, write to the Free Software Foundation,
    34.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    34.6  
    34.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    34.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    34.9 -have any questions.
   34.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   34.11 +or visit www.oracle.com if you need additional information or have any
   34.12 +questions.
   34.13  -->
   34.14  
   34.15  <style type="text/css">
    35.1 --- a/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html	Thu May 27 10:57:25 2010 -0700
    35.2 +++ b/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html	Wed Jun 02 15:39:48 2010 -0700
    35.3 @@ -18,9 +18,9 @@
    35.4  2 along with this work; if not, write to the Free Software Foundation,
    35.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    35.6  
    35.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    35.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    35.9 -have any questions.
   35.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   35.11 +or visit www.oracle.com if you need additional information or have any
   35.12 +questions.
   35.13  -->
   35.14  
   35.15  <html>
    36.1 --- a/src/share/classes/java/nio/channels/exceptions	Thu May 27 10:57:25 2010 -0700
    36.2 +++ b/src/share/classes/java/nio/channels/exceptions	Wed Jun 02 15:39:48 2010 -0700
    36.3 @@ -28,7 +28,7 @@
    36.4  SINCE=1.4
    36.5  PACKAGE=java.nio.channels
    36.6  # This year should only change if the generated source is modified.
    36.7 -COPYRIGHT_YEARS=2000-2007
    36.8 +COPYRIGHT_YEARS="2000, 2007,"
    36.9  
   36.10  
   36.11  SUPER=java.io.IOException
    37.1 --- a/src/share/classes/java/nio/charset/exceptions	Thu May 27 10:57:25 2010 -0700
    37.2 +++ b/src/share/classes/java/nio/charset/exceptions	Wed Jun 02 15:39:48 2010 -0700
    37.3 @@ -28,7 +28,7 @@
    37.4  SINCE=1.4
    37.5  PACKAGE=java.nio.charset
    37.6  # This year should only change if the generated source is modified.
    37.7 -COPYRIGHT_YEARS=2000-2007
    37.8 +COPYRIGHT_YEARS="2000, 2007,"
    37.9  
   37.10  SUPER=java.io.IOException
   37.11  
    38.1 --- a/src/share/classes/java/nio/exceptions	Thu May 27 10:57:25 2010 -0700
    38.2 +++ b/src/share/classes/java/nio/exceptions	Wed Jun 02 15:39:48 2010 -0700
    38.3 @@ -28,7 +28,7 @@
    38.4  SINCE=1.4
    38.5  PACKAGE=java.nio
    38.6  # This year should only change if the generated source is modified.
    38.7 -COPYRIGHT_YEARS=2000-2007
    38.8 +COPYRIGHT_YEARS="2000, 2007,"
    38.9  
   38.10  
   38.11  SUPER=RuntimeException
    39.1 --- a/src/share/classes/java/security/acl/package.html	Thu May 27 10:57:25 2010 -0700
    39.2 +++ b/src/share/classes/java/security/acl/package.html	Wed Jun 02 15:39:48 2010 -0700
    39.3 @@ -21,9 +21,9 @@
    39.4  2 along with this work; if not, write to the Free Software Foundation,
    39.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    39.6  
    39.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    39.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    39.9 -have any questions.
   39.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   39.11 +or visit www.oracle.com if you need additional information or have any
   39.12 +questions.
   39.13  -->
   39.14  
   39.15  </head>
    40.1 --- a/src/share/classes/java/security/package.html	Thu May 27 10:57:25 2010 -0700
    40.2 +++ b/src/share/classes/java/security/package.html	Wed Jun 02 15:39:48 2010 -0700
    40.3 @@ -21,9 +21,9 @@
    40.4  2 along with this work; if not, write to the Free Software Foundation,
    40.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    40.6  
    40.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    40.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    40.9 -have any questions.
   40.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   40.11 +or visit www.oracle.com if you need additional information or have any
   40.12 +questions.
   40.13  -->
   40.14  
   40.15  </head>
    41.1 --- a/src/share/classes/java/security/spec/package.html	Thu May 27 10:57:25 2010 -0700
    41.2 +++ b/src/share/classes/java/security/spec/package.html	Wed Jun 02 15:39:48 2010 -0700
    41.3 @@ -21,9 +21,9 @@
    41.4  2 along with this work; if not, write to the Free Software Foundation,
    41.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    41.6  
    41.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    41.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    41.9 -have any questions.
   41.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   41.11 +or visit www.oracle.com if you need additional information or have any
   41.12 +questions.
   41.13  -->
   41.14  
   41.15  </head>
    42.1 --- a/src/share/classes/java/sql/package.html	Thu May 27 10:57:25 2010 -0700
    42.2 +++ b/src/share/classes/java/sql/package.html	Wed Jun 02 15:39:48 2010 -0700
    42.3 @@ -21,9 +21,9 @@
    42.4  2 along with this work; if not, write to the Free Software Foundation,
    42.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    42.6  
    42.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    42.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    42.9 -have any questions.
   42.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   42.11 +or visit www.oracle.com if you need additional information or have any
   42.12 +questions.
   42.13  -->
   42.14  
   42.15  </head>
    43.1 --- a/src/share/classes/java/text/package.html	Thu May 27 10:57:25 2010 -0700
    43.2 +++ b/src/share/classes/java/text/package.html	Wed Jun 02 15:39:48 2010 -0700
    43.3 @@ -21,9 +21,9 @@
    43.4  2 along with this work; if not, write to the Free Software Foundation,
    43.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    43.6  
    43.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    43.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    43.9 -have any questions.
   43.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   43.11 +or visit www.oracle.com if you need additional information or have any
   43.12 +questions.
   43.13  -->
   43.14  
   43.15  </head>
    44.1 --- a/src/share/classes/java/text/spi/package.html	Thu May 27 10:57:25 2010 -0700
    44.2 +++ b/src/share/classes/java/text/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
    44.3 @@ -21,9 +21,9 @@
    44.4  2 along with this work; if not, write to the Free Software Foundation,
    44.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    44.6  
    44.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    44.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    44.9 -have any questions.
   44.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   44.11 +or visit www.oracle.com if you need additional information or have any
   44.12 +questions.
   44.13  -->
   44.14  
   44.15  </head>
    45.1 --- a/src/share/classes/java/util/jar/package.html	Thu May 27 10:57:25 2010 -0700
    45.2 +++ b/src/share/classes/java/util/jar/package.html	Wed Jun 02 15:39:48 2010 -0700
    45.3 @@ -21,9 +21,9 @@
    45.4  2 along with this work; if not, write to the Free Software Foundation,
    45.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    45.6  
    45.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    45.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    45.9 -have any questions.
   45.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   45.11 +or visit www.oracle.com if you need additional information or have any
   45.12 +questions.
   45.13  -->
   45.14  
   45.15  </head>
    46.1 --- a/src/share/classes/java/util/logging/package.html	Thu May 27 10:57:25 2010 -0700
    46.2 +++ b/src/share/classes/java/util/logging/package.html	Wed Jun 02 15:39:48 2010 -0700
    46.3 @@ -21,9 +21,9 @@
    46.4  2 along with this work; if not, write to the Free Software Foundation,
    46.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    46.6  
    46.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    46.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    46.9 -have any questions.
   46.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   46.11 +or visit www.oracle.com if you need additional information or have any
   46.12 +questions.
   46.13  -->
   46.14  
   46.15  </head>
    47.1 --- a/src/share/classes/java/util/package.html	Thu May 27 10:57:25 2010 -0700
    47.2 +++ b/src/share/classes/java/util/package.html	Wed Jun 02 15:39:48 2010 -0700
    47.3 @@ -21,9 +21,9 @@
    47.4  2 along with this work; if not, write to the Free Software Foundation,
    47.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    47.6  
    47.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    47.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    47.9 -have any questions.
   47.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   47.11 +or visit www.oracle.com if you need additional information or have any
   47.12 +questions.
   47.13  -->
   47.14  
   47.15  </head>
    48.1 --- a/src/share/classes/java/util/prefs/package.html	Thu May 27 10:57:25 2010 -0700
    48.2 +++ b/src/share/classes/java/util/prefs/package.html	Wed Jun 02 15:39:48 2010 -0700
    48.3 @@ -21,9 +21,9 @@
    48.4  2 along with this work; if not, write to the Free Software Foundation,
    48.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    48.6  
    48.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    48.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    48.9 -have any questions.
   48.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   48.11 +or visit www.oracle.com if you need additional information or have any
   48.12 +questions.
   48.13  -->
   48.14  
   48.15  </head>
    49.1 --- a/src/share/classes/java/util/regex/package.html	Thu May 27 10:57:25 2010 -0700
    49.2 +++ b/src/share/classes/java/util/regex/package.html	Wed Jun 02 15:39:48 2010 -0700
    49.3 @@ -21,9 +21,9 @@
    49.4  2 along with this work; if not, write to the Free Software Foundation,
    49.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    49.6  
    49.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    49.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    49.9 -have any questions.
   49.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   49.11 +or visit www.oracle.com if you need additional information or have any
   49.12 +questions.
   49.13  -->
   49.14  
   49.15  </head>
    50.1 --- a/src/share/classes/java/util/spi/package.html	Thu May 27 10:57:25 2010 -0700
    50.2 +++ b/src/share/classes/java/util/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
    50.3 @@ -21,9 +21,9 @@
    50.4  2 along with this work; if not, write to the Free Software Foundation,
    50.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    50.6  
    50.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    50.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    50.9 -have any questions.
   50.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   50.11 +or visit www.oracle.com if you need additional information or have any
   50.12 +questions.
   50.13  -->
   50.14  
   50.15  </head>
    51.1 --- a/src/share/classes/java/util/zip/package.html	Thu May 27 10:57:25 2010 -0700
    51.2 +++ b/src/share/classes/java/util/zip/package.html	Wed Jun 02 15:39:48 2010 -0700
    51.3 @@ -21,9 +21,9 @@
    51.4  2 along with this work; if not, write to the Free Software Foundation,
    51.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    51.6  
    51.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    51.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    51.9 -have any questions.
   51.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   51.11 +or visit www.oracle.com if you need additional information or have any
   51.12 +questions.
   51.13  -->
   51.14  
   51.15  </head>
    52.1 --- a/src/share/classes/javax/accessibility/package.html	Thu May 27 10:57:25 2010 -0700
    52.2 +++ b/src/share/classes/javax/accessibility/package.html	Wed Jun 02 15:39:48 2010 -0700
    52.3 @@ -22,9 +22,9 @@
    52.4  2 along with this work; if not, write to the Free Software Foundation,
    52.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    52.6  
    52.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    52.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    52.9 -have any questions.
   52.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   52.11 +or visit www.oracle.com if you need additional information or have any
   52.12 +questions.
   52.13  -->
   52.14  </HEAD>
   52.15  <BODY BGCOLOR="#FFFFFF">
    53.1 --- a/src/share/classes/javax/crypto/interfaces/package.html	Thu May 27 10:57:25 2010 -0700
    53.2 +++ b/src/share/classes/javax/crypto/interfaces/package.html	Wed Jun 02 15:39:48 2010 -0700
    53.3 @@ -18,9 +18,9 @@
    53.4  2 along with this work; if not, write to the Free Software Foundation,
    53.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    53.6  
    53.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    53.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    53.9 -have any questions.
   53.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   53.11 +or visit www.oracle.com if you need additional information or have any
   53.12 +questions.
   53.13  -->
   53.14  
   53.15  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
    54.1 --- a/src/share/classes/javax/crypto/package.html	Thu May 27 10:57:25 2010 -0700
    54.2 +++ b/src/share/classes/javax/crypto/package.html	Wed Jun 02 15:39:48 2010 -0700
    54.3 @@ -18,9 +18,9 @@
    54.4  2 along with this work; if not, write to the Free Software Foundation,
    54.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    54.6  
    54.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    54.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    54.9 -have any questions.
   54.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   54.11 +or visit www.oracle.com if you need additional information or have any
   54.12 +questions.
   54.13  -->
   54.14  
   54.15  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
    55.1 --- a/src/share/classes/javax/crypto/spec/package.html	Thu May 27 10:57:25 2010 -0700
    55.2 +++ b/src/share/classes/javax/crypto/spec/package.html	Wed Jun 02 15:39:48 2010 -0700
    55.3 @@ -18,9 +18,9 @@
    55.4  2 along with this work; if not, write to the Free Software Foundation,
    55.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    55.6  
    55.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    55.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    55.9 -have any questions.
   55.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   55.11 +or visit www.oracle.com if you need additional information or have any
   55.12 +questions.
   55.13  -->
   55.14  
   55.15  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
    56.1 --- a/src/share/classes/javax/imageio/event/package.html	Thu May 27 10:57:25 2010 -0700
    56.2 +++ b/src/share/classes/javax/imageio/event/package.html	Wed Jun 02 15:39:48 2010 -0700
    56.3 @@ -21,9 +21,9 @@
    56.4  2 along with this work; if not, write to the Free Software Foundation,
    56.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    56.6  
    56.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    56.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    56.9 -have any questions.
   56.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   56.11 +or visit www.oracle.com if you need additional information or have any
   56.12 +questions.
   56.13  -->
   56.14  
   56.15  </head>
    57.1 --- a/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html	Thu May 27 10:57:25 2010 -0700
    57.2 +++ b/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html	Wed Jun 02 15:39:48 2010 -0700
    57.3 @@ -21,9 +21,9 @@
    57.4  2 along with this work; if not, write to the Free Software Foundation,
    57.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    57.6  
    57.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    57.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    57.9 -have any questions.
   57.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   57.11 +or visit www.oracle.com if you need additional information or have any
   57.12 +questions.
   57.13  -->
   57.14  
   57.15  <title>BMP Metadata Format Specification</title>
    58.1 --- a/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html	Thu May 27 10:57:25 2010 -0700
    58.2 +++ b/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html	Wed Jun 02 15:39:48 2010 -0700
    58.3 @@ -21,9 +21,9 @@
    58.4  2 along with this work; if not, write to the Free Software Foundation,
    58.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    58.6  
    58.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    58.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    58.9 -have any questions.
   58.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   58.11 +or visit www.oracle.com if you need additional information or have any
   58.12 +questions.
   58.13  -->
   58.14  
   58.15  <title>GIF Metadata Format Specification</title>
    59.1 --- a/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html	Thu May 27 10:57:25 2010 -0700
    59.2 +++ b/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html	Wed Jun 02 15:39:48 2010 -0700
    59.3 @@ -21,9 +21,9 @@
    59.4  2 along with this work; if not, write to the Free Software Foundation,
    59.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    59.6  
    59.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    59.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    59.9 -have any questions.
   59.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   59.11 +or visit www.oracle.com if you need additional information or have any
   59.12 +questions.
   59.13  -->
   59.14  
   59.15  <title>JPEG Metadata Format Specification and Usage Notes</title>
    60.1 --- a/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html	Thu May 27 10:57:25 2010 -0700
    60.2 +++ b/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html	Wed Jun 02 15:39:48 2010 -0700
    60.3 @@ -21,9 +21,9 @@
    60.4  2 along with this work; if not, write to the Free Software Foundation,
    60.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    60.6  
    60.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    60.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    60.9 -have any questions.
   60.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   60.11 +or visit www.oracle.com if you need additional information or have any
   60.12 +questions.
   60.13  -->
   60.14  
   60.15  <title>PNG Metadata Format Specification</title>
    61.1 --- a/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html	Thu May 27 10:57:25 2010 -0700
    61.2 +++ b/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html	Wed Jun 02 15:39:48 2010 -0700
    61.3 @@ -21,9 +21,9 @@
    61.4  2 along with this work; if not, write to the Free Software Foundation,
    61.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    61.6  
    61.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    61.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    61.9 -have any questions.
   61.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   61.11 +or visit www.oracle.com if you need additional information or have any
   61.12 +questions.
   61.13  -->
   61.14  
   61.15  <title>Standard Metadata Format Specification</title>
    62.1 --- a/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html	Thu May 27 10:57:25 2010 -0700
    62.2 +++ b/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html	Wed Jun 02 15:39:48 2010 -0700
    62.3 @@ -21,9 +21,9 @@
    62.4  2 along with this work; if not, write to the Free Software Foundation,
    62.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    62.6  
    62.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    62.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    62.9 -have any questions.
   62.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   62.11 +or visit www.oracle.com if you need additional information or have any
   62.12 +questions.
   62.13  -->
   62.14  
   62.15  <title>WBMP Metadata Format Specification</title>
    63.1 --- a/src/share/classes/javax/imageio/metadata/package.html	Thu May 27 10:57:25 2010 -0700
    63.2 +++ b/src/share/classes/javax/imageio/metadata/package.html	Wed Jun 02 15:39:48 2010 -0700
    63.3 @@ -21,9 +21,9 @@
    63.4  2 along with this work; if not, write to the Free Software Foundation,
    63.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    63.6  
    63.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    63.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    63.9 -have any questions.
   63.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   63.11 +or visit www.oracle.com if you need additional information or have any
   63.12 +questions.
   63.13  -->
   63.14  
   63.15  </head>
    64.1 --- a/src/share/classes/javax/imageio/package.html	Thu May 27 10:57:25 2010 -0700
    64.2 +++ b/src/share/classes/javax/imageio/package.html	Wed Jun 02 15:39:48 2010 -0700
    64.3 @@ -21,9 +21,9 @@
    64.4  2 along with this work; if not, write to the Free Software Foundation,
    64.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    64.6  
    64.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    64.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    64.9 -have any questions.
   64.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   64.11 +or visit www.oracle.com if you need additional information or have any
   64.12 +questions.
   64.13  -->
   64.14  
   64.15  </head>
    65.1 --- a/src/share/classes/javax/imageio/plugins/bmp/package.html	Thu May 27 10:57:25 2010 -0700
    65.2 +++ b/src/share/classes/javax/imageio/plugins/bmp/package.html	Wed Jun 02 15:39:48 2010 -0700
    65.3 @@ -21,9 +21,9 @@
    65.4  2 along with this work; if not, write to the Free Software Foundation,
    65.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    65.6  
    65.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    65.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    65.9 -have any questions.
   65.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   65.11 +or visit www.oracle.com if you need additional information or have any
   65.12 +questions.
   65.13  -->
   65.14  
   65.15  </head>
    66.1 --- a/src/share/classes/javax/imageio/plugins/jpeg/package.html	Thu May 27 10:57:25 2010 -0700
    66.2 +++ b/src/share/classes/javax/imageio/plugins/jpeg/package.html	Wed Jun 02 15:39:48 2010 -0700
    66.3 @@ -21,9 +21,9 @@
    66.4  2 along with this work; if not, write to the Free Software Foundation,
    66.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    66.6  
    66.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    66.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    66.9 -have any questions.
   66.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   66.11 +or visit www.oracle.com if you need additional information or have any
   66.12 +questions.
   66.13  -->
   66.14  
   66.15  </head>
    67.1 --- a/src/share/classes/javax/imageio/spi/package.html	Thu May 27 10:57:25 2010 -0700
    67.2 +++ b/src/share/classes/javax/imageio/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
    67.3 @@ -21,9 +21,9 @@
    67.4  2 along with this work; if not, write to the Free Software Foundation,
    67.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    67.6  
    67.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    67.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    67.9 -have any questions.
   67.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   67.11 +or visit www.oracle.com if you need additional information or have any
   67.12 +questions.
   67.13  -->
   67.14  
   67.15  </head>
    68.1 --- a/src/share/classes/javax/imageio/stream/package.html	Thu May 27 10:57:25 2010 -0700
    68.2 +++ b/src/share/classes/javax/imageio/stream/package.html	Wed Jun 02 15:39:48 2010 -0700
    68.3 @@ -21,9 +21,9 @@
    68.4  2 along with this work; if not, write to the Free Software Foundation,
    68.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    68.6  
    68.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    68.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    68.9 -have any questions.
   68.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   68.11 +or visit www.oracle.com if you need additional information or have any
   68.12 +questions.
   68.13  -->
   68.14  
   68.15  </head>
    69.1 --- a/src/share/classes/javax/management/build.xml	Thu May 27 10:57:25 2010 -0700
    69.2 +++ b/src/share/classes/javax/management/build.xml	Wed Jun 02 15:39:48 2010 -0700
    69.3 @@ -51,7 +51,7 @@
    69.4       -->
    69.5  
    69.6      <description>
    69.7 -	Copyright 2006 Sun Microsystems, Inc.  All rights reserved. Use is subject to license terms.
    69.8 +        Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
    69.9  
   69.10          Description: JMX API Version 1.4 - Source Code from Java SE 6
   69.11      </description>
    70.1 --- a/src/share/classes/javax/management/loading/package.html	Thu May 27 10:57:25 2010 -0700
    70.2 +++ b/src/share/classes/javax/management/loading/package.html	Wed Jun 02 15:39:48 2010 -0700
    70.3 @@ -21,9 +21,9 @@
    70.4  2 along with this work; if not, write to the Free Software Foundation,
    70.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    70.6  
    70.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    70.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    70.9 -have any questions.
   70.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   70.11 +or visit www.oracle.com if you need additional information or have any
   70.12 +questions.
   70.13  -->
   70.14  </head>
   70.15  <body bgcolor="white">
    71.1 --- a/src/share/classes/javax/management/modelmbean/package.html	Thu May 27 10:57:25 2010 -0700
    71.2 +++ b/src/share/classes/javax/management/modelmbean/package.html	Wed Jun 02 15:39:48 2010 -0700
    71.3 @@ -21,9 +21,9 @@
    71.4  2 along with this work; if not, write to the Free Software Foundation,
    71.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    71.6  
    71.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    71.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    71.9 -have any questions.
   71.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   71.11 +or visit www.oracle.com if you need additional information or have any
   71.12 +questions.
   71.13  -->
   71.14  </head>
   71.15  <body bgcolor="white">
    72.1 --- a/src/share/classes/javax/management/monitor/package.html	Thu May 27 10:57:25 2010 -0700
    72.2 +++ b/src/share/classes/javax/management/monitor/package.html	Wed Jun 02 15:39:48 2010 -0700
    72.3 @@ -21,9 +21,9 @@
    72.4  2 along with this work; if not, write to the Free Software Foundation,
    72.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    72.6  
    72.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    72.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    72.9 -have any questions.
   72.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   72.11 +or visit www.oracle.com if you need additional information or have any
   72.12 +questions.
   72.13  -->
   72.14  </head>
   72.15  <body bgcolor="white">
    73.1 --- a/src/share/classes/javax/management/openmbean/package.html	Thu May 27 10:57:25 2010 -0700
    73.2 +++ b/src/share/classes/javax/management/openmbean/package.html	Wed Jun 02 15:39:48 2010 -0700
    73.3 @@ -21,9 +21,9 @@
    73.4  2 along with this work; if not, write to the Free Software Foundation,
    73.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    73.6  
    73.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    73.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    73.9 -have any questions.
   73.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   73.11 +or visit www.oracle.com if you need additional information or have any
   73.12 +questions.
   73.13  -->
   73.14  </head>
   73.15  <body bgcolor="white">
    74.1 --- a/src/share/classes/javax/management/package.html	Thu May 27 10:57:25 2010 -0700
    74.2 +++ b/src/share/classes/javax/management/package.html	Wed Jun 02 15:39:48 2010 -0700
    74.3 @@ -21,9 +21,9 @@
    74.4  2 along with this work; if not, write to the Free Software Foundation,
    74.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    74.6  
    74.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    74.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    74.9 -have any questions.
   74.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   74.11 +or visit www.oracle.com if you need additional information or have any
   74.12 +questions.
   74.13          -->
   74.14      </head>
   74.15      <body bgcolor="white">
    75.1 --- a/src/share/classes/javax/management/relation/package.html	Thu May 27 10:57:25 2010 -0700
    75.2 +++ b/src/share/classes/javax/management/relation/package.html	Wed Jun 02 15:39:48 2010 -0700
    75.3 @@ -21,9 +21,9 @@
    75.4  2 along with this work; if not, write to the Free Software Foundation,
    75.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    75.6  
    75.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    75.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    75.9 -have any questions.
   75.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   75.11 +or visit www.oracle.com if you need additional information or have any
   75.12 +questions.
   75.13  -->
   75.14  </head>
   75.15  <body bgcolor="white">
    76.1 --- a/src/share/classes/javax/management/remote/package.html	Thu May 27 10:57:25 2010 -0700
    76.2 +++ b/src/share/classes/javax/management/remote/package.html	Wed Jun 02 15:39:48 2010 -0700
    76.3 @@ -21,9 +21,9 @@
    76.4  2 along with this work; if not, write to the Free Software Foundation,
    76.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    76.6  
    76.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    76.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    76.9 -have any questions.
   76.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   76.11 +or visit www.oracle.com if you need additional information or have any
   76.12 +questions.
   76.13  -->
   76.14  </head>
   76.15  <body bgcolor="white">
    77.1 --- a/src/share/classes/javax/management/remote/rmi/package.html	Thu May 27 10:57:25 2010 -0700
    77.2 +++ b/src/share/classes/javax/management/remote/rmi/package.html	Wed Jun 02 15:39:48 2010 -0700
    77.3 @@ -21,9 +21,9 @@
    77.4  2 along with this work; if not, write to the Free Software Foundation,
    77.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    77.6  
    77.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    77.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    77.9 -have any questions.
   77.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   77.11 +or visit www.oracle.com if you need additional information or have any
   77.12 +questions.
   77.13  -->
   77.14  </head>
   77.15  <body bgcolor="white">
    78.1 --- a/src/share/classes/javax/management/timer/package.html	Thu May 27 10:57:25 2010 -0700
    78.2 +++ b/src/share/classes/javax/management/timer/package.html	Wed Jun 02 15:39:48 2010 -0700
    78.3 @@ -21,9 +21,9 @@
    78.4  2 along with this work; if not, write to the Free Software Foundation,
    78.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    78.6  
    78.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    78.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    78.9 -have any questions.
   78.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   78.11 +or visit www.oracle.com if you need additional information or have any
   78.12 +questions.
   78.13  -->
   78.14  </head>
   78.15  <body bgcolor="white">
    79.1 --- a/src/share/classes/javax/naming/directory/package.html	Thu May 27 10:57:25 2010 -0700
    79.2 +++ b/src/share/classes/javax/naming/directory/package.html	Wed Jun 02 15:39:48 2010 -0700
    79.3 @@ -21,9 +21,9 @@
    79.4  2 along with this work; if not, write to the Free Software Foundation,
    79.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    79.6  
    79.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    79.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    79.9 -have any questions.
   79.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   79.11 +or visit www.oracle.com if you need additional information or have any
   79.12 +questions.
   79.13  -->
   79.14  </head>
   79.15  <body bgcolor="white">
    80.1 --- a/src/share/classes/javax/naming/event/package.html	Thu May 27 10:57:25 2010 -0700
    80.2 +++ b/src/share/classes/javax/naming/event/package.html	Wed Jun 02 15:39:48 2010 -0700
    80.3 @@ -21,9 +21,9 @@
    80.4  2 along with this work; if not, write to the Free Software Foundation,
    80.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    80.6  
    80.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    80.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    80.9 -have any questions.
   80.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   80.11 +or visit www.oracle.com if you need additional information or have any
   80.12 +questions.
   80.13  -->
   80.14  </head>
   80.15  <body bgcolor="white">
    81.1 --- a/src/share/classes/javax/naming/ldap/package.html	Thu May 27 10:57:25 2010 -0700
    81.2 +++ b/src/share/classes/javax/naming/ldap/package.html	Wed Jun 02 15:39:48 2010 -0700
    81.3 @@ -21,9 +21,9 @@
    81.4  2 along with this work; if not, write to the Free Software Foundation,
    81.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    81.6  
    81.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    81.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    81.9 -have any questions.
   81.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   81.11 +or visit www.oracle.com if you need additional information or have any
   81.12 +questions.
   81.13   
   81.14  -->
   81.15  </head>
    82.1 --- a/src/share/classes/javax/naming/package.html	Thu May 27 10:57:25 2010 -0700
    82.2 +++ b/src/share/classes/javax/naming/package.html	Wed Jun 02 15:39:48 2010 -0700
    82.3 @@ -21,9 +21,9 @@
    82.4  2 along with this work; if not, write to the Free Software Foundation,
    82.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    82.6  
    82.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    82.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    82.9 -have any questions.
   82.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   82.11 +or visit www.oracle.com if you need additional information or have any
   82.12 +questions.
   82.13  -->
   82.14  </head>
   82.15  <body bgcolor="white">
    83.1 --- a/src/share/classes/javax/naming/spi/package.html	Thu May 27 10:57:25 2010 -0700
    83.2 +++ b/src/share/classes/javax/naming/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
    83.3 @@ -21,9 +21,9 @@
    83.4  2 along with this work; if not, write to the Free Software Foundation,
    83.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    83.6  
    83.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    83.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    83.9 -have any questions.
   83.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   83.11 +or visit www.oracle.com if you need additional information or have any
   83.12 +questions.
   83.13  -->
   83.14  </head>
   83.15  <body bgcolor="white">
    84.1 --- a/src/share/classes/javax/net/package.html	Thu May 27 10:57:25 2010 -0700
    84.2 +++ b/src/share/classes/javax/net/package.html	Wed Jun 02 15:39:48 2010 -0700
    84.3 @@ -21,9 +21,9 @@
    84.4  2 along with this work; if not, write to the Free Software Foundation,
    84.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    84.6  
    84.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    84.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    84.9 -have any questions.
   84.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   84.11 +or visit www.oracle.com if you need additional information or have any
   84.12 +questions.
   84.13  -->
   84.14  
   84.15  </head>
    85.1 --- a/src/share/classes/javax/net/ssl/package.html	Thu May 27 10:57:25 2010 -0700
    85.2 +++ b/src/share/classes/javax/net/ssl/package.html	Wed Jun 02 15:39:48 2010 -0700
    85.3 @@ -21,9 +21,9 @@
    85.4  2 along with this work; if not, write to the Free Software Foundation,
    85.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    85.6  
    85.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    85.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    85.9 -have any questions.
   85.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   85.11 +or visit www.oracle.com if you need additional information or have any
   85.12 +questions.
   85.13  -->
   85.14  
   85.15  </head>
    86.1 --- a/src/share/classes/javax/print/attribute/package.html	Thu May 27 10:57:25 2010 -0700
    86.2 +++ b/src/share/classes/javax/print/attribute/package.html	Wed Jun 02 15:39:48 2010 -0700
    86.3 @@ -21,9 +21,9 @@
    86.4  2 along with this work; if not, write to the Free Software Foundation,
    86.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    86.6  
    86.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    86.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    86.9 -have any questions.
   86.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   86.11 +or visit www.oracle.com if you need additional information or have any
   86.12 +questions.
   86.13  -->
   86.14  </head>
   86.15  <body bgcolor="white">
    87.1 --- a/src/share/classes/javax/print/attribute/standard/package.html	Thu May 27 10:57:25 2010 -0700
    87.2 +++ b/src/share/classes/javax/print/attribute/standard/package.html	Wed Jun 02 15:39:48 2010 -0700
    87.3 @@ -21,9 +21,9 @@
    87.4  2 along with this work; if not, write to the Free Software Foundation,
    87.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    87.6  
    87.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    87.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    87.9 -have any questions.
   87.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   87.11 +or visit www.oracle.com if you need additional information or have any
   87.12 +questions.
   87.13  -->
   87.14  </head>
   87.15  <body bgcolor="white">
    88.1 --- a/src/share/classes/javax/print/event/package.html	Thu May 27 10:57:25 2010 -0700
    88.2 +++ b/src/share/classes/javax/print/event/package.html	Wed Jun 02 15:39:48 2010 -0700
    88.3 @@ -21,9 +21,9 @@
    88.4  2 along with this work; if not, write to the Free Software Foundation,
    88.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    88.6  
    88.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    88.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    88.9 -have any questions.
   88.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   88.11 +or visit www.oracle.com if you need additional information or have any
   88.12 +questions.
   88.13  -->
   88.14  </head>
   88.15  <body bgcolor="white">
    89.1 --- a/src/share/classes/javax/print/package.html	Thu May 27 10:57:25 2010 -0700
    89.2 +++ b/src/share/classes/javax/print/package.html	Wed Jun 02 15:39:48 2010 -0700
    89.3 @@ -21,9 +21,9 @@
    89.4  2 along with this work; if not, write to the Free Software Foundation,
    89.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    89.6  
    89.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    89.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    89.9 -have any questions.
   89.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   89.11 +or visit www.oracle.com if you need additional information or have any
   89.12 +questions.
   89.13  -->
   89.14  </head>
   89.15  <body bgcolor="white">
    90.1 --- a/src/share/classes/javax/rmi/ssl/package.html	Thu May 27 10:57:25 2010 -0700
    90.2 +++ b/src/share/classes/javax/rmi/ssl/package.html	Wed Jun 02 15:39:48 2010 -0700
    90.3 @@ -21,9 +21,9 @@
    90.4  2 along with this work; if not, write to the Free Software Foundation,
    90.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    90.6  
    90.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    90.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    90.9 -have any questions.
   90.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   90.11 +or visit www.oracle.com if you need additional information or have any
   90.12 +questions.
   90.13  -->
   90.14  
   90.15  </head>
    91.1 --- a/src/share/classes/javax/script/package.html	Thu May 27 10:57:25 2010 -0700
    91.2 +++ b/src/share/classes/javax/script/package.html	Wed Jun 02 15:39:48 2010 -0700
    91.3 @@ -21,9 +21,9 @@
    91.4  2 along with this work; if not, write to the Free Software Foundation,
    91.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    91.6  
    91.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    91.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    91.9 -have any questions.
   91.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   91.11 +or visit www.oracle.com if you need additional information or have any
   91.12 +questions.
   91.13  -->
   91.14  
   91.15  </head>
    92.1 --- a/src/share/classes/javax/security/auth/callback/package.html	Thu May 27 10:57:25 2010 -0700
    92.2 +++ b/src/share/classes/javax/security/auth/callback/package.html	Wed Jun 02 15:39:48 2010 -0700
    92.3 @@ -21,9 +21,9 @@
    92.4  2 along with this work; if not, write to the Free Software Foundation,
    92.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    92.6  
    92.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    92.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    92.9 -have any questions.
   92.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   92.11 +or visit www.oracle.com if you need additional information or have any
   92.12 +questions.
   92.13  -->
   92.14  
   92.15  </head>
    93.1 --- a/src/share/classes/javax/security/auth/kerberos/package.html	Thu May 27 10:57:25 2010 -0700
    93.2 +++ b/src/share/classes/javax/security/auth/kerberos/package.html	Wed Jun 02 15:39:48 2010 -0700
    93.3 @@ -21,9 +21,9 @@
    93.4  2 along with this work; if not, write to the Free Software Foundation,
    93.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    93.6  
    93.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    93.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    93.9 -have any questions.
   93.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   93.11 +or visit www.oracle.com if you need additional information or have any
   93.12 +questions.
   93.13  -->
   93.14  
   93.15  </head>
    94.1 --- a/src/share/classes/javax/security/auth/login/package.html	Thu May 27 10:57:25 2010 -0700
    94.2 +++ b/src/share/classes/javax/security/auth/login/package.html	Wed Jun 02 15:39:48 2010 -0700
    94.3 @@ -21,9 +21,9 @@
    94.4  2 along with this work; if not, write to the Free Software Foundation,
    94.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    94.6  
    94.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    94.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    94.9 -have any questions.
   94.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   94.11 +or visit www.oracle.com if you need additional information or have any
   94.12 +questions.
   94.13  -->
   94.14  
   94.15  </head>
    95.1 --- a/src/share/classes/javax/security/auth/package.html	Thu May 27 10:57:25 2010 -0700
    95.2 +++ b/src/share/classes/javax/security/auth/package.html	Wed Jun 02 15:39:48 2010 -0700
    95.3 @@ -21,9 +21,9 @@
    95.4  2 along with this work; if not, write to the Free Software Foundation,
    95.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    95.6  
    95.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    95.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    95.9 -have any questions.
   95.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   95.11 +or visit www.oracle.com if you need additional information or have any
   95.12 +questions.
   95.13  -->
   95.14  
   95.15  </head>
    96.1 --- a/src/share/classes/javax/security/auth/spi/package.html	Thu May 27 10:57:25 2010 -0700
    96.2 +++ b/src/share/classes/javax/security/auth/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
    96.3 @@ -21,9 +21,9 @@
    96.4  2 along with this work; if not, write to the Free Software Foundation,
    96.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    96.6  
    96.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    96.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    96.9 -have any questions.
   96.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   96.11 +or visit www.oracle.com if you need additional information or have any
   96.12 +questions.
   96.13  -->
   96.14  
   96.15  </head>
    97.1 --- a/src/share/classes/javax/security/auth/x500/package.html	Thu May 27 10:57:25 2010 -0700
    97.2 +++ b/src/share/classes/javax/security/auth/x500/package.html	Wed Jun 02 15:39:48 2010 -0700
    97.3 @@ -21,9 +21,9 @@
    97.4  2 along with this work; if not, write to the Free Software Foundation,
    97.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    97.6  
    97.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    97.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    97.9 -have any questions.
   97.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   97.11 +or visit www.oracle.com if you need additional information or have any
   97.12 +questions.
   97.13  -->
   97.14  
   97.15  </head>
    98.1 --- a/src/share/classes/javax/security/cert/package.html	Thu May 27 10:57:25 2010 -0700
    98.2 +++ b/src/share/classes/javax/security/cert/package.html	Wed Jun 02 15:39:48 2010 -0700
    98.3 @@ -21,9 +21,9 @@
    98.4  2 along with this work; if not, write to the Free Software Foundation,
    98.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    98.6  
    98.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    98.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    98.9 -have any questions.
   98.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   98.11 +or visit www.oracle.com if you need additional information or have any
   98.12 +questions.
   98.13  -->
   98.14  
   98.15  </head>
    99.1 --- a/src/share/classes/javax/security/sasl/package.html	Thu May 27 10:57:25 2010 -0700
    99.2 +++ b/src/share/classes/javax/security/sasl/package.html	Wed Jun 02 15:39:48 2010 -0700
    99.3 @@ -21,9 +21,9 @@
    99.4  2 along with this work; if not, write to the Free Software Foundation,
    99.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    99.6  
    99.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    99.8 -CA 95054 USA or visit www.sun.com if you need additional information or
    99.9 -have any questions.
   99.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   99.11 +or visit www.oracle.com if you need additional information or have any
   99.12 +questions.
   99.13  -->
   99.14  </head>
   99.15  <body bgcolor="white">
   100.1 --- a/src/share/classes/javax/sound/midi/package.html	Thu May 27 10:57:25 2010 -0700
   100.2 +++ b/src/share/classes/javax/sound/midi/package.html	Wed Jun 02 15:39:48 2010 -0700
   100.3 @@ -21,9 +21,9 @@
   100.4  2 along with this work; if not, write to the Free Software Foundation,
   100.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   100.6  
   100.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   100.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   100.9 -have any questions.
  100.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  100.11 +or visit www.oracle.com if you need additional information or have any
  100.12 +questions.
  100.13  -->
  100.14  
  100.15  </head>
   101.1 --- a/src/share/classes/javax/sound/midi/spi/package.html	Thu May 27 10:57:25 2010 -0700
   101.2 +++ b/src/share/classes/javax/sound/midi/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
   101.3 @@ -21,9 +21,9 @@
   101.4  2 along with this work; if not, write to the Free Software Foundation,
   101.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   101.6  
   101.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   101.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   101.9 -have any questions.
  101.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  101.11 +or visit www.oracle.com if you need additional information or have any
  101.12 +questions.
  101.13  -->
  101.14  
  101.15  </head>
   102.1 --- a/src/share/classes/javax/sound/sampled/package.html	Thu May 27 10:57:25 2010 -0700
   102.2 +++ b/src/share/classes/javax/sound/sampled/package.html	Wed Jun 02 15:39:48 2010 -0700
   102.3 @@ -21,9 +21,9 @@
   102.4  2 along with this work; if not, write to the Free Software Foundation,
   102.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   102.6  
   102.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   102.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   102.9 -have any questions.
  102.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  102.11 +or visit www.oracle.com if you need additional information or have any
  102.12 +questions.
  102.13  -->
  102.14  
  102.15  </head>
   103.1 --- a/src/share/classes/javax/sound/sampled/spi/package.html	Thu May 27 10:57:25 2010 -0700
   103.2 +++ b/src/share/classes/javax/sound/sampled/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
   103.3 @@ -21,9 +21,9 @@
   103.4  2 along with this work; if not, write to the Free Software Foundation,
   103.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   103.6  
   103.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   103.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   103.9 -have any questions.
  103.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  103.11 +or visit www.oracle.com if you need additional information or have any
  103.12 +questions.
  103.13  -->
  103.14  
  103.15  </head>
   104.1 --- a/src/share/classes/javax/sql/package.html	Thu May 27 10:57:25 2010 -0700
   104.2 +++ b/src/share/classes/javax/sql/package.html	Wed Jun 02 15:39:48 2010 -0700
   104.3 @@ -21,9 +21,9 @@
   104.4  2 along with this work; if not, write to the Free Software Foundation,
   104.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   104.6  
   104.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   104.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   104.9 -have any questions.
  104.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  104.11 +or visit www.oracle.com if you need additional information or have any
  104.12 +questions.
  104.13  -->
  104.14  
  104.15  </head>
   105.1 --- a/src/share/classes/javax/sql/rowset/package.html	Thu May 27 10:57:25 2010 -0700
   105.2 +++ b/src/share/classes/javax/sql/rowset/package.html	Wed Jun 02 15:39:48 2010 -0700
   105.3 @@ -24,9 +24,9 @@
   105.4  2 along with this work; if not, write to the Free Software Foundation,
   105.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   105.6  
   105.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   105.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   105.9 -have any questions.
  105.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  105.11 +or visit www.oracle.com if you need additional information or have any
  105.12 +questions.
  105.13  
  105.14  -->
  105.15    <title>javax.sql.rowset Package</title>
   106.1 --- a/src/share/classes/javax/sql/rowset/serial/package.html	Thu May 27 10:57:25 2010 -0700
   106.2 +++ b/src/share/classes/javax/sql/rowset/serial/package.html	Wed Jun 02 15:39:48 2010 -0700
   106.3 @@ -27,9 +27,9 @@
   106.4  2 along with this work; if not, write to the Free Software Foundation,
   106.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   106.6  
   106.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   106.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   106.9 -have any questions.
  106.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  106.11 +or visit www.oracle.com if you need additional information or have any
  106.12 +questions.
  106.13  -->
  106.14  <title>javax.sql.rowset.serial</title>
  106.15  </head>
   107.1 --- a/src/share/classes/javax/sql/rowset/spi/package.html	Thu May 27 10:57:25 2010 -0700
   107.2 +++ b/src/share/classes/javax/sql/rowset/spi/package.html	Wed Jun 02 15:39:48 2010 -0700
   107.3 @@ -27,9 +27,9 @@
   107.4  2 along with this work; if not, write to the Free Software Foundation,
   107.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   107.6  
   107.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   107.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   107.9 -have any questions.
  107.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  107.11 +or visit www.oracle.com if you need additional information or have any
  107.12 +questions.
  107.13  -->
  107.14    <title>javax.sql.rowset.spi</title>
  107.15     
   108.1 --- a/src/share/classes/javax/swing/border/package.html	Thu May 27 10:57:25 2010 -0700
   108.2 +++ b/src/share/classes/javax/swing/border/package.html	Wed Jun 02 15:39:48 2010 -0700
   108.3 @@ -21,9 +21,9 @@
   108.4  2 along with this work; if not, write to the Free Software Foundation,
   108.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   108.6  
   108.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   108.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   108.9 -have any questions.
  108.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  108.11 +or visit www.oracle.com if you need additional information or have any
  108.12 +questions.
  108.13  -->
  108.14  
  108.15  </head>
   109.1 --- a/src/share/classes/javax/swing/colorchooser/package.html	Thu May 27 10:57:25 2010 -0700
   109.2 +++ b/src/share/classes/javax/swing/colorchooser/package.html	Wed Jun 02 15:39:48 2010 -0700
   109.3 @@ -21,9 +21,9 @@
   109.4  2 along with this work; if not, write to the Free Software Foundation,
   109.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   109.6  
   109.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   109.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   109.9 -have any questions.
  109.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  109.11 +or visit www.oracle.com if you need additional information or have any
  109.12 +questions.
  109.13  -->
  109.14  </head>
  109.15  <body bgcolor="white">
   110.1 --- a/src/share/classes/javax/swing/event/package.html	Thu May 27 10:57:25 2010 -0700
   110.2 +++ b/src/share/classes/javax/swing/event/package.html	Wed Jun 02 15:39:48 2010 -0700
   110.3 @@ -21,9 +21,9 @@
   110.4  2 along with this work; if not, write to the Free Software Foundation,
   110.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   110.6  
   110.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   110.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   110.9 -have any questions.
  110.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  110.11 +or visit www.oracle.com if you need additional information or have any
  110.12 +questions.
  110.13  -->
  110.14  
  110.15  </head>
   111.1 --- a/src/share/classes/javax/swing/filechooser/package.html	Thu May 27 10:57:25 2010 -0700
   111.2 +++ b/src/share/classes/javax/swing/filechooser/package.html	Wed Jun 02 15:39:48 2010 -0700
   111.3 @@ -21,9 +21,9 @@
   111.4  2 along with this work; if not, write to the Free Software Foundation,
   111.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   111.6  
   111.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   111.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   111.9 -have any questions.
  111.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  111.11 +or visit www.oracle.com if you need additional information or have any
  111.12 +questions.
  111.13  -->
  111.14  
  111.15  </head>
   112.1 --- a/src/share/classes/javax/swing/package.html	Thu May 27 10:57:25 2010 -0700
   112.2 +++ b/src/share/classes/javax/swing/package.html	Wed Jun 02 15:39:48 2010 -0700
   112.3 @@ -22,9 +22,9 @@
   112.4  2 along with this work; if not, write to the Free Software Foundation,
   112.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   112.6  
   112.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   112.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   112.9 -have any questions.
  112.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  112.11 +or visit www.oracle.com if you need additional information or have any
  112.12 +questions.
  112.13  -->
  112.14  
  112.15          <META NAME="Author" Content="Eric Armstrong">
   113.1 --- a/src/share/classes/javax/swing/plaf/basic/package.html	Thu May 27 10:57:25 2010 -0700
   113.2 +++ b/src/share/classes/javax/swing/plaf/basic/package.html	Wed Jun 02 15:39:48 2010 -0700
   113.3 @@ -21,9 +21,9 @@
   113.4  2 along with this work; if not, write to the Free Software Foundation,
   113.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   113.6  
   113.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   113.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   113.9 -have any questions.
  113.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  113.11 +or visit www.oracle.com if you need additional information or have any
  113.12 +questions.
  113.13  -->
  113.14  
  113.15  </head>
   114.1 --- a/src/share/classes/javax/swing/plaf/metal/package.html	Thu May 27 10:57:25 2010 -0700
   114.2 +++ b/src/share/classes/javax/swing/plaf/metal/package.html	Wed Jun 02 15:39:48 2010 -0700
   114.3 @@ -21,9 +21,9 @@
   114.4  2 along with this work; if not, write to the Free Software Foundation,
   114.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   114.6  
   114.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   114.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   114.9 -have any questions.
  114.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  114.11 +or visit www.oracle.com if you need additional information or have any
  114.12 +questions.
  114.13  -->
  114.14  
  114.15  </head>
   115.1 --- a/src/share/classes/javax/swing/plaf/multi/package.html	Thu May 27 10:57:25 2010 -0700
   115.2 +++ b/src/share/classes/javax/swing/plaf/multi/package.html	Wed Jun 02 15:39:48 2010 -0700
   115.3 @@ -21,9 +21,9 @@
   115.4  2 along with this work; if not, write to the Free Software Foundation,
   115.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   115.6  
   115.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   115.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   115.9 -have any questions.
  115.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  115.11 +or visit www.oracle.com if you need additional information or have any
  115.12 +questions.
  115.13  -->
  115.14  
  115.15  </head>
   116.1 --- a/src/share/classes/javax/swing/plaf/nimbus/package.html	Thu May 27 10:57:25 2010 -0700
   116.2 +++ b/src/share/classes/javax/swing/plaf/nimbus/package.html	Wed Jun 02 15:39:48 2010 -0700
   116.3 @@ -21,9 +21,9 @@
   116.4  2 along with this work; if not, write to the Free Software Foundation,
   116.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   116.6  
   116.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   116.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   116.9 -have any questions.
  116.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  116.11 +or visit www.oracle.com if you need additional information or have any
  116.12 +questions.
  116.13  -->
  116.14  
  116.15  </head>
   117.1 --- a/src/share/classes/javax/swing/plaf/package.html	Thu May 27 10:57:25 2010 -0700
   117.2 +++ b/src/share/classes/javax/swing/plaf/package.html	Wed Jun 02 15:39:48 2010 -0700
   117.3 @@ -21,9 +21,9 @@
   117.4  2 along with this work; if not, write to the Free Software Foundation,
   117.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   117.6  
   117.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   117.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   117.9 -have any questions.
  117.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  117.11 +or visit www.oracle.com if you need additional information or have any
  117.12 +questions.
  117.13  -->
  117.14  
  117.15  </head>
   118.1 --- a/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html	Thu May 27 10:57:25 2010 -0700
   118.2 +++ b/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html	Wed Jun 02 15:39:48 2010 -0700
   118.3 @@ -21,9 +21,9 @@
   118.4  2 along with this work; if not, write to the Free Software Foundation,
   118.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   118.6  
   118.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   118.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   118.9 -have any questions.
  118.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  118.11 +or visit www.oracle.com if you need additional information or have any
  118.12 +questions.
  118.13  
  118.14  -->
  118.15  </head>
   119.1 --- a/src/share/classes/javax/swing/plaf/synth/package.html	Thu May 27 10:57:25 2010 -0700
   119.2 +++ b/src/share/classes/javax/swing/plaf/synth/package.html	Wed Jun 02 15:39:48 2010 -0700
   119.3 @@ -21,9 +21,9 @@
   119.4  2 along with this work; if not, write to the Free Software Foundation,
   119.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   119.6  
   119.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   119.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   119.9 -have any questions.
  119.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  119.11 +or visit www.oracle.com if you need additional information or have any
  119.12 +questions.
  119.13  
  119.14  
  119.15  -->
   120.1 --- a/src/share/classes/javax/swing/table/package.html	Thu May 27 10:57:25 2010 -0700
   120.2 +++ b/src/share/classes/javax/swing/table/package.html	Wed Jun 02 15:39:48 2010 -0700
   120.3 @@ -21,9 +21,9 @@
   120.4  2 along with this work; if not, write to the Free Software Foundation,
   120.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   120.6  
   120.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   120.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   120.9 -have any questions.
  120.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  120.11 +or visit www.oracle.com if you need additional information or have any
  120.12 +questions.
  120.13  -->
  120.14  
  120.15  </head>
   121.1 --- a/src/share/classes/javax/swing/text/html/package.html	Thu May 27 10:57:25 2010 -0700
   121.2 +++ b/src/share/classes/javax/swing/text/html/package.html	Wed Jun 02 15:39:48 2010 -0700
   121.3 @@ -21,9 +21,9 @@
   121.4  2 along with this work; if not, write to the Free Software Foundation,
   121.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   121.6  
   121.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   121.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   121.9 -have any questions.
  121.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  121.11 +or visit www.oracle.com if you need additional information or have any
  121.12 +questions.
  121.13  -->
  121.14  
  121.15  </head>
   122.1 --- a/src/share/classes/javax/swing/text/html/parser/package.html	Thu May 27 10:57:25 2010 -0700
   122.2 +++ b/src/share/classes/javax/swing/text/html/parser/package.html	Wed Jun 02 15:39:48 2010 -0700
   122.3 @@ -21,9 +21,9 @@
   122.4  2 along with this work; if not, write to the Free Software Foundation,
   122.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   122.6  
   122.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   122.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   122.9 -have any questions.
  122.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  122.11 +or visit www.oracle.com if you need additional information or have any
  122.12 +questions.
  122.13  -->
  122.14  
  122.15  </head>
   123.1 --- a/src/share/classes/javax/swing/text/package.html	Thu May 27 10:57:25 2010 -0700
   123.2 +++ b/src/share/classes/javax/swing/text/package.html	Wed Jun 02 15:39:48 2010 -0700
   123.3 @@ -21,9 +21,9 @@
   123.4  2 along with this work; if not, write to the Free Software Foundation,
   123.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   123.6  
   123.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   123.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   123.9 -have any questions.
  123.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  123.11 +or visit www.oracle.com if you need additional information or have any
  123.12 +questions.
  123.13  -->
  123.14  
  123.15  </head>
   124.1 --- a/src/share/classes/javax/swing/text/rtf/package.html	Thu May 27 10:57:25 2010 -0700
   124.2 +++ b/src/share/classes/javax/swing/text/rtf/package.html	Wed Jun 02 15:39:48 2010 -0700
   124.3 @@ -21,9 +21,9 @@
   124.4  2 along with this work; if not, write to the Free Software Foundation,
   124.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   124.6  
   124.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   124.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   124.9 -have any questions.
  124.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  124.11 +or visit www.oracle.com if you need additional information or have any
  124.12 +questions.
  124.13  -->
  124.14  
  124.15  </head>
   125.1 --- a/src/share/classes/javax/swing/tree/package.html	Thu May 27 10:57:25 2010 -0700
   125.2 +++ b/src/share/classes/javax/swing/tree/package.html	Wed Jun 02 15:39:48 2010 -0700
   125.3 @@ -21,9 +21,9 @@
   125.4  2 along with this work; if not, write to the Free Software Foundation,
   125.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   125.6  
   125.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   125.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   125.9 -have any questions.
  125.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  125.11 +or visit www.oracle.com if you need additional information or have any
  125.12 +questions.
  125.13  -->
  125.14  
  125.15  </head>
   126.1 --- a/src/share/classes/javax/swing/undo/package.html	Thu May 27 10:57:25 2010 -0700
   126.2 +++ b/src/share/classes/javax/swing/undo/package.html	Wed Jun 02 15:39:48 2010 -0700
   126.3 @@ -21,9 +21,9 @@
   126.4  2 along with this work; if not, write to the Free Software Foundation,
   126.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   126.6  
   126.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   126.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   126.9 -have any questions.
  126.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  126.11 +or visit www.oracle.com if you need additional information or have any
  126.12 +questions.
  126.13  -->
  126.14  
  126.15  </head>
   127.1 --- a/src/share/classes/javax/xml/crypto/dom/package.html	Thu May 27 10:57:25 2010 -0700
   127.2 +++ b/src/share/classes/javax/xml/crypto/dom/package.html	Wed Jun 02 15:39:48 2010 -0700
   127.3 @@ -20,9 +20,9 @@
   127.4  2 along with this work; if not, write to the Free Software Foundation,
   127.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   127.6  
   127.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   127.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   127.9 -have any questions.
  127.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  127.11 +or visit www.oracle.com if you need additional information or have any
  127.12 +questions.
  127.13  -->
  127.14  
  127.15  </head>
   128.1 --- a/src/share/classes/javax/xml/crypto/dsig/dom/package.html	Thu May 27 10:57:25 2010 -0700
   128.2 +++ b/src/share/classes/javax/xml/crypto/dsig/dom/package.html	Wed Jun 02 15:39:48 2010 -0700
   128.3 @@ -20,9 +20,9 @@
   128.4  2 along with this work; if not, write to the Free Software Foundation,
   128.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   128.6  
   128.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   128.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   128.9 -have any questions.
  128.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  128.11 +or visit www.oracle.com if you need additional information or have any
  128.12 +questions.
  128.13  -->
  128.14  
  128.15  </head>
   129.1 --- a/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html	Thu May 27 10:57:25 2010 -0700
   129.2 +++ b/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html	Wed Jun 02 15:39:48 2010 -0700
   129.3 @@ -20,9 +20,9 @@
   129.4  2 along with this work; if not, write to the Free Software Foundation,
   129.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   129.6  
   129.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   129.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   129.9 -have any questions.
  129.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  129.11 +or visit www.oracle.com if you need additional information or have any
  129.12 +questions.
  129.13  -->
  129.14  
  129.15  </head>
   130.1 --- a/src/share/classes/javax/xml/crypto/dsig/package.html	Thu May 27 10:57:25 2010 -0700
   130.2 +++ b/src/share/classes/javax/xml/crypto/dsig/package.html	Wed Jun 02 15:39:48 2010 -0700
   130.3 @@ -20,9 +20,9 @@
   130.4  2 along with this work; if not, write to the Free Software Foundation,
   130.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   130.6  
   130.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   130.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   130.9 -have any questions.
  130.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  130.11 +or visit www.oracle.com if you need additional information or have any
  130.12 +questions.
  130.13  -->
  130.14  
  130.15  </head>
   131.1 --- a/src/share/classes/javax/xml/crypto/dsig/spec/package.html	Thu May 27 10:57:25 2010 -0700
   131.2 +++ b/src/share/classes/javax/xml/crypto/dsig/spec/package.html	Wed Jun 02 15:39:48 2010 -0700
   131.3 @@ -20,9 +20,9 @@
   131.4  2 along with this work; if not, write to the Free Software Foundation,
   131.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   131.6  
   131.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   131.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   131.9 -have any questions.
  131.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  131.11 +or visit www.oracle.com if you need additional information or have any
  131.12 +questions.
  131.13  -->
  131.14  
  131.15  </head>
   132.1 --- a/src/share/classes/javax/xml/crypto/package.html	Thu May 27 10:57:25 2010 -0700
   132.2 +++ b/src/share/classes/javax/xml/crypto/package.html	Wed Jun 02 15:39:48 2010 -0700
   132.3 @@ -20,9 +20,9 @@
   132.4  2 along with this work; if not, write to the Free Software Foundation,
   132.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   132.6  
   132.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   132.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   132.9 -have any questions.
  132.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  132.11 +or visit www.oracle.com if you need additional information or have any
  132.12 +questions.
  132.13  -->
  132.14  
  132.15  </head>
   133.1 --- a/src/share/classes/org/ietf/jgss/package.html	Thu May 27 10:57:25 2010 -0700
   133.2 +++ b/src/share/classes/org/ietf/jgss/package.html	Wed Jun 02 15:39:48 2010 -0700
   133.3 @@ -21,9 +21,9 @@
   133.4  2 along with this work; if not, write to the Free Software Foundation,
   133.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   133.6  
   133.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   133.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   133.9 -have any questions.
  133.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  133.11 +or visit www.oracle.com if you need additional information or have any
  133.12 +questions.
  133.13  -->
  133.14  
  133.15  </head>
   134.1 --- a/src/share/classes/overview-core.html	Thu May 27 10:57:25 2010 -0700
   134.2 +++ b/src/share/classes/overview-core.html	Wed Jun 02 15:39:48 2010 -0700
   134.3 @@ -22,9 +22,9 @@
   134.4  2 along with this work; if not, write to the Free Software Foundation,
   134.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   134.6  
   134.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   134.8 -CA 95054 USA or visit www.sun.com if you need additional information or
   134.9 -have any questions.
  134.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  134.11 +or visit www.oracle.com if you need additional information or have any
  134.12 +questions.
  134.13  -->
  134.14  
  134.15  </head>
   135.1 --- a/src/share/classes/sun/nio/cs/standard-charsets	Thu May 27 10:57:25 2010 -0700
   135.2 +++ b/src/share/classes/sun/nio/cs/standard-charsets	Wed Jun 02 15:39:48 2010 -0700
   135.3 @@ -35,7 +35,7 @@
   135.4  # which is lazy initialized.
   135.5  
   135.6  # This year should only change if the generated source is modified.
   135.7 -copyright 2000
   135.8 +copyright 2000, 2007,
   135.9  package sun.nio.cs
  135.10  class StandardCharsets
  135.11  
   136.1 --- a/src/solaris/classes/sun/awt/X11/keysym2ucs.h	Thu May 27 10:57:25 2010 -0700
   136.2 +++ b/src/solaris/classes/sun/awt/X11/keysym2ucs.h	Wed Jun 02 15:39:48 2010 -0700
   136.3 @@ -39,7 +39,7 @@
   136.4   */
   136.5  
   136.6  tojava /*
   136.7 -tojava  * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
   136.8 +tojava  * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
   136.9  tojava  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  136.10  tojava  *
  136.11  tojava  * This code is free software; you can redistribute it and/or modify it
   137.1 --- a/test/java/awt/font/LineBreakMeasurer/FRCTest.java	Thu May 27 10:57:25 2010 -0700
   137.2 +++ b/test/java/awt/font/LineBreakMeasurer/FRCTest.java	Wed Jun 02 15:39:48 2010 -0700
   137.3 @@ -1,5 +1,5 @@
   137.4  /*
   137.5 - * Copyright 2008-9 Sun Microsystems, Inc.  All Rights Reserved.
   137.6 + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
   137.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   137.8   *
   137.9   * This code is free software; you can redistribute it and/or modify it
   138.1 --- a/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java	Thu May 27 10:57:25 2010 -0700
   138.2 +++ b/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java	Wed Jun 02 15:39:48 2010 -0700
   138.3 @@ -1,5 +1,5 @@
   138.4  /*
   138.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   138.6 + * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
   138.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   138.8   *
   138.9   * This code is free software; you can redistribute it and/or modify it
  138.10 @@ -16,9 +16,9 @@
  138.11   * 2 along with this work; if not, write to the Free Software Foundation,
  138.12   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  138.13   *
  138.14 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  138.15 - * CA 95054 USA or visit www.sun.com if you need additional information or
  138.16 - * have any questions.
  138.17 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  138.18 + * or visit www.oracle.com if you need additional information or have any
  138.19 + * questions.
  138.20   */
  138.21  
  138.22  /*
  138.23 @@ -92,4 +92,4 @@
  138.24  
  138.25          return op;
  138.26      }
  138.27 -}
  138.28 \ No newline at end of file
  138.29 +}
   139.1 --- a/test/java/beans/XMLEncoder/java_awt_Component.java	Thu May 27 10:57:25 2010 -0700
   139.2 +++ b/test/java/beans/XMLEncoder/java_awt_Component.java	Wed Jun 02 15:39:48 2010 -0700
   139.3 @@ -1,5 +1,5 @@
   139.4  /*
   139.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   139.6 + * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
   139.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   139.8   *
   139.9   * This code is free software; you can redistribute it and/or modify it
  139.10 @@ -16,9 +16,9 @@
  139.11   * 2 along with this work; if not, write to the Free Software Foundation,
  139.12   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  139.13   *
  139.14 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  139.15 - * CA 95054 USA or visit www.sun.com if you need additional information or
  139.16 - * have any questions.
  139.17 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  139.18 + * or visit www.oracle.com if you need additional information or have any
  139.19 + * questions.
  139.20   */
  139.21  
  139.22  /*
  139.23 @@ -55,4 +55,5 @@
  139.24  
  139.25      public static final class MyComponent extends Component {
  139.26      }
  139.27 -}
  139.28 \ No newline at end of file
  139.29 +}
  139.30 +
   140.1 --- a/test/java/lang/ClassLoader/getdotresource.sh	Thu May 27 10:57:25 2010 -0700
   140.2 +++ b/test/java/lang/ClassLoader/getdotresource.sh	Wed Jun 02 15:39:48 2010 -0700
   140.3 @@ -1,7 +1,7 @@
   140.4  #! /bin/sh
   140.5  
   140.6  #
   140.7 -# Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
   140.8 +# Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
   140.9  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  140.10  #
  140.11  # This code is free software; you can redistribute it and/or modify it
  140.12 @@ -18,9 +18,9 @@
  140.13  # 2 along with this work; if not, write to the Free Software Foundation,
  140.14  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  140.15  #
  140.16 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  140.17 -# CA 95054 USA or visit www.sun.com if you need additional information or
  140.18 -# have any questions.
  140.19 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  140.20 +# or visit www.oracle.com if you need additional information or have any
  140.21 +# questions.
  140.22  #
  140.23  
  140.24  #
  140.25 @@ -33,4 +33,5 @@
  140.26  if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
  140.27  
  140.28  # now start the test
  140.29 -${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
  140.30 \ No newline at end of file
  140.31 +${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
  140.32 +
   141.1 --- a/test/java/lang/Runtime/exec/setcwd.sh	Thu May 27 10:57:25 2010 -0700
   141.2 +++ b/test/java/lang/Runtime/exec/setcwd.sh	Wed Jun 02 15:39:48 2010 -0700
   141.3 @@ -1,7 +1,7 @@
   141.4  #! /bin/sh
   141.5  
   141.6  #
   141.7 -# Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
   141.8 +# Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
   141.9  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  141.10  #
  141.11  # This code is free software; you can redistribute it and/or modify it
  141.12 @@ -18,9 +18,9 @@
  141.13  # 2 along with this work; if not, write to the Free Software Foundation,
  141.14  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  141.15  #
  141.16 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  141.17 -# CA 95054 USA or visit www.sun.com if you need additional information or
  141.18 -# have any questions.
  141.19 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  141.20 +# or visit www.oracle.com if you need additional information or have any
  141.21 +# questions.
  141.22  #
  141.23  
  141.24  #
  141.25 @@ -37,4 +37,5 @@
  141.26  cp ${TESTCLASSES}/SetCwd.class foo
  141.27  
  141.28  # now start the test
  141.29 -${TESTJAVA}/bin/java SetCwd
  141.30 \ No newline at end of file
  141.31 +${TESTJAVA}/bin/java SetCwd
  141.32 +
   142.1 --- a/test/java/util/ResourceBundle/Bug4083270Test.properties	Thu May 27 10:57:25 2010 -0700
   142.2 +++ b/test/java/util/ResourceBundle/Bug4083270Test.properties	Wed Jun 02 15:39:48 2010 -0700
   142.3 @@ -1,5 +1,5 @@
   142.4  # 
   142.5 -# Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
   142.6 +# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   142.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   142.8  # 
   142.9  # This code is free software; you can redistribute it and/or modify it
  142.10 @@ -16,8 +16,9 @@
  142.11  # 2 along with this work; if not, write to the Free Software Foundation,
  142.12  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  142.13  # 
  142.14 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  142.15 -# CA 95054 USA or visit www.sun.com if you need additional information or
  142.16 -# have any questions.
  142.17 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  142.18 +# or visit www.oracle.com if you need additional information or have any
  142.19 +# questions.
  142.20  #
  142.21 -Bug4179221Test=Bug4179221Test
  142.22 \ No newline at end of file
  142.23 +Bug4179221Test=Bug4179221Test
  142.24 +
   143.1 --- a/test/java/util/ResourceBundle/Bug4168625Test.java	Thu May 27 10:57:25 2010 -0700
   143.2 +++ b/test/java/util/ResourceBundle/Bug4168625Test.java	Wed Jun 02 15:39:48 2010 -0700
   143.3 @@ -32,10 +32,6 @@
   143.4   *
   143.5   * (C) Copyright IBM Corp. 1999 - All Rights Reserved
   143.6   *
   143.7 - * Portions Copyright 2007 by Sun Microsystems, Inc.,
   143.8 - * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
   143.9 - * All rights reserved.
  143.10 - *
  143.11   * This software is the confidential and proprietary information
  143.12   * of Sun Microsystems, Inc. ("Confidential Information").  You
  143.13   * shall not disclose such Confidential Information and shall use
   144.1 --- a/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java	Thu May 27 10:57:25 2010 -0700
   144.2 +++ b/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java	Wed Jun 02 15:39:48 2010 -0700
   144.3 @@ -1,12 +1,12 @@
   144.4  /*
   144.5 - * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
   144.6 + * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   144.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   144.8   *
   144.9   * This code is free software; you can redistribute it and/or modify it
  144.10   * under the terms of the GNU General Public License version 2 only, as
  144.11 - * published by the Free Software Foundation.  Sun designates this
  144.12 + * published by the Free Software Foundation.  Oracle designates this
  144.13   * particular file as subject to the "Classpath" exception as provided
  144.14 - * by Sun in the LICENSE file that accompanied this code.
  144.15 + * by Oracle in the LICENSE file that accompanied this code.
  144.16   *
  144.17   * This code is distributed in the hope that it will be useful, but WITHOUT
  144.18   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  144.19 @@ -18,9 +18,9 @@
  144.20   * 2 along with this work; if not, write to the Free Software Foundation,
  144.21   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  144.22   *
  144.23 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  144.24 - * CA 95054 USA or visit www.sun.com if you need additional information or
  144.25 - * have any questions.
  144.26 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  144.27 + * or visit www.oracle.com if you need additional information or have any
  144.28 + * questions.
  144.29   */
  144.30  
  144.31  /* @test
  144.32 @@ -110,4 +110,5 @@
  144.33          if(max > 0.01)
  144.34              fail("Interpolation failed, error="+max);
  144.35      }
  144.36 -}
  144.37 \ No newline at end of file
  144.38 +}
  144.39 +
   145.1 --- a/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java	Thu May 27 10:57:25 2010 -0700
   145.2 +++ b/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java	Wed Jun 02 15:39:48 2010 -0700
   145.3 @@ -1,12 +1,12 @@
   145.4  /*
   145.5 - * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
   145.6 + * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   145.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   145.8   *
   145.9   * This code is free software; you can redistribute it and/or modify it
  145.10   * under the terms of the GNU General Public License version 2 only, as
  145.11 - * published by the Free Software Foundation.  Sun designates this
  145.12 + * published by the Free Software Foundation.  Oracle designates this
  145.13   * particular file as subject to the "Classpath" exception as provided
  145.14 - * by Sun in the LICENSE file that accompanied this code.
  145.15 + * by Oracle in the LICENSE file that accompanied this code.
  145.16   *
  145.17   * This code is distributed in the hope that it will be useful, but WITHOUT
  145.18   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  145.19 @@ -18,9 +18,9 @@
  145.20   * 2 along with this work; if not, write to the Free Software Foundation,
  145.21   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  145.22   *
  145.23 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  145.24 - * CA 95054 USA or visit www.sun.com if you need additional information or
  145.25 - * have any questions.
  145.26 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  145.27 + * or visit www.oracle.com if you need additional information or have any
  145.28 + * questions.
  145.29   */
  145.30  
  145.31  /* @test
  145.32 @@ -110,4 +110,5 @@
  145.33          if(max > 0.001)
  145.34              fail("Interpolation failed, error="+max);
  145.35      }
  145.36 -}
  145.37 \ No newline at end of file
  145.38 +}
  145.39 +
   146.1 --- a/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java	Thu May 27 10:57:25 2010 -0700
   146.2 +++ b/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java	Wed Jun 02 15:39:48 2010 -0700
   146.3 @@ -1,12 +1,12 @@
   146.4  /*
   146.5 - * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
   146.6 + * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   146.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   146.8   *
   146.9   * This code is free software; you can redistribute it and/or modify it
  146.10   * under the terms of the GNU General Public License version 2 only, as
  146.11 - * published by the Free Software Foundation.  Sun designates this
  146.12 + * published by the Free Software Foundation.  Oracle designates this
  146.13   * particular file as subject to the "Classpath" exception as provided
  146.14 - * by Sun in the LICENSE file that accompanied this code.
  146.15 + * by Oracle in the LICENSE file that accompanied this code.
  146.16   *
  146.17   * This code is distributed in the hope that it will be useful, but WITHOUT
  146.18   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  146.19 @@ -18,9 +18,9 @@
  146.20   * 2 along with this work; if not, write to the Free Software Foundation,
  146.21   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  146.22   *
  146.23 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  146.24 - * CA 95054 USA or visit www.sun.com if you need additional information or
  146.25 - * have any questions.
  146.26 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  146.27 + * or visit www.oracle.com if you need additional information or have any
  146.28 + * questions.
  146.29   */
  146.30  
  146.31  /* @test
  146.32 @@ -110,4 +110,5 @@
  146.33          if(max > 0.2)
  146.34              fail("Interpolation failed, error="+max);
  146.35      }
  146.36 -}
  146.37 \ No newline at end of file
  146.38 +}
  146.39 +
   147.1 --- a/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java	Thu May 27 10:57:25 2010 -0700
   147.2 +++ b/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java	Wed Jun 02 15:39:48 2010 -0700
   147.3 @@ -1,12 +1,12 @@
   147.4  /*
   147.5 - * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
   147.6 + * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   147.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   147.8   *
   147.9   * This code is free software; you can redistribute it and/or modify it
  147.10   * under the terms of the GNU General Public License version 2 only, as
  147.11 - * published by the Free Software Foundation.  Sun designates this
  147.12 + * published by the Free Software Foundation.  Oracle designates this
  147.13   * particular file as subject to the "Classpath" exception as provided
  147.14 - * by Sun in the LICENSE file that accompanied this code.
  147.15 + * by Oracle in the LICENSE file that accompanied this code.
  147.16   *
  147.17   * This code is distributed in the hope that it will be useful, but WITHOUT
  147.18   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  147.19 @@ -18,9 +18,9 @@
  147.20   * 2 along with this work; if not, write to the Free Software Foundation,
  147.21   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  147.22   *
  147.23 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  147.24 - * CA 95054 USA or visit www.sun.com if you need additional information or
  147.25 - * have any questions.
  147.26 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  147.27 + * or visit www.oracle.com if you need additional information or have any
  147.28 + * questions.
  147.29   */
  147.30  
  147.31  /* @test
  147.32 @@ -110,4 +110,5 @@
  147.33          if(max > 0.2)
  147.34              fail("Interpolation failed, error="+max);
  147.35      }
  147.36 -}
  147.37 \ No newline at end of file
  147.38 +}
  147.39 +
   148.1 --- a/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java	Thu May 27 10:57:25 2010 -0700
   148.2 +++ b/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java	Wed Jun 02 15:39:48 2010 -0700
   148.3 @@ -1,12 +1,12 @@
   148.4  /*
   148.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   148.6 + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   148.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   148.8   *
   148.9   * This code is free software; you can redistribute it and/or modify it
  148.10   * under the terms of the GNU General Public License version 2 only, as
  148.11 - * published by the Free Software Foundation.  Sun designates this
  148.12 + * published by the Free Software Foundation.  Oracle designates this
  148.13   * particular file as subject to the "Classpath" exception as provided
  148.14 - * by Sun in the LICENSE file that accompanied this code.
  148.15 + * by Oracle in the LICENSE file that accompanied this code.
  148.16   *
  148.17   * This code is distributed in the hope that it will be useful, but WITHOUT
  148.18   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  148.19 @@ -18,9 +18,9 @@
  148.20   * 2 along with this work; if not, write to the Free Software Foundation,
  148.21   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  148.22   *
  148.23 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  148.24 - * CA 95054 USA or visit www.sun.com if you need additional information or
  148.25 - * have any questions.
  148.26 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  148.27 + * or visit www.oracle.com if you need additional information or have any
  148.28 + * questions.
  148.29   */
  148.30  
  148.31  /* @test
  148.32 @@ -45,4 +45,5 @@
  148.33          }
  148.34          synth.close();
  148.35      }
  148.36 -}
  148.37 \ No newline at end of file
  148.38 +}
  148.39 +
   149.1 --- a/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java	Thu May 27 10:57:25 2010 -0700
   149.2 +++ b/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java	Wed Jun 02 15:39:48 2010 -0700
   149.3 @@ -1,12 +1,12 @@
   149.4  /*
   149.5 - * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
   149.6 + * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   149.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   149.8   *
   149.9   * This code is free software; you can redistribute it and/or modify it
  149.10   * under the terms of the GNU General Public License version 2 only, as
  149.11 - * published by the Free Software Foundation.  Sun designates this
  149.12 + * published by the Free Software Foundation.  Oracle designates this
  149.13   * particular file as subject to the "Classpath" exception as provided
  149.14 - * by Sun in the LICENSE file that accompanied this code.
  149.15 + * by Oracle in the LICENSE file that accompanied this code.
  149.16   *
  149.17   * This code is distributed in the hope that it will be useful, but WITHOUT
  149.18   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  149.19 @@ -18,9 +18,9 @@
  149.20   * 2 along with this work; if not, write to the Free Software Foundation,
  149.21   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  149.22   *
  149.23 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  149.24 - * CA 95054 USA or visit www.sun.com if you need additional information or
  149.25 - * have any questions.
  149.26 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  149.27 + * or visit www.oracle.com if you need additional information or have any
  149.28 + * questions.
  149.29   */
  149.30  
  149.31  /* @test
  149.32 @@ -110,4 +110,5 @@
  149.33          if(max > 0.0001)
  149.34              fail("Interpolation failed, error="+max);
  149.35      }
  149.36 -}
  149.37 \ No newline at end of file
  149.38 +}
  149.39 +
   150.1 --- a/test/javax/swing/JTable/Test6888156.java	Thu May 27 10:57:25 2010 -0700
   150.2 +++ b/test/javax/swing/JTable/Test6888156.java	Wed Jun 02 15:39:48 2010 -0700
   150.3 @@ -1,5 +1,5 @@
   150.4  /*
   150.5 - * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
   150.6 + * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   150.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   150.8   *
   150.9   * This code is free software; you can redistribute it and/or modify it
  150.10 @@ -16,9 +16,9 @@
  150.11   * 2 along with this work; if not, write to the Free Software Foundation,
  150.12   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  150.13   *
  150.14 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  150.15 - * CA 95054 USA or visit www.sun.com if you need additional information or
  150.16 - * have any questions.
  150.17 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  150.18 + * or visit www.oracle.com if you need additional information or have any
  150.19 + * questions.
  150.20   */
  150.21  
  150.22  /* @test
  150.23 @@ -95,4 +95,5 @@
  150.24          t.test(new javax.swing.plaf.nimbus.NimbusLookAndFeel());
  150.25          t.test(new com.sun.java.swing.plaf.gtk.GTKLookAndFeel());
  150.26      }
  150.27 -}
  150.28 \ No newline at end of file
  150.29 +}
  150.30 +
   151.1 --- a/test/sun/net/www/protocol/jar/getcontenttype.sh	Thu May 27 10:57:25 2010 -0700
   151.2 +++ b/test/sun/net/www/protocol/jar/getcontenttype.sh	Wed Jun 02 15:39:48 2010 -0700
   151.3 @@ -1,7 +1,7 @@
   151.4  #! /bin/sh
   151.5  
   151.6  #
   151.7 -# Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
   151.8 +# Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
   151.9  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  151.10  #
  151.11  # This code is free software; you can redistribute it and/or modify it
  151.12 @@ -18,9 +18,9 @@
  151.13  # 2 along with this work; if not, write to the Free Software Foundation,
  151.14  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  151.15  #
  151.16 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  151.17 -# CA 95054 USA or visit www.sun.com if you need additional information or
  151.18 -# have any questions.
  151.19 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  151.20 +# or visit www.oracle.com if you need additional information or have any
  151.21 +# questions.
  151.22  #
  151.23  
  151.24  #
  151.25 @@ -33,4 +33,5 @@
  151.26  if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
  151.27  
  151.28  # now start the test
  151.29 -${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType
  151.30 \ No newline at end of file
  151.31 +${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType
  151.32 +