Mercurial > hg > release > icedtea7-forest-2.5 > corba
changeset 198:8f0a1a30461d
Merge
author | lana |
---|---|
date | Wed, 16 Jun 2010 13:41:34 -0700 |
parents | 032585ad970d (current diff) 3b99409057e4 (diff) |
children | 8eeca6e452de 03fd3d78e344 |
files | |
diffstat | 20 files changed, 63 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 14 11:28:53 2010 -0700 +++ b/.hgtags Wed Jun 16 13:41:34 2010 -0700 @@ -70,3 +70,5 @@ 9718d624864c29dca44373d541e93cdd309a994f jdk7-b93 533c11186b44e3a02d6c5fe69a73260505fcfe5e jdk7-b94 06dbf406818c789bb586c1de4c002024cd26ecd2 jdk7-b95 +edc2a2659c77dabc55cb55bb617bad89e3a05bb3 jdk7-b96 +4ec9d59374caa1e5d72fa802291b4d66955a4936 jdk7-b97
--- a/make/common/Defs-linux.gmk Mon Jun 14 11:28:53 2010 -0700 +++ b/make/common/Defs-linux.gmk Wed Jun 16 13:41:34 2010 -0700 @@ -176,7 +176,16 @@ CXXFLAGS_DBG += $(CC_LOWER_OPT) endif -CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ +CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' + +# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) +ifneq ($(ARCH),alpha) + CPP_ARCH_FLAGS += -D$(ARCH) +else + CPP_ARCH_FLAGS += -D_$(ARCH)_ +endif + +CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT ifeq ($(ARCH_DATA_MODEL), 64)
--- a/make/common/shared/Platform.gmk Mon Jun 14 11:28:53 2010 -0700 +++ b/make/common/shared/Platform.gmk Wed Jun 16 13:41:34 2010 -0700 @@ -53,7 +53,6 @@ # 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 @@ 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 @@ # 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 @@ 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 @@ # 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 \
--- a/src/share/classes/com/sun/corba/se/pept/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/com/sun/corba/se/pept/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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">
--- a/src/share/classes/com/sun/corba/se/spi/ior/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/com/sun/corba/se/spi/ior/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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. -->
--- a/src/share/classes/com/sun/corba/se/spi/monitoring/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/com/sun/corba/se/spi/monitoring/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -25,9 +25,9 @@ 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">
--- a/src/share/classes/javax/activity/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/javax/activity/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -21,9 +21,9 @@ 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>
--- a/src/share/classes/javax/rmi/CORBA/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/javax/rmi/CORBA/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -21,9 +21,9 @@ 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">
--- a/src/share/classes/javax/rmi/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/javax/rmi/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -21,9 +21,9 @@ 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">
--- a/src/share/classes/javax/transaction/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/javax/transaction/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -21,9 +21,9 @@ 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>
--- a/src/share/classes/javax/transaction/xa/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/javax/transaction/xa/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -21,9 +21,9 @@ 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>
--- a/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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">
--- a/src/share/classes/org/omg/CORBA/ORBPackage/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/CORBA/ORBPackage/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -21,9 +21,9 @@ 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">
--- a/src/share/classes/org/omg/CORBA/portable/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/CORBA/portable/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -21,9 +21,9 @@ 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">
--- a/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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. -->
--- a/src/share/classes/org/omg/IOP/CodecPackage/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/IOP/CodecPackage/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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. -->
--- a/src/share/classes/org/omg/IOP/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/IOP/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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. -->
--- a/src/share/classes/org/omg/Messaging/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/Messaging/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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. -->
--- a/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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. -->
--- a/src/share/classes/org/omg/PortableInterceptor/package.html Mon Jun 14 11:28:53 2010 -0700 +++ b/src/share/classes/org/omg/PortableInterceptor/package.html Wed Jun 16 13:41:34 2010 -0700 @@ -22,9 +22,9 @@ 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. -->