/hg/icedtea6-hg: 6 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Jun 17 12:27:44 PDT 2010


changeset df96f563510a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=df96f563510a
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Jun 14 14:55:08 2010 -0400

	Patch for Bug# 480 (NPPlugin with NoScript extension), by Omair
	Majid.


changeset 3dc9772300a0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3dc9772300a0
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Jun 14 14:58:37 2010 -0400

	Fix for Bug# 488 (Question mark changing into underscore in URL), by
	Omair M.


changeset 9a9ed35b3f80 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9a9ed35b3f80
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Jun 14 15:03:55 2010 -0400

	Fix bug causing 100% CPU usage (rhbz# 592553).


changeset 1e95c787d40b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1e95c787d40b
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 15 18:34:45 2010 +0100

	Don't generate a random pointer from a pthread_t in the debug
	output.

	2010-06-14 Andrew John Hughes <ahughes at redhat.com>

	 Don't print out the return value of pthread_self
	which is a pthread_t. pthread_t is an opaque type and we
	don't know what it actually is (it varies from system to
	system; recent versions of Linux use an unsigned long int).
		* plugin/icedteanp/IcedTeaPluginUtils.h:
	(PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t.
	(PLUGIN_DEBUG_1ARG(str,arg1)): Likewise.
	(PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise.
	(PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise.
	(PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise.
	(PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise.


changeset 17f89df79552 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=17f89df79552
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 17 20:25:25 2010 +0100

	Remove the local copy of Zero, now available upstream. Replace
	remaining local changes with patches.

	2010-06-17 Andrew John Hughes <ahughes at redhat.com>

	 * patches/nimbus-source-target.patch: Upstreamed as
	6961536.
		* patches/zero.patch: Dropped; old changes necessary for hs16
	when we had to support hs14 & hs16. These changes are now
	upstream.
		* ports/hotspot/make/linux/makefiles/zero.make,
		* ports/hotspot/make/linux/makefiles/zeroshark.make,
		* ports/hotspot/make/linux/platform_zero.in,
		* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp,
		* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp,
		* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/copy_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/debug_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/dump_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp,
		* ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/icache_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/icache_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/jni_zero.h,
		* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/register_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/register_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/stack_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp,
		* ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp,
		* ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline
	.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hp
	p,
		* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp,
		* ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp,
		* ports/hotspot/src/share/vm/includeDB_zero: Dropped,
	upstream.
		* Makefile.am: Remove patches and add new ones.
		* patches/arm.patch: Changes to Zero necessary for the ARM assembler
	port. Moved from local files in ports.
		* patches/shark-debug-option.patch: Remaining Zero changes not
	upstreamed.


changeset d87364165dfb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d87364165dfb
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 17 20:27:34 2010 +0100

	Merge


diffstat:

213 files changed, 40872 insertions(+), 23567 deletions(-)
ChangeLog                                                                                               |  394 
Makefile.am                                                                                             |   91 
acinclude.m4                                                                                            |   65 
configure.ac                                                                                            |    2 
generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java                                        |  119 
generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java                                             |  653 
generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java                                   |  163 
generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java                                           |  636 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java                          |   42 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java                                |  477 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java                                     |   42 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java                                           |  734 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java                                  |  255 
generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java                                        |  160 
generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java                                        |  351 
generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java                                         |  125 
generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java                                        | 2249 
generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java                                 |  382 
generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java                                      |  403 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java                  |  464 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java    |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java                |  607 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java  |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java               | 1046 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java  |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java                   |  518 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java     |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java                             |   89 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java                  |   41 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java                           |   41 
generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java                                        |  108 
generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java                                            |  153 
generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java                                           |  108 
generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java                                               |  158 
generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java                                            | 1773 
generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java               |  106 
generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java                              |   89 
generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java                                         |  584 
generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java                                      |  382 
generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java                                          |  164 
generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java                                 |  106 
generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java                                  |   43 
generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java                             |   43 
generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java                                        |  613 
generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java                                |  172 
generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java                                        |  705 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java                                    |  381 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java                                          |   88 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java                                     |  380 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java                                     |  276 
generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java                                         |  179 
generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java                                          |  106 
generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java                                     |   40 
generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java                                             |   88 
generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java                                |   40 
generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java                                        |  655 
generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java                                |   40 
generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java                                        |  230 
generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java                                  |  583 
generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java                                            |   89 
generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java              |  321 
generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java                              |  505 
generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java                                   |  290 
generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java                             |   41 
generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java                                          |   89 
generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java                                    |   41 
generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java                                         |   93 
generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java                                  |  221 
generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java                                      |  678 
generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java                                        |  135 
generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java                                        |  141 
generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java                                |  381 
generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java                            |   42 
generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java                              |   41 
generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java                                           |  412 
generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java                                          |  382 
generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java                                           |  125 
generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java                                       |  706 
generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java                                      |  289 
generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java                                          |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java                                         |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java                                            |  212 
generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java                                         |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java                                |  536 
generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java                                          |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java                                            |  151 
generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java                                     |  144 
generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java                                           |  146 
generated/com/sun/java/swing/plaf/nimbus/TreePainter.java                                               |  653 
hotspot.map                                                                                             |    1 
overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java                   |   49 
patches/arm.patch                                                                                       |  221 
patches/ecj/bootver.patch                                                                               |   14 
patches/ecj/icedtea.patch                                                                               |  134 
patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch                                             |   42 
patches/hotspot/hs17/params-cast-size_t.patch                                                           |  252 
patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch                                               |   14 
patches/hotspot/hs17/systemtap.patch                                                                    |  157 
patches/hotspot/original/params-cast-size_t.patch                                                       |  252 
patches/hotspot/original/shark_do_nothing_on_stub_frame.patch                                           |   15 
patches/hotspot/original/systemtap.patch                                                                |  182 
patches/icedtea-alpha-fixes.patch                                                                       |   24 
patches/icedtea-clean-crypto.patch                                                                      |   91 
patches/icedtea-doc-headers.patch                                                                       |  181 
patches/icedtea-java2d-dasher.patch                                                                     |   11 
patches/icedtea-jtreg-jrunscript.patch                                                                  |   26 
patches/icedtea-nio2.patch                                                                              |  269 
patches/icedtea-nomotif-6706121.patch                                                                   |26836 +++++-----
patches/icedtea-sh4-support.patch                                                                       |  212 
patches/openjdk/6616792-focus-tests-fix.patch                                                           | 1117 
patches/openjdk/6798572-iso-8859-15-fix.patch                                                           |   10 
patches/openjdk/6896472-missing_libjsig.patch                                                           |   20 
patches/params-cast-size_t.patch                                                                        |  252 
patches/shark-debug-option.patch                                                                        |   30 
patches/shark_do_nothing_on_stub_frame.patch                                                            |   14 
patches/systemtap.patch                                                                                 |  157 
patches/xrender/icedtea-000.patch                                                                       |  112 
patches/zero.patch                                                                                      |  107 
plugin/icedteanp/IcedTeaNPPlugin.cc                                                                     |   30 
plugin/icedteanp/IcedTeaPluginUtils.h                                                                   |   16 
plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java                                             |    4 
plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java                                        |    4 
ports/hotspot/make/linux/makefiles/zero.make                                                            |   32 
ports/hotspot/make/linux/makefiles/zeroshark.make                                                       |   80 
ports/hotspot/make/linux/platform_zero.in                                                               |   17 
ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp                                                        |   72 
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp                                                        |   63 
ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp                                                 |   26 
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp                                              |   54 
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp                                              |  148 
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp                                       |  301 
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp                                                        |   81 
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp                                                        |   65 
ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp                                                            |  164 
ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp                                                       |   27 
ports/hotspot/src/cpu/zero/vm/copy_zero.hpp                                                             |  178 
ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp                                          |   37 
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp                                                   |  957 
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp                                                   |   43 
ports/hotspot/src/cpu/zero/vm/debug_zero.cpp                                                            |   31 
ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp                                                       |   26 
ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp                                                       |   26 
ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp                                                     |   26 
ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp                                                     |   32 
ports/hotspot/src/cpu/zero/vm/dump_zero.cpp                                                             |   36 
ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp                                                       |   65 
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp                                                            |   74 
ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp                                                    |   53 
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp                                                            |  401 
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp                                                            |   74 
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp                                                     |  151 
ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp                                                |   26 
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp                                                          |   49 
ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp                                                         |   49 
ports/hotspot/src/cpu/zero/vm/icache_zero.cpp                                                           |   32 
ports/hotspot/src/cpu/zero/vm/icache_zero.hpp                                                           |   36 
ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp                                                      |   26 
ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp                                                      |   31 
ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp                                                 |   73 
ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp                                             |   36 
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp                                                    |  161 
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp                                                    |  127 
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp                                                      |   66 
ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp                                                      |   61 
ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp                                                  |   87 
ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp                                                  |   59 
ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp                                                         |  108 
ports/hotspot/src/cpu/zero/vm/jni_zero.h                                                                |   38 
ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp                                                    |   26 
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp                                                       |   50 
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp                                                       |  185 
ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp                                                      |   39 
ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp                                             |   26 
ports/hotspot/src/cpu/zero/vm/register_zero.cpp                                                         |   39 
ports/hotspot/src/cpu/zero/vm/register_zero.hpp                                                         |  108 
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp                                                        |   74 
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp                                                        |   32 
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp                                                    |  115 
ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp                                                       |   79 
ports/hotspot/src/cpu/zero/vm/stack_zero.cpp                                                            |   86 
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp                                                            |  219 
ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp                                                     |   48 
ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp                                                    |  253 
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp                                                     |   31 
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp                                                     |   51 
ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp                                     |   26 
ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp                                              |   26 
ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp                                              |   26 
ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp                                                    |   26 
ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp                                                    |   26 
ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp                                                        |   52 
ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp                                                       |   26 
ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp                                                       |   31 
ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp                                                            |   62 
ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp                                                            |   29 
ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp                                                     |   32 
ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp                                                      |   43 
ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp                                         |   26 
ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp                                     |  293 
ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp                                      |   40 
ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp                                           |   42 
ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp                                |  167 
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp                                                |  480 
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp                                                |   51 
ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp                                   |   30 
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp                                          |   39 
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp                                          |   30 
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp                                            |   26 
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp                                            |  116 
ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp                                         |   45 
ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp                                        |   26 
ports/hotspot/src/share/vm/includeDB_zero                                                               |   68 

diffs (truncated from 67119 to 500 lines):

diff -r be0a17ddbdb8 -r d87364165dfb ChangeLog
--- a/ChangeLog	Fri Jun 11 14:45:52 2010 +0100
+++ b/ChangeLog	Thu Jun 17 20:27:34 2010 +0100
@@ -1,8 +1,339 @@ 2010-06-11 Andrew John Hughes  <ahughes@
+2010-06-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/nimbus-source-target.patch:
+	Upstreamed as 6961536.
+	* patches/zero.patch:
+	Dropped; old changes necessary for hs16 when we had to
+	support hs14 & hs16.  These changes are now upstream.
+	* ports/hotspot/make/linux/makefiles/zero.make,
+	* ports/hotspot/make/linux/makefiles/zeroshark.make,
+	* ports/hotspot/make/linux/platform_zero.in,
+	* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp,
+	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp,
+	* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/copy_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/debug_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/dump_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp,
+	* ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/icache_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/icache_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/jni_zero.h,
+	* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/register_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/register_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/stack_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp,
+	* ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp,
+	* ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp,
+	* ports/hotspot/src/share/vm/includeDB_zero:
+	Dropped, upstream.
+	* Makefile.am: Remove patches and add new ones.
+	* patches/arm.patch: Changes to Zero necessary for the ARM assembler
+	port.  Moved from local files in ports.
+	* patches/shark-debug-option.patch:
+	Remaining Zero changes not upstreamed.
+
+2010-06-14 Andrew John Hughes  <ahughes at redhat.com>
+
+	Don't print out the return value of pthread_self
+	which is a pthread_t.  pthread_t is an opaque type
+	and we don't know what it actually is (it varies
+	from system to system; recent versions of Linux
+	use an unsigned long int).
+	* plugin/icedteanp/IcedTeaPluginUtils.h:
+	(PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t.
+	(PLUGIN_DEBUG_1ARG(str,arg1)): Likewise.
+	(PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise.
+	(PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise.
+	(PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise.
+	(PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise.
+
+2010-06-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Make available BUILD_DIR for where a relative
+	path needs to be built.
+	(BUILD_DIR): Set to openjdk.build.
+	(BUILD_OUTPUT_DIR): Use BUILD_DIR.
+	(ECJ_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-ecj'.
+
+2010-06-14  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug
+	causing 100% CPU usage (rhbz# 592553).
+
+2010-06-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(SRC_DIR_LINK): Use reflink only if hard
+	linking is not possible.
+	(liveconnect-dist.stamp): Replace $(REFLINK) with
+	$(SRC_DIR_LINK).
+	(netx-dist.stamp): Likewise.
+	(plugin-tests.stamp): Likewise.
+	* acinclude.m4:
+	(IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking
+	to files in the source directory from the build directory
+	is possible.
+	* configure.ac:
+	Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE.
+
+2010-06-14  Omair Majid <omajid at redhat.com>
+
+	* plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to 
+	incorrect assumption that 'A' > 'a'.
+
+2010-06-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(REFLINK): Remove unneeded quotation.
+	(OPENJDK_SRC_DIR_LINK): Use reflink only
+	if hard linking is not possible.
+	(extract-openjdk.stamp): Replace $(REFLINK)
+	with $(OPENJDK_SRC_DIR_LINK).
+	* acinclude.m4:
+	(IT_CP_SUPPORTS_REFLINK): Define once only.
+	(WITH_OPENJDK_SRC_DIR): Define once only.
+	Check that directory is valid (to the extent
+	this is discernable by the README being present)
+	and whether hardlinking is possible, defining
+	OPENJDK_SRC_DIR_HARDLINKABLE if it is.
+
+2010-06-14  Omair Majid <omajid at redhat.com>
+
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead
+	of evaluate, to get page URL.
+
+2010-06-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(REFLINK): Set to --reflink=auto if
+	CP_SUPPORTS_REFLINK is defined.
+	(extract-openjdk.stamp): Replace --reflink=auto
+	with $(REFLINK).
+	(liveconnect-dist.stamp): Likewise.
+	(netx-dist.stamp): Likewise.
+	(plugin-tests.stamp): Likewise.
+	* acinclude.m4:
+	(IT_CP_SUPPORTS_REFLINK): New macro to check
+	for a cp new enough to have --reflink.
+	* configure.ac:
+	Invoke IT_CP_SUPPORTS_REFLINK.
+
+2010-06-13 Andrew John Hughes  <ahughes at redhat.com>
+
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java:
+	Removed, provided upstream.
+	* Makefile.am: Add new nimbus-source-target.patch.
+	* patches/ecj/bootver.patch: Always set required version to 1.5,
+	don't bother checking DISABLE_NIMBUS.
+	* patches/nimbus-source-target.patch: Fix source/target options
+	for Nimbus sources to 6, due to presence of @Override on interfaces.
+
+2010-06-13 Andrew John Hughes  <ahughes at redhat.com>
+
+	* generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java,
+	* generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TreePainter.java:
+	Add generated Nimbus files so SynthUI can be compiled during
+	bootstrap.
+
 2010-06-11 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	(rt.stamp): Drop old dependencies no
 	longer needed.
+
+2010-06-10 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-doc-headers.patch:
+	Dropped, upstream file has completely changed.
+	May need to be recreated, may not.
+	* patches/icedtea-java2d-dasher.patch:
+	Upstreamed by Omair as 6793344.  Now in OpenJDK6.
+	* Makefile.am:
+	Remove above patches.
+	(JAXWS_DROP_URL): Updated.
+	(JAXWS_DROP_ZIP): Likewise.
+	(JAXWS_DROP_SHA256SUM): Likewise.
+	(JAF_DROP_URL): Added.
+	(JAF_DROP_ZIP): Updated.
+	(JAF_DROP_SHA256SUM): Likewise.
+	(JAXP_DROP_URL): Updated.
+	(JAXP_DROP_ZIP): Likewise.
+	(JAXP_DROP_SHA256SUM): Likewise.
+	(download-jaf-drop): Use specific JAF_DROP_URL,
+	not JAXWS_DROP_URL.
+	* patches/icedtea-nio2.patch: Converted to use
+	new doc generation makefile.
+
+2010-06-08 Andrew John Hughes  <ahughes at redhat.com>
+
+	Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ
+	made obsolete by previous merge.  Use --reflink=auto instead
+	of -l to avoid cross-device issues.
+	* Makefile.am:
+	(ICEDTEA_ENV): Fix use of ICEDTEA_BUILD_DIR.
+	(ICEDTEA_ENV_ECJ): Fix use of ICEDTEA_BUILD_DIR_ECJ.
+	(distclean-local): Fix use of ICEDTEA_BUILD_DIR
+	and ICEDTEA_BUILD_DIR_ECJ.
+	(extract-openjdk.stamp): Use --reflink=auto instead
+	of -l.
+	(liveconnect-dist.stamp): Likewise.
+	(netx-dist.stamp): Likewise.
+	(plugin-tests.stamp): Likewise.
 
 2010-06-07 Andrew John Hughes  <ahughes at redhat.com>
 
@@ -38,6 +369,13 @@ 2010-06-07 Jon VanAlten  <jon.vanalten at r
 	* Makefile.am
 	(stamps/icedtea.stamp): Use full path when adding PulseAudio sources to src.zip
 
+2010-06-06  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-alpha-fixes.patch:
+	Remove upstreamed JDK portion.
+	* patches/icedtea-sh4-support.patch:
+	Recreated against upstreamed alpha patch.
+
 2010-06-04 Jon VanAlten  <jon.vanalten at redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java:
@@ -49,11 +387,21 @@ 2010-06-01  Xerxes RÃ¥nby  <xerxes at zafen
 2010-06-01  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* Makefile.am:
-	(extra-lib/about.jar): Remove redundant 
+	(extra-lib/about.jar): Remove redundant
 	conditional that we don't need any more.
 	(rewrite-rhino.stamp): Use full path to
 	jar application to avoid relying on the one
 	on the path.
+
+2010-05-26  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/ecj/icedtea.patch,
+	* patches/icedtea-clean-crypto.patch,
+	* patches/icedtea-jtreg-jrunscript.patch,
+	* patches/icedtea-nio2.patch,
+	* patches/icedtea-nomotif-6706121.patch,
+	* patches/xrender/icedtea-000.patch:
+	Update after changes to licensing headers.
 
 2010-05-28 Andrew John Hughes  <ahughes at redhat.com>
 
@@ -80,6 +428,30 @@ 2010-05-24  Andrew John Hughes  <ahughes
 	over any --with-openjdk-src-zip/dir options.
 	Using a live Mercurial checkout only makes
 	sense in this context.
+
+2010-05-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	Remove hs17 build option as this is now the default.
+	* patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch:
+	Dropped; applied upstream.
+	* patches/hotspot/hs17/params-cast-size_t.patch,
+	* patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch,
+	* patches/hotspot/hs17/systemtap.patch:
+	Moved to top-level.
+	* patches/hotspot/original/params-cast-size_t.patch,
+	* patches/hotspot/original/shark_do_nothing_on_stub_frame.patch,
+	* patches/hotspot/original/systemtap.patch:
+	Dropped; hs16 is dead.
+	* patches/openjdk/6896472-missing_libjsig.patch:
+	Dropped; applied upstream.
+	* Makefile.am:
+	Remove differentation between original and hs17 build patches
+	as only build is now the hs17 one in the OpenJDK repository.
+	* hotspot.map: Drop hs17.
+	* patches/params-cast-size_t.patch,
+	* patches/shark_do_nothing_on_stub_frame.patch,
+	* patches/systemtap.patch:
+	Moved from hs17 to top-level.
 
 2010-05-20  Gary Benson  <gbenson at redhat.com>
 
@@ -271,7 +643,7 @@ 2010-05-10  Gary Benson  <gbenson at redhat
 	for new stack overflow code.
 	(SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise.
 	(SharkStack::CreateAssertLastJavaSPIsNull): New method.
-	
+
 	* ports/hotspot/make/linux/makefiles/zeroshark.make
 	(CFLAGS): Remove -DHOTSPOT_ASM until the ARM interpreter
 	and JIT are updated to use the new frame anchor code.
@@ -403,6 +775,24 @@ 2010-04-28  Andrew John Hughes  <ahughes
 	* patches/systemtap-gcc-4.5.patch:
 	Add cast to NULL (doesn't apply to DTrace due
 	to differences between SystemTap and DTrace macros).
+
+2010-04-26  Andrew John Hughes  <ahughes at redhat.com>
+
+	Use build directories outside the source
+	tree and link instead of copying external
+	source trees where possible.
+	* Makefile.am:
+	(OS_DIR): Removed.
+	(BUILD_OUTPUT_DIR): Set to openjdk.build.
+	(ECJ_BUILD_OUTPUT_DIR): Set to openjdk-ecj.build.
+	(ICEDTEA_ENV): Set output directory.
+	(ICEDTEA_ENV_ECJ): Likewise.
+	(distclean-local): Remove build directories.
+	(extract-openjdk.stamp): Link instead of copying
+	where possible.
+	(liveconnect-dist.stamp): Likewise.
+	(netx-dist.stamp): Likewise.
+	(plugin-tests.stamp): Likewise.
 
 2010-04-24  Matthias Klose  <doko at ubuntu.com>
 
diff -r be0a17ddbdb8 -r d87364165dfb Makefile.am
--- a/Makefile.am	Fri Jun 11 14:45:52 2010 +0100
+++ b/Makefile.am	Thu Jun 17 20:27:34 2010 +0100
@@ -18,23 +18,24 @@ VISUALVM_URL = https://visualvm.dev.java
 VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/
 VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz
 
-JAXWS_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download
-JAXWS_DROP_ZIP = jdk6-jaxws-2009_10_27.zip
-JAXWS_DROP_SHA256SUM = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2
-JAF_DROP_ZIP = jdk6-jaf-2009_10_27.zip
-JAF_DROP_SHA256SUM = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147491
-JAXP_DROP_ZIP = jdk6-jaxp-2010_01_15.zip
-JAXP_DROP_SHA256SUM = 181615cfec1c3721a7d8f278fa25b392be4247a496c7774a10cb9df37684f94f
+JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724
+JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip
+JAXWS_DROP_SHA256SUM = 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
+JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725
+JAF_DROP_ZIP = jdk6-jaf-b20.zip
+JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648
+JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
+JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
 # Build directories
 
-OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR)
+BUILD_DIR = openjdk.build
+BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR)
 DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj/build/$(OS_DIR)
+ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-ecj
 ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
 ICEDTEA_BOOT_DIR= \
@@ -177,11 +178,12 @@ else
   MEMORY_LIMIT =
 endif
 
+ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(ICEDTEA_DEBUG_BUILD_DIR)"
 if WITH_CACAO
   ICEDTEA_BUILD_TARGET=j2se_only
-  ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only
+  ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only
 else
-  ICEDTEA_DEBUG_BUILD_TARGET=debug_build
+  ICEDTEA_DEBUG_BUILD_TARGET += debug_build
 endif
 
 # FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap
@@ -195,6 +197,22 @@ else



More information about the distro-pkg-dev mailing list