diff --git a/corba/make/common/shared/Platform.gmk b/corba/make/common/shared/Platform.gmk index 1a53132c64ae46b0fc6122d24353f2de03a0e630..edaf8582fdef1d88f46261e09d774c70d24560a0 100644 --- a/corba/make/common/shared/Platform.gmk +++ b/corba/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/corba/src/share/classes/com/sun/corba/se/pept/package.html b/corba/src/share/classes/com/sun/corba/se/pept/package.html index 3f9325e3fe0c030fde0ce1466583ddd5f29050ea..b96935e1f076bed4d50018f1fa776c5bee274ff2 100644 --- a/corba/src/share/classes/com/sun/corba/se/pept/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/package.html b/corba/src/share/classes/com/sun/corba/se/spi/ior/package.html index c8eb39fdbd394399549f6bdf09649290b0245ade..2bdbb74e8044df2d6fe26929ca1572c09367e30a 100644 --- a/corba/src/share/classes/com/sun/corba/se/spi/ior/package.html +++ b/corba/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/corba/src/share/classes/com/sun/corba/se/spi/monitoring/package.html b/corba/src/share/classes/com/sun/corba/se/spi/monitoring/package.html index af3b22f806ef6c6bca3fb2dc2ec53b3ec8e6f191..4a72719c0cfb42f017fba4585a3dba872f588f82 100644 --- a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/javax/activity/package.html b/corba/src/share/classes/javax/activity/package.html index da36de1e69bd47346d7fd7bce6e018a6335fa066..bceb353231a1a4878d8bab1b7cfdae9c3cce3fba 100644 --- a/corba/src/share/classes/javax/activity/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/javax/rmi/CORBA/package.html b/corba/src/share/classes/javax/rmi/CORBA/package.html index b76da2c61bbaccc649b916cf1d3a779b636007d9..db004c63d22a3be9a034d0671f26ae58cb488a38 100644 --- a/corba/src/share/classes/javax/rmi/CORBA/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/javax/rmi/package.html b/corba/src/share/classes/javax/rmi/package.html index 9bdffa61ae36065cf7884d80ec266648de849bb8..e743b10a92e7b48200bf256b29e6900da3236e3d 100644 --- a/corba/src/share/classes/javax/rmi/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/javax/transaction/package.html b/corba/src/share/classes/javax/transaction/package.html index 1c1ecf625f1717678032eded7634f11823861175..7f71b1791c8196715156e8b4cc0a8d0ca05f2022 100644 --- a/corba/src/share/classes/javax/transaction/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/javax/transaction/xa/package.html b/corba/src/share/classes/javax/transaction/xa/package.html index bd80350e465ee3d093c3a183f755ce0c82517fb8..daa9e6807ca120845e3be9527fd9d8142744a20b 100644 --- a/corba/src/share/classes/javax/transaction/xa/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html b/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html index 80d2411d52050cb2ccd70cbb007fce1a34080cb1..0908e6462b0941407cbf91d9ece43f2c74850f8b 100644 --- a/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/org/omg/CORBA/ORBPackage/package.html b/corba/src/share/classes/org/omg/CORBA/ORBPackage/package.html index a735dd7546bcecb6a0618c25431761ab2845c8d9..7fcb5e857a398d0b3a171bf147e973a40c0b8741 100644 --- a/corba/src/share/classes/org/omg/CORBA/ORBPackage/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/org/omg/CORBA/portable/package.html b/corba/src/share/classes/org/omg/CORBA/portable/package.html index f8f9a7d99c1340966b6e6640b9158dce4ba14c63..445b78d1ec6d6a1d9073973c05b1ef095b1113a2 100644 --- a/corba/src/share/classes/org/omg/CORBA/portable/package.html +++ b/corba/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. --> diff --git a/corba/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html b/corba/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html index 5b678924210f1b5ecc60633b5451d211ab7ec819..0a6bc3bbfa066a0dd873da36660b91e1fbaa4254 100644 --- a/corba/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html +++ b/corba/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/corba/src/share/classes/org/omg/IOP/CodecPackage/package.html b/corba/src/share/classes/org/omg/IOP/CodecPackage/package.html index 6ae56e46936ee22bf5a692ad9d23605f53dfea31..0301fb590a5a210ee1a3802de3fa73f56e7c5ca2 100644 --- a/corba/src/share/classes/org/omg/IOP/CodecPackage/package.html +++ b/corba/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/corba/src/share/classes/org/omg/IOP/package.html b/corba/src/share/classes/org/omg/IOP/package.html index 3d89ebb725bbd2b2e7e66573e4912a93488327f9..34f2aa2060e5ff8aee8fad331b5c76b703ee2f53 100644 --- a/corba/src/share/classes/org/omg/IOP/package.html +++ b/corba/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/corba/src/share/classes/org/omg/Messaging/package.html b/corba/src/share/classes/org/omg/Messaging/package.html index 78fd92b70c403868eceea4fbc28081b73e741a74..f2fa37bdb4a4ac188bf43e553b88d5b8ce456f05 100644 --- a/corba/src/share/classes/org/omg/Messaging/package.html +++ b/corba/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/corba/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html b/corba/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html index 46d7781daf03a098c7fcba13f60244e58d6c53c5..422069e6b717304bb60b05bda6b9d38800ce20d6 100644 --- a/corba/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html +++ b/corba/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/corba/src/share/classes/org/omg/PortableInterceptor/package.html b/corba/src/share/classes/org/omg/PortableInterceptor/package.html index a21d61326915ea07da3bfca6eaa60fdeee4631ae..08782dd520f34e8505c9efb49c11dba662bb17d2 100644 --- a/corba/src/share/classes/org/omg/PortableInterceptor/package.html +++ b/corba/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. -->