jdk8-mips64-public/corba: changeset 164:edc2a2659c77

     1.1 --- a/make/common/shared/Platform.gmk	Sat May 29 09:53:33 2010 -0700
     1.2 +++ b/make/common/shared/Platform.gmk	Wed Jun 02 15:39:28 2010 -0700
     1.3 @@ -53,7 +53,6 @@
     1.4  #     VARIANT                     OPT or DBG, OPT is the default
     1.5  #     OS_NAME                     solaris, linux, or nt
     1.6  #     OS_VERSION                  specific version of os, 5.10, 2.4.9-e.3, etc.
     1.7 -#     OS_VENDOR                   company name
     1.8  #     TEMP_DISK                   /tmp or C:/temp
     1.9  #     ARCH_DATA_MODEL             32 or 64
    1.10  #     ARCH                        sparc, sparcv9, i586, amd64, or ia64
    1.11 @@ -153,7 +152,6 @@
    1.12    endif
    1.13    # Suffix for file bundles used in previous release
    1.14    BUNDLE_FILE_SUFFIX=.tar
    1.15 -  OS_VENDOR = Sun Microsystems
    1.16    # Required Solaris version
    1.17    REQUIRED_OS_VERSION = 5.10
    1.18    # Minimum disk space needed as determined by running 'du -sk' on 
    1.19 @@ -236,7 +234,6 @@
    1.20    #    a fully built workspace.
    1.21    REQUIRED_FREE_SPACE=1460000
    1.22    LINUX_VERSION_INFO = /etc/redhat-release
    1.23 -  OS_VENDOR = Red Hat
    1.24    ifeq ($(ARCH_DATA_MODEL), 32)
    1.25      REQUIRED_LINUX_VER = Advanced Server
    1.26      REQUIRED_LINUX_FULLVER = Advanced Server release 2.1AS
    1.27 @@ -244,7 +241,6 @@
    1.28    else
    1.29      ifeq ($(ARCH), amd64)
    1.30        LINUX_VERSION_INFO = /etc/SuSE-release
    1.31 -      OS_VENDOR = SuSE Enterprise
    1.32        REQUIRED_LINUX_VER = 8.1
    1.33        REQUIRED_LINUX_FULLVER = $(REQUIRED_LINUX_VER) SLSE AMD64
    1.34        REQUIRED_OS_VERSION = 2.4.19-SMP
    1.35 @@ -370,7 +366,6 @@
    1.36    # Minimum disk space needed as determined by running 'du -sk' on 
    1.37    #    a fully built workspace.
    1.38    REQUIRED_FREE_SPACE=500000
    1.39 -  OS_VENDOR = Microsoft
    1.40    # How much RAM does this machine have:
    1.41    ifndef MB_OF_MEMORY
    1.42      MB_OF_MEMORY := $(shell \

     2.1 --- a/src/share/classes/com/sun/corba/se/pept/package.html	Sat May 29 09:53:33 2010 -0700
     2.2 +++ b/src/share/classes/com/sun/corba/se/pept/package.html	Wed Jun 02 15:39:28 2010 -0700
     2.3 @@ -22,9 +22,9 @@
     2.4  2 along with this work; if not, write to the Free Software Foundation,
     2.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     2.6  
     2.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     2.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     2.9 -have any questions.
    2.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.11 +or visit www.oracle.com if you need additional information or have any
    2.12 +questions.
    2.13  -->
    2.14  </head>
    2.15  <body bgcolor="white">

     3.1 --- a/src/share/classes/com/sun/corba/se/spi/ior/package.html	Sat May 29 09:53:33 2010 -0700
     3.2 +++ b/src/share/classes/com/sun/corba/se/spi/ior/package.html	Wed Jun 02 15:39:28 2010 -0700
     3.3 @@ -22,9 +22,9 @@
     3.4  2 along with this work; if not, write to the Free Software Foundation,
     3.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     3.6  
     3.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     3.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     3.9 -have any questions.
    3.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.11 +or visit www.oracle.com if you need additional information or have any
    3.12 +questions.
    3.13  
    3.14  -->
    3.15

     4.1 --- a/src/share/classes/com/sun/corba/se/spi/monitoring/package.html	Sat May 29 09:53:33 2010 -0700
     4.2 +++ b/src/share/classes/com/sun/corba/se/spi/monitoring/package.html	Wed Jun 02 15:39:28 2010 -0700
     4.3 @@ -25,9 +25,9 @@
     4.4  2 along with this work; if not, write to the Free Software Foundation,
     4.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     4.6  
     4.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     4.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     4.9 -have any questions.
    4.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.11 +or visit www.oracle.com if you need additional information or have any
    4.12 +questions.
    4.13  -->
    4.14  </head>
    4.15  <body bgcolor="#FFFFFF">

     5.1 --- a/src/share/classes/javax/activity/package.html	Sat May 29 09:53:33 2010 -0700
     5.2 +++ b/src/share/classes/javax/activity/package.html	Wed Jun 02 15:39:28 2010 -0700
     5.3 @@ -21,9 +21,9 @@
     5.4  2 along with this work; if not, write to the Free Software Foundation,
     5.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     5.6  
     5.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     5.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     5.9 -have any questions.
    5.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5.11 +or visit www.oracle.com if you need additional information or have any
    5.12 +questions.
    5.13  -->
    5.14  
    5.15  </head>

     6.1 --- a/src/share/classes/javax/rmi/CORBA/package.html	Sat May 29 09:53:33 2010 -0700
     6.2 +++ b/src/share/classes/javax/rmi/CORBA/package.html	Wed Jun 02 15:39:28 2010 -0700
     6.3 @@ -21,9 +21,9 @@
     6.4  2 along with this work; if not, write to the Free Software Foundation,
     6.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     6.6  
     6.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     6.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     6.9 -have any questions.
    6.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    6.11 +or visit www.oracle.com if you need additional information or have any
    6.12 +questions.
    6.13  -->
    6.14  </head>
    6.15  <body bgcolor="white">

     7.1 --- a/src/share/classes/javax/rmi/package.html	Sat May 29 09:53:33 2010 -0700
     7.2 +++ b/src/share/classes/javax/rmi/package.html	Wed Jun 02 15:39:28 2010 -0700
     7.3 @@ -21,9 +21,9 @@
     7.4  2 along with this work; if not, write to the Free Software Foundation,
     7.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     7.6  
     7.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     7.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     7.9 -have any questions.
    7.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    7.11 +or visit www.oracle.com if you need additional information or have any
    7.12 +questions.
    7.13  -->
    7.14  </head>
    7.15  <body bgcolor="white">

     8.1 --- a/src/share/classes/javax/transaction/package.html	Sat May 29 09:53:33 2010 -0700
     8.2 +++ b/src/share/classes/javax/transaction/package.html	Wed Jun 02 15:39:28 2010 -0700
     8.3 @@ -21,9 +21,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  
    8.15  </head>

     9.1 --- a/src/share/classes/javax/transaction/xa/package.html	Sat May 29 09:53:33 2010 -0700
     9.2 +++ b/src/share/classes/javax/transaction/xa/package.html	Wed Jun 02 15:39:28 2010 -0700
     9.3 @@ -21,9 +21,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  
    9.15  </head>

    10.1 --- a/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html	Sat May 29 09:53:33 2010 -0700
    10.2 +++ b/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html	Wed Jun 02 15:39:28 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/org/omg/CORBA/ORBPackage/package.html	Sat May 29 09:53:33 2010 -0700
    11.2 +++ b/src/share/classes/org/omg/CORBA/ORBPackage/package.html	Wed Jun 02 15:39:28 2010 -0700
    11.3 @@ -21,9 +21,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/org/omg/CORBA/portable/package.html	Sat May 29 09:53:33 2010 -0700
    12.2 +++ b/src/share/classes/org/omg/CORBA/portable/package.html	Wed Jun 02 15:39:28 2010 -0700
    12.3 @@ -21,9 +21,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/org/omg/IOP/CodecFactoryPackage/package.html	Sat May 29 09:53:33 2010 -0700
    13.2 +++ b/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html	Wed Jun 02 15:39:28 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  
   13.15  -->

    14.1 --- a/src/share/classes/org/omg/IOP/CodecPackage/package.html	Sat May 29 09:53:33 2010 -0700
    14.2 +++ b/src/share/classes/org/omg/IOP/CodecPackage/package.html	Wed Jun 02 15:39:28 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   
   14.15  -->

    15.1 --- a/src/share/classes/org/omg/IOP/package.html	Sat May 29 09:53:33 2010 -0700
    15.2 +++ b/src/share/classes/org/omg/IOP/package.html	Wed Jun 02 15:39:28 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  -->
   15.15

    16.1 --- a/src/share/classes/org/omg/Messaging/package.html	Sat May 29 09:53:33 2010 -0700
    16.2 +++ b/src/share/classes/org/omg/Messaging/package.html	Wed Jun 02 15:39:28 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  -->
   16.15

    17.1 --- a/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html	Sat May 29 09:53:33 2010 -0700
    17.2 +++ b/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html	Wed Jun 02 15:39:28 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  -->
   17.15

    18.1 --- a/src/share/classes/org/omg/PortableInterceptor/package.html	Sat May 29 09:53:33 2010 -0700
    18.2 +++ b/src/share/classes/org/omg/PortableInterceptor/package.html	Wed Jun 02 15:39:28 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  -->
   18.15

Mercurial > jdk8-mips64-public > corba / changeset

changeset

Merge jdk7-b96