Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
7 deleted
21 edited
8 copied

Legend:

Unmodified
Added
Removed
  • trunk/openjdk

  • trunk/openjdk/langtools/make/Makefile

    r173 r278  
    11#
    2 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
     
    2727
    2828#
    29 # On Solaris, the 'make' utility from Sun will not work with these makefiles.
    30 #    This little rule is only understood by Sun's make, and is harmless
    31 #    when seen by the GNU make tool. If using Sun's make, this causes the
     29# On Solaris, the standard 'make' utility will not work with these makefiles.
     30#    This little rule is only understood by Solaris make, and is harmless
     31#    when seen by the GNU make tool. If using Solaris make, this causes the
    3232#    make command to fail.
    3333#
     
    4141SYSTEM_UNAME := $(shell uname)
    4242
     43# Where is unwanted output to be delivered?
     44# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
    4345ifeq ($(SYSTEM_UNAME), Windows_NT)
    4446DEV_NULL = NUL
    4547else
     48DEV_NULL = /dev/null
     49endif
     50
    4651ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
    47 DEV_NULL = NUL
    4852USING_CYGWIN = true
    49 else
    50 DEV_NULL = /dev/null
    51 endif
    5253endif
    5354
     
    202203#-------------------------------------------------------------------
    203204#
    204 # Targets for Sun's internal JPRT build system
     205# Targets for Oracle's internal JPRT build system
    205206
    206207CD = cd
  • trunk/openjdk/langtools/make/Makefile-classic

    r2 r278  
    11#
    2 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
     
    2929
    3030#
    31 # On Solaris, the 'make' utility from Sun will not work with these makefiles.
    32 #    This little rule is only understood by Sun's make, and is harmless
    33 #    when seen by the GNU make tool. If using Sun's make, this causes the
     31# On Solaris, the standard 'make' utility will not work with these makefiles.
     32#    This little rule is only understood by Solaris make, and is harmless
     33#    when seen by the GNU make tool. If using Solaris make, this causes the
    3434#    make command to fail.
    3535#
  • trunk/openjdk/langtools/make/build.properties

    r2 r278  
    11#
    2 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/build.xml

    r21 r278  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<!--
    3  Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
     3 Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    44 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55
    66 This code is free software; you can redistribute it and/or modify it
    77 under the terms of the GNU General Public License version 2 only, as
    8  published by the Free Software Foundation.  Sun designates this
     8 published by the Free Software Foundation.  Oracle designates this
    99 particular file as subject to the "Classpath" exception as provided
    10  by Sun in the LICENSE file that accompanied this code.
     10 by Oracle in the LICENSE file that accompanied this code.
    1111
    1212 This code is distributed in the hope that it will be useful, but WITHOUT
     
    2020 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2121
    22  Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23  CA 95054 USA or visit www.sun.com if you need additional information or
    24  have any questions.
     22 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     23 or visit www.oracle.com if you need additional information or have any
     24 questions.
    2525-->
    2626
     
    666666            <attribute name="jdk" default="${target.java.home}"/>
    667667            <attribute name="samevm" default="true"/>
    668             <attribute name="verbose" default="summary"/>
    669             <attribute name="options" default=""/>
     668            <attribute name="verbose" default="${default.jtreg.verbose}"/>
     669            <attribute name="options" default="${other.jtreg.options}"/>
    670670            <attribute name="keywords" default="-keywords:!ignore"/>
    671671            <attribute name="jpda.jvmargs" default=""/>
    672672            <sequential>
    673                 <property name="coverage.options" value=""/>    <!-- default -->
    674                 <property name="coverage.classpath" value=""/>    <!-- default -->
     673                <property name="coverage.options" value=""/>              <!-- default -->
     674                <property name="coverage.classpath" value=""/>            <!-- default -->
     675                <property name="default.jtreg.verbose" value="summary"/>  <!-- default -->
     676                <property name="other.jtreg.options" value=""/>           <!-- default -->
    675677                <jtreg
    676678                    dir="${test.dir}"
  • trunk/openjdk/langtools/make/jprt.properties

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
     
    2929# Specific platform list
    3030jprt.build.platforms=\
    31 solaris_sparc_5.8,\
    32 solaris_sparcv9_5.8,\
    33 solaris_i586_5.8,\
     31solaris_sparc_5.10,\
     32solaris_sparcv9_5.10,\
     33solaris_i586_5.10,\
    3434solaris_x64_5.10,\
    3535linux_i586_2.6,\
     
    4141jprt.build.flavors=product
    4242
    43 # Explicitly designate what the 32bit match is for the 64bit build
    44 jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8
    45 jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8
    46 jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8
    47 jprt.solaris_x64.build.platform.match32=solaris_i586_5.8
    48 jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8
    49 jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8
    50 
    5143# Standard list of jprt test targets for this workspace
    5244jprt.test.targets=
  • trunk/openjdk/langtools/make/netbeans/README

    r2 r278  
    1 Working on the "langtools" workspace using NetBeans.
     1Using NetBeans to work on the langtools repository.
    22
    3 This directory (make/netbeans) contains NetBeans projects that
    4 allow you to work on the various tools using the NetBeans IDE.
     3Netbeans 6.0 or later is recommended.
    54
    6 NetBeans 5.0 or later is required and sufficient to use these
    7 projects. This is different from other projects in OpenJDK,
    8 which requires version 6.0 or later.
     5The "langtools" project in this directory allows you to
     6edit, run, test and debug the tools in the OpenJDK langtools
     7repository.
    98
    10 The following projects are provided:
     9The repository contains a number of tools:
     10    apt, javac, javadoc and its doclets, javah and javap.
    1111
    12 compiler: for working on the compiler, javac
    13 javadoc:  for working on the documentation tool, javadoc
    14 doclets:  for working on the standard doclets used by the
    15           documentation tool, javadoc
    16 javah:    for working on the C header tool, javah
    17 javap:    for working on the disassembler, javap
    18 apt:      for working on the annotation processing tool, apt.
    19           Note that this is just provided for completeness;
    20           the tool has been superceded by new features in javac,
    21           and work on apt itself is discouraged.
     12Build Properties.
    2213
    23 However, any tool can be worked on from any project; the only difference
    24 between these projects is the behavior of the standard NetBeans actions,
    25 so that "Build" in the compiler project will build the compiler, etc.
     14To build this repository, you must set some properties for Ant.
     15You can set these properties in a number of ways:
    2616
     17- Set the properties in the Properties panel under Tool> Options> Ant.
     18  Properties set this way will apply globally to all the langtools
     19  repositories you may be working on.
    2720
     21- Create a file build.properties in the root directory of a
     22  langtools repository, and set the properties in that file.
     23  These properties will be specific to that repository.
    2824
     25To build the repository, at a minimum you must set the "boot.java.home"
     26property.  To run the tools, you must also set "target.java.home". To
     27run the regression tests, you must set "jtreg.home".
     28
     29By default, the build and test targets will build and test all
     30of these tools. The run and debug targets will prompt you for the
     31name of a tool to execute.
     32
     33As an alternative, you can focus on a single tool.  When you do
     34this, you will still see all the source code for all the tools,
     35but the various Ant targets will now be focussed on the selected tool.
     36To focus on a tool, bring up the context menu on the "langtools"
     37project (i.e. right-click on the project) and select "Select Tool".
     38This brings up a dialog which allows you to specify which tool you
     39wish to work on, and the arguments to use if and when you run it.
  • trunk/openjdk/langtools/make/test/HelloWorld.java

    r2 r278  
    11/*
    2  * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    55 * This code is free software; you can redistribute it and/or modify it
    66 * under the terms of the GNU General Public License version 2 only, as
    7  * published by the Free Software Foundation.  Sun designates this
     7 * published by the Free Software Foundation.  Oracle designates this
    88 * particular file as subject to the "Classpath" exception as provided
    9  * by Sun in the LICENSE file that accompanied this code.
     9 * by Oracle in the LICENSE file that accompanied this code.
    1010 *
    1111 * This code is distributed in the hope that it will be useful, but WITHOUT
     
    1919 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020 *
    21  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22  * CA 95054 USA or visit www.sun.com if you need additional information or
    23  * have any questions.
     21 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22 * or visit www.oracle.com if you need additional information or have any
     23 * questions.
    2424 */
    2525
  • trunk/openjdk/langtools/make/test/bootstrap/javac.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/bootstrap/javadoc.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/bootstrap/javah.sh

    r2 r278  
    22
    33#
    4 # Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/contents.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/lib/apt.sh

    r2 r278  
    22
    33#
    4 # Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/lib/classes.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/lib/javac.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/lib/javadoc.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/lib/javah.sh

    r2 r278  
    22
    33#
    4 # Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/lib/javap.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/test/lib/src.sh

    r2 r278  
    22
    33#
    4 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
     
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
  • trunk/openjdk/langtools/make/tools/CompileProperties/CompileProperties.java

    r2 r278  
    11/*
    2  * Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    55 * This code is free software; you can redistribute it and/or modify it
    66 * under the terms of the GNU General Public License version 2 only, as
    7  * published by the Free Software Foundation.  Sun designates this
     7 * published by the Free Software Foundation.  Oracle designates this
    88 * particular file as subject to the "Classpath" exception as provided
    9  * by Sun in the LICENSE file that accompanied this code.
     9 * by Oracle in the LICENSE file that accompanied this code.
    1010 *
    1111 * This code is distributed in the hope that it will be useful, but WITHOUT
     
    1919 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020 *
    21  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22  * CA 95054 USA or visit www.sun.com if you need additional information or
    23  * have any questions.
     21 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22 * or visit www.oracle.com if you need additional information or have any
     23 * questions.
    2424 */
    2525
  • trunk/openjdk/langtools/make/tools/CompileProperties/CompilePropertiesTask.java

    r2 r278  
    11/*
    2  * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    55 * This code is free software; you can redistribute it and/or modify it
    66 * under the terms of the GNU General Public License version 2 only, as
    7  * published by the Free Software Foundation.  Sun designates this
     7 * published by the Free Software Foundation.  Oracle designates this
    88 * particular file as subject to the "Classpath" exception as provided
    9  * by Sun in the LICENSE file that accompanied this code.
     9 * by Oracle in the LICENSE file that accompanied this code.
    1010 *
    1111 * This code is distributed in the hope that it will be useful, but WITHOUT
     
    1919 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020 *
    21  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22  * CA 95054 USA or visit www.sun.com if you need additional information or
    23  * have any questions.
     21 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22 * or visit www.oracle.com if you need additional information or have any
     23 * questions.
    2424 */
    2525
Note: See TracChangeset for help on using the changeset viewer.