Merge
authorprr
Mon, 06 Feb 2017 09:35:08 -0800
changeset 43662 6b16a26de895
parent 43661 c3f1a529d829 (diff)
parent 43593 06bce0388880 (current diff)
child 43663 4416065868c1
Merge
hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassCollector.java
hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionTest.java
hotspot/test/compiler/aot/fingerprint/CDSDumper.java
hotspot/test/compiler/aot/fingerprint/CDSRunner.java
hotspot/test/compiler/aot/fingerprint/SelfChanged.java
hotspot/test/compiler/aot/fingerprint/SelfChangedCDS.java
hotspot/test/compiler/aot/fingerprint/SuperChanged.java
hotspot/test/compiler/c2/cr7200264/Test7200264.sh
hotspot/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java
jaxws/src/java.annotations.common/share/classes/javax/annotation/Generated.java
jaxws/src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java
jaxws/src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java
jaxws/src/java.annotations.common/share/classes/javax/annotation/Resource.java
jaxws/src/java.annotations.common/share/classes/javax/annotation/Resources.java
jaxws/src/java.annotations.common/share/classes/module-info.java
jdk/make/copy/Copy-java.management.gmk
jdk/make/gensrc/Gensrc-java.management.gmk
jdk/make/rmic/Rmic-java.management.gmk
jdk/src/java.base/unix/classes/sun/nio/fs/DefaultFileSystemProvider.java
jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ProxyRef.java
jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/RMIExporter.java
jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/Unmarshal.java
jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java
jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnection.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServer.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServerImpl.java
jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html
jdk/src/java.management/share/classes/sun/management/Agent.java
jdk/src/java.management/share/classes/sun/management/AgentConfigurationError.java
jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
jdk/src/java.management/share/classes/sun/management/FileSystem.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpBroadcaster.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpController.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpException.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpGenericPacket.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpJmxPacket.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpPacket.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpPacketReader.java
jdk/src/java.management/share/classes/sun/management/jdp/JdpPacketWriter.java
jdk/src/java.management/share/classes/sun/management/jdp/package-info.java
jdk/src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
jdk/src/java.management/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java
jdk/src/java.management/share/classes/sun/management/jmxremote/SingleEntryRegistry.java
jdk/src/java.management/share/classes/sun/management/jmxremote/package.html
jdk/src/java.management/share/classes/sun/management/resources/agent.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_de.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_es.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_fr.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_it.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_ja.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_ko.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_pt_BR.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_sv.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_zh_CN.properties
jdk/src/java.management/share/classes/sun/management/resources/agent_zh_TW.properties
jdk/src/java.management/share/classes/sun/management/spi/AgentProvider.java
jdk/src/java.management/share/conf/jmxremote.access
jdk/src/java.management/share/conf/jmxremote.password.template
jdk/src/java.management/share/conf/management.properties
jdk/src/java.management/share/conf/snmp.acl.template
jdk/src/java.management/unix/classes/sun/management/FileSystemImpl.java
jdk/src/java.management/unix/native/libmanagement/FileSystemImpl.c
jdk/src/java.management/windows/classes/sun/management/FileSystemImpl.java
jdk/src/java.management/windows/native/libmanagement/FileSystemImpl.c
jdk/src/jdk.jvmstat/share/classes/module-info.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/AbstractMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/IntegerMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/LongMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Monitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitorException.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/StringMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Units.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Variability.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/HostEvent.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/HostListener.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmEvent.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmListener.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/package.html
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/package.html
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/package.html
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
jdk/test/sun/management/AgentCMETest.java
jdk/test/sun/management/AgentCheckTest.java
langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/PackageEmptyOrNotFound.java
langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/modulesourcepath/m1x/module-info.java
make/common/Modules.gmk
--- a/make/common/Modules.gmk	Wed Jul 05 22:48:37 2017 +0200
+++ b/make/common/Modules.gmk	Mon Feb 06 09:35:08 2017 -0800
@@ -107,7 +107,6 @@
     jdk.charsets \
     jdk.crypto.ec \
     jdk.crypto.cryptoki \
-    jdk.desktop \
     jdk.dynalink \
     jdk.jsobject \
     jdk.localedata \