hg: jigsaw/jake/jdk: Fixup merge issue

2016-08-19 Thread mandy . chung 
Changeset: a0f2a493ec38
Author:mchung
Date:  2016-08-19 21:58 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/a0f2a493ec38

Fixup merge issue

! test/com/sun/corba/transport/KeepAliveSockets.java
! test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java
! test/sun/rmi/rmic/classpath/RMICClassPathTest.java
! test/sun/security/util/Resources/NewNamesFormat.java

hg: jigsaw/jake/nashorn: 6 new changesets

2016-08-19 Thread mandy . chung 
Changeset: 3487086f145a
Author:sdama
Date:  2016-08-10 09:21 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/nashorn/rev/3487086f145a

8134304: NPE in initialization of OptimisticTypesPersistence
Reviewed-by: hannesw, jlaskey, mhaupt

! 
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java

Changeset: eb330974acdf
Author:mchung
Date:  2016-08-10 15:49 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/nashorn/rev/eb330974acdf

8136930: Simplify use of module-system options by custom launchers
Reviewed-by: alanb, ksrini, henryjen, sundar

! buildtools/nasgen/project.properties
! make/BuildNashorn.gmk
! make/build.xml
! make/project.properties
! test/TEST.ROOT
! test/script/currently-failing/JDK-8055034.js

Changeset: 55a75af751df
Author:lana
Date:  2016-08-11 17:02 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/nashorn/rev/55a75af751df

Merge


Changeset: 4a7e22549915
Author:mchung
Date:  2016-08-19 12:28 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/nashorn/rev/4a7e22549915

Merge

! buildtools/nasgen/project.properties
! make/build.xml
! make/project.properties

Changeset: 5278d6859047
Author:lana
Date:  2016-08-18 21:01 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/nashorn/rev/5278d6859047

Added tag jdk-9+132 for changeset 55a75af751df

! .hgtags

Changeset: bdb1caec3b0f
Author:mchung
Date:  2016-08-19 16:30 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/nashorn/rev/bdb1caec3b0f

Merge

! .hgtags

hg: jigsaw/jake/hotspot: 6 new changesets

2016-08-19 Thread mandy . chung 
Changeset: 3cfddcb268e3
Author:hseigel
Date:  2016-08-10 15:48 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/hotspot/rev/3cfddcb268e3

8136930: Simplify use of module-system options by custom launchers
Reviewed-by: coleenp, lfoltan, mchung

! 
src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java
! src/share/vm/classfile/classLoader.cpp
! src/share/vm/classfile/classLoader.hpp
! src/share/vm/memory/filemap.cpp
! src/share/vm/prims/jvmtiEnv.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/arguments.hpp
! src/share/vm/utilities/ostream.cpp
! test/TEST.ROOT
! test/compiler/unsafe/UnsafeGetConstantField.java
! test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java
! test/gc/arguments/TestSurvivorRatioFlag.java
! test/gc/arguments/TestTargetSurvivorRatioFlag.java
! test/gc/g1/TestShrinkAuxiliaryData.java
! test/runtime/BadObjectClass/BootstrapRedefine.java
! test/runtime/BootClassAppendProp/BootClassPathAppendProp.java
! test/runtime/ErrorHandling/CreateCoredumpOnCrash.java
! test/runtime/ErrorHandling/ProblematicFrameTest.java
! test/runtime/SharedArchiveFile/BootAppendTests.java
! test/runtime/SharedArchiveFile/SASymbolTableTest.java
! test/runtime/Unsafe/RangeCheck.java
! test/runtime/getSysPackage/GetSysPkgTest.java
+ test/runtime/modules/IgnoreModulePropertiesTest.java
+ test/runtime/modules/ModuleOptionsTest.java
+ test/runtime/modules/ModuleOptionsWarn.java
! test/runtime/modules/ModuleStress/ExportModuleStressTest.java
! test/runtime/modules/ModuleStress/ModuleStressGC.java
+ test/runtime/modules/PatchModule/BasicJarBuilder.java
+ test/runtime/modules/PatchModule/PatchModule2Dirs.java
+ test/runtime/modules/PatchModule/PatchModule2DirsMain.java
+ test/runtime/modules/PatchModule/PatchModuleCDS.java
+ test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java
+ test/runtime/modules/PatchModule/PatchModuleDupModule.java
+ test/runtime/modules/PatchModule/PatchModuleJavaBase.java
+ test/runtime/modules/PatchModule/PatchModuleMain.java
+ test/runtime/modules/PatchModule/PatchModuleTest.java
+ test/runtime/modules/PatchModule/PatchModuleTestJar.java
+ test/runtime/modules/PatchModule/PatchModuleTestJarDir.java
+ test/runtime/modules/PatchModule/PatchModuleTraceCL.java
+ test/runtime/modules/Visibility/PatchModuleVisibility.java
! test/runtime/modules/Visibility/XbootcpNoVisibility.java
- test/runtime/modules/Visibility/XpatchVisibility.java
- test/runtime/modules/Xpatch/BasicJarBuilder.java
- test/runtime/modules/Xpatch/Xpatch2Dirs.java
- test/runtime/modules/Xpatch/Xpatch2DirsMain.java
- test/runtime/modules/Xpatch/XpatchDupJavaBase.java
- test/runtime/modules/Xpatch/XpatchDupModule.java
- test/runtime/modules/Xpatch/XpatchJavaBase.java
- test/runtime/modules/Xpatch/XpatchMain.java
- test/runtime/modules/Xpatch/XpatchTest.java
- test/runtime/modules/Xpatch/XpatchTestJar.java
- test/runtime/modules/Xpatch/XpatchTestJarDir.java
- test/runtime/modules/Xpatch/XpatchTraceCL.java
- test/runtime/modules/XpatchCDS.java
! test/runtime/modules/java.base/java/lang/reflect/ModuleHelper.java
! test/serviceability/sa/TestInstanceKlassSize.java
! test/serviceability/sa/TestInstanceKlassSizeForInterface.java
! test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
! test/testlibrary/ctw/Makefile
! test/testlibrary/jittester/Makefile

Changeset: c7b7794b406e
Author:lana
Date:  2016-08-11 17:02 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/hotspot/rev/c7b7794b406e

Merge

- test/runtime/modules/Visibility/XpatchVisibility.java
- test/runtime/modules/Xpatch/BasicJarBuilder.java
- test/runtime/modules/Xpatch/Xpatch2Dirs.java
- test/runtime/modules/Xpatch/Xpatch2DirsMain.java
- test/runtime/modules/Xpatch/XpatchDupJavaBase.java
- test/runtime/modules/Xpatch/XpatchDupModule.java
- test/runtime/modules/Xpatch/XpatchJavaBase.java
- test/runtime/modules/Xpatch/XpatchMain.java
- test/runtime/modules/Xpatch/XpatchTest.java
- test/runtime/modules/Xpatch/XpatchTestJar.java
- test/runtime/modules/Xpatch/XpatchTestJarDir.java
- test/runtime/modules/Xpatch/XpatchTraceCL.java
- test/runtime/modules/XpatchCDS.java

Changeset: 713951c08aa2
Author:mhaupt
Date:  2016-08-12 08:59 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/hotspot/rev/713951c08aa2

8163533: jdk.vm.ci.hotspot.test.MethodHandleAccessProviderTest fails on jdk9/dev
Reviewed-by: shade

! 
src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java

Changeset: 774bb7884602
Author:mchung
Date:  2016-08-19 12:28 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/hotspot/rev/774bb7884602

Merge

! src/share/vm/classfile/classLoader.cpp
! src/share/vm/classfile/classLoader.hpp
! src/share/vm/memory/filemap.cpp
! src/share/vm/prims/jvmtiEnv.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/arguments.hpp
! src/share/vm/utilities/ostream.cpp
! test/TEST.ROOT
! test/compiler/unsafe/UnsafeGetConstantField.java
!

hg: jigsaw/jake/jaxp: 8 new changesets

2016-08-19 Thread mandy . chung 
Changeset: 55f2b1691a7b
Author:lana
Date:  2016-08-04 13:58 +0800
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/55f2b1691a7b

8163145: Remove two null line in the end of message.properties
Reviewed-by: joehw, rriggs
Contributed-by: li.ji...@oracle.com

! 
src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties

Changeset: 22c066efb42e
Author:mchung
Date:  2016-08-10 15:49 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/22c066efb42e

8136930: Simplify use of module-system options by custom launchers
Reviewed-by: alanb, ksrini, henryjen, sundar

! test/TEST.ROOT

Changeset: 2e81820b5653
Author:fyuan
Date:  2016-08-11 10:20 +0800
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/2e81820b5653

8163468: javax/xml/jaxp/unittest/validation/Bug6773084Test.java fails 
intermittently
Reviewed-by: joehw, dfuchs, amlu
Contributed-by: Frank Yuan 

! test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java
! test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java

Changeset: 16ba98d804eb
Author:lana
Date:  2016-08-11 17:02 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/16ba98d804eb

Merge


Changeset: 907445d85e68
Author:joehw
Date:  2016-08-11 13:34 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/907445d85e68

8163535: javax/xml/jaxp/unittest/catalog/CatalogSupport2.java failed due to 
SocketTimeoutException
Reviewed-by: lancea

! test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java

Changeset: fd41b4412218
Author:mchung
Date:  2016-08-19 12:28 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/fd41b4412218

Merge


Changeset: b68be589dcd9
Author:lana
Date:  2016-08-18 21:01 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/b68be589dcd9

Added tag jdk-9+132 for changeset 907445d85e68

! .hgtags

Changeset: 3e34059c2402
Author:mchung
Date:  2016-08-19 16:30 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxp/rev/3e34059c2402

Merge

hg: jigsaw/jake: 5 new changesets

2016-08-19 Thread mandy . chung 
Changeset: 8b1d348ad6a2
Author:mchung
Date:  2016-08-10 15:49 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/rev/8b1d348ad6a2

8136930: Simplify use of module-system options by custom launchers
Reviewed-by: alanb, ksrini, henryjen, sundar

! common/autoconf/boot-jdk.m4
! common/autoconf/generated-configure.sh
! common/autoconf/spec.gmk.in
! common/conf/jib-profiles.js
! make/CompileJavaModules.gmk
! make/CreateJmods.gmk
! make/Images.gmk
! make/InterimImage.gmk
! make/Javadoc.gmk
! make/common/MakeBase.gmk
! make/common/SetupJavaCompilers.gmk

Changeset: a24702d4d5ab
Author:lana
Date:  2016-08-11 17:01 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/rev/a24702d4d5ab

Merge


Changeset: 49202a591b1d
Author:mchung
Date:  2016-08-19 12:28 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/rev/49202a591b1d

Merge

! common/autoconf/boot-jdk.m4
! common/autoconf/generated-configure.sh
! common/autoconf/spec.gmk.in
! common/conf/jib-profiles.js
! make/CompileJavaModules.gmk
! make/CreateJmods.gmk
! make/Images.gmk
! make/Javadoc.gmk
! make/common/MakeBase.gmk

Changeset: 25d1d7b13d54
Author:lana
Date:  2016-08-18 21:01 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/rev/25d1d7b13d54

Added tag jdk-9+132 for changeset a24702d4d5ab

! .hgtags

Changeset: 65cd7c0e5d53
Author:mchung
Date:  2016-08-19 16:30 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/rev/65cd7c0e5d53

Merge

! common/autoconf/generated-configure.sh

hg: jigsaw/jake/corba: 2 new changesets

2016-08-19 Thread mandy . chung 
Changeset: 8b243cd19bff
Author:lana
Date:  2016-08-18 21:01 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/corba/rev/8b243cd19bff

Added tag jdk-9+132 for changeset 1ab4b9399c4c

! .hgtags

Changeset: d4a7b03f7cd4
Author:mchung
Date:  2016-08-19 16:30 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/corba/rev/d4a7b03f7cd4

Merge

hg: jigsaw/jake/langtools: Merge

2016-08-19 Thread mandy . chung 
Changeset: 19130450ad62
Author:mchung
Date:  2016-08-19 16:30 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/langtools/rev/19130450ad62

Merge

! src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java

hg: jigsaw/jake/jdk: 35 new changesets

2016-08-19 Thread mandy . chung 
Changeset: ef0ba6e50464
Author:bpb
Date:  2016-08-09 07:43 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/ef0ba6e50464

8163431: probeContentType/Basic.java fails after changes for JDK-8146215
Summary: Allow multiple legal MIME type interpretations for certain extensions.
Reviewed-by: chegar

! test/java/nio/file/Files/probeContentType/Basic.java

Changeset: 9287101b5f49
Author:bpb
Date:  2016-08-09 07:50 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/9287101b5f49

8163305: Add some print instrumentation to 
java/nio/channels/Selector/RacyDeregister
Summary: Perform more iterations on Windows, and on all platforms if the test 
enters the failure branch, poll for an extra period of time to determine 
whether it might have succeeded with a longer timeout
Reviewed-by: chegar

! test/java/nio/channels/Selector/RacyDeregister.java

Changeset: a670a92950d9
Author:sdrach
Date:  2016-07-29 09:58 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/a670a92950d9

8158295: Add a multi-release jar validation mechanism to jar tool
Reviewed-by: ogb, psandoz

! src/java.base/share/classes/module-info.java
+ src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java
! src/jdk.jartool/share/classes/sun/tools/jar/Main.java
+ src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
! src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
! test/tools/jar/multiRelease/Basic.java
+ test/tools/jar/multiRelease/data/test04/v9/version/Version.java
+ test/tools/jar/multiRelease/data/test05/v9/version/Extra.java
+ test/tools/jar/multiRelease/data/test06/v9/version/Extra.java
+ test/tools/jar/multiRelease/data/test10/base/version/Nested.java
+ test/tools/jar/multiRelease/data/test10/v9/version/Nested.java

Changeset: 8a8741cfb084
Author:weijun
Date:  2016-08-10 11:21 +0800
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/8a8741cfb084

8163489: Avoid using Utils.getFreePort() in TsacertOptionTest.java test
Reviewed-by: chegar

! test/sun/security/tools/jarsigner/TsacertOptionTest.java

Changeset: 12c7305432b7
Author:weijun
Date:  2016-08-10 11:30 +0800
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/12c7305432b7

8162739: Create new keytool option to access cacerts file
Reviewed-by: erikj, vinnie, mullan

! make/copy/Copy-java.base.gmk
! src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java
! src/java.base/share/classes/sun/security/tools/keytool/Main.java
! src/java.base/share/classes/sun/security/tools/keytool/Resources.java
- src/java.base/share/conf/security/cacerts
+ src/java.base/share/lib/security/cacerts
+ test/sun/security/tools/keytool/CacertsOption.java

Changeset: 94b271f4da23
Author:jnimeh
Date:  2016-08-09 22:31 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/94b271f4da23

8132943: ServerHandshaker may select non-empty OCSPStatusRequest structures 
when Responder ID
Summary: Select only OCSPStatusRequest objects that have no responder IDs in 
them when deciding whether to do OCSP stapling and what form of stapling.
Reviewed-by: xuelei

! src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
+ test/sun/security/ssl/StatusStapling/RunStatReqSelect.java
+ 
test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusReqSelection.java

Changeset: 92c31ec731eb
Author:coffeys
Date:  2016-08-10 11:54 +0100
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/92c31ec731eb

8163104: Unexpected NPE still possible on some Kerberos ticket calls
Reviewed-by: weijun

! 
src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java

Changeset: 7b894239a5c2
Author:redestad
Date:  2016-08-10 13:54 +0200
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/7b894239a5c2

8163370: Reduce number of classes loaded by common usage of java.lang.invoke
Reviewed-by: igerasim, psandoz

! src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
! src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
! src/java.base/share/classes/java/lang/invoke/MemberName.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
! src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/java.base/share/classes/sun/invoke/util/ValueConversions.java
! src/java.base/share/classes/sun/invoke/util/Wrapper.java

Changeset: 3f523e22d151
Author:simonis
Date:  2016-08-10 17:55 +0200
URL:   http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/3f523e22d151

8163408: Fix wrong prototype of getNativeScaleFactor() in systemScale.h
Reviewed-by: serb

! src/java.desktop/unix/native/common/awt/systemscale/systemScale.h
! src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c

Changeset: 7f2dd75d0299
Author:redestad
Date:  2016-08-10 21:55

hg: jigsaw/jake/jaxws: 5 new changesets

2016-08-19 Thread mandy . chung 
Changeset: b41e7cd5f414
Author:mchung
Date:  2016-08-10 15:49 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxws/rev/b41e7cd5f414

8136930: Simplify use of module-system options by custom launchers
Reviewed-by: alanb, ksrini, henryjen, sundar

! src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
! 
src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
! 
src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java

Changeset: 9fff2477a4ca
Author:lana
Date:  2016-08-11 17:02 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxws/rev/9fff2477a4ca

Merge


Changeset: 100a110ab8c9
Author:mchung
Date:  2016-08-19 12:28 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxws/rev/100a110ab8c9

Merge


Changeset: 0ea56976efac
Author:lana
Date:  2016-08-18 21:01 +
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxws/rev/0ea56976efac

Added tag jdk-9+132 for changeset 9fff2477a4ca

! .hgtags

Changeset: be2dcbedaf4a
Author:mchung
Date:  2016-08-19 16:30 -0700
URL:   http://hg.openjdk.java.net/jigsaw/jake/jaxws/rev/be2dcbedaf4a

Merge

Re: RFR: 8163126 Wrong @modules in some of jdk/* tests

2016-08-19 Thread Mandy Chung 

> On Aug 16, 2016, at 10:17 AM, Alexandre (Shura) Iline 
>  wrote:
> 
> Hi.
> 
> Please review fixes related to module dependencies in a few jdk tests:
> http://cr.openjdk.java.net/~shurailine/8163126/webrev.00/index.html

Looks okay.  I will sponsor this patch for you.

Mandy