OpenJDK / jdk / jdk
changeset 1729:dee3a249a81b
Merge
| author | lana |
|---|---|
| date | Mon, 20 Oct 2008 11:52:47 -0700 |
| parents | 7c281f43cafa a2879b2837f5 |
| children | 2482c2865beb |
| files | hotspot/agent/src/share/lib/jlfgr-1_0.jar hotspot/agent/src/share/lib/maf-1_0.jar hotspot/src/cpu/x86/vm/assembler_x86_32.cpp hotspot/src/cpu/x86/vm/assembler_x86_32.hpp hotspot/src/cpu/x86/vm/assembler_x86_32.inline.hpp hotspot/src/cpu/x86/vm/assembler_x86_64.cpp hotspot/src/cpu/x86/vm/assembler_x86_64.hpp hotspot/src/cpu/x86/vm/assembler_x86_64.inline.hpp hotspot/src/os_cpu/linux_x86/vm/assembler_linux_x86_32.cpp hotspot/src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp hotspot/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_32.cpp hotspot/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_64.cpp hotspot/src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp hotspot/src/os_cpu/windows_x86/vm/assembler_windows_x86_64.cpp jdk/make/ASSEMBLY_EXCEPTION jdk/make/LICENSE jdk/make/README jdk/make/README-builds.html jdk/make/README.html jdk/make/THIRD_PARTY_README jdk/make/java/nio/spp.sh jdk/make/tools/auto_multi/Makefile jdk/make/tools/src/build/tools/automulti/AutoMulti.java jdk/make/tools/src/build/tools/automulti/README.txt jdk/make/tools/src/build/tools/automulti/TestALFGenerator.java jdk/make/tools/src/build/tools/automulti/TestALFLookAndFeel.java jdk/src/share/classes/java/nio/channels/package.html jdk/src/share/classes/javax/swing/colorchooser/DefaultHSBChooserPanel.java jdk/src/share/classes/javax/swing/colorchooser/DefaultRGBChooserPanel.java jdk/src/share/classes/javax/swing/colorchooser/SyntheticImage.java jdk/src/share/classes/org/jcp/xml/dsig/internal/package.html jdk/src/share/classes/sun/launcher/LauncherHelp.java jdk/src/share/classes/sun/nio/ch/OptionAdaptor.java jdk/src/share/classes/sun/nio/ch/SocketOpts.java jdk/src/share/classes/sun/nio/ch/SocketOptsImpl.java jdk/src/share/classes/sun/nio/ch/exceptions jdk/src/share/classes/sun/swing/SwingUtilities2.java jdk/src/share/javavm/include/opcodes.h jdk/src/share/javavm/include/opcodes.length jdk/src/share/javavm/include/opcodes.list jdk/src/share/javavm/include/opcodes.weight jdk/src/share/javavm/include/opcodes.wide jdk/src/share/javavm/include/sys_api.h jdk/src/share/javavm/include/typedefs.h jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java jdk/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java jdk/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java jdk/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java jdk/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java jdk/src/solaris/classes/sun/awt/motif/MFramePeer.java jdk/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java jdk/src/solaris/classes/sun/awt/motif/MInputMethod.java jdk/src/solaris/classes/sun/awt/motif/MInputMethodControl.java jdk/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java jdk/src/solaris/classes/sun/awt/motif/MLabelPeer.java jdk/src/solaris/classes/sun/awt/motif/MListPeer.java jdk/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java jdk/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java jdk/src/solaris/classes/sun/awt/motif/MMenuPeer.java jdk/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java jdk/src/solaris/classes/sun/awt/motif/MPanelPeer.java jdk/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java jdk/src/solaris/classes/sun/awt/motif/MRobotPeer.java jdk/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java jdk/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java jdk/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java jdk/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java jdk/src/solaris/classes/sun/awt/motif/MWindowPeer.java jdk/src/solaris/classes/sun/awt/motif/X11Clipboard.java jdk/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java jdk/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java jdk/src/solaris/classes/sun/awt/motif/X11Selection.java jdk/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java jdk/src/solaris/javavm/include/typedefs_md.h jdk/src/solaris/native/sun/awt/awt_Button.c jdk/src/solaris/native/sun/awt/awt_Canvas.c jdk/src/solaris/native/sun/awt/awt_Checkbox.c jdk/src/solaris/native/sun/awt/awt_Choice12.c jdk/src/solaris/native/sun/awt/awt_Choice21.c jdk/src/solaris/native/sun/awt/awt_Component.c jdk/src/solaris/native/sun/awt/awt_Cursor.c jdk/src/solaris/native/sun/awt/awt_DataTransferer.c jdk/src/solaris/native/sun/awt/awt_DataTransferer.h jdk/src/solaris/native/sun/awt/awt_FileDialog.c jdk/src/solaris/native/sun/awt/awt_GlobalCursorManager.c jdk/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c jdk/src/solaris/native/sun/awt/awt_Label.c jdk/src/solaris/native/sun/awt/awt_List.c jdk/src/solaris/native/sun/awt/awt_Menu.c jdk/src/solaris/native/sun/awt/awt_Menu.h jdk/src/solaris/native/sun/awt/awt_MenuBar.c jdk/src/solaris/native/sun/awt/awt_MenuBar.h jdk/src/solaris/native/sun/awt/awt_MenuComponent.c jdk/src/solaris/native/sun/awt/awt_MenuItem.c jdk/src/solaris/native/sun/awt/awt_PopupMenu.c jdk/src/solaris/native/sun/awt/awt_ScrollPane.c jdk/src/solaris/native/sun/awt/awt_Scrollbar.c jdk/src/solaris/native/sun/awt/awt_Selection.c jdk/src/solaris/native/sun/awt/awt_TextArea.c jdk/src/solaris/native/sun/awt/awt_TextArea.h jdk/src/solaris/native/sun/awt/awt_TextField.c jdk/src/solaris/native/sun/awt/awt_TextField.h jdk/src/solaris/native/sun/awt/awt_TopLevel.c jdk/src/solaris/native/sun/awt/awt_XmDnD.c jdk/src/solaris/native/sun/awt/awt_XmDnD.h jdk/src/solaris/native/sun/awt/awt_dnd.c jdk/src/solaris/native/sun/awt/awt_dnd.h jdk/src/solaris/native/sun/awt/awt_dnd_ds.c jdk/src/solaris/native/sun/awt/awt_dnd_dt.c jdk/src/solaris/native/sun/awt/awt_motif.c jdk/src/solaris/native/sun/awt/awt_motif12.c jdk/src/solaris/native/sun/awt/awt_motif21.c jdk/src/solaris/native/sun/awt/awt_xembed.c jdk/src/solaris/native/sun/awt/canvas.c jdk/src/solaris/native/sun/awt/cursor.c jdk/src/windows/javavm/include/typedefs_md.h jdk/test/javax/swing/JFileChooser/4252173/bug4252173.java jdk/test/javax/swing/JFileChooser/6524424/bug6524424.html jdk/test/javax/swing/JFileChooser/6524424/bug6524424.java jdk/test/sun/net/www/http/ChunkedInputStream/test.txt jdk/test/tools/launcher/Arrrghs.sh langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticFormatter.java langtools/test/bootclasspath-exclude.jtx langtools/test/tools/javac/5045412/out langtools/test/tools/javac/capture/Capture4.java langtools/test/tools/javac/policy/A.java langtools/test/tools/javac/policy/B.java langtools/test/tools/javac/policy/C.java langtools/test/tools/javac/policy/D.java langtools/test/tools/javac/policy/Test.java langtools/test/tools/javac/policy/byfile.ABD.out langtools/test/tools/javac/policy/byfile.ACD.out langtools/test/tools/javac/policy/bytodo.ABD.out langtools/test/tools/javac/policy/bytodo.ACD.out langtools/test/tools/javac/policy/simple.ABD.out langtools/test/tools/javac/policy/simple.ACD.out langtools/test/tools/javac/versionOpt.sh |
| diffstat | 2001 files changed, 129356 insertions(+), 96600 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Oct 16 06:28:37 2008 -0700 +++ b/.hgtags Mon Oct 20 11:52:47 2008 -0700 @@ -6,3 +6,9 @@ bfe4572fd301a6fcd120373cdb2eff5d2da0c72c jdk7-b29 bee4731164a06ddece1297ae58db24aca6a1c626 jdk7-b30 cd8b8f500face60d1566d850857a7fccadbd383a jdk7-b31 +a9f1805e3ba9ca520cad199d522c84af5433e85a jdk7-b32 +6838c1a3296aaa3572364d2ce7d70826cee96286 jdk7-b33 +90cf935adb353bb0af4b46fb0677e841fd24c000 jdk7-b34 +6d909d5803e3a22850e6c4e5a75b888742ee7e20 jdk7-b35 +d718a441936196b93d8bc9f084933af9a4c2a350 jdk7-b36 +c2036bf76829c03b99108fffab52e20910a9be4f jdk7-b37
--- a/.hgtags-top-repo Thu Oct 16 06:28:37 2008 -0700 +++ b/.hgtags-top-repo Mon Oct 20 11:52:47 2008 -0700 @@ -6,3 +6,9 @@ 31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29 2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30 3300a35a0bd56d695b92fe0b34f03ebbfc939064 jdk7-b31 +64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32 +bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33 +46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34 +143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35 +4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36 +744554f5a3290e11c71cd2ddb1aff49e431f9ed0 jdk7-b37
--- a/Makefile Thu Oct 16 06:28:37 2008 -0700 +++ b/Makefile Mon Oct 20 11:52:47 2008 -0700 @@ -49,27 +49,17 @@ JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared endif -include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk - -include ./make/Defs-internal.gmk - -all:: - @$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build started: `$(DATE) '+%y-%m-%d %H:%M'` - $(MKDIR) -p $(OUTPUTDIR) - -# Rules for sanity checks -include ./make/sanity-rules.gmk +# For start and finish echo lines +TITLE_TEXT = Control $(PLATFORM) $(ARCH) $(RELEASE) +DAYE_STAMP = `$(DATE) '+%y-%m-%d %H:%M'` +START_ECHO = echo "$(TITLE_TEXT) $@ build started: $(DATE_STAMP)" +FINISH_ECHO = echo "$(TITLE_TEXT) $@ build finished: $(DATE_STAMP)" -dev : dev-build +default: all -dev-build: - $(MAKE) DEV_ONLY=true all -dev-sanity: - $(MAKE) DEV_ONLY=true sanity -dev-clobber: - $(MAKE) DEV_ONLY=true clobber - -# Rules for various components +include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk +include ./make/Defs-internal.gmk +include ./make/sanity-rules.gmk include ./make/hotspot-rules.gmk include ./make/langtools-rules.gmk include ./make/corba-rules.gmk @@ -80,10 +70,204 @@ include ./make/sponsors-rules.gmk include ./make/deploy-rules.gmk -all:: setup build +# What "all" means +all:: + @$(START_ECHO) + +all:: openjdk_check sanity + +ifeq ($(SKIP_FASTDEBUG_BUILD), false) + all:: fastdebug_build +endif + +ifeq ($(SKIP_DEBUG_BUILD), false) + all:: debug_build +endif + +ifneq ($(SKIP_OPENJDK_BUILD), true) + all:: openjdk_build +endif + +all:: all_product_build + +all:: + @$(FINISH_ECHO) + +# Everything for a full product build +all_product_build:: + @$(START_ECHO) + +ifeq ($(SKIP_PRODUCT_BUILD), false) + + all_product_build:: product_build + + ifeq ($(BUILD_INSTALL), true) + all_product_build:: $(INSTALL) + clobber:: install-clobber + endif + + ifeq ($(BUILD_SPONSORS), true) + all_product_build:: $(SPONSORS) + clobber:: sponsors-clobber + endif + + ifneq ($(SKIP_COMPARE_IMAGES), true) + all_product_build:: compare-image + endif + +endif + +all_product_build:: + @$(FINISH_ECHO) + +# Generis build of basic repo series +generic_build_repo_series:: + $(MKDIR) -p $(OUTPUTDIR) + $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image + +ifeq ($(BUILD_LANGTOOLS), true) + generic_build_repo_series:: langtools + clobber:: langtools-clobber +endif + +ifeq ($(BUILD_CORBA), true) + generic_build_repo_series:: corba + clobber:: corba-clobber +endif + +ifeq ($(BUILD_JAXP), true) + generic_build_repo_series:: jaxp + clobber:: jaxp-clobber +endif + +ifeq ($(BUILD_JAXWS), true) + generic_build_repo_series:: jaxws + clobber:: jaxws-clobber +endif + +ifeq ($(BUILD_HOTSPOT), true) + generic_build_repo_series:: $(HOTSPOT) + clobber:: hotspot-clobber +endif + +ifeq ($(BUILD_JDK), true) + generic_build_repo_series:: $(JDK_JAVA_EXE) + clobber:: jdk-clobber +endif + +ifeq ($(BUILD_DEPLOY), true) + generic_build_repo_series:: $(DEPLOY) + clobber:: deploy-clobber +endif + +ifeq ($(BUILD_JDK), true) + ifeq ($(BUNDLE_RULES_AVAILABLE), true) + generic_build_repo_series:: openjdk-binary-plugs-bundles + endif +endif -setup: openjdk_check - $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image +# The debug build, fastdebug or debug. Needs special handling. +# Note that debug builds do NOT do INSTALL steps, but must be done +# after the product build and before the INSTALL step of the product build. +# +# DEBUG_NAME is fastdebug or debug +# ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix +# The resulting j2sdk-image is used by the install makefiles to create a +# debug install bundle jdk-*-debug-** bundle (tar or zip) +# which will install in the debug or fastdebug subdirectory of the +# normal product install area. +# The install process needs to know what the DEBUG_NAME is, so +# look for INSTALL_DEBUG_NAME in the install rules. +# + +# Location of fresh bootdir output +ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk +FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image +FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image + +create_fresh_product_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ + NO_DOCS=true \ + BOOT_CYCLE_SETTINGS= \ + build_product_image + @$(FINISH_ECHO) + +create_fresh_debug_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ + NO_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_debug_image + @$(FINISH_ECHO) + +create_fresh_fastdebug_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ + NO_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_fastdebug_image + @$(FINISH_ECHO) + +# Create boot image? +ifeq ($(SKIP_BOOT_CYCLE),false) + ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) + DO_BOOT_CYCLE=true + endif +endif + +ifeq ($(DO_BOOT_CYCLE),true) + + # Create the bootdir to use in the build + product_build:: create_fresh_product_bootdir + debug_build:: create_fresh_debug_bootdir + fastdebug_build:: create_fresh_fastdebug_bootdir + + # Define variables to be used now for the boot jdk + BOOT_CYCLE_SETTINGS= \ + ALT_BOOTDIR=$(FRESH_BOOTDIR) \ + ALT_JDK_IMPORT_PATH=$(FRESH_BOOTDIR) + BOOT_CYCLE_DEBUG_SETTINGS= \ + ALT_BOOTDIR=$(FRESH_DEBUG_BOOTDIR) \ + ALT_JDK_IMPORT_PATH=$(FRESH_DEBUG_BOOTDIR) + +else + + # Use the supplied ALT_BOOTDIR as the boot + BOOT_CYCLE_SETTINGS= + BOOT_CYCLE_DEBUG_SETTINGS= + +endif + +build_product_image: + @$(START_ECHO) + $(MAKE) \ + SKIP_FASTDEBUG_BUILD=true \ + SKIP_DEBUG_BUILD=true \ + $(BOOT_CYCLE_SETTINGS) \ + generic_build_repo_series + @$(FINISH_ECHO) + +generic_debug_build: + @$(START_ECHO) + $(MAKE) \ + ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ + DEBUG_NAME=$(DEBUG_NAME) \ + NO_DOCS=true \ + $(BOOT_CYCLE_DEBUG_SETTINGS) \ + generic_build_repo_series + @$(FINISH_ECHO) + +build_debug_image: + $(MAKE) DEBUG_NAME=debug generic_debug_build + +build_fastdebug_image: + $(MAKE) DEBUG_NAME=fastdebug generic_debug_build + +# Build final image +product_build:: build_product_image +debug_build:: build_debug_image +fastdebug_build:: build_fastdebug_image # Check on whether we really can build the openjdk, need source etc. openjdk_check: FRC @@ -101,113 +285,6 @@ @$(ECHO) " " endif -build:: sanity - -clobber:: - -ifeq ($(BUILD_LANGTOOLS), true) - build:: langtools - clobber:: langtools-clobber -endif - -ifeq ($(BUILD_CORBA), true) - build:: corba - clobber:: corba-clobber -endif - -ifeq ($(BUILD_JAXP), true) - build:: jaxp - clobber:: jaxp-clobber -endif - -ifeq ($(BUILD_JAXWS), true) - build:: jaxws - clobber:: jaxws-clobber -endif - -ifeq ($(BUILD_HOTSPOT), true) - build:: $(HOTSPOT) - clobber:: hotspot-clobber -endif - -ifeq ($(BUILD_JDK), true) - build:: $(JDK_JAVA_EXE) - clobber:: jdk-clobber -endif - -ifeq ($(BUILD_DEPLOY), true) - build:: $(DEPLOY) - clobber:: deploy-clobber -endif - -# -# Generic debug build, fastdebug or debug. Needs special handling. -# Note that debug builds do NOT do INSTALL steps, but must be done -# after the product build and before the INSTALL step of the product build. -# -# DEBUG_NAME is fastdebug or debug -# ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix -# The resulting j2sdk-image is used by the install makefiles to create a -# debug install bundle jdk-*-debug-** bundle (tar or zip) -# which will install in the debug or fastdebug subdirectory of the -# normal product install area. -# The install process needs to know what the DEBUG_NAME is, so -# look for INSTALL_DEBUG_NAME in the install rules. -# - -COMMON_DEBUG_FLAGS= \ - DEBUG_NAME=$(DEBUG_NAME) \ - ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ - NO_DOCS=true - -product_build: setup - @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'` - $(MAKE) SKIP_FASTDEBUG_BUILD=true SKIP_DEBUG_BUILD=true all - @$(ECHO) $@ build finished: `$(DATE) '+%y-%m-%d %H:%M'` - -generic_debug_build: - @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'` - $(MAKE) $(COMMON_DEBUG_FLAGS) setup build - @$(ECHO) $@ build finished: `$(DATE) '+%y-%m-%d %H:%M'` - -debug_build: setup - $(MAKE) DEBUG_NAME=debug generic_debug_build - -fastdebug_build: setup - $(MAKE) DEBUG_NAME=fastdebug generic_debug_build - -ifeq ($(SKIP_FASTDEBUG_BUILD), false) - all:: fastdebug_build -endif - -ifeq ($(SKIP_DEBUG_BUILD), false) - all:: debug_build -endif - -ifeq ($(BUILD_JDK), true) - ifeq ($(BUNDLE_RULES_AVAILABLE), true) - all:: openjdk-binary-plugs-bundles - endif -endif - -ifeq ($(BUILD_INSTALL), true) - all :: $(INSTALL) - clobber:: install-clobber -endif - -ifeq ($(BUILD_SPONSORS), true) - all :: $(SPONSORS) - clobber:: sponsors-clobber -endif - -ifneq ($(SKIP_COMPARE_IMAGES), true) - all :: compare-image -endif - -ifneq ($(SKIP_OPENJDK_BUILD), true) - all :: openjdk_build -endif - # If we have bundle rules, we have a chance here to do a complete cycle # build, of production and open build. # FIXUP: We should create the openjdk source bundle and build that? @@ -235,6 +312,7 @@ endif openjdk_build: + @$(START_ECHO) @$(ECHO) " " @$(ECHO) "=================================================" @$(ECHO) "Starting openjdk build" @@ -245,6 +323,7 @@ $(MKDIR) -p $(OPENJDK_OUTPUTDIR) ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \ OPENJDK=true \ + NO_DOCS=true \ ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \ @@ -261,6 +340,7 @@ @$(ECHO) " Binary Bundle: $(OPENJDK_BUILD_BINARY_ZIP)" @$(ECHO) "=================================================" @$(ECHO) " " + @$(FINISH_ECHO) endif endif @@ -274,8 +354,18 @@ clean: clobber -all:: - @$(ECHO) Control build finished: `$(DATE) '+%y-%m-%d %H:%M'` +# +# Dev builds +# + +dev : dev-build + +dev-build: + $(MAKE) DEV_ONLY=true all +dev-sanity: + $(MAKE) DEV_ONLY=true sanity +dev-clobber: + $(MAKE) DEV_ONLY=true clobber # # Quick jdk verification build @@ -461,16 +551,6 @@ endif ################################################################ -# Cycle build. Build the jdk, use it to build the jdk again. -################################################################ - -ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk - -boot_cycle: - $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) product_build - $(MAKE) ALT_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image product_build - -################################################################ # JPRT rule to build ################################################################ @@ -480,9 +560,20 @@ # PHONY ################################################################ -.PHONY: all build what clobber insane \ - fastdebug_build debug_build product_build setup \ - dev dev-build dev-sanity dev-clobber +.PHONY: all \ + generic_build_repo_series \ + what clobber insane \ + dev dev-build dev-sanity dev-clobber \ + product_build \ + fastdebug_build \ + debug_build \ + build_product_image \ + build_debug_image \ + build_fastdebug_image \ + create_fresh_product_bootdir \ + create_fresh_debug_bootdir \ + create_fresh_fastdebug_bootdir \ + generic_debug_build # Force target FRC:
--- a/README-builds.html Thu Oct 16 06:28:37 2008 -0700 +++ b/README-builds.html Mon Oct 20 11:52:47 2008 -0700 @@ -5,7 +5,7 @@ </head> <body style="background-color:lightcyan"> <!-- ====================================================== --> - + <table width="100%"> + <table width="100%"> <tr> <td align="center"> <img alt="OpenJDK" @@ -39,6 +39,11 @@ <li><a href="#introduction">Introduction</a></li> <li><a href="#MBE">Minimum Build Environments</a></li> <li><a href="#SDBE">Specific Developer Build Environments</a></li> + <ul> + <li><a href="#fedora">Fedora Linux</a> </li> + <li><a href="#centos">CentOS Linux</a> </li> + <li><a href="#ubuntu">Ubuntu Linux</a> </li> + </ul> <li><a href="#directories">Source Directory Structure</a> </li> <li><a href="#building">Build Information</a> <ul> @@ -132,7 +137,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11 </td> + <td>Sun Studio 12</td> </tr> <tr> <td>Solaris SPARCV9 (64bit)</td> @@ -141,7 +146,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11</td> + <td>Sun Studio 12</td> </tr> <tr> <td>Solaris X86 (32bit)</td> @@ -150,7 +155,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11</td> + <td>Sun Studio 12</td> </tr> <tr> <td>Solaris X64 (64bit)</td> @@ -159,7 +164,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11</td> + <td>Sun Studio 12</td> </tr> <tr> <td>Windows X86 (32bit)</td> @@ -182,14 +187,64 @@ we will try to provide what information we have available to us. </blockquote> <!-- ------------------------------------------------------ --> - <h3><a name="fedora">Fedora</a></h3> + <h3><a name="fedora">Fedora 9</a></h3> <blockquote> - TBD + After installing + <a href="http://www.fedoraproject.org/">Fedora 9</a> + you need to make sure you have + the "Software Development" bundle installed, plus the + following packages: + <blockquote> + <ul> + <li>cups devel: Cups Development Package</li> + <li>freetype 2.3+ devel: Freetype 2.3 Development Package</li> + <li>hg: Mercurial, if you need to clone or manage source repositories</li> + <li>ksh: May be needed when using <tt>webrev</tt></li> + </ul> + </blockquote> + <p> + Always a good idea to do a complete Software Update/Refresh + after you get all the packages installed. </blockquote> <!-- ------------------------------------------------------ --> - <h3><a name="debian">Debian</a></h3> + <h3><a name="centos">CentOS 5.2</a></h3> <blockquote> - TBD + After installing + <a href="http://www.centos.org/">CentOS 5.2</a> + you need to make sure you have + the following Development bundles installed: + <blockquote> + <ul> + <li>Development Libraries</li> + <li>Development Tools</li> + <li>Java Development</li> + <li>X Software Development</li> + </ul> + </blockquote> + <p> + Plus the following packages: + <blockquote> + <ul> + <li>cups devel: Cups Development Package</li> + <li>alsa devel: Alsa Development Package</li> + <li>ant: Ant Package</li> + <li>Xi devel: libXi.so Development Package</li> + </ul> + </blockquote> + <p> + The freetype 2.3 packages don't seem to be available, + but the freetype 2.3 sources can be downloaded, built, + and installed easily enough from + <a href="http://downloads.sourceforge.net/freetype"> + the freetype site</a>. + Build and install with something like: + <blockquote> + <tt>./configure && make && sudo -u root make install</tt> + </blockquote> + <p> + Mercurial packages could not be found easily, but a Google + search should find ones, and they usually include Python if + it's needed. </blockquote> <!-- ------------------------------------------------------ --> <h3><a name="ubuntu">Ubuntu</a></h3> @@ -664,8 +719,8 @@ </li> <li> Install the - <a href="#msvc">Microsoft Visual Studio .NET 2003 Professional</a> or the - <a href="#mssdk">Microsoft Platform SDK</a>. + <a href="#msvc">Microsoft Visual Studio .NET 2003 Professional</a> (32bit) or the + <a href="#mssdk">Microsoft Platform SDK</a> (64bit). </li> <li> Setup all environment variables for compilers @@ -831,8 +886,8 @@ <blockquote> At a minimum, the <a href="http://developers.sun.com/sunstudio/index.jsp" target="_blank"> - Sun Studio 11 Compilers</a> - (containing version 5.8 of the C and C++ compilers) is required, + Sun Studio 12 Compilers</a> + (containing version 5.9 of the C and C++ compilers) is required, with patches from the <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/patch-access" target="_blank"> SunSolve web site</a>. @@ -871,6 +926,11 @@ The Microsoft Visual Studio .NET 2005 (VS2005) compiler will not work at this time due to the new runtime dll and the manifest requirements. + <p> + <b>WARNING:</b> Make sure you check out the + <a href="#cygwin">CYGWIN link.exe WARNING</a>. + The path <tt>/usr/bin</tt> must be after the path to the + Visual Studio product. </blockquote> <strong><a name="mssdk">Windows X64: Microsoft Platform SDK April 2005</a></strong> <blockquote> @@ -1079,6 +1139,7 @@ <thead> <tr> <td>Binary Name</td> + <td>Category</td> <td>Package</td> <td>Description</td> </tr> @@ -1087,50 +1148,59 @@ <tr> <td>ar.exe</td> <td>Devel</td> - <td>binutils: The GNU assembler, linker and binary + <td>binutils</td> + <td>The GNU assembler, linker and binary utilities</td> </tr> <tr> <td>make.exe</td> <td>Devel</td> - <td>make: The GNU version of the 'make' utility<br> + <td>make</td> + <td>The GNU version of the 'make' utility built for CYGWIN.<br> <b>NOTE</b>: See <a href="#gmake">the GNU make section</a></td> </tr> <tr> <td>m4.exe</td> <td>Interpreters</td> - <td>m4: GNU implementation of the traditional Unix macro + <td>m4</td> + <td>GNU implementation of the traditional Unix macro processor</td> </tr> <tr> <td>cpio.exe</td> <td>Utils</td> - <td>cpio: A program to manage archives of files</td> + <td>cpio</td> + <td>A program to manage archives of files</td> </tr> <tr> <td>gawk.exe</td> <td>Utils</td> - <td>awk: Pattern-directed scanning and processing language</td> + <td>awk</td> + <td>Pattern-directed scanning and processing language</td> </tr> <tr> <td>file.exe</td> <td>Utils</td> - <td>file: Determines file type using 'magic' numbers</td> + <td>file</td> + <td>Determines file type using 'magic' numbers</td> </tr> <tr> <td>zip.exe</td> <td>Archive</td> - <td>zip: Package and compress (archive) files</td> + <td>zip</td> + <td>Package and compress (archive) files</td> </tr> <tr> <td>unzip.exe</td> <td>Archive</td> - <td>unzip: Extract compressed files in a ZIP archive</td> + <td>unzip</td> + <td>Extract compressed files in a ZIP archive</td> </tr> <tr> <td>free.exe</td> - <td>Procps</td> - <td>free: Display amount of free and used memory in the system</td> + <td>System</td> + <td>procps</td> + <td>Display amount of free and used memory in the system</td> </tr> </tbody> </table> @@ -1144,6 +1214,13 @@ section on <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank"> BLODA (applications that interfere with CYGWIN)</a>. + <p> + <b>WARNING:</b> + Be very careful with <b><tt>link.exe</tt></b>, it will conflict + with the Visual Studio version. You need the Visual Studio + version of <tt>link.exe</tt>, not the CYGWIN one. + So it's important that the Visual Studio paths in PATH preceed + the CYGWIN path <tt>/usr/bin</tt>. </blockquote> <strong><a name="dxsdk">Microsoft DirectX 9.0 SDK header files and libraries</a></strong> <blockquote> @@ -1429,7 +1506,7 @@ build output is to go. The default output directory will be build/<i>platform</i>. </dd> - <dt><a name="ALT_SLASHJAVA"><tt>ALT_SLASHJAVA</tt></a></dt> + <dt><a name="ALT_SLASH_JAVA"><tt>ALT_SLASH_JAVA</tt></a></dt> <dd> The default root location for many of the ALT path locations of the following ALT variables.
--- a/corba/.hgtags Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/.hgtags Mon Oct 20 11:52:47 2008 -0700 @@ -6,3 +6,9 @@ 8b71960f79ce0a6fb8ddfeec03f03d400a361747 jdk7-b29 c0252adbb2abbfdd6c35595429ac6fbdd98e20ac jdk7-b30 ef6af34d75a7b44e77083f1d4ee47631fa09d3b4 jdk7-b31 +80a0f46a6203e727012bd579fe38a609b83decce jdk7-b32 +6a5b9d2f8b20de54e3bfe33cd12bd0793caedc4e jdk7-b33 +0a812b9824e5d17b073765d1505594b49ff88a10 jdk7-b34 +3867c4d14a5bfdbb37c97b4874ccb0ee5343111c jdk7-b35 +0723891eb8d1c27e67c54163af0b4cea05a4e036 jdk7-b36 +59d5848bdedebe91cc2753acce78911bcb4a66db jdk7-b37
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2000-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -41,4 +41,7 @@ com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java \ com/sun/corba/se/impl/dynamicany/DynStructImpl.java \ com/sun/corba/se/impl/dynamicany/DynUnionImpl.java \ - com/sun/corba/se/impl/dynamicany/DynValueImpl.java + com/sun/corba/se/impl/dynamicany/DynValueImpl.java \ + com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java \ + com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java +
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -52,6 +52,8 @@ com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java \ com/sun/corba/se/impl/encoding/EncapsInputStream.java \ com/sun/corba/se/impl/encoding/EncapsOutputStream.java \ + com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ + com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java \ com/sun/corba/se/impl/encoding/MarkAndResetHandler.java \ com/sun/corba/se/impl/encoding/MarshalInputStream.java \ com/sun/corba/se/impl/encoding/MarshalOutputStream.java \
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -63,6 +63,7 @@ com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java \ com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java \ com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java \ + com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2000-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,7 @@ com/sun/corba/se/impl/orbutil/CacheTable.java \ com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java \ com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \ + com/sun/corba/se/impl/orbutil/GetPropertyAction.java \ com/sun/corba/se/impl/orbutil/HexOutputStream.java \ com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \ com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \ @@ -76,6 +77,7 @@ com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java \ com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java \ com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java \ + com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java \ com/sun/corba/se/impl/orbutil/graph/Node.java \ com/sun/corba/se/impl/orbutil/graph/NodeData.java \ com/sun/corba/se/impl/orbutil/graph/Graph.java \
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -63,6 +63,7 @@ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java \ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java \ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java \ + com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java \ com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java \ com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java \ com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java \
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -29,6 +29,7 @@ com_sun_corba_se_spi_legacy_interceptor_java = \ com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \ + com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java \ com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \ com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -35,5 +35,6 @@ com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ com/sun/corba/se/spi/monitoring/MonitoredAttribute.java \ com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java \ + com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ com/sun/corba/se/spi/monitoring/MonitoringManager.java \ com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,7 @@ com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java \ com/sun/corba/se/spi/presentation/rmi/DynamicStub.java \ com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ + com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ com_sun_corba_se_spi_transport_java = \ com/sun/corba/se/spi/transport/CorbaAcceptor.java \ com/sun/corba/se/spi/transport/CorbaConnection.java \ + com/sun/corba/se/spi/transport/CorbaConnectionCache.java \ com/sun/corba/se/spi/transport/CorbaContactInfo.java \ com/sun/corba/se/spi/transport/CorbaContactInfoList.java \ com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java \
--- a/corba/make/com/sun/corba/minclude/org_omg_CosNaming.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/org_omg_CosNaming.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -47,6 +47,7 @@ org/omg/CosNaming/NamingContext.java \ org/omg/CosNaming/NamingContextHelper.java \ org/omg/CosNaming/NamingContextHolder.java \ + org/omg/CosNaming/NamingContextOperations.java \ org/omg/CosNaming/_NamingContextStub.java \ org/omg/CosNaming/NamingContextPackage/AlreadyBound.java \ org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java \
--- a/corba/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -47,6 +47,10 @@ org/omg/DynamicAny/DynUnionOperations.java \ org/omg/DynamicAny/DynValue.java \ org/omg/DynamicAny/DynValueOperations.java \ + org/omg/DynamicAny/DynValueBox.java \ + org/omg/DynamicAny/DynValueBoxOperations.java \ + org/omg/DynamicAny/DynValueCommon.java \ + org/omg/DynamicAny/DynValueCommonOperations.java \ org/omg/DynamicAny/NameDynAnyPair.java \ org/omg/DynamicAny/NameValuePair.java \ org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \ @@ -70,8 +74,16 @@ org/omg/DynamicAny/DynSequenceHelper.java \ org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \ org/omg/DynamicAny/NameValuePairHelper.java \ - org/omg/DynamicAny/NameValuePairSeqHelper.java - + org/omg/DynamicAny/NameValuePairSeqHelper.java \ + org/omg/DynamicAny/_DynAnyFactoryStub.java \ + org/omg/DynamicAny/_DynAnyStub.java \ + org/omg/DynamicAny/_DynArrayStub.java \ + org/omg/DynamicAny/_DynEnumStub.java \ + org/omg/DynamicAny/_DynFixedStub.java \ + org/omg/DynamicAny/_DynSequenceStub.java \ + org/omg/DynamicAny/_DynStructStub.java \ + org/omg/DynamicAny/_DynUnionStub.java \ + org/omg/DynamicAny/_DynValueStub.java DYNANY_HELP_HOLD_java = \ org/omg/DynamicAny/AnySeqHolder.java \
--- a/corba/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2000-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -106,6 +106,7 @@ org/omg/IOP/CodecPackage/TypeMismatchHelper.java \ org/omg/IOP/ENCODING_CDR_ENCAPS.java \ org/omg/IOP/Encoding.java \ + org/omg/IOP/ExceptionDetailMessage.java \ org/omg/Dynamic/Parameter.java # Helper and Holder files to be removed:
--- a/corba/make/com/sun/corba/se/sources/Makefile Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/com/sun/corba/se/sources/Makefile Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -46,6 +46,8 @@ include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk +FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java + # # Dirs #
--- a/corba/make/common/Defs-windows.gmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/common/Defs-windows.gmk Mon Oct 20 11:52:47 2008 -0700 @@ -58,11 +58,24 @@ # The following DLL's are considered MS runtime libraries and should # not to be REBASEd, see deploy/make/common/Release.gmk. -# msvcrt.dll, msvcr71.dll: Microsoft runtimes +# msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes MS_RUNTIME_LIBRARIES = msvcrt.dll +MSVCRNN_DLL = ifeq ($(ARCH_DATA_MODEL), 32) ifeq ($(COMPILER_VERSION), VS2003) - MS_RUNTIME_LIBRARIES += msvcr71.dll + MSVCRNN_DLL = msvcr71.dll + MSVCPNN_DLL = msvcp71.dll + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) + endif + ifeq ($(COMPILER_VERSION), VS2005) + MSVCRNN_DLL = msvcr80.dll + MSVCPNN_DLL = msvcp80.dll + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) + endif + ifeq ($(COMPILER_VERSION), VS2008) + MSVCRNN_DLL = msvcr90.dll + MSVCPNN_DLL = msvcp90.dll + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) endif endif @@ -148,6 +161,20 @@ CC_LOWER_OPT = -O1 endif endif + ifeq ($(COMPILER_VERSION), VS2008) + # Automatic precompiled header option to use (if COMPILE_APPROACH=batch) + AUTOMATIC_PCH_OPTION = + GX_OPTION = -EHsc + ifeq ($(ARCH_DATA_MODEL), 32) + CC_HIGHEST_OPT = -O2 + CC_HIGHER_OPT = -O1 + CC_LOWER_OPT = -O1 + else + CC_HIGHEST_OPT = -O2 + CC_HIGHER_OPT = -O1 + CC_LOWER_OPT = -O1 + endif + endif CC_NO_OPT = -Od else # CC_VERSION # GCC not supported, but left for historical reference... @@ -179,7 +206,7 @@ # -MTd Use static debug version (better than -MDd, no runtime issues) # -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd) # -# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcp71.dll +# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcpnn.dll # ifeq ($(MS_RUNTIME_STATIC),true) MS_RUNTIME_OPTION=-MT @@ -217,7 +244,7 @@ # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?) # -nologo Don't print out startup message # /D _STATIC_CPPLIB - # Use static link for the C++ runtime (so msvcp71.dll not needed) + # Use static link for the C++ runtime (so msvcpnn.dll not needed) # CFLAGS_COMMON += -Zi -nologo CFLAGS_OPT = $(POPT)
--- a/corba/make/common/shared/Compiler-msvc.gmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/common/shared/Compiler-msvc.gmk Mon Oct 20 11:52:47 2008 -0700 @@ -47,24 +47,17 @@ # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo + # Compiler version and type (Always get word after "Version") + CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}') + # SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure... ifeq ($(ARCH_DATA_MODEL), 32) - CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$8}') LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}') - CC_TYPE := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$5}') CC_MAJORVER :=$(call MajorVersion,$(CC_VER)) - REQUIRED_CCTYPE = Optimizing - REQUIRED_CC_VER = 13.10.3077 - REQUIRED_LINK_VER = 7.10.3077 - ifeq ($(CC_MAJORVER), 12) - # This should be: CC_VER=12.00.8168 LINK_VER=6.00.8447 - COMPILER_NAME=Visual C++ 6.0 Professional + VC6-SP 3 - COMPILER_VERSION=VC6 - REBASE = $(COMPILER_PATH)rebase - MTL = $(COMPILER_PATH)midl - endif ifeq ($(CC_MAJORVER), 13) # This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077 + REQUIRED_CC_VER = 13.10.3077 + REQUIRED_LINK_VER = 7.10.3077 COMPILER_NAME=Visual Studio .NET 2003 Professional C++ COMPILER_VERSION=VS2003 REBASE = $(COMPILER_PATH)../../Common7/Tools/Bin/rebase @@ -74,9 +67,10 @@ endif endif ifeq ($(CC_MAJORVER), 14) - # This should be: CC_VER=14.00.0000 LINK_VER=8.00.0000 - # NOTE: This compiler has not been tried yet on 32bit systems - COMPILER_NAME=Visual Studio .NET 2005 + # This should be: CC_VER=14.00.50727.42 LINK_VER=8.00.50727.42 + REQUIRED_CC_VER = 14.00.50727.42 + REQUIRED_LINK_VER = 8.00.50727.42 + COMPILER_NAME=Visual Studio 8 COMPILER_VERSION=VS2005 REBASE = $(COMPILER_PATH)../../Common8/Tools/Bin/rebase MTL = $(COMPILER_PATH)../../Common8/Tools/Bin/midl @@ -84,10 +78,22 @@ COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) endif endif + ifeq ($(CC_MAJORVER), 15) + # This should be: CC_VER=15.00.21022.08 LINK_VER=9.00.21022.08 + REQUIRED_CC_VER = 15.00.21022.08 + REQUIRED_LINK_VER = 9.00.21022.08 + COMPILER_NAME=Visual Studio 9 + COMPILER_VERSION=VS2008 + #rebase and midl moved out of Visual Studio into the SDK: + REBASE = $(MSDEVTOOLS_PATH)/rebase + MTL = $(MSDEVTOOLS_PATH)/midl.exe + ifndef COMPILER_PATH + COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) + endif + endif else - CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$7}') + # else ARCH_DATA_MODEL is 64 LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}') - CC_TYPE := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$4}') CC_MAJORVER :=$(call MajorVersion,$(CC_VER)) CC_MINORVER :=$(call MinorVersion,$(CC_VER)) CC_MICROVER :=$(call MicroVersion,$(CC_VER))
--- a/corba/make/common/shared/Compiler-sun.gmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/common/shared/Compiler-sun.gmk Mon Oct 20 11:52:47 2008 -0700 @@ -31,11 +31,8 @@ # Sun Studio Compiler settings specific to Solaris ifeq ($(PLATFORM), solaris) - # FIXUP: Change to SS12 when validated - #COMPILER_VERSION=SS12 - #REQUIRED_CC_VER=5.9 - COMPILER_VERSION=SS11 - REQUIRED_CC_VER=5.8 + COMPILER_VERSION=SS12 + REQUIRED_CC_VER=5.9 CC = $(COMPILER_PATH)cc CPP = $(COMPILER_PATH)cc -E CXX = $(COMPILER_PATH)CC
--- a/corba/make/common/shared/Defs-utils.gmk Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/common/shared/Defs-utils.gmk Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -67,16 +67,6 @@ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) endif -# Utilities ant and findbugs -ifndef ANT_HOME - ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest -endif -ANT = $(ANT_HOME)/bin/ant -ifndef FINDBUGS_HOME - FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest -endif -FINDBUGS = $(FINDBUGS_HOME)/bin/findbugs - # Utilities ADB = $(UTILS_COMMAND_PATH)adb AR = $(UTILS_CCS_BIN_PATH)ar
--- a/corba/make/javax/xa/Makefile Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/javax/xa/Makefile Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ # # Files to compile # -AUTO_FILES_JAVA_DIRS = javax/transaction/xa +AUTO_FILES_JAVA_DIRS = javax/transaction # # Rules
--- a/corba/make/jprt.config Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/jprt.config Mon Oct 20 11:52:47 2008 -0700 @@ -93,23 +93,13 @@ jdk_devtools="${slashjava}/devtools" share="${jdk_devtools}/share" -# Needed for langtools, maybe other parts of the build -ANT_HOME="${share}/ant/latest" -export ANT_HOME -FINDBUGS_HOME="${share}/findbugs/latest" -export FINDBUGS_HOME - # The 3 bin directories in common to all platforms sharebin="${share}/bin" -antbin="${ANT_HOME}/bin" -findbugsbin="${FINDBUGS_HOME}/bin" # Check input dirMustExist "${bootdir}" ALT_BOOTDIR dirMustExist "${slashjava}" ALT_SLASH_JAVA dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH -dirMustExist "${ANT_HOME}" ANT_HOME -dirMustExist "${FINDBUGS_HOME}" FINDBUGS_HOME # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. osname=`uname -s` @@ -127,15 +117,13 @@ if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then compiler_name=${JPRT_SOLARIS_COMPILER_NAME} else - # FIXUP: Change to SS12 when validated - #compiler_name=SS12 - compiler_name=SS11 + compiler_name=SS12 fi compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin ALT_COMPILER_PATH="${compiler_path}" export ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH - path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} + path4sdk=${compiler_path}:${sharebin} # Add basic solaris system paths path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin @@ -172,7 +160,7 @@ ALT_COMPILER_PATH="${compiler_path}" export ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH - path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} + path4sdk=${compiler_path}:${sharebin} # Add basic paths path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin @@ -213,7 +201,7 @@ dosname="${mkshome}/mksnt/dosname -s" # Most unix utilities are in the mksnt directory of ROOTDIR unixcommand_path="${mkshome}/mksnt" - path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" + path4sdk="${sharebin};${unixcommand_path}" dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH devtools_path="${jdk_devtools}/win32/bin" path4sdk="${devtools_path};${path4sdk}" @@ -231,7 +219,7 @@ dosname="/usr/bin/cygpath -a -m -s" # Most unix utilities are in the /usr/bin unixcommand_path="/usr/bin" - path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" + path4sdk="${sharebin};${unixcommand_path}" dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH # Find GNU make make="${unixcommand_path}/make.exe"
--- a/corba/make/org/omg/CORBA/Makefile Thu Oct 16 06:28:37 2008 -0700 +++ b/corba/make/org/omg/CORBA/Makefile Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ # -# Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -47,8 +47,8 @@ endif FILES_java = \ - $(ORG_OMG_SENDINGCONTEXT_java) \ - $(ORG_OMG_CORBA_2_3_java) \ + $(org_omg_SendingContext_java) \ + $(org_omg_CORBA_2_3_java) \ $(ORG_OMG_CORBA_java) #
--- a/hotspot/.hgtags Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/.hgtags Mon Oct 20 11:52:47 2008 -0700 @@ -6,3 +6,9 @@ 4f91c08b3e4498213a9c5a24898f7d9c38cf86fb jdk7-b29 d1605aabd0a15ecf93787c47de63073c33fba52d jdk7-b30 9c2ecc2ffb125f14fab3857fe7689598956348a0 jdk7-b31 +b727c32788a906c04839516ae7443a085185a300 jdk7-b32 +585535ec8a14adafa6bfea65d6975e29094c8cec jdk7-b33 +5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34 +5fa96a5a7e76da7c8dad12486293a0456c2c116c jdk7-b35 +e91159f921a58af3698e6479ea1fc5818da66d09 jdk7-b36 +9ee9cf798b59e7d51f8c0a686959f313867a55d6 jdk7-b37
--- a/hotspot/agent/make/Makefile Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/Makefile Mon Oct 20 11:52:47 2008 -0700 @@ -32,6 +32,12 @@ include $(GAMMADIR)/make/defs.make endif +ifeq "x$(HOTSPOT_BUILD_VERSION)" "x" +SA_BUILD_VERSION=$(HOTSPOT_RELEASE_VERSION) +else +SA_BUILD_VERSION=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) +endif + PKGLIST = \ sun.jvm.hotspot \ sun.jvm.hotspot.asm \ @@ -117,7 +123,9 @@ sun.jvm.hotspot.ui.treetable \ sun.jvm.hotspot.utilities \ sun.jvm.hotspot.utilities.memo \ -sun.jvm.hotspot.utilities.soql +sun.jvm.hotspot.utilities.soql \ +com.sun.java.swing.action \ +com.sun.java.swing.ui #END PKGLIST # Generated using the build-filelist script @@ -198,7 +206,9 @@ sun/jvm/hotspot/ui/treetable/*.java \ sun/jvm/hotspot/utilities/*.java \ sun/jvm/hotspot/utilities/memo/*.java \ -sun/jvm/hotspot/utilities/soql/*.java +sun/jvm/hotspot/utilities/soql/*.java \ +com/sun/java/swing/action/*.java \ +com/sun/java/swing/ui/*.java #END FILELIST ifneq "x$(ALT_BOOTDIR)" "x" @@ -220,8 +230,6 @@ endif SRC_DIR = ../src/share/classes -LIB_DIR = ../src/share/lib -CLOSED_LIB_DIR = ../closed/src/share/lib BUILD_DIR = ../build OUTPUT_DIR = $(BUILD_DIR)/classes DOC_DIR = $(BUILD_DIR)/doc @@ -231,9 +239,9 @@ ALLFILES := $(patsubst %,$(SRC_DIR)/%,$(FILELIST)) ALLFILES := $(shell /bin/ls $(ALLFILES)) +# tools.jar is used by the sa-jdi binding +CLASSPATH = $(JDK_HOME)/lib/tools.jar -# tools.jar is needed by the JDI - SA binding -CLASSPATH = $(LIB_DIR)/maf-1_0.jar$(CPS)$(JDK_HOME)/lib/tools.jar CLASSPATH := $(subst \,/,$(CLASSPATH)) # FIXME: autogenerate call to rmic @@ -241,24 +249,36 @@ SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" SA_PROPERTIES = $(OUTPUT_DIR)/sa.properties +JAVAC = $(JDK_HOME)/bin/javac +JAVADOC = $(JDK_HOME)/bin/javadoc +RMIC = $(JDK_HOME)/bin/rmic # Tagging it on because there's no reason not to run it all: filelist @mkdir -p $(OUTPUT_DIR) @echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) - @${JDK_HOME}/bin/javac -source 1.4 -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist - @${JDK_HOME}/bin/rmic -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(JAVAC) -source 1.4 -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist + $(RMIC) -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql/sa.js cp $(SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql + mkdir -p $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources + rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources/* + cp $(SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources/ + cp -r $(SRC_DIR)/images/* $(OUTPUT_DIR)/ allprof: filelist @mkdir -p $(OUTPUT_DIR) @echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) - @${JDK_HOME}/bin/javac -source 1.4 -J-Xprof -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist - @${JDK_HOME}/bin/rmic -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(JAVAC) -source 1.4 -J-Xprof -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist + $(RMIC) -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql/sa.js cp $(SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql + mkdir -p $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources + rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources/* + cp $(SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources/ + cp -r $(SRC_DIR)/images/* $(OUTPUT_DIR)/ +.PHONY: filelist filelist: $(ALLFILES) @if [ ! -f $(JDK_HOME)/lib/tools.jar ] ; then \ echo "Missing $(JDK_HOME)/lib/tools.jar file. Use 1.6.0 or later version jdk to build SA."; \ @@ -274,36 +294,23 @@ .PHONY: sa-jdi.jar sa-jdi.jar: - if [ ! -f $(JDK_HOME)/lib/tools.jar ] ; then \ - echo "Missing $(JDK_HOME)/lib/tools.jar file. Use 1.6.0 or later version jdk to build SA.";\ - exit 1; \ - fi - rm -f $(BUILD_DIR)/sa-jdi.jar - rm -f $(OUTPUT_DIR)/jdi_class_files - javac -source 1.4 ClosureFinder.java -d $(OUTPUT_DIR) - cd $(OUTPUT_DIR) ; find sun/jvm/hotspot/jdi -name "*.class" > jdi_class_files - cd $(OUTPUT_DIR) ; jar cvf ../sa-jdi.jar `java ClosureFinder jdi_class_files .` - cd $(BUILD_DIR) ; jar uvf sa-jdi.jar -C $(SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector - cd $(BUILD_DIR) ; jar uvf sa-jdi.jar -C $(OUTPUT_DIR) sa.properties - rm -f $(OUTPUT_DIR)/ClosureFinder.class - rm -f $(OUTPUT_DIR)/jdi_class_files + echo "sa-jdi.jar is built by a hotspot build." docs: - @javadoc -private -classpath $(CLASSPATH) -sourcepath $(SRC_DIR) -d $(DOC_DIR) $(PKGLIST) + @$(JAVADOC) -private -classpath $(CLASSPATH) -sourcepath $(SRC_DIR) -d $(DOC_DIR) $(PKGLIST) sizes: $(ALLFILES) wc -l $(ALLFILES) cscope: $(ALLFILES) + rm -f java.files echo $(ALLFILES) > java.files cscope -b -i java.files -f java.out + rm -f java.files .PHONY: sa.jar sa.jar: rm -f $(BUILD_DIR)/sa.jar - mkdir -p $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources - rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources/* - cp $(SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(OUTPUT_DIR)/sun/jvm/hotspot/ui/resources/ cd $(OUTPUT_DIR) ; jar cvf ../sa.jar * clean::
--- a/hotspot/agent/make/bugspot.bat Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/bugspot.bat Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ REM -REM Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. +REM Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM REM This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,4 @@ REM REM -java -showversion -cp ..\build\classes;..\src\share\lib\maf-1_0.jar;..\src\share\lib\jlfgr-1_0.jar;..\src\share\lib\js.jar;sa.jar;lib\maf-1_0.jar;lib\jlfgr-1_0.jar;lib\js.jar sun.jvm.hotspot.bugspot.Main +java -showversion -cp ..\build\classes;..\src\share\lib\js.jar;.\sa.jar;lib\js.jar sun.jvm.hotspot.bugspot.Main
--- a/hotspot/agent/make/build-pkglist Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/build-pkglist Mon Oct 20 11:52:47 2008 -0700 @@ -8,4 +8,4 @@ SED=$MKS_HOME/sed SORT=$MKS_HOME/sort -$CD ../src/share/classes; $FIND sun/jvm/hotspot \( -name SCCS -prune \) -o -type d -print | $SED -e 's/\//./g' | $SORT > ../../../make/pkglist.txt +$CD ../src/share/classes; $FIND sun/jvm/hotspot com/sun/java/swing -type d -print | $SED -e 's/\//./g' | $SORT > ../../../make/pkglist.txt
--- a/hotspot/agent/make/build.xml Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/build.xml Mon Oct 20 11:52:47 2008 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. + Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,6 @@ <property name="app.name" value="sa"/> <property name="dist.jar" value="${app.name}.jar"/> - <property name="libs" value="../src/share/lib"/> <property name="classes" value="../build/classes"/> <!-- The "prepare" target is used to construct the deployment home @@ -83,11 +82,6 @@ home directory structure will be created if needed the first time. --> - <path id="javac.classpath"> - <pathelement path="${libs}/maf-1_0.jar" /> - <pathelement path="${libs}/jlfgr-1_0.jar" /> - </path> - <target name="compile" depends="prepare" description="Compiles the sources"> <javac srcdir="../src/share/classes" destdir="${classes}" @@ -110,6 +104,18 @@ <copy todir="${classes}/sun/jvm/hotspot/ui/resources"> <fileset dir="../src/share/classes/sun/jvm/hotspot/ui/resources" includes="*.png" /> </copy> + <copy todir="${classes}/toolbarButtonGraphics/development/"> + <fileset dir="../src/share/classes/images/toolbarButtonGraphics/development/" includes="*.gif" /> + </copy> + <copy todir="${classes}/toolbarButtonGraphics/general/"> + <fileset dir="../src/share/classes/images/toolbarButtonGraphics/general/" includes="*.gif" /> + </copy> + <copy todir="${classes}/toolbarButtonGraphics/navigation/"> + <fileset dir="../src/share/classes/images/toolbarButtonGraphics/navigation/" includes="*.gif" /> + </copy> + <copy todir="${classes}/toolbarButtonGraphics/text/"> + <fileset dir="../src/share/classes/images/toolbarButtonGraphics/text/" includes="*.gif" /> + </copy> <jar jarfile="${classes}/${dist.jar}" basedir="${classes}"/>
--- a/hotspot/agent/make/hsdb.bat Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/hsdb.bat Mon Oct 20 11:52:47 2008 -0700 @@ -1,5 +1,5 @@ REM -REM Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. +REM Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM REM This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,4 @@ REM REM -java -showversion -cp ..\build\classes;..\src\share\lib\maf-1_0.jar;..\src\share\lib\jlfgr-1_0.jar;..\src\share\lib\js.jar;sa.jar;lib\maf-1_0.jar;lib\jlfgr-1_0.jar;lib\js.jar sun.jvm.hotspot.HSDB %1 %2 +java -showversion -cp ..\build\classes;..\src\share\lib\js.jar;.\sa.jar;lib\js.jar sun.jvm.hotspot.HSDB %1 %2
--- a/hotspot/agent/make/hsdb.sh Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/hsdb.sh Mon Oct 20 11:52:47 2008 -0700 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -29,4 +29,4 @@ SA_JAVA=java fi -$SA_JAVA -showversion -cp $STARTDIR/../build/classes:$STARTDIR/../src/share/lib/maf-1_0.jar:$STARTDIR/../src/share/lib/jlfgr-1_0.jar:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar:$STARTDIR/lib/maf-1_0.jar:$STARTDIR/lib/jlfgr-1_0.jar:$STARTDIR/lib/js.jar sun.jvm.hotspot.HSDB $* +$SA_JAVA -showversion -cp $STARTDIR/../build/classes:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar:$STARTDIR/lib/js.jar sun.jvm.hotspot.HSDB $*
--- a/hotspot/agent/make/saenv.bat Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/saenv.bat Mon Oct 20 11:52:47 2008 -0700 @@ -1,6 +1,6 @@ @echo off REM -REM Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. +REM Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM REM This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ :sa_java_set -set SA_CLASSPATH=..\build\classes;..\src\share\lib\maf-1_0.jar;..\src\share\lib\jlfgr-1_0.jar;..\src\share\lib\js.jar;sa.jar;lib\maf-1_0.jar;lib\jlfgr-1_0.jar;lib\js.jar +set SA_CLASSPATH=..\build\classes;..\src\share\lib\js.jar;sa.jar;lib\js.jar set SA_LIBPATH=..\src\os\win32\windbg\i386;.\win32\i386
--- a/hotspot/agent/make/saenv.sh Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/saenv.sh Mon Oct 20 11:52:47 2008 -0700 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -58,7 +58,7 @@ fi -SA_CLASSPATH=$STARTDIR/../build/classes:$STARTDIR/../src/share/lib/maf-1_0.jar:$STARTDIR/../src/share/lib/jlfgr-1_0.jar:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar:$STARTDIR/lib/maf-1_0.jar:$STARTDIR/lib/jlfgr-1_0.jar:$STARTDIR/lib/js.jar +SA_CLASSPATH=$STARTDIR/../build/classes:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar:$STARTDIR/lib/js.jar OPTIONS="-Djava.system.class.loader=sun.jvm.hotspot.SALauncherLoader ${OPTIONS}"
--- a/hotspot/agent/make/saenv64.bat Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/saenv64.bat Mon Oct 20 11:52:47 2008 -0700 @@ -1,6 +1,6 @@ @echo off REM -REM Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. +REM Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM REM This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ :sa_java_set -set SA_CLASSPATH=..\build\classes;..\src\share\lib\maf-1_0.jar;..\src\share\lib\jlfgr-1_0.jar;..\src\share\lib\js.jar;sa.jar;lib\maf-1_0.jar;lib\jlfgr-1_0.jar;lib\js.jar +set SA_CLASSPATH=..\build\classes;..\src\share\lib\js.jar;sa.jar;lib\js.jar REM For now, only AMD-64, IA-64 stack walking is not working anyway set SA_LIBPATH=.\src\os\win32\windbg\amd64;.\win32\amd64
--- a/hotspot/agent/make/saenv64.sh Thu Oct 16 06:28:37 2008 -0700 +++ b/hotspot/agent/make/saenv64.sh Mon Oct 20 11:52:47 2008 -0700 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -55,7 +55,7 @@ OPTIONS="-Dsun.jvm.hotspot.runtime.VM.disableVersionCheck ${OPTIONS}" fi -SA_CLASSPATH=$STARTDIR/../build/classes:$STARTDIR/../src/share/lib/maf-1_0.jar:$STARTDIR/../src/share/lib/jlfgr-1_0.jar:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar:$STARTDIR/lib/maf-1_0.jar:$STARTDIR/lib/jlfgr-1_0.jar:$STARTDIR/lib/js.jar +SA_CLASSPATH=$STARTDIR/../build/classes:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar::$STARTDIR/lib/js.jar OPTIONS="-Djava.system.class.loader=sun.jvm.hotspot.SALauncherLoader ${OPTIONS}"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/AboutAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,57 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class AboutAction extends DelegateAction +{ + + public AboutAction() + { + this("general/About16.gif"); + } + + public AboutAction(String iconPath) + { + super("About...", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "about-command"); + putValue("ShortDescription", "About..."); + putValue("LongDescription", "System information and version of the application."); + putValue("MnemonicKey", VALUE_MNEMONIC); + } + + public static final String VALUE_COMMAND = "about-command"; + public static final String VALUE_NAME = "About..."; + public static final String VALUE_SMALL_ICON = "general/About16.gif"; + public static final String VALUE_LARGE_ICON = "general/About24.gif"; + public static final Integer VALUE_MNEMONIC = new Integer(65); + public static final String VALUE_SHORT_DESCRIPTION = "About..."; + public static final String VALUE_LONG_DESCRIPTION = "System information and version of the application."; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/ActionManager.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,95 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import java.util.HashMap; +import javax.swing.Action; +import javax.swing.ImageIcon; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, StateChangeAction, ActionUtilities + +public abstract class ActionManager +{ + + protected ActionManager() + { + actions = new HashMap(); + addActions(); + } + + public static ActionManager getInstance() + { + return manager; + } + + protected abstract void addActions(); + + protected void addAction(String cmdname, Action action) + { + actions.put(cmdname, action); + } + + public Action getAction(String key) + { + return (Action)actions.get(key); + } + + public DelegateAction getDelegateAction(String name) + { + Action a = getAction(name); + if(a instanceof DelegateAction) + return (DelegateAction)a; + else + return null; + } + + public StateChangeAction getStateChangeAction(String name) + { + Action a = getAction(name); + if(a instanceof StateChangeAction) + return (StateChangeAction)a; + else + return null; + } + + public static ImageIcon getIcon(String name) + { + return utilities.getIcon(name); + } + + public void setActionEnabled(String name, boolean enabled) + { + Action action = getAction(name); + if(action != null) + action.setEnabled(enabled); + } + + private HashMap actions; + private static ActionUtilities utilities = new ActionUtilities(); + protected static ActionManager manager; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/ActionUtilities.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,49 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.ImageIcon; + +class ActionUtilities +{ + + ActionUtilities() + { + } + + public ImageIcon getIcon(String name) + { + String imagePath = "/toolbarButtonGraphics/" + name; + java.net.URL url = getClass().getResource(imagePath); + if(url != null) + return new ImageIcon(url); + else + return null; + } + + public static final String IMAGE_DIR = "/toolbarButtonGraphics/"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/AlignCenterAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// StateChangeAction, ActionManager + +public class AlignCenterAction extends StateChangeAction +{ + + public AlignCenterAction() + { + this("text/AlignCenter16.gif"); + } + + public AlignCenterAction(String iconPath) + { + super("Center", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "align-center-command"); + putValue("ShortDescription", "Center"); + putValue("LongDescription", "Adjust the placement of text to the center of the line"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "align-center-command"; + public static final String VALUE_NAME = "Center"; + public static final String VALUE_SMALL_ICON = "text/AlignCenter16.gif"; + public static final String VALUE_LARGE_ICON = "text/AlignCenter24.gif"; + public static final Integer VALUE_MNEMONIC = new Integer(78); + public static final KeyStroke VALUE_ACCELERATOR = KeyStroke.getKeyStroke(69, 2); + public static final String VALUE_SHORT_DESCRIPTION = "Center"; + public static final String VALUE_LONG_DESCRIPTION = "Adjust the placement of text to the center of the line"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/AlignLeftAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// StateChangeAction, ActionManager + +public class AlignLeftAction extends StateChangeAction +{ + + public AlignLeftAction() + { + this("text/AlignLeft16.gif"); + } + + public AlignLeftAction(String iconPath) + { + super("Left Align", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "align-left-command"); + putValue("ShortDescription", "Left Align"); + putValue("LongDescription", "Adjust the placement of text along the left edge"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "align-left-command"; + public static final String VALUE_NAME = "Left Align"; + public static final String VALUE_SMALL_ICON = "text/AlignLeft16.gif"; + public static final String VALUE_LARGE_ICON = "text/AlignLeft24.gif"; + public static final Integer VALUE_MNEMONIC = new Integer(76); + public static final KeyStroke VALUE_ACCELERATOR = KeyStroke.getKeyStroke(76, 2); + public static final String VALUE_SHORT_DESCRIPTION = "Left Align"; + public static final String VALUE_LONG_DESCRIPTION = "Adjust the placement of text along the left edge"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/AlignRightAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// StateChangeAction, ActionManager + +public class AlignRightAction extends StateChangeAction +{ + + public AlignRightAction() + { + this("text/AlignRight16.gif"); + } + + public AlignRightAction(String iconPath) + { + super("Right Align", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "align-right-command"); + putValue("ShortDescription", "Right Align"); + putValue("LongDescription", "Adjust the placement of text along the right edge"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "align-right-command"; + public static final String VALUE_NAME = "Right Align"; + public static final String VALUE_SMALL_ICON = "text/AlignRight16.gif"; + public static final String VALUE_LARGE_ICON = "text/AlignRight24.gif"; + public static final Integer VALUE_MNEMONIC = new Integer(82); + public static final KeyStroke VALUE_ACCELERATOR = KeyStroke.getKeyStroke(82, 2); + public static final String VALUE_SHORT_DESCRIPTION = "Right Align"; + public static final String VALUE_LONG_DESCRIPTION = "Adjust the placement of text along the right edge"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/ApplyAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class ApplyAction extends DelegateAction +{ + + public ApplyAction() + { + this(VALUE_SMALL_ICON); + } + + public ApplyAction(String iconPath) + { + super("Apply", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "apply-command"); + putValue("ShortDescription", "Apply the activity"); + putValue("LongDescription", "Apply the activity"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "apply-command"; + public static final String VALUE_NAME = "Apply"; + public static final String VALUE_SMALL_ICON = null; + public static final String VALUE_LARGE_ICON = null; + public static final Integer VALUE_MNEMONIC = new Integer(65); + public static final KeyStroke VALUE_ACCELERATOR = null; + public static final String VALUE_SHORT_DESCRIPTION = "Apply the activity"; + public static final String VALUE_LONG_DESCRIPTION = "Apply the activity"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/BackAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class BackAction extends DelegateAction +{ + + public BackAction() + { + this(VALUE_SMALL_ICON); + } + + public BackAction(String iconPath) + { + super("< Back", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "back-command"); + putValue("ShortDescription", "Select previous item"); + putValue("LongDescription", "Select previous item"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "back-command"; + public static final String VALUE_NAME = "< Back"; + public static final String VALUE_SMALL_ICON = null; + public static final String VALUE_LARGE_ICON = null; + public static final Integer VALUE_MNEMONIC = new Integer(66); + public static final KeyStroke VALUE_ACCELERATOR = null; + public static final String VALUE_SHORT_DESCRIPTION = "Select previous item"; + public static final String VALUE_LONG_DESCRIPTION = "Select previous item"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/CancelAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class CancelAction extends DelegateAction +{ + + public CancelAction() + { + this(VALUE_SMALL_ICON); + } + + public CancelAction(String iconPath) + { + super("Cancel", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "cancel-command"); + putValue("ShortDescription", "Cancels the action"); + putValue("LongDescription", "Cancels the action"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "cancel-command"; + public static final String VALUE_NAME = "Cancel"; + public static final String VALUE_SMALL_ICON = null; + public static final String VALUE_LARGE_ICON = null; + public static final Integer VALUE_MNEMONIC = new Integer(67); + public static final KeyStroke VALUE_ACCELERATOR = null; + public static final String VALUE_SHORT_DESCRIPTION = "Cancels the action"; + public static final String VALUE_LONG_DESCRIPTION = "Cancels the action"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/DelegateAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,65 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.AbstractAction; +import javax.swing.Icon; + +public abstract class DelegateAction extends AbstractAction +{ + + public DelegateAction(String name, Icon icon) + { + super(name, icon); + } + + public void addActionListener(ActionListener listener) + { + this.listener = listener; + } + + public void removeActionListener(ActionListener listener) + { + this.listener = null; + } + + public ActionListener[] getActionListeners() + { + return (new ActionListener[] { + listener + }); + } + + public void actionPerformed(ActionEvent evt) + { + if(listener != null) + listener.actionPerformed(evt); + } + + private ActionListener listener; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/ExitAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class ExitAction extends DelegateAction +{ + + public ExitAction() + { + super("Exit", ActionManager.getIcon(VALUE_SMALL_ICON)); + putValue("ActionCommandKey", "exit-command"); + putValue("ShortDescription", "Exits the application"); + putValue("LongDescription", "Exits the application"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "exit-command"; + public static final String VALUE_NAME = "Exit"; + public static final String VALUE_SMALL_ICON = null; + public static final String VALUE_LARGE_ICON = null; + public static final Integer VALUE_MNEMONIC = new Integer(88); + public static final KeyStroke VALUE_ACCELERATOR = null; + public static final String VALUE_SHORT_DESCRIPTION = "Exits the application"; + public static final String VALUE_LONG_DESCRIPTION = "Exits the application"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/FileMenu.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import java.awt.event.ActionEvent; +import javax.swing.AbstractAction; + +public class FileMenu extends AbstractAction +{ + + public FileMenu() + { + super("File"); + putValue("ActionCommandKey", "file-menu-command"); + putValue("ShortDescription", "File operations"); + putValue("LongDescription", "File operations"); + putValue("MnemonicKey", VALUE_MNEMONIC); + } + + public void actionPerformed(ActionEvent actionevent) + { + } + + public static final String VALUE_COMMAND = "file-menu-command"; + public static final String VALUE_NAME = "File"; + public static final Integer VALUE_MNEMONIC = new Integer(70); + public static final String VALUE_SHORT_DESCRIPTION = "File operations"; + public static final String VALUE_LONG_DESCRIPTION = "File operations"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/FinishAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class FinishAction extends DelegateAction +{ + + public FinishAction() + { + this(VALUE_SMALL_ICON); + } + + public FinishAction(String iconPath) + { + super("Finish", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "finish-command"); + putValue("ShortDescription", "Finish the activity"); + putValue("LongDescription", "Finish the activity"); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "finish-command"; + public static final String VALUE_NAME = "Finish"; + public static final String VALUE_SMALL_ICON = null; + public static final String VALUE_LARGE_ICON = null; + public static final Integer VALUE_MNEMONIC = new Integer(70); + public static final KeyStroke VALUE_ACCELERATOR = null; + public static final String VALUE_SHORT_DESCRIPTION = "Finish the activity"; + public static final String VALUE_LONG_DESCRIPTION = "Finish the activity"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/HelpAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class HelpAction extends DelegateAction +{ + + public HelpAction() + { + this("general/Help16.gif"); + } + + public HelpAction(String iconPath) + { + super("Help", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "help-command"); + putValue("ShortDescription", "Help..."); + putValue("LongDescription", "Provide information which may aid the user."); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "help-command"; + public static final String VALUE_NAME = "Help"; + public static final String VALUE_SMALL_ICON = "general/Help16.gif"; + public static final String VALUE_LARGE_ICON = "general/Help24.gif"; + public static final Integer VALUE_MNEMONIC = new Integer(72); + public static final KeyStroke VALUE_ACCELERATOR = KeyStroke.getKeyStroke(112, 0); + public static final String VALUE_SHORT_DESCRIPTION = "Help..."; + public static final String VALUE_LONG_DESCRIPTION = "Provide information which may aid the user."; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/HelpMenu.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import java.awt.event.ActionEvent; +import javax.swing.AbstractAction; + +public class HelpMenu extends AbstractAction +{ + + public HelpMenu() + { + super("Help"); + putValue("ActionCommandKey", "help-menu-command"); + putValue("ShortDescription", "Help operations"); + putValue("LongDescription", "Help operations"); + putValue("MnemonicKey", VALUE_MNEMONIC); + } + + public void actionPerformed(ActionEvent actionevent) + { + } + + public static final String VALUE_COMMAND = "help-menu-command"; + public static final String VALUE_NAME = "Help"; + public static final Integer VALUE_MNEMONIC = new Integer(72); + public static final String VALUE_SHORT_DESCRIPTION = "Help operations"; + public static final String VALUE_LONG_DESCRIPTION = "Help operations"; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/NewAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + + +package com.sun.java.swing.action; + +import javax.swing.KeyStroke; + +// Referenced classes of package com.sun.java.swing.action: +// DelegateAction, ActionManager + +public class NewAction extends DelegateAction +{ + + public NewAction() + { + this("general/New16.gif"); + } + + public NewAction(String iconPath) + { + super("New", ActionManager.getIcon(iconPath)); + putValue("ActionCommandKey", "new-command"); + putValue("ShortDescription", "Create a new object."); + putValue("LongDescription", "Create a new object."); + putValue("MnemonicKey", VALUE_MNEMONIC); + putValue("AcceleratorKey", VALUE_ACCELERATOR); + } + + public static final String VALUE_COMMAND = "new-command"; + public static final String VALUE_NAME = "New"; + public static final String VALUE_SMALL_ICON = "general/New16.gif"; + public static final String VALUE_LARGE_ICON = "general/New24.gif"; + public static final Integer VALUE_MNEMONIC = new Integer(78); + public static final KeyStroke VALUE_ACCELERATOR = KeyStroke.getKeyStroke(78, 2); + public static final String VALUE_SHORT_DESCRIPTION = "Create a new object."; + public static final String VALUE_LONG_DESCRIPTION = "Create a new object."; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/NextAction.java Mon Oct 20 11:52:47 2008 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT