changeset 17095:24f63661bb5e

Merge
author dlong
date Wed, 24 Apr 2013 21:11:02 -0400
parents 29c4955396d2 ea30b4c302b9
children 1cfa436cf2fd 94ea4cfd9573
files hotspot/make/bsd/makefiles/jvmg.make hotspot/make/bsd/makefiles/profiled.make hotspot/make/linux/makefiles/jvmg.make hotspot/make/linux/makefiles/profiled.make hotspot/make/solaris/makefiles/jvmg.make hotspot/make/solaris/makefiles/profiled.make hotspot/src/cpu/sparc/vm/sparc.ad hotspot/src/cpu/x86/vm/x86_32.ad hotspot/src/cpu/x86/vm/x86_64.ad hotspot/src/os/bsd/vm/chaitin_bsd.cpp hotspot/src/os/linux/vm/chaitin_linux.cpp hotspot/src/os/solaris/vm/chaitin_solaris.cpp hotspot/src/os/windows/vm/chaitin_windows.cpp hotspot/src/share/vm/opto/output.cpp hotspot/test/gc/6941923/test6941923.sh hotspot/test/gc/TestVerifyBeforeGCDuringStartup.java hotspot/test/runtime/NMT/AllocTestType.java jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyle.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyleFeature.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/Databinding.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingFactory.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingMode.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingModeFeature.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/JavaCallInfo.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/ContentType.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/DistributedPropertySet.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContext.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContextFactory.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/PropertySet.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/Localizable.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/Localizer.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/NullLocalizable.java langtools/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java langtools/test/tools/javac/diags/examples/SecondaryBoundMustBeMarkerIntf.java langtools/test/tools/javac/lambda/Intersection01.out langtools/test/tools/javac/lambda/TargetType01.out nashorn/test/script/basic/JDK-8017010.js nashorn/test/script/basic/JDK-8017010.js.EXPECTED
diffstat 2658 files changed, 85746 insertions(+), 19122 deletions(-) [+]