aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormikejwre <none@none>2010-06-02 15:39:28 -0700
committermikejwre <none@none>2010-06-02 15:39:28 -0700
commit86e1579aa5e5d91fd375f2378766a2e3a92f8d5c (patch)
treef7c5ac27c1f9494a3984dc871c558a5950083b3d
parenta45d145961c6c033a99a517ced21f3b736c23ec9 (diff)
parent3893ee18970866c81e568f1e9e0491d55e0a5651 (diff)
Mergejdk7-b96
Diffstat
-rw-r--r--make/common/shared/Platform.gmk5
-rw-r--r--src/share/classes/com/sun/corba/se/pept/package.html6
-rw-r--r--src/share/classes/com/sun/corba/se/spi/ior/package.html6
-rw-r--r--src/share/classes/com/sun/corba/se/spi/monitoring/package.html6
-rw-r--r--src/share/classes/javax/activity/package.html6
-rw-r--r--src/share/classes/javax/rmi/CORBA/package.html6
-rw-r--r--src/share/classes/javax/rmi/package.html6
-rw-r--r--src/share/classes/javax/transaction/package.html6
-rw-r--r--src/share/classes/javax/transaction/xa/package.html6
-rw-r--r--src/share/classes/org/omg/CORBA/DynAnyPackage/package.html6
-rw-r--r--src/share/classes/org/omg/CORBA/ORBPackage/package.html6
-rw-r--r--src/share/classes/org/omg/CORBA/portable/package.html6
-rw-r--r--src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html6
-rw-r--r--src/share/classes/org/omg/IOP/CodecPackage/package.html6
-rw-r--r--src/share/classes/org/omg/IOP/package.html6
-rw-r--r--src/share/classes/org/omg/Messaging/package.html6
-rw-r--r--src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html6
-rw-r--r--src/share/classes/org/omg/PortableInterceptor/package.html6
18 files changed, 51 insertions, 56 deletions
diff --git a/make/common/shared/Platform.gmk b/make/common/shared/Platform.gmk
index 1a53132..edaf858 100644
--- a/make/common/shared/Platform.gmk
+++ b/make/common/shared/Platform.gmk
@@ -53,7 +53,6 @@ PLATFORM_SHARED=done
# VARIANT OPT or DBG, OPT is the default
# OS_NAME solaris, linux, or nt
# OS_VERSION specific version of os, 5.10, 2.4.9-e.3, etc.
-# OS_VENDOR company name
# TEMP_DISK /tmp or C:/temp
# ARCH_DATA_MODEL 32 or 64
# ARCH sparc, sparcv9, i586, amd64, or ia64
@@ -153,7 +152,6 @@ ifeq ($(SYSTEM_UNAME), SunOS)
endif
# Suffix for file bundles used in previous release
BUNDLE_FILE_SUFFIX=.tar
- OS_VENDOR = Sun Microsystems
# Required Solaris version
REQUIRED_OS_VERSION = 5.10
# Minimum disk space needed as determined by running 'du -sk' on
@@ -236,7 +234,6 @@ ifeq ($(SYSTEM_UNAME), Linux)
# a fully built workspace.
REQUIRED_FREE_SPACE=1460000
LINUX_VERSION_INFO = /etc/redhat-release
- OS_VENDOR = Red Hat
ifeq ($(ARCH_DATA_MODEL), 32)
REQUIRED_LINUX_VER = Advanced Server
REQUIRED_LINUX_FULLVER = Advanced Server release 2.1AS
@@ -244,7 +241,6 @@ ifeq ($(SYSTEM_UNAME), Linux)
else
ifeq ($(ARCH), amd64)
LINUX_VERSION_INFO = /etc/SuSE-release
- OS_VENDOR = SuSE Enterprise
REQUIRED_LINUX_VER = 8.1
REQUIRED_LINUX_FULLVER = $(REQUIRED_LINUX_VER) SLSE AMD64
REQUIRED_OS_VERSION = 2.4.19-SMP
@@ -370,7 +366,6 @@ ifeq ($(PLATFORM), windows)
# Minimum disk space needed as determined by running 'du -sk' on
# a fully built workspace.
REQUIRED_FREE_SPACE=500000
- OS_VENDOR = Microsoft
# How much RAM does this machine have:
ifndef MB_OF_MEMORY
MB_OF_MEMORY := $(shell \
diff --git a/src/share/classes/com/sun/corba/se/pept/package.html b/src/share/classes/com/sun/corba/se/pept/package.html
index 3f9325e..b96935e 100644
--- a/src/share/classes/com/sun/corba/se/pept/package.html
+++ b/src/share/classes/com/sun/corba/se/pept/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
<body bgcolor="white">
diff --git a/src/share/classes/com/sun/corba/se/spi/ior/package.html b/src/share/classes/com/sun/corba/se/spi/ior/package.html
index c8eb39f..2bdbb74 100644
--- a/src/share/classes/com/sun/corba/se/spi/ior/package.html
+++ b/src/share/classes/com/sun/corba/se/spi/ior/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/corba/se/spi/monitoring/package.html b/src/share/classes/com/sun/corba/se/spi/monitoring/package.html
index af3b22f..4a72719 100644
--- a/src/share/classes/com/sun/corba/se/spi/monitoring/package.html
+++ b/src/share/classes/com/sun/corba/se/spi/monitoring/package.html
@@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
<body bgcolor="#FFFFFF">
diff --git a/src/share/classes/javax/activity/package.html b/src/share/classes/javax/activity/package.html
index da36de1..bceb353 100644
--- a/src/share/classes/javax/activity/package.html
+++ b/src/share/classes/javax/activity/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
diff --git a/src/share/classes/javax/rmi/CORBA/package.html b/src/share/classes/javax/rmi/CORBA/package.html
index b76da2c..db004c6 100644
--- a/src/share/classes/javax/rmi/CORBA/package.html
+++ b/src/share/classes/javax/rmi/CORBA/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
<body bgcolor="white">
diff --git a/src/share/classes/javax/rmi/package.html b/src/share/classes/javax/rmi/package.html
index 9bdffa6..e743b10 100644
--- a/src/share/classes/javax/rmi/package.html
+++ b/src/share/classes/javax/rmi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
<body bgcolor="white">
diff --git a/src/share/classes/javax/transaction/package.html b/src/share/classes/javax/transaction/package.html
index 1c1ecf6..7f71b17 100644
--- a/src/share/classes/javax/transaction/package.html
+++ b/src/share/classes/javax/transaction/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
diff --git a/src/share/classes/javax/transaction/xa/package.html b/src/share/classes/javax/transaction/xa/package.html
index bd80350..daa9e68 100644
--- a/src/share/classes/javax/transaction/xa/package.html
+++ b/src/share/classes/javax/transaction/xa/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
diff --git a/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html b/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html
index 80d2411..0908e64 100644
--- a/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html
+++ b/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
<body bgcolor="white">
diff --git a/src/share/classes/org/omg/CORBA/ORBPackage/package.html b/src/share/classes/org/omg/CORBA/ORBPackage/package.html
index a735dd7..7fcb5e8 100644
--- a/src/share/classes/org/omg/CORBA/ORBPackage/package.html
+++ b/src/share/classes/org/omg/CORBA/ORBPackage/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
<body bgcolor="white">
diff --git a/src/share/classes/org/omg/CORBA/portable/package.html b/src/share/classes/org/omg/CORBA/portable/package.html
index f8f9a7d..445b78d 100644
--- a/src/share/classes/org/omg/CORBA/portable/package.html
+++ b/src/share/classes/org/omg/CORBA/portable/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
</head>
<body bgcolor="white">
diff --git a/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html b/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html
index 5b67892..0a6bc3b 100644
--- a/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html
+++ b/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/org/omg/IOP/CodecPackage/package.html b/src/share/classes/org/omg/IOP/CodecPackage/package.html
index 6ae56e4..0301fb5 100644
--- a/src/share/classes/org/omg/IOP/CodecPackage/package.html
+++ b/src/share/classes/org/omg/IOP/CodecPackage/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/org/omg/IOP/package.html b/src/share/classes/org/omg/IOP/package.html
index 3d89ebb..34f2aa2 100644
--- a/src/share/classes/org/omg/IOP/package.html
+++ b/src/share/classes/org/omg/IOP/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/org/omg/Messaging/package.html b/src/share/classes/org/omg/Messaging/package.html
index 78fd92b..f2fa37b 100644
--- a/src/share/classes/org/omg/Messaging/package.html
+++ b/src/share/classes/org/omg/Messaging/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html b/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html
index 46d7781..422069e 100644
--- a/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html
+++ b/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/org/omg/PortableInterceptor/package.html b/src/share/classes/org/omg/PortableInterceptor/package.html
index a21d613..08782dd 100644
--- a/src/share/classes/org/omg/PortableInterceptor/package.html
+++ b/src/share/classes/org/omg/PortableInterceptor/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:30:05 +0000