6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
6845973: Update JDK7 with deployment changes in 6u13, 6u14
4802695: Support 64-bit Java Plug-in and Java webstart on Windows/Linux on AMD64
6825019: DownloadManager should not be loaded and referenced for full JRE
6738770: REGRESSION:JSException throws when use LiveConnect javascript facility
6772884: plugin2 : java.lang.OutOfMemoryError or crash
6707535: Crossing domain hole affecting multiple sites/domains using plug-in
6728071: Non-verification of Update files may allow unintended updates
6704154: Code loaded from local filesystem should not get access to localhost
6727081: Web Start security restrictions bypass using special extension jnlp
6727079: Java Web Start Socket() restriction bypass
6727071: Cache location/user name information disclosure in SingleInstanceImpl.
6716217: AppletClassLoader adds permissions based on codebase regardless of CS
6694892: Java Webstart inclusion via system properties override [CVE-2008-2086]
6704074: localhost socket access due to cache location exposed
6703909: Java webstart arbitrary file creation using nativelib
6665315: browser crashes when deployment.properties has more slashes ( / )
6660121: Encoding values in JNLP files can cause buffer overflow
6606110: URLConnection.setProxiedHost for resources that are loaded via proxy
6581221: SSV(VISTA): Redirection FAILS to work if user does a downgrade install
6609756: Buffer Overflow in Java ActiveX component
6608712: Bypassing the same origin policy in Java with crafted names
6534630: "gnumake clobber" doesn't
6849953: JDK7 - replacement of bufferoverflowU.lib on amd64 breaks build
6849029: Need some JDK7 merge clean-up after comments on the webrev
6847582: Build problem on JDK7 with isSecureProperty in merge
6827935: JDK 7 deployment merging - problem in Compiler-msvm.gmk
6823215: latest merge fixes from 6u12 -> JDK7
6816153: further mergers for JDK7 deployment integration
6807074: Fix Java Kernel and JQS in initial JDK7 builds
Summary: Initial changeset for implementing 6uX Deployment Features into JDK7
Reviewed-by: dgu, billyh
--- a/corba/make/common/Defs-windows.gmk Thu May 14 10:57:56 2009 -0700
+++ b/corba/make/common/Defs-windows.gmk Thu Jun 11 15:16:20 2009 -0400
@@ -365,10 +365,10 @@
COPYRIGHT_YEAR = 2007
endif
-RC_FLAGS += -d "J2SE_BUILD_ID=$(FULL_VERSION)" \
- -d "J2SE_COMPANY=$(COMPANY_NAME)" \
- -d "J2SE_COMPONENT=$(PRODUCT_NAME) Platform SE binary" \
- -d "J2SE_VER=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(J2SE_UPDATE_VER).$(COOKED_BUILD_NUMBER)" \
- -d "J2SE_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
- -d "J2SE_NAME=$(PRODUCT_NAME) Platform SE $(JDK_MINOR_VERSION) $(J2SE_UPDATE_META_TAG)" \
- -d "J2SE_FVER=$(JDK_VERSION)"
+RC_FLAGS += -d "JDK_BUILD_ID=$(FULL_VERSION)" \
+ -d "JDK_COMPANY=$(COMPANY_NAME)" \
+ -d "JDK_COMPONENT=$(PRODUCT_NAME) Platform SE binary" \
+ -d "JDK_VER=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)" \
+ -d "JDK_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
+ -d "JDK_NAME=$(PRODUCT_NAME) Platform SE $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)" \
+ -d "JDK_FVER=$(JDK_VERSION)"
--- a/corba/make/common/Library.gmk Thu May 14 10:57:56 2009 -0700
+++ b/corba/make/common/Library.gmk Thu Jun 11 15:16:20 2009 -0400
@@ -158,9 +158,9 @@
endif
@$(ECHO) Created $@
-RC_FLAGS += /D "J2SE_FNAME=$(LIBRARY).dll" \
- /D "J2SE_INTERNAL_NAME=$(LIBRARY)" \
- /D "J2SE_FTYPE=0x2L"
+RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \
+ /D "JDK_INTERNAL_NAME=$(LIBRARY)" \
+ /D "JDK_FTYPE=0x2L"
$(OBJDIR)/$(LIBRARY).res: $(VERSIONINFO_RESOURCE)
ifndef LOCAL_RESOURCE_FILE
--- a/corba/make/org/omg/idl/Makefile Thu May 14 10:57:56 2009 -0700
+++ b/corba/make/org/omg/idl/Makefile Thu Jun 11 15:16:20 2009 -0400
@@ -32,6 +32,12 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
+# This program must contain a manifest that defines the execution level
+# needed to follow standard Vista User Access Control Guidelines
+# This must be set before Program.gmk is included
+#
+BUILD_MANIFEST=true
+
#
# Files
#
--- a/corba/src/windows/resource/version.rc Thu May 14 10:57:56 2009 -0700
+++ b/corba/src/windows/resource/version.rc Thu Jun 11 15:16:20 2009 -0400
@@ -37,8 +37,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION J2SE_FVER
- PRODUCTVERSION J2SE_FVER
+ FILEVERSION JDK_FVER
+ PRODUCTVERSION JDK_FVER
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -48,22 +48,22 @@
// FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
FILEOS 0x4L
// FILETYPE should be 0x1 for .exe and 0x2 for .dll
- FILETYPE J2SE_FTYPE
+ FILETYPE JDK_FTYPE
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "CompanyName", XSTR(J2SE_COMPANY) "\0"
- VALUE "FileDescription", XSTR(J2SE_COMPONENT) "\0"
- VALUE "FileVersion", XSTR(J2SE_VER) "\0"
- VALUE "Full Version", XSTR(J2SE_BUILD_ID) "\0"
- VALUE "InternalName", XSTR(J2SE_INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", XSTR(J2SE_COPYRIGHT) "\0"
- VALUE "OriginalFilename", XSTR(J2SE_FNAME) "\0"
- VALUE "ProductName", XSTR(J2SE_NAME) "\0"
- VALUE "ProductVersion", XSTR(J2SE_VER) "\0"
+ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
+ VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0"
+ VALUE "FileVersion", XSTR(JDK_VER) "\0"
+ VALUE "Full Version", XSTR(JDK_BUILD_ID) "\0"
+ VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
+ VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
+ VALUE "ProductName", XSTR(JDK_NAME) "\0"
+ VALUE "ProductVersion", XSTR(JDK_VER) "\0"
END
END
BLOCK "VarFileInfo"