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 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk

  • trunk/openjdk/hotspot/agent/test/libproc/LibprocClient.java

    r2 r278  
    11/*
    2  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
     
    1717 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818 *
    19  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20  * CA 95054 USA or visit www.sun.com if you need additional information or
    21  * have any questions.
     19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20 * or visit www.oracle.com if you need additional information or have any
     21 * questions.
    2222 *
    2323 */
  • trunk/openjdk/hotspot/agent/test/libproc/LibprocTest.java

    r2 r278  
    11/*
    2  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
     
    1717 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818 *
    19  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20  * CA 95054 USA or visit www.sun.com if you need additional information or
    21  * have any questions.
     19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20 * or visit www.oracle.com if you need additional information or have any
     21 * questions.
    2222 *
    2323 */
  • trunk/openjdk/hotspot/agent/test/libproc/Makefile

    r2 r278  
    11#
    2 # Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/agent/test/libproc/README

    r2 r278  
    11#
    2 # Copyright (c) 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#   
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#   
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/agent/test/libproc/libproctest.sh

    r2 r278  
    22
    33#
    4 # Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2003, 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/hotspot/agent/test/libproc/libproctest64.sh

    r2 r278  
    22
    33#
    4 # Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2003, 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#
Note: See TracChangeset for help on using the changeset viewer.