changeset 3932:c9cd7ff79037

Merge
author jgodinez
date Wed, 16 Sep 2009 19:36:05 -0700
parents 81071c37cc91 df4bcd06e1d0
children 38e8ef00316e
files hotspot/src/share/vm/gc_implementation/shared/coTracker.cpp hotspot/src/share/vm/gc_implementation/shared/coTracker.hpp hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java jdk/make/javax/swing/plaf/nimbus/Makefile jdk/make/tools/swing-nimbus/Makefile jdk/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Canvas.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/ControlPoint.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Designer.jibx.xml jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/EllipseShape.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/GraphicsHelper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Layer.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PaintedShape.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PathShape.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/RectangleShape.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/TemplateLayer.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/DropShadowEffect.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/Effect.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtils.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtilsTemp.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerShadowEffect.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/OuterGlowEffect.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/ShadowEffect.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/ColorMapper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/DimensionMapper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/InsetsMapper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/AbstractGradient.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/GradientStop.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Matte.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Texture.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasPath.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasResources.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasUIDefaults.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/DefaultsGenerator.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/Generator.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/GeneratorUtils.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/TemplateWriter.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/HasUIStyle.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/PainterBorder.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.jibx.xml jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIBorder.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIColor.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIComponent.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIFont.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIcon.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIconRegion.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIInsets.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIPaint.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIProperty.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStateType.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStyle.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/BorderMapper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassConverter.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassMapper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/UIPropertyMapper.java jdk/src/share/classes/com/sun/crypto/provider/JarVerifier.java jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java jdk/src/share/classes/java/awt/Component.java jdk/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template jdk/src/share/classes/sun/nio/ch/AbstractFuture.java jdk/src/share/classes/sun/security/pkcs11/JarVerifier.java jdk/src/share/classes/sun/swing/SwingUtilities2.java jdk/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog jdk/src/share/native/java/util/zip/zlib-1.1.3/README jdk/src/share/native/java/util/zip/zlib-1.1.3/compress.c jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.c jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.h jdk/src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc jdk/src/share/native/java/util/zip/zlib-1.1.3/example.c jdk/src/share/native/java/util/zip/zlib-1.1.3/gzio.c jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.c jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.h jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.c jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.h jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.c jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.h jdk/src/share/native/java/util/zip/zlib-1.1.3/inffixed.h jdk/src/share/native/java/util/zip/zlib-1.1.3/inflate.c jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.c jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.h jdk/src/share/native/java/util/zip/zlib-1.1.3/minigzip.c jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.c jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.h jdk/src/share/native/java/util/zip/zlib-1.1.3/uncompr.c jdk/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h jdk/src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c jdk/src/share/native/java/util/zip/zlib-1.1.3/zlib.h jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.c jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.h jdk/src/solaris/classes/sun/awt/X11/XToolkit.java jdk/src/windows/classes/sun/security/mscapi/JarVerifier.java jdk/test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java jdk/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java jdk/test/java/util/concurrent/LinkedBlockingQueue/LastElement.java jdk/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java langtools/src/share/classes/com/sun/mirror/apt/package.html langtools/src/share/classes/com/sun/mirror/declaration/package.html langtools/src/share/classes/com/sun/mirror/type/package.html langtools/src/share/classes/com/sun/mirror/util/package.html langtools/test/tools/javac/innerClassFile/Driver.java langtools/test/tools/javac/meth/InvokeMH_BAD68.java langtools/test/tools/javac/meth/InvokeMH_BAD72.java langtools/test/tools/javac/quid/QuotedIdent_BAD61.java langtools/test/tools/javac/quid/QuotedIdent_BAD62.java langtools/test/tools/javac/quid/QuotedIdent_BAD63.java
diffstat 2869 files changed, 173454 insertions(+), 49309 deletions(-) [+]