jdk8-mips64-public/corba: changeset 88:ffb590b42ed1

changeset
raw
bz2
zip
gz

changeset

6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7

Thu, 11 Jun 2009 15:16:20 -0400

author: herrick
date: Thu, 11 Jun 2009 15:16:20 -0400
changeset 88: ffb590b42ed1
parent 75: e9ba2b962ddf
child 89: 79d8fd9e74b9

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

make/common/Defs-windows.gmk		file \| annotate \| diff \| comparison \| revisions
make/common/Library.gmk		file \| annotate \| diff \| comparison \| revisions
make/org/omg/idl/Makefile		file \| annotate \| diff \| comparison \| revisions
src/windows/resource/version.rc		file \| annotate \| diff \| comparison \| revisions

     1.1 --- a/make/common/Defs-windows.gmk	Thu May 14 10:57:56 2009 -0700
     1.2 +++ b/make/common/Defs-windows.gmk	Thu Jun 11 15:16:20 2009 -0400
     1.3 @@ -365,10 +365,10 @@
     1.4      COPYRIGHT_YEAR = 2007 
     1.5  endif
     1.6  
     1.7 -RC_FLAGS += -d "J2SE_BUILD_ID=$(FULL_VERSION)" \
     1.8 -            -d "J2SE_COMPANY=$(COMPANY_NAME)" \
     1.9 -            -d "J2SE_COMPONENT=$(PRODUCT_NAME) Platform SE binary" \
    1.10 -            -d "J2SE_VER=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(J2SE_UPDATE_VER).$(COOKED_BUILD_NUMBER)" \
    1.11 -            -d "J2SE_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
    1.12 -            -d "J2SE_NAME=$(PRODUCT_NAME) Platform SE $(JDK_MINOR_VERSION) $(J2SE_UPDATE_META_TAG)" \
    1.13 -            -d "J2SE_FVER=$(JDK_VERSION)"
    1.14 +RC_FLAGS += -d "JDK_BUILD_ID=$(FULL_VERSION)" \
    1.15 +            -d "JDK_COMPANY=$(COMPANY_NAME)" \
    1.16 +            -d "JDK_COMPONENT=$(PRODUCT_NAME) Platform SE binary" \
    1.17 +            -d "JDK_VER=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)" \
    1.18 +            -d "JDK_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
    1.19 +            -d "JDK_NAME=$(PRODUCT_NAME) Platform SE $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)" \
    1.20 +            -d "JDK_FVER=$(JDK_VERSION)"

     2.1 --- a/make/common/Library.gmk	Thu May 14 10:57:56 2009 -0700
     2.2 +++ b/make/common/Library.gmk	Thu Jun 11 15:16:20 2009 -0400
     2.3 @@ -158,9 +158,9 @@
     2.4  endif
     2.5  	@$(ECHO) Created $@ 
     2.6  
     2.7 -RC_FLAGS += /D "J2SE_FNAME=$(LIBRARY).dll" \
     2.8 -            /D "J2SE_INTERNAL_NAME=$(LIBRARY)" \
     2.9 -            /D "J2SE_FTYPE=0x2L"
    2.10 +RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \
    2.11 +            /D "JDK_INTERNAL_NAME=$(LIBRARY)" \
    2.12 +            /D "JDK_FTYPE=0x2L"
    2.13  
    2.14  $(OBJDIR)/$(LIBRARY).res: $(VERSIONINFO_RESOURCE)
    2.15  ifndef LOCAL_RESOURCE_FILE

     3.1 --- a/make/org/omg/idl/Makefile	Thu May 14 10:57:56 2009 -0700
     3.2 +++ b/make/org/omg/idl/Makefile	Thu Jun 11 15:16:20 2009 -0400
     3.3 @@ -32,6 +32,12 @@
     3.4  PRODUCT = sun
     3.5  include $(BUILDDIR)/common/Defs.gmk
     3.6  
     3.7 +# This program must contain a manifest that defines the execution level
     3.8 +# needed to follow standard Vista User Access Control Guidelines
     3.9 +# This must be set before Program.gmk is included
    3.10 +#
    3.11 +BUILD_MANIFEST=true
    3.12 +
    3.13  #
    3.14  # Files
    3.15  #

     4.1 --- a/src/windows/resource/version.rc	Thu May 14 10:57:56 2009 -0700
     4.2 +++ b/src/windows/resource/version.rc	Thu Jun 11 15:16:20 2009 -0400
     4.3 @@ -37,8 +37,8 @@
     4.4  //
     4.5  
     4.6  VS_VERSION_INFO VERSIONINFO
     4.7 - FILEVERSION    J2SE_FVER
     4.8 - PRODUCTVERSION J2SE_FVER
     4.9 + FILEVERSION    JDK_FVER
    4.10 + PRODUCTVERSION JDK_FVER
    4.11   FILEFLAGSMASK 0x3fL
    4.12  #ifdef _DEBUG
    4.13   FILEFLAGS 0x1L
    4.14 @@ -48,22 +48,22 @@
    4.15   // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
    4.16   FILEOS 0x4L
    4.17   // FILETYPE should be 0x1 for .exe and 0x2 for .dll
    4.18 - FILETYPE J2SE_FTYPE
    4.19 + FILETYPE JDK_FTYPE
    4.20   FILESUBTYPE 0x0L
    4.21  BEGIN
    4.22      BLOCK "StringFileInfo"
    4.23      BEGIN
    4.24          BLOCK "000004b0"
    4.25          BEGIN
    4.26 -            VALUE "CompanyName",      XSTR(J2SE_COMPANY)       "\0"
    4.27 -            VALUE "FileDescription",  XSTR(J2SE_COMPONENT)     "\0"
    4.28 -            VALUE "FileVersion",      XSTR(J2SE_VER)           "\0"
    4.29 -            VALUE "Full Version",     XSTR(J2SE_BUILD_ID)      "\0"
    4.30 -	    VALUE "InternalName",     XSTR(J2SE_INTERNAL_NAME) "\0"
    4.31 -            VALUE "LegalCopyright",   XSTR(J2SE_COPYRIGHT)     "\0"
    4.32 -            VALUE "OriginalFilename", XSTR(J2SE_FNAME)         "\0"
    4.33 -            VALUE "ProductName",      XSTR(J2SE_NAME)          "\0"
    4.34 -            VALUE "ProductVersion",   XSTR(J2SE_VER)           "\0"
    4.35 +            VALUE "CompanyName",      XSTR(JDK_COMPANY)       "\0"
    4.36 +            VALUE "FileDescription",  XSTR(JDK_COMPONENT)     "\0"
    4.37 +            VALUE "FileVersion",      XSTR(JDK_VER)           "\0"
    4.38 +            VALUE "Full Version",     XSTR(JDK_BUILD_ID)      "\0"
    4.39 +	    VALUE "InternalName",     XSTR(JDK_INTERNAL_NAME) "\0"
    4.40 +            VALUE "LegalCopyright",   XSTR(JDK_COPYRIGHT)     "\0"
    4.41 +            VALUE "OriginalFilename", XSTR(JDK_FNAME)         "\0"
    4.42 +            VALUE "ProductName",      XSTR(JDK_NAME)          "\0"
    4.43 +            VALUE "ProductVersion",   XSTR(JDK_VER)           "\0"
    4.44          END
    4.45      END
    4.46      BLOCK "VarFileInfo"

Mercurial > jdk8-mips64-public > corba / changeset

changeset

6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7