Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/Makefile	Wed May 19 20:16:11 2010 -0700
     1.2 +++ b/Makefile	Tue May 25 15:51:26 2010 -0700
     1.3 @@ -1,12 +1,12 @@
     1.4  #
     1.5 -# Copyright 1995-2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 +# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10  # under the terms of the GNU General Public License version 2 only, as
    1.11 -# published by the Free Software Foundation.  Sun designates this
    1.12 +# published by the Free Software Foundation.  Oracle designates this
    1.13  # particular file as subject to the "Classpath" exception as provided
    1.14 -# by Sun in the LICENSE file that accompanied this code.
    1.15 +# by Oracle in the LICENSE file that accompanied this code.
    1.16  #
    1.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    1.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.19 @@ -18,9 +18,9 @@
    1.20  # 2 along with this work; if not, write to the Free Software Foundation,
    1.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.22  #
    1.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    1.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    1.25 -# have any questions.
    1.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.27 +# or visit www.oracle.com if you need additional information or have any
    1.28 +# questions.
    1.29  #
    1.30  
    1.31  BUILD_PARENT_DIRECTORY=.

     2.1 --- a/make/Defs-internal.gmk	Wed May 19 20:16:11 2010 -0700
     2.2 +++ b/make/Defs-internal.gmk	Tue May 25 15:51:26 2010 -0700
     2.3 @@ -1,12 +1,12 @@
     2.4  #
     2.5 -# Copyright 1995-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2.6 +# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10  # under the terms of the GNU General Public License version 2 only, as
    2.11 -# published by the Free Software Foundation.  Sun designates this
    2.12 +# published by the Free Software Foundation.  Oracle designates this
    2.13  # particular file as subject to the "Classpath" exception as provided
    2.14 -# by Sun in the LICENSE file that accompanied this code.
    2.15 +# by Oracle in the LICENSE file that accompanied this code.
    2.16  #
    2.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    2.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.19 @@ -18,9 +18,9 @@
    2.20  # 2 along with this work; if not, write to the Free Software Foundation,
    2.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.22  #
    2.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    2.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    2.25 -# have any questions.
    2.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.27 +# or visit www.oracle.com if you need additional information or have any
    2.28 +# questions.
    2.29  #
    2.30  
    2.31  #

     3.1 --- a/make/corba-rules.gmk	Wed May 19 20:16:11 2010 -0700
     3.2 +++ b/make/corba-rules.gmk	Tue May 25 15:51:26 2010 -0700
     3.3 @@ -1,12 +1,12 @@
     3.4  #
     3.5 -# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
     3.6 +# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
     3.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  #
     3.9  # This code is free software; you can redistribute it and/or modify it
    3.10  # under the terms of the GNU General Public License version 2 only, as
    3.11 -# published by the Free Software Foundation.  Sun designates this
    3.12 +# published by the Free Software Foundation.  Oracle designates this
    3.13  # particular file as subject to the "Classpath" exception as provided
    3.14 -# by Sun in the LICENSE file that accompanied this code.
    3.15 +# by Oracle in the LICENSE file that accompanied this code.
    3.16  #
    3.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    3.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.19 @@ -18,9 +18,9 @@
    3.20  # 2 along with this work; if not, write to the Free Software Foundation,
    3.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.22  #
    3.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    3.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    3.25 -# have any questions.
    3.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.27 +# or visit www.oracle.com if you need additional information or have any
    3.28 +# questions.
    3.29  #
    3.30  
    3.31  ################################################################

     4.1 --- a/make/deploy-rules.gmk	Wed May 19 20:16:11 2010 -0700
     4.2 +++ b/make/deploy-rules.gmk	Tue May 25 15:51:26 2010 -0700
     4.3 @@ -1,12 +1,12 @@
     4.4  #
     4.5 -# Copyright 2002-2009 Sun Microsystems, Inc.  All Rights Reserved.
     4.6 +# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
     4.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8  #
     4.9  # This code is free software; you can redistribute it and/or modify it
    4.10  # under the terms of the GNU General Public License version 2 only, as
    4.11 -# published by the Free Software Foundation.  Sun designates this
    4.12 +# published by the Free Software Foundation.  Oracle designates this
    4.13  # particular file as subject to the "Classpath" exception as provided
    4.14 -# by Sun in the LICENSE file that accompanied this code.
    4.15 +# by Oracle in the LICENSE file that accompanied this code.
    4.16  #
    4.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    4.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.19 @@ -18,9 +18,9 @@
    4.20  # 2 along with this work; if not, write to the Free Software Foundation,
    4.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.22  #
    4.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    4.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    4.25 -# have any questions.
    4.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.27 +# or visit www.oracle.com if you need additional information or have any
    4.28 +# questions.
    4.29  #
    4.30  
    4.31  ################################################################

     5.1 --- a/make/hotspot-rules.gmk	Wed May 19 20:16:11 2010 -0700
     5.2 +++ b/make/hotspot-rules.gmk	Tue May 25 15:51:26 2010 -0700
     5.3 @@ -1,12 +1,12 @@
     5.4  #
     5.5 -# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
     5.6 +# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
     5.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8  #
     5.9  # This code is free software; you can redistribute it and/or modify it
    5.10  # under the terms of the GNU General Public License version 2 only, as
    5.11 -# published by the Free Software Foundation.  Sun designates this
    5.12 +# published by the Free Software Foundation.  Oracle designates this
    5.13  # particular file as subject to the "Classpath" exception as provided
    5.14 -# by Sun in the LICENSE file that accompanied this code.
    5.15 +# by Oracle in the LICENSE file that accompanied this code.
    5.16  #
    5.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    5.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5.19 @@ -18,9 +18,9 @@
    5.20  # 2 along with this work; if not, write to the Free Software Foundation,
    5.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5.22  #
    5.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    5.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    5.25 -# have any questions.
    5.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5.27 +# or visit www.oracle.com if you need additional information or have any
    5.28 +# questions.
    5.29  #
    5.30  
    5.31  ################################################################

     6.1 --- a/make/install-rules.gmk	Wed May 19 20:16:11 2010 -0700
     6.2 +++ b/make/install-rules.gmk	Tue May 25 15:51:26 2010 -0700
     6.3 @@ -1,12 +1,12 @@
     6.4  #
     6.5 -# Copyright 2002-2009 Sun Microsystems, Inc.  All Rights Reserved.
     6.6 +# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
     6.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8  #
     6.9  # This code is free software; you can redistribute it and/or modify it
    6.10  # under the terms of the GNU General Public License version 2 only, as
    6.11 -# published by the Free Software Foundation.  Sun designates this
    6.12 +# published by the Free Software Foundation.  Oracle designates this
    6.13  # particular file as subject to the "Classpath" exception as provided
    6.14 -# by Sun in the LICENSE file that accompanied this code.
    6.15 +# by Oracle in the LICENSE file that accompanied this code.
    6.16  #
    6.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    6.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    6.19 @@ -18,9 +18,9 @@
    6.20  # 2 along with this work; if not, write to the Free Software Foundation,
    6.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    6.22  #
    6.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    6.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    6.25 -# have any questions.
    6.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    6.27 +# or visit www.oracle.com if you need additional information or have any
    6.28 +# questions.
    6.29  #
    6.30  
    6.31  ################################################################

     7.1 --- a/make/jaxp-rules.gmk	Wed May 19 20:16:11 2010 -0700
     7.2 +++ b/make/jaxp-rules.gmk	Tue May 25 15:51:26 2010 -0700
     7.3 @@ -1,12 +1,12 @@
     7.4  #
     7.5 -# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
     7.6 +# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
     7.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8  #
     7.9  # This code is free software; you can redistribute it and/or modify it
    7.10  # under the terms of the GNU General Public License version 2 only, as
    7.11 -# published by the Free Software Foundation.  Sun designates this
    7.12 +# published by the Free Software Foundation.  Oracle designates this
    7.13  # particular file as subject to the "Classpath" exception as provided
    7.14 -# by Sun in the LICENSE file that accompanied this code.
    7.15 +# by Oracle in the LICENSE file that accompanied this code.
    7.16  #
    7.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    7.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    7.19 @@ -18,9 +18,9 @@
    7.20  # 2 along with this work; if not, write to the Free Software Foundation,
    7.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    7.22  #
    7.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    7.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    7.25 -# have any questions.
    7.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    7.27 +# or visit www.oracle.com if you need additional information or have any
    7.28 +# questions.
    7.29  #
    7.30  
    7.31  ################################################################

     8.1 --- a/make/jaxws-rules.gmk	Wed May 19 20:16:11 2010 -0700
     8.2 +++ b/make/jaxws-rules.gmk	Tue May 25 15:51:26 2010 -0700
     8.3 @@ -1,12 +1,12 @@
     8.4  #
     8.5 -# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
     8.6 +# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
     8.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8  #
     8.9  # This code is free software; you can redistribute it and/or modify it
    8.10  # under the terms of the GNU General Public License version 2 only, as
    8.11 -# published by the Free Software Foundation.  Sun designates this
    8.12 +# published by the Free Software Foundation.  Oracle designates this
    8.13  # particular file as subject to the "Classpath" exception as provided
    8.14 -# by Sun in the LICENSE file that accompanied this code.
    8.15 +# by Oracle in the LICENSE file that accompanied this code.
    8.16  #
    8.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    8.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    8.19 @@ -18,9 +18,9 @@
    8.20  # 2 along with this work; if not, write to the Free Software Foundation,
    8.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    8.22  #
    8.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    8.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    8.25 -# have any questions.
    8.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    8.27 +# or visit www.oracle.com if you need additional information or have any
    8.28 +# questions.
    8.29  #
    8.30  
    8.31  ################################################################

     9.1 --- a/make/jdk-rules.gmk	Wed May 19 20:16:11 2010 -0700
     9.2 +++ b/make/jdk-rules.gmk	Tue May 25 15:51:26 2010 -0700
     9.3 @@ -1,12 +1,12 @@
     9.4  #
     9.5 -# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
     9.6 +# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
     9.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8  #
     9.9  # This code is free software; you can redistribute it and/or modify it
    9.10  # under the terms of the GNU General Public License version 2 only, as
    9.11 -# published by the Free Software Foundation.  Sun designates this
    9.12 +# published by the Free Software Foundation.  Oracle designates this
    9.13  # particular file as subject to the "Classpath" exception as provided
    9.14 -# by Sun in the LICENSE file that accompanied this code.
    9.15 +# by Oracle in the LICENSE file that accompanied this code.
    9.16  #
    9.17  # This code is distributed in the hope that it will be useful, but WITHOUT
    9.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    9.19 @@ -18,9 +18,9 @@
    9.20  # 2 along with this work; if not, write to the Free Software Foundation,
    9.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    9.22  #
    9.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    9.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    9.25 -# have any questions.
    9.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    9.27 +# or visit www.oracle.com if you need additional information or have any
    9.28 +# questions.
    9.29  #
    9.30  
    9.31  ################################################################

    10.1 --- a/make/jprt.gmk	Wed May 19 20:16:11 2010 -0700
    10.2 +++ b/make/jprt.gmk	Tue May 25 15:51:26 2010 -0700
    10.3 @@ -1,12 +1,12 @@
    10.4  #
    10.5 -# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
    10.6 +# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    10.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8  #
    10.9  # This code is free software; you can redistribute it and/or modify it
   10.10  # under the terms of the GNU General Public License version 2 only, as
   10.11 -# published by the Free Software Foundation.  Sun designates this
   10.12 +# published by the Free Software Foundation.  Oracle designates this
   10.13  # particular file as subject to the "Classpath" exception as provided
   10.14 -# by Sun in the LICENSE file that accompanied this code.
   10.15 +# by Oracle in the LICENSE file that accompanied this code.
   10.16  #
   10.17  # This code is distributed in the hope that it will be useful, but WITHOUT
   10.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   10.19 @@ -18,9 +18,9 @@
   10.20  # 2 along with this work; if not, write to the Free Software Foundation,
   10.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   10.22  #
   10.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   10.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
   10.25 -# have any questions.
   10.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   10.27 +# or visit www.oracle.com if you need additional information or have any
   10.28 +# questions.
   10.29  #
   10.30  
   10.31  ################################################################

    11.1 --- a/make/jprt.properties	Wed May 19 20:16:11 2010 -0700
    11.2 +++ b/make/jprt.properties	Tue May 25 15:51:26 2010 -0700
    11.3 @@ -1,12 +1,12 @@
    11.4  #
    11.5 -# Copyright 2006-2010 Sun Microsystems, Inc.  All Rights Reserved.
    11.6 +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    11.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8  #
    11.9  # This code is free software; you can redistribute it and/or modify it
   11.10  # under the terms of the GNU General Public License version 2 only, as
   11.11 -# published by the Free Software Foundation.  Sun designates this
   11.12 +# published by the Free Software Foundation.  Oracle designates this
   11.13  # particular file as subject to the "Classpath" exception as provided
   11.14 -# by Sun in the LICENSE file that accompanied this code.
   11.15 +# by Oracle in the LICENSE file that accompanied this code.
   11.16  #
   11.17  # This code is distributed in the hope that it will be useful, but WITHOUT
   11.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   11.19 @@ -18,9 +18,9 @@
   11.20  # 2 along with this work; if not, write to the Free Software Foundation,
   11.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   11.22  #
   11.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   11.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
   11.25 -# have any questions.
   11.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   11.27 +# or visit www.oracle.com if you need additional information or have any
   11.28 +# questions.
   11.29  #
   11.30  
   11.31  # Properties for jprt

    12.1 --- a/make/langtools-rules.gmk	Wed May 19 20:16:11 2010 -0700
    12.2 +++ b/make/langtools-rules.gmk	Tue May 25 15:51:26 2010 -0700
    12.3 @@ -1,12 +1,12 @@
    12.4  #
    12.5 -# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
    12.6 +# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
    12.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.8  #
    12.9  # This code is free software; you can redistribute it and/or modify it
   12.10  # under the terms of the GNU General Public License version 2 only, as
   12.11 -# published by the Free Software Foundation.  Sun designates this
   12.12 +# published by the Free Software Foundation.  Oracle designates this
   12.13  # particular file as subject to the "Classpath" exception as provided
   12.14 -# by Sun in the LICENSE file that accompanied this code.
   12.15 +# by Oracle in the LICENSE file that accompanied this code.
   12.16  #
   12.17  # This code is distributed in the hope that it will be useful, but WITHOUT
   12.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.19 @@ -18,9 +18,9 @@
   12.20  # 2 along with this work; if not, write to the Free Software Foundation,
   12.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.22  #
   12.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   12.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
   12.25 -# have any questions.
   12.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   12.27 +# or visit www.oracle.com if you need additional information or have any
   12.28 +# questions.
   12.29  #
   12.30  
   12.31  ################################################################

    13.1 --- a/make/sanity-rules.gmk	Wed May 19 20:16:11 2010 -0700
    13.2 +++ b/make/sanity-rules.gmk	Tue May 25 15:51:26 2010 -0700
    13.3 @@ -1,12 +1,12 @@
    13.4  #
    13.5 -# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
    13.6 +# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
    13.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8  #
    13.9  # This code is free software; you can redistribute it and/or modify it
   13.10  # under the terms of the GNU General Public License version 2 only, as
   13.11 -# published by the Free Software Foundation.  Sun designates this
   13.12 +# published by the Free Software Foundation.  Oracle designates this
   13.13  # particular file as subject to the "Classpath" exception as provided
   13.14 -# by Sun in the LICENSE file that accompanied this code.
   13.15 +# by Oracle in the LICENSE file that accompanied this code.
   13.16  #
   13.17  # This code is distributed in the hope that it will be useful, but WITHOUT
   13.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   13.19 @@ -18,9 +18,9 @@
   13.20  # 2 along with this work; if not, write to the Free Software Foundation,
   13.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   13.22  #
   13.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   13.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
   13.25 -# have any questions.
   13.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   13.27 +# or visit www.oracle.com if you need additional information or have any
   13.28 +# questions.
   13.29  #
   13.30  
   13.31  ################################################################

    14.1 --- a/make/sponsors-rules.gmk	Wed May 19 20:16:11 2010 -0700
    14.2 +++ b/make/sponsors-rules.gmk	Tue May 25 15:51:26 2010 -0700
    14.3 @@ -1,12 +1,12 @@
    14.4  #
    14.5 -# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
    14.6 +# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    14.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8  #
    14.9  # This code is free software; you can redistribute it and/or modify it
   14.10  # under the terms of the GNU General Public License version 2 only, as
   14.11 -# published by the Free Software Foundation.  Sun designates this
   14.12 +# published by the Free Software Foundation.  Oracle designates this
   14.13  # particular file as subject to the "Classpath" exception as provided
   14.14 -# by Sun in the LICENSE file that accompanied this code.
   14.15 +# by Oracle in the LICENSE file that accompanied this code.
   14.16  #
   14.17  # This code is distributed in the hope that it will be useful, but WITHOUT
   14.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   14.19 @@ -18,9 +18,9 @@
   14.20  # 2 along with this work; if not, write to the Free Software Foundation,
   14.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   14.22  #
   14.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   14.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
   14.25 -# have any questions.
   14.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   14.27 +# or visit www.oracle.com if you need additional information or have any
   14.28 +# questions.
   14.29  #
   14.30  
   14.31  ################################################################

    15.1 --- a/make/templates/bsd-header	Wed May 19 20:16:11 2010 -0700
    15.2 +++ b/make/templates/bsd-header	Tue May 25 15:51:26 2010 -0700
    15.3 @@ -11,7 +11,7 @@
    15.4      notice, this list of conditions and the following disclaimer in the
    15.5      documentation and/or other materials provided with the distribution.
    15.6  
    15.7 -  - Neither the name of Sun Microsystems nor the names of its
    15.8 +  - Neither the name of Oracle nor the names of its
    15.9      contributors may be used to endorse or promote products derived
   15.10      from this software without specific prior written permission.
   15.11  

    16.1 --- a/make/templates/gpl-cp-header	Wed May 19 20:16:11 2010 -0700
    16.2 +++ b/make/templates/gpl-cp-header	Tue May 25 15:51:26 2010 -0700
    16.3 @@ -3,9 +3,9 @@
    16.4  
    16.5  This code is free software; you can redistribute it and/or modify it
    16.6  under the terms of the GNU General Public License version 2 only, as
    16.7 -published by the Free Software Foundation.  Sun designates this
    16.8 +published by the Free Software Foundation.  Oracle designates this
    16.9  particular file as subject to the "Classpath" exception as provided
   16.10 -by Sun in the LICENSE file that accompanied this code.
   16.11 +by Oracle in the LICENSE file that accompanied this code.
   16.12  
   16.13  This code is distributed in the hope that it will be useful, but WITHOUT
   16.14  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

    17.1 --- a/test/Makefile	Wed May 19 20:16:11 2010 -0700
    17.2 +++ b/test/Makefile	Tue May 25 15:51:26 2010 -0700
    17.3 @@ -1,12 +1,12 @@
    17.4  #
    17.5 -# Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
    17.6 +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
    17.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.8  #
    17.9  # This code is free software; you can redistribute it and/or modify it
   17.10  # under the terms of the GNU General Public License version 2 only, as
   17.11 -# published by the Free Software Foundation.  Sun designates this
   17.12 +# published by the Free Software Foundation.  Oracle designates this
   17.13  # particular file as subject to the "Classpath" exception as provided
   17.14 -# by Sun in the LICENSE file that accompanied this code.
   17.15 +# by Oracle in the LICENSE file that accompanied this code.
   17.16  #
   17.17  # This code is distributed in the hope that it will be useful, but WITHOUT
   17.18  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   17.19 @@ -18,9 +18,9 @@
   17.20  # 2 along with this work; if not, write to the Free Software Foundation,
   17.21  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   17.22  #
   17.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   17.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
   17.25 -# have any questions.
   17.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   17.27 +# or visit www.oracle.com if you need additional information or have any
   17.28 +# questions.
   17.29  #
   17.30  
   17.31  #