From b2fa4708ade8ed5b02d8dfd99e238b6a5d03aadb Mon Sep 17 00:00:00 2001 From: John Cuthbertson Date: Fri, 17 Dec 2010 11:26:53 -0800 Subject: [PATCH 01/17] 7006113: G1: Initialize ReferenceProcessor::_is_alive_non_header field Initialize the _is_alive_non_header field of G1's reference processor with an instance of the G1CMIsAliveClosure. This will stop adding reference objects with live referents to the discovered reference lists unnecessarily. Reviewed-by: tonyp, ysr, jwilhelm, brutisso --- .../gc_implementation/g1/concurrentMark.cpp | 39 +++++++------------ .../gc_implementation/g1/concurrentMark.hpp | 19 +++++++++ .../gc_implementation/g1/g1CollectedHeap.cpp | 4 +- .../gc_implementation/g1/g1CollectedHeap.hpp | 8 +++- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp index cea107220ab..d1989d4a24e 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp @@ -1825,23 +1825,11 @@ void ConcurrentMark::completeCleanup() { } } - -class G1CMIsAliveClosure: public BoolObjectClosure { - G1CollectedHeap* _g1; - public: - G1CMIsAliveClosure(G1CollectedHeap* g1) : - _g1(g1) - {} - - void do_object(oop obj) { - assert(false, "not to be invoked"); - } - bool do_object_b(oop obj) { - HeapWord* addr = (HeapWord*)obj; - return addr != NULL && - (!_g1->is_in_g1_reserved(addr) || !_g1->is_obj_ill(obj)); - } -}; +bool G1CMIsAliveClosure::do_object_b(oop obj) { + HeapWord* addr = (HeapWord*)obj; + return addr != NULL && + (!_g1->is_in_g1_reserved(addr) || !_g1->is_obj_ill(obj)); +} class G1CMKeepAliveClosure: public OopClosure { G1CollectedHeap* _g1; @@ -1896,16 +1884,15 @@ void ConcurrentMark::weakRefsWork(bool clear_all_soft_refs) { rp->setup_policy(clear_all_soft_refs); assert(_markStack.isEmpty(), "mark stack should be empty"); - G1CMIsAliveClosure g1IsAliveClosure (g1h); - G1CMKeepAliveClosure g1KeepAliveClosure(g1h, this, nextMarkBitMap()); + G1CMIsAliveClosure g1_is_alive(g1h); + G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap()); G1CMDrainMarkingStackClosure - g1DrainMarkingStackClosure(nextMarkBitMap(), &_markStack, - &g1KeepAliveClosure); + g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive); // XXXYYY Also: copy the parallel ref processing code from CMS. - rp->process_discovered_references(&g1IsAliveClosure, - &g1KeepAliveClosure, - &g1DrainMarkingStackClosure, + rp->process_discovered_references(&g1_is_alive, + &g1_keep_alive, + &g1_drain_mark_stack, NULL); assert(_markStack.overflow() || _markStack.isEmpty(), "mark stack should be empty (unless it overflowed)"); @@ -1918,8 +1905,8 @@ void ConcurrentMark::weakRefsWork(bool clear_all_soft_refs) { assert(!rp->discovery_enabled(), "should have been disabled"); // Now clean up stale oops in SymbolTable and StringTable - SymbolTable::unlink(&g1IsAliveClosure); - StringTable::unlink(&g1IsAliveClosure); + SymbolTable::unlink(&g1_is_alive); + StringTable::unlink(&g1_is_alive); } void ConcurrentMark::swapMarkBitMaps() { diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp index 7f13483b72e..f02d6f049fa 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp @@ -33,6 +33,25 @@ class CMTask; typedef GenericTaskQueue CMTaskQueue; typedef GenericTaskQueueSet CMTaskQueueSet; +// Closure used by CM during concurrent reference discovery +// and reference processing (during remarking) to determine +// if a particular object is alive. It is primarily used +// to determine if referents of discovered reference objects +// are alive. An instance is also embedded into the +// reference processor as the _is_alive_non_header field +class G1CMIsAliveClosure: public BoolObjectClosure { + G1CollectedHeap* _g1; + public: + G1CMIsAliveClosure(G1CollectedHeap* g1) : + _g1(g1) + {} + + void do_object(oop obj) { + ShouldNotCallThis(); + } + bool do_object_b(oop obj); +}; + // A generic CM bit map. This is essentially a wrapper around the BitMap // class, with one bit per (1<<_shifter) HeapWords. diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 29a2cc24743..0c496472ea9 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -1768,6 +1768,7 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) : _g1_policy(policy_), _dirty_card_queue_set(false), _into_cset_dirty_card_queue_set(false), + _is_alive_closure(this), _ref_processor(NULL), _process_strong_tasks(new SubTasksDone(G1H_PS_NumElements)), _bot_shared(NULL), @@ -2061,7 +2062,8 @@ void G1CollectedHeap::ref_processing_init() { mr, // span false, // Reference discovery is not atomic true, // mt_discovery - NULL, // is alive closure: need to fill this in for efficiency + &_is_alive_closure, // is alive closure + // for efficiency ParallelGCThreads, ParallelRefProcEnabled, true); // Setting next fields of discovered diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp index ad5ca71a143..0cec92564fe 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @@ -849,6 +849,12 @@ protected: void print_gc_alloc_regions(); #endif // !PRODUCT + // Instance of the concurrent mark is_alive closure for embedding + // into the reference processor as the is_alive_non_header. This + // prevents unnecessary additions to the discovered lists during + // concurrent discovery. + G1CMIsAliveClosure _is_alive_closure; + // ("Weak") Reference processing support ReferenceProcessor* _ref_processor; @@ -893,7 +899,7 @@ public: // specified by the policy object. jint initialize(); - void ref_processing_init(); + virtual void ref_processing_init(); void set_par_threads(int t) { SharedHeap::set_par_threads(t); -- GitLab From 41bf31bff44e7d5baabc720b132a63959c12f127 Mon Sep 17 00:00:00 2001 From: "Y. Srinivas Ramakrishna" Date: Fri, 17 Dec 2010 23:41:31 -0800 Subject: [PATCH 02/17] 6807801: CMS: could save/restore fewer header words during scavenge Age bits need not enter the mark-word preservation calculus; also affected, in addition to CMS, per CR synopsis above, were ParNew (but not DefNew), ParallelScavenge and G1, albeit to a lesser degree than CMS. Reviewed-by: tonyp, johnc --- .../gc_implementation/g1/g1CollectedHeap.cpp | 7 +++--- .../parNew/parNewGeneration.cpp | 7 +++--- .../parallelScavenge/psScavenge.cpp | 2 ++ .../src/share/vm/memory/defNewGeneration.cpp | 17 ++++++++----- .../src/share/vm/memory/defNewGeneration.hpp | 1 + hotspot/src/share/vm/oops/markOop.inline.hpp | 24 ++++++++++++------- 6 files changed, 37 insertions(+), 21 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 0c496472ea9..02c9a104793 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -3958,8 +3958,6 @@ void G1CollectedHeap::remove_self_forwarding_pointers() { // Now restore saved marks, if any. if (_objs_with_preserved_marks != NULL) { assert(_preserved_marks_of_objs != NULL, "Both or none."); - assert(_objs_with_preserved_marks->length() == - _preserved_marks_of_objs->length(), "Both or none."); guarantee(_objs_with_preserved_marks->length() == _preserved_marks_of_objs->length(), "Both or none."); for (int i = 0; i < _objs_with_preserved_marks->length(); i++) { @@ -4054,7 +4052,10 @@ void G1CollectedHeap::handle_evacuation_failure_common(oop old, markOop m) { } void G1CollectedHeap::preserve_mark_if_necessary(oop obj, markOop m) { - if (m != markOopDesc::prototype()) { + assert(evacuation_failed(), "Oversaving!"); + // We want to call the "for_promotion_failure" version only in the + // case of a promotion failure. + if (m->must_be_preserved_for_promotion_failure(obj)) { if (_objs_with_preserved_marks == NULL) { assert(_preserved_marks_of_objs == NULL, "Both or none."); _objs_with_preserved_marks = diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp index 2b63c9382f4..d8d1ae9b4bf 100644 --- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp +++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp @@ -1058,10 +1058,11 @@ bool ParNewGeneration::is_legal_forward_ptr(oop p) { #endif void ParNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) { - if ((m != markOopDesc::prototype()) && - (!UseBiasedLocking || (m != markOopDesc::biased_locking_prototype()))) { + if (m->must_be_preserved_for_promotion_failure(obj)) { + // We should really have separate per-worker stacks, rather + // than use locking of a common pair of stacks. MutexLocker ml(ParGCRareEvent_lock); - DefNewGeneration::preserve_mark_if_necessary(obj, m); + preserve_mark(obj, m); } } diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp index 9cf294eb97c..f87db47e7cb 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp @@ -694,6 +694,8 @@ void PSScavenge::clean_up_failed_promotion() { void PSScavenge::oop_promotion_failed(oop obj, markOop obj_mark) { _promotion_failed = true; if (obj_mark->must_be_preserved_for_promotion_failure(obj)) { + // Should use per-worker private stakcs hetre rather than + // locking a common pair of stacks. ThreadCritical tc; _preserved_oop_stack.push(obj); _preserved_mark_stack.push(obj_mark); diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/memory/defNewGeneration.cpp index 746119ada93..cbb6c38cfc3 100644 --- a/hotspot/src/share/vm/memory/defNewGeneration.cpp +++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp @@ -684,23 +684,28 @@ void DefNewGeneration::remove_forwarding_pointers() { _preserved_marks_of_objs.clear(true); } +void DefNewGeneration::preserve_mark(oop obj, markOop m) { + assert(promotion_failed() && m->must_be_preserved_for_promotion_failure(obj), + "Oversaving!"); + _objs_with_preserved_marks.push(obj); + _preserved_marks_of_objs.push(m); +} + void DefNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) { if (m->must_be_preserved_for_promotion_failure(obj)) { - _objs_with_preserved_marks.push(obj); - _preserved_marks_of_objs.push(m); + preserve_mark(obj, m); } } void DefNewGeneration::handle_promotion_failure(oop old) { - preserve_mark_if_necessary(old, old->mark()); - if (!_promotion_failed && PrintPromotionFailure) { + if (PrintPromotionFailure && !_promotion_failed) { gclog_or_tty->print(" (promotion failure size = " SIZE_FORMAT ") ", old->size()); } - + _promotion_failed = true; + preserve_mark_if_necessary(old, old->mark()); // forward to self old->forward_to(old); - _promotion_failed = true; _promo_failure_scan_stack.push(old); diff --git a/hotspot/src/share/vm/memory/defNewGeneration.hpp b/hotspot/src/share/vm/memory/defNewGeneration.hpp index e21fb2cb875..e7b85285775 100644 --- a/hotspot/src/share/vm/memory/defNewGeneration.hpp +++ b/hotspot/src/share/vm/memory/defNewGeneration.hpp @@ -85,6 +85,7 @@ protected: // Preserve the mark of "obj", if necessary, in preparation for its mark // word being overwritten with a self-forwarding-pointer. void preserve_mark_if_necessary(oop obj, markOop m); + void preserve_mark(oop obj, markOop m); // work routine used by the above // Together, these keep pairs. // They should always contain the same number of elements. diff --git a/hotspot/src/share/vm/oops/markOop.inline.hpp b/hotspot/src/share/vm/oops/markOop.inline.hpp index 6e82ada2c58..b5893669355 100644 --- a/hotspot/src/share/vm/oops/markOop.inline.hpp +++ b/hotspot/src/share/vm/oops/markOop.inline.hpp @@ -30,7 +30,7 @@ #include "oops/markOop.hpp" #include "runtime/globals.hpp" -// Should this header be preserved during GC? +// Should this header be preserved during GC (when biased locking is enabled)? inline bool markOopDesc::must_be_preserved_with_bias(oop obj_containing_mark) const { assert(UseBiasedLocking, "unexpected"); if (has_bias_pattern()) { @@ -47,14 +47,15 @@ inline bool markOopDesc::must_be_preserved_with_bias(oop obj_containing_mark) co return (!is_unlocked() || !has_no_hash()); } +// Should this header be preserved during GC? inline bool markOopDesc::must_be_preserved(oop obj_containing_mark) const { if (!UseBiasedLocking) return (!is_unlocked() || !has_no_hash()); return must_be_preserved_with_bias(obj_containing_mark); } -// Should this header (including its age bits) be preserved in the -// case of a promotion failure during scavenge? +// Should this header be preserved in the case of a promotion failure +// during scavenge (when biased locking is enabled)? inline bool markOopDesc::must_be_preserved_with_bias_for_promotion_failure(oop obj_containing_mark) const { assert(UseBiasedLocking, "unexpected"); // We don't explicitly save off the mark words of biased and @@ -70,18 +71,20 @@ inline bool markOopDesc::must_be_preserved_with_bias_for_promotion_failure(oop o prototype_for_object(obj_containing_mark)->has_bias_pattern()) { return true; } - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); } +// Should this header be preserved in the case of a promotion failure +// during scavenge? inline bool markOopDesc::must_be_preserved_for_promotion_failure(oop obj_containing_mark) const { if (!UseBiasedLocking) - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); return must_be_preserved_with_bias_for_promotion_failure(obj_containing_mark); } -// Should this header (including its age bits) be preserved in the -// case of a scavenge in which CMS is the old generation? +// Same as must_be_preserved_with_bias_for_promotion_failure() except that +// it takes a klassOop argument, instead of the object of which this is the mark word. inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const { assert(UseBiasedLocking, "unexpected"); // CMS scavenges preserve mark words in similar fashion to promotion failures; see above @@ -89,11 +92,14 @@ inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(klassOop k klass_of_obj_containing_mark->klass_part()->prototype_header()->has_bias_pattern()) { return true; } - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); } + +// Same as must_be_preserved_for_promotion_failure() except that +// it takes a klassOop argument, instead of the object of which this is the mark word. inline bool markOopDesc::must_be_preserved_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const { if (!UseBiasedLocking) - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); return must_be_preserved_with_bias_for_cms_scavenge(klass_of_obj_containing_mark); } -- GitLab From 2aa9ac11779261b3933c8983682d0e2814bbf1bb Mon Sep 17 00:00:00 2001 From: Antonios Printezis Date: Sun, 19 Dec 2010 20:57:16 -0500 Subject: [PATCH 03/17] 6896624: G1: hotspot:::gc and hotspot:::mem-pool-gc probes are not fired Fire the gc-begin and gc-end probes for G1. Reviewed-by: kamg, ysr, jcoomes --- .../share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 6 ++++-- .../vm/gc_implementation/shared/vmGCOperations.hpp | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 02c9a104793..030aecade77 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -1192,6 +1192,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc, return false; } + DTraceGCProbeMarker gc_probe_marker(true /* full */); ResourceMark rm; if (PrintHeapAtGC) { @@ -3213,13 +3214,14 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) { return false; } + DTraceGCProbeMarker gc_probe_marker(false /* full */); + ResourceMark rm; + if (PrintHeapAtGC) { Universe::print_heap_before_gc(); } { - ResourceMark rm; - // This call will decide whether this pause is an initial-mark // pause. If it is, during_initial_mark_pause() will return true // for the duration of this pause. diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp index 93611bdaf61..c7ee95f445b 100644 --- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp +++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp @@ -209,4 +209,15 @@ class VM_GenCollectForPermanentAllocation: public VM_GC_Operation { HeapWord* result() const { return _res; } }; +class DTraceGCProbeMarker : public StackObj { +public: + DTraceGCProbeMarker(bool full) { + VM_GC_Operation::notify_gc_begin(full); + } + + ~DTraceGCProbeMarker() { + VM_GC_Operation::notify_gc_end(); + } +}; + #endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP -- GitLab From d5ee3dcc8a4046b86737bae645812d8206c2bbdf Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Tue, 21 Dec 2010 16:44:00 -0800 Subject: [PATCH 04/17] 6360517: ALT_MSDEVTOOLS_PATH and rc.exe location, and rebase location Reviewed-by: ksrini --- Makefile | 3 --- README-builds.html | 13 ++++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d42650e58ce..6b296080ad9 100644 --- a/Makefile +++ b/Makefile @@ -456,7 +456,6 @@ CACERTS_FILE.desc = Location of certificates file DEVTOOLS_PATH.desc = Directory containing zip and gnumake CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files DXSDK_PATH.desc = Root directory of DirectX SDK -MSDEVTOOLS_PATH.desc = Root directory of VC++ tools (e.g. rc.exe) MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll # Make variables to print out (description and value) @@ -487,12 +486,10 @@ ifeq ($(PLATFORM), windows) VARIABLE_PRINTVAL_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH VARIABLE_CHECKDIR_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH endif diff --git a/README-builds.html b/README-builds.html index 1c2504c4dc5..297494f74b5 100644 --- a/README-builds.html +++ b/README-builds.html @@ -1650,13 +1650,16 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
Windows specific:
-
ALT_MSDEVTOOLS_PATH
+
ALT_WINDOWSSDKDIR
The location of the - Microsoft Visual Studio - tools 'bin' directory. - The default is usually derived from - ALT_COMPILER_PATH. + Microsoft Windows SDK where some tools will be + located. + The default is whatever WINDOWSSDKDIR is set to + (or WindowsSdkDir) or the path + 
+                            c:\Program Files\Microsoft SDKs\Windows\v6.1a
+
ALT_DXSDK_PATH
-- GitLab From bf2ba650f9a6b13e522feb5e9e422de8465e3ada Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Tue, 21 Dec 2010 18:21:26 -0800 Subject: [PATCH 05/17] 6360517: ALT_MSDEVTOOLS_PATH and rc.exe location, and rebase location Reviewed-by: ksrini --- jdk/make/Makefile | 3 - jdk/make/common/shared/Compiler-gcc.gmk | 4 +- jdk/make/common/shared/Compiler-msvc.gmk | 86 +++---- jdk/make/common/shared/Defs-solaris.gmk | 3 +- jdk/make/common/shared/Defs-versions.gmk | 17 +- jdk/make/common/shared/Defs-windows.gmk | 253 +++++++++++++-------- jdk/make/common/shared/Defs.gmk | 28 +-- jdk/make/common/shared/Sanity-Settings.gmk | 6 +- jdk/make/common/shared/Sanity.gmk | 20 +- jdk/make/jdk_generic_profile.sh | 11 +- 10 files changed, 248 insertions(+), 183 deletions(-) diff --git a/jdk/make/Makefile b/jdk/make/Makefile index 9ec690639a9..30790befacc 100644 --- a/jdk/make/Makefile +++ b/jdk/make/Makefile @@ -100,7 +100,6 @@ CACERTS_FILE.desc = Location of certificates file DEVTOOLS_PATH.desc = Directory containing zip and unzip CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files DXSDK_PATH.desc = Root directory of DirectX SDK -MSDEVTOOLS_PATH.desc = Root directory of VC++ tools (e.g. rc.exe) MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll # Make variables to print out (description and value) @@ -135,12 +134,10 @@ ifeq ($(PLATFORM), windows) VARIABLE_PRINTVAL_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH VARIABLE_CHECKDIR_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH endif diff --git a/jdk/make/common/shared/Compiler-gcc.gmk b/jdk/make/common/shared/Compiler-gcc.gmk index b4a4f536353..570ea1c85db 100644 --- a/jdk/make/common/shared/Compiler-gcc.gmk +++ b/jdk/make/common/shared/Compiler-gcc.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -36,7 +36,7 @@ ifeq ($(PLATFORM), windows) CCC = $(COMPILER_PATH)g++ LIBEXE = $(COMPILER_PATH)lib LINK = $(COMPILER_PATH)link - RC = $(MSDEVTOOLS_PATH)link + RC = $(COMPILER_PATH)rc LINK32 = $(LINK) RSC = $(RC) # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake diff --git a/jdk/make/common/shared/Compiler-msvc.gmk b/jdk/make/common/shared/Compiler-msvc.gmk index 08ea9b332b1..49a0d5fe63c 100644 --- a/jdk/make/common/shared/Compiler-msvc.gmk +++ b/jdk/make/common/shared/Compiler-msvc.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -34,8 +34,6 @@ ifeq ($(PLATFORM), windows) CCC = $(COMPILER_PATH)cl LIBEXE = $(COMPILER_PATH)lib LINK = $(COMPILER_PATH)link - RC = $(MSDEVTOOLS_PATH)rc - RSC = $(MSDEVTOOLS_PATH)rc LINK32 = $(LINK) # Fill in unknown values @@ -47,7 +45,10 @@ ifeq ($(PLATFORM), windows) # 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}') - + + # The MSDEVTOOLS_PATH is for older compilers, place for rc, mt, etc. + _OTHER_TOOLS_PATH = $(MSDEVTOOLS_PATH) + # SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure... ifeq ($(ARCH_DATA_MODEL), 32) LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}') @@ -56,43 +57,26 @@ ifeq ($(PLATFORM), windows) # This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077 COMPILER_NAME=Visual Studio .NET 2003 Professional C++ COMPILER_VERSION=VS2003 + RC = $(_OTHER_TOOLS_PATH)rc REBASE = $(COMPILER_PATH)../../Common7/Tools/Bin/rebase MTL = $(COMPILER_PATH)../../Common7/Tools/Bin/midl - ifndef COMPILER_PATH - COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) - endif endif ifeq ($(CC_MAJORVER), 14) COMPILER_NAME=Visual Studio 8 COMPILER_VERSION=VS2005 + RC = $(_OTHER_TOOLS_PATH)rc REBASE = $(COMPILER_PATH)../../Common8/Tools/Bin/rebase MTL = $(COMPILER_PATH)../../Common8/Tools/Bin/midl - MT = $(MSDEVTOOLS_PATH)/mt - ifndef COMPILER_PATH - COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) - endif + MT = $(_OTHER_TOOLS_PATH)/mt endif ifeq ($(CC_MAJORVER), 15) COMPILER_NAME=Visual Studio 9 COMPILER_VERSION=VS2008 + RC = $(_OTHER_TOOLS_PATH)rc #rebase and midl moved out of Visual Studio into the SDK: - REBASE = $(MSDEVTOOLS_PATH)/rebase - MTL = $(MSDEVTOOLS_PATH)/midl.exe - MT = $(MSDEVTOOLS_PATH)mt - ifndef COMPILER_PATH - COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) - endif - endif - ifeq ($(CC_MAJORVER), 16) - COMPILER_NAME=Visual Studio 10 - COMPILER_VERSION=VS2010 - #rebase and midl moved out of Visual Studio into the SDK: - REBASE = $(MSDEVTOOLS_PATH)/rebase - MTL = $(MSDEVTOOLS_PATH)/midl.exe - MT = $(MSDEVTOOLS_PATH)mt - ifndef COMPILER_PATH - COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) - endif + REBASE = $(_OTHER_TOOLS_PATH)/rebase + MTL = $(_OTHER_TOOLS_PATH)/midl.exe + MT = $(_OTHER_TOOLS_PATH)mt endif else # else ARCH_DATA_MODEL is 64 @@ -105,13 +89,15 @@ ifeq ($(PLATFORM), windows) # This should be: CC_VER=13.00.9337.7 LINK_VER=7.00.9337.7 COMPILER_NAME=Microsoft Platform SDK - November 2001 Edition COMPILER_VERSION=VS2003 + RC = $(_OTHER_TOOLS_PATH)rc endif endif ifeq ($(CC_MAJORVER), 14) ifeq ($(ARCH), amd64) #rebase and midl moved out of Visual Studio into the SDK: - REBASE = $(MSDEVTOOLS_PATH)/rebase - MTL = $(MSDEVTOOLS_PATH)/midl.exe + RC = $(_OTHER_TOOLS_PATH)/rc + REBASE = $(_OTHER_TOOLS_PATH)/rebase + MTL = $(_OTHER_TOOLS_PATH)/midl.exe ifeq ($(CC_MICROVER), 30701) # This should be: CC_VER=14.00.30701 LINK_VER=8.00.30701 # WARNING: it says 14, but it is such an early build it doesn't @@ -135,24 +121,42 @@ ifeq ($(PLATFORM), windows) MT = $(MSSDK61)/Bin/X64/mt.exe MTL = $(MSSDK61)/Bin/X64/midl.exe endif - ifeq ($(CC_MAJORVER), 16) - COMPILER_NAME=Microsoft Visual Studio 10 (16.00.30319.01) - COMPILER_VERSION=VS2010 - RC = $(MSDEVTOOLS_PATH)/Bin/x64/rc.exe - RSC = $(MSDEVTOOLS_PATH)/Bin/x64/rc.exe - MT = $(MSDEVTOOLS_PATH)/Bin/x64/mt.exe - MTL = $(MSDEVTOOLS_PATH)/Bin/X64/midl.exe + endif + + # The VS2010 compiler is the same one used on both 32bit and 64bit + ifeq ($(CC_MAJORVER), 16) + COMPILER_NAME=Microsoft Visual Studio 10 (16.00.30319.01) + COMPILER_VERSION=VS2010 + ifeq ($(WINDOWSSDKDIR),) + WINDOWSSDKDIR := $(error WINDOWSSDKDIR cannot be empty here) endif - # This will cause problems if ALT_COMPILER_PATH is defined to "" - # which is a directive to use the PATH. - ifndef COMPILER_PATH - COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) + ifeq ($(ARCH_DATA_MODEL), 32) + _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin + else + ifeq ($(ARCH), ia64) + _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/ia64 + else + _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/x64 + endif endif + RC = $(_OTHER_TOOLS_BIN)/rc.exe + REBASE = $(_OTHER_TOOLS_BIN)/rebase.exe + MT = $(_OTHER_TOOLS_BIN)/mt.exe + MTL = $(_OTHER_TOOLS_BIN)/midl.exe + endif + + # These variables can never be empty + ifndef COMPILER_PATH + COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) endif ifndef COMPILER_VERSION COMPILER_VERSION := $(error COMPILER_VERSION cannot be empty here) endif + # Shared library generation flag SHARED_LIBRARY_FLAG = -LD + # RSC is always same as RC (Not sure who uses this RSC variable) + RSC = $(RC) + endif diff --git a/jdk/make/common/shared/Defs-solaris.gmk b/jdk/make/common/shared/Defs-solaris.gmk index 8ba3f4e98cd..98b054ef3d4 100644 --- a/jdk/make/common/shared/Defs-solaris.gmk +++ b/jdk/make/common/shared/Defs-solaris.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -91,7 +91,6 @@ endif ifneq "$(origin ALT_COMPILER_PATH)" "undefined" COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH)) else - # Careful here, REQUIRED_COMPILER_VERSION may not be defined yet (see Defs-versions.gmk) # If the place where we keep a set of Sun Studio compilers doesn't exist, # try and use /opt/SUNWspro, the default location for the SS compilers. # (DirExists checks for this path twice, an automount double check) diff --git a/jdk/make/common/shared/Defs-versions.gmk b/jdk/make/common/shared/Defs-versions.gmk index 88e7ae5267c..72f37175c63 100644 --- a/jdk/make/common/shared/Defs-versions.gmk +++ b/jdk/make/common/shared/Defs-versions.gmk @@ -27,7 +27,22 @@ # WARNING: This file is shared with other workspaces. # -# This file needs these set: CC_VERSION, PLATFORM, ARCH_FAMILY, and ARCH_DATA_MODEL. +# This file needs these set: PLATFORM, ARCH_FAMILY, and ARCH_DATA_MODEL. + +# Windows uses Microsoft compilers by default +ifeq ($(PLATFORM), windows) + override CC_VERSION = msvc +endif + +# Solaris uses Sun Studio compilers by default +ifeq ($(PLATFORM), solaris) + override CC_VERSION = sun +endif + +# Linux uses GNU compilers by default +ifeq ($(PLATFORM), linux) + override CC_VERSION = gcc +endif ########################################################################## # diff --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk index ac9daf4cd6c..2c149e07de1 100644 --- a/jdk/make/common/shared/Defs-windows.gmk +++ b/jdk/make/common/shared/Defs-windows.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -80,13 +80,20 @@ override INCREMENTAL_BUILD = false # their own variable assigned with :=, then use FullPath. # -# Use FullPath to get C:/ style non-spaces path. Never ends with a /! ifdef USING_CYGWIN +# All possible drive letters +drives=a b c d e f g h i j k l m n o p q r s t v u w x y z +# Convert /cygdrive/ paths to the mixed style without an exec of cygpath +# Must be a path with no spaces. +define MixedPath +$(patsubst /%,c:/cygwin/%,$(sort $(filter-out /cygdrive/%,$(foreach drive,$(drives),$(patsubst /cygdrive/$(drive)/%,$(drive):/%,$1))))) +endef +# Use FullPath to get C:/ style non-spaces path. Never ends with a /! # We assume cygpath is available in the search path # NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path! CYGPATH_CMD=cygpath -a -s -m define FullPath -$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL)) +$(if $(word 2,$1),$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL)),$(call MixedPath,$(realpath $(subst ",,$1)))) endef define OptFullPath $(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1" 2> $(DEV_NULL); else echo "$1"; fi) @@ -228,29 +235,125 @@ else _dx_sdk_dir :=$(call FullPath,$(xDXSDK_DIR)) endif -# Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit] -ifeq ($(ARCH_DATA_MODEL), 32) - # Try looking in MSVCDIR or MSVCDir area first - # (set by vcvars32.bat for VC .NET, not defined in the VC 2008/2010) - ifdef MSVCDIR - xMSVCDIR :="$(subst \,/,$(MSVCDIR))" - _msvc_dir :=$(call FullPath,$(xMSVCDIR)) +# Use of the Visual Studio compilers requires certain env variables be set: +# PATH should include the path to cl.exe +# INCLUDE should be defined +# LIB should be defined +# LIBPATH should be defined +# VS100COMNTOOLS should be defined +# WINDOWSSDKDIR should be defined +# The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK. +# For 64bit either will work for us. +# If a developer chooses to install the standalone SDK in some other +# location, then they need to set WINDOWSSDKDIR. +# +# Compilers for 64bit may be from the free SDK, or Visual Studio Professional. +# The free Express compilers don't contain 64 bit compilers, which is why +# you instead need the SDK. +# Release enginering will use VS2010 Pro, so the frequency of testing of +# SDK based builds will depend entirely on individual usage. + +# We only need to do this once +ifndef VS2010_EXISTS + # The 2 key paths we need are WINDOWSSDKDIR and VS100COMNTOOLS. + # If not defined try to see if default location exists. + # If defined make sure that the path has no spaces. + # Finally, export path with no spaces so logic minimizes FullPath calls. + ifndef WINDOWSSDKDIR + # The 7.0a SDK is the second choice. + xWINDOWSSDKDIR :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/" + fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR)) + # The 7.1 SDK is the second choice. + ifeq ($(fWINDOWSSDKDIR),) + xWINDOWSSDKDIR :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/" + fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR)) + endif else - ifdef MSVCDir - xMSVCDIR :="$(subst \,/,$(MSVCDir))" - _msvc_dir :=$(call FullPath,$(xMSVCDIR)) + ifneq ($(word 2,$(WINDOWSSDKDIR)),) + xWINDOWSSDKDIR :="$(subst \,/,$(WINDOWSSDKDIR))" + fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR)) + else + fWINDOWSSDKDIR :=$(WINDOWSSDKDIR) endif endif - # If we still don't have it, look for VSnnCOMNTOOLS (newest first), - # set by installer? - ifeq ($(_msvc_dir),) - ifdef VS100COMNTOOLS # /Common/Tools directory, use ../../Vc + ifneq ($(fWINDOWSSDKDIR),) + WINDOWSSDKDIR :=$(fWINDOWSSDKDIR)/ + endif + ifndef VS100COMNTOOLS + xVS100COMNTOOLS :="$(_program_files32)/Microsoft Visual Studio 10.0/Common7/Tools/" + fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS)) + else + ifneq ($(word 2,$(VS100COMNTOOLS)),) xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" - _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) + fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS)) + else + fVS100COMNTOOLS :=$(xVS100COMNTOOLS) endif - ifneq ($(_vs100tools),) - _msvc_dir :=$(_vs100tools)/../../Vc + endif + ifneq ($(fVS100COMNTOOLS),) + VS100COMNTOOLS :=$(fVS100COMNTOOLS)/ + endif + # Check to see that both exist + ifeq ($(WINDOWSSDKDIR),) + _vs2010_message := No WINDOWSSDKDIR found on system. $(_vs2010_message) + VS2010_EXISTS := false + endif + ifeq ($(VS100COMNTOOLS),) + _vs2010_message := No VS100COMNTOOLS found on system. $(_vs2010_message) + VS2010_EXISTS := false + endif + ifeq ($(VS2010_EXISTS),false) + x:=$(warning WARNING: No VS2010 available. $(_vs2010_message)) + VS100COMNTOOLS := + WINDOWSSDKDIR := + else + VS2010_EXISTS := true + _msvc_dir :=$(VS100COMNTOOLS)/../../Vc + endif + export VS2010_EXISTS + export VS100COMNTOOLS + export WINDOWSSDKDIR +endif + +# Setup for VS2010 is simple, others logic is historic +ifeq ($(VS2010_EXISTS),true) + + # VS2010 Compiler root directory + _msvc_dir :=$(VS100COMNTOOLS)/../../Vc + # SDK root directory + _ms_sdk :=$(WINDOWSSDKDIR) + # Compiler bin directory and redist directory + ifeq ($(ARCH_DATA_MODEL), 32) + _compiler_bin :=$(_msvc_dir)/Bin + _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT) + endif + ifeq ($(ARCH_DATA_MODEL), 64) + _compiler_bin :=$(_msvc_dir)/bin/amd64 + _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x64/Microsoft.VC100.CRT) + endif + ifeq ($(_redist_sdk),) + _redist_sdk :=$(_system_root)/system32 + endif + +else # Not VS2010 + + # Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit] + ifeq ($(ARCH_DATA_MODEL), 32) + + # Try looking in MSVCDIR or MSVCDir area first + # (set by vcvars32.bat for VC .NET, not defined in the VC 2008/2010) + ifdef MSVCDIR + xMSVCDIR :="$(subst \,/,$(MSVCDIR))" + _msvc_dir :=$(call FullPath,$(xMSVCDIR)) else + ifdef MSVCDir + xMSVCDIR :="$(subst \,/,$(MSVCDir))" + _msvc_dir :=$(call FullPath,$(xMSVCDIR)) + endif + endif + # If we still don't have it, look for VSnnCOMNTOOLS (newest first), + # set by installer? + ifeq ($(_msvc_dir),) ifdef VS90COMNTOOLS # /Common/Tools directory, use ../../Vc xVS90COMNTOOLS :="$(subst \,/,$(VS90COMNTOOLS))" _vs90tools :=$(call FullPath,$(xVS90COMNTOOLS)) @@ -275,46 +378,38 @@ ifeq ($(ARCH_DATA_MODEL), 32) endif endif endif - endif - ifneq ($(_msvc_dir),) - _compiler_bin :=$(_msvc_dir)/Bin - # Assume PlatformSDK is in VS71 (will be empty if VS90) - _ms_sdk :=$(call FullPath,$(_msvc_dir)/PlatformSDK) - # Assume VS100, then VS90, then VS80, then VS71 - _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT) - ifeq ($(_redist_sdk),) - ifneq ($(VS100COMNTOOLS),) - _redist_sdk :=c:/windows/system32 - else - _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT) + + ifneq ($(_msvc_dir),) + _compiler_bin :=$(_msvc_dir)/Bin + # Assume PlatformSDK is in VS71 (will be empty if VS90) + _ms_sdk :=$(call FullPath,$(_msvc_dir)/PlatformSDK) + _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT) + ifeq ($(_redist_sdk),) + _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT) ifeq ($(_redist_sdk),) - _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT) - ifeq ($(_redist_sdk),) - _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin) - endif + _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin) endif endif endif endif -endif -# The Microsoft Platform SDK installed by itself -ifneq ($(_program_files),) - _PSDK :="$(_program_files)/Microsoft SDKs/Windows/v6.1/" - _psdk :=$(call FullPath,$(xMSSDK61)) - ifeq ($(_psdk),) - xPSDK :="$(_program_files)/Microsoft Platform SDK" - _psdk :=$(call FullPath,$(xPSDK)) + # The Microsoft Platform SDK installed by itself + ifneq ($(_program_files),) + _PSDK :="$(_program_files)/Microsoft SDKs/Windows/v6.1/" + _psdk :=$(call FullPath,$(xMSSDK61)) ifeq ($(_psdk),) - xPSDK :="$(_program_files)/Microsoft SDK" - _psdk :=$(call FullPath,$(xMSSDK)) + xPSDK :="$(_program_files)/Microsoft Platform SDK" + _psdk :=$(call FullPath,$(xPSDK)) + ifeq ($(_psdk),) + xPSDK :="$(_program_files)/Microsoft SDK" + _psdk :=$(call FullPath,$(xMSSDK)) + endif endif endif -endif -# If no SDK found yet, look in other places -ifeq ($(_ms_sdk),) - ifdef MSSDK + # If no SDK found yet, look in other places + ifeq ($(_ms_sdk),) + ifdef MSSDK xMSSDK :="$(subst \,/,$(MSSDK))" _ms_sdk :=$(call FullPath,$(xMSSDK)) else @@ -322,56 +417,13 @@ ifeq ($(_ms_sdk),) xMSSDK :="$(subst \,/,$(MSSdk))" _ms_sdk :=$(call FullPath,$(xMSSDK)) else - _ms_sdk :=$(_psdk) + _ms_sdk :=$(_psdk) + endif endif endif -endif - -# Compilers for 64bit may be from the free SDK, or Visual Studio Professional -# The free Express compilers don't contain 64 bit compilers, which is why -# you instead need the SDK. -# So for VS2010 based builds, either VS2010 Pro with the 7.0a SDK, or -# the Windows 7.1 standalone SDK with compilers may be used. -# Release enginering will use VS2010 Pro, so the frequency of testing of -# SDK based builds will depend entirely on individual usage. -ifeq ($(ARCH_DATA_MODEL), 64) - ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc - # VS2010 default location is used when building 64 bit using the 7.1 SDK - # This is safe to hardwire as the SDK installer won't let you change it - # and the VS2010 variable is only used if the compilers are from the SDK - xVS2010 :="$(_program_files32)/Microsoft Visual Studio 10.0/" - VS2010 :=$(call FullPath,$(xVS2010)) - xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" - _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) - endif - ifneq ($(_vs100tools),) - _compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64 - x_redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT - _redist_sdk :=$(call FullPath,$(x_redist_sdk)) - # The SDK doesn't have the redist directory, but the DLL is installed - # into the windows directory. - ifeq ($(_redist_sdk),) - _redist_sdk :=c:/windows/system32 - endif - # Not currently using MSSDK7n, but maybe we can make use of it for - # doing default location lookup to find some SDK tools that presently - # require the developer to explicitly set the path. - # The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK. - # Either will work for us. - # If a developer chooses to install the standalone SDK in some other - # location, then this will fail to find it, which won't matter so long as - # we aren't using this variable. If we do they'd still need to set the - # ALT_MSDEVTOOLS_PATH as now. - # %WindowsSdkDir% could be referenced instead but the SDK installer - # doesn't set it and in the case of the VS2010 compilers, - # you can't change this location in the installer anyway. - xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/" - MSSDK7n :=$(call FullPath,$(xMSSDK7n)) - ifeq ($(MSSDK7n),) - xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/" - MSSDK7n :=$(call FullPath,$(xMSSDK7n)) - endif - else + + # Compilers for 64bit may be from the free SDK, or Visual Studio Professional. + ifeq ($(ARCH_DATA_MODEL), 64) xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/" VS2008 :=$(call FullPath,$(xVS2008)) ifneq ($(VS2008),) @@ -391,7 +443,8 @@ ifeq ($(ARCH_DATA_MODEL), 64) endif endif endif -endif + +endif # VS2010_EXISTS # Location on system where jdk installs might be ifneq ($(_program_files),) @@ -509,7 +562,7 @@ MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH) ifeq ($(ARCH_DATA_MODEL), 32) _NEEDS_MSVCRNN = true else - ifneq ($(VS2010),) + ifeq ($(VS2010_EXISTS),true) _NEEDS_MSVCRNN = true else ifneq ($(VS2008),) diff --git a/jdk/make/common/shared/Defs.gmk b/jdk/make/common/shared/Defs.gmk index 43e27a5a4ca..aae5e6d85f0 100644 --- a/jdk/make/common/shared/Defs.gmk +++ b/jdk/make/common/shared/Defs.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -373,6 +373,9 @@ OUTPUTDIR:=$(call AltCheckValue,OUTPUTDIR) # Get platform specific settings # NB: OUTPUTDIR must be defined. Otherwise hotspot import detection will not work correctly # On other hand this must be included early as it provides platform specific defines such as FullPath +include $(JDK_MAKE_SHARED_DIR)/Defs-versions.gmk + +# Get platform specific settings (defines COMPILER_PATH) include $(JDK_MAKE_SHARED_DIR)/Defs-$(PLATFORM).gmk # Components @@ -608,24 +611,9 @@ else COPYRIGHT_YEAR = $(shell $(DATE) '+%Y') endif -# Windows uses Microsoft compilers by default -ifeq ($(PLATFORM), windows) - override CC_VERSION = msvc -endif - -# Solaris uses Sun Studio compilers by default -ifeq ($(PLATFORM), solaris) - override CC_VERSION = sun -endif - -# Linux uses GNU compilers by default -ifeq ($(PLATFORM), linux) - override CC_VERSION = gcc -endif - -# Get the REQUIRED versions (needs CC_VERSION set) -include $(JDK_MAKE_SHARED_DIR)/Defs-versions.gmk - -# Get the compiler specific settings +# Get the compiler specific settings (will run the compiler to find out) +# NOTE: COMPILER_PATH must be set by this time. +# Up until we include this file, we don't know what specific compiler +# version is actually being used (i.e. what is in PATH or COMPILER_PATH). include $(JDK_MAKE_SHARED_DIR)/Compiler-$(CC_VERSION).gmk diff --git a/jdk/make/common/shared/Sanity-Settings.gmk b/jdk/make/common/shared/Sanity-Settings.gmk index 75e0cc86bcb..d18ccf76758 100644 --- a/jdk/make/common/shared/Sanity-Settings.gmk +++ b/jdk/make/common/shared/Sanity-Settings.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -100,7 +100,8 @@ ifeq ($(PLATFORM),windows) ifneq ($(MSVCRNN_DLL),) ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH) endif - ALL_SETTINGS+=$(call addAltSetting,MSDEVTOOLS_PATH) + ALL_SETTINGS+=$(call addRequiredSetting,INCLUDE) + ALL_SETTINGS+=$(call addRequiredSetting,LIB) endif ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_NAME) ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_VERSION) @@ -223,6 +224,7 @@ ifeq ($(PLATFORM),windows) ALL_SETTINGS+=$(call addAltSetting,DXSDK_PATH) ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH) ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH) + ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR) ifndef OPENJDK ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK) ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK) diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk index 6b545159d54..b53f73bfdbd 100644 --- a/jdk/make/common/shared/Sanity.gmk +++ b/jdk/make/common/shared/Sanity.gmk @@ -1020,10 +1020,11 @@ ifeq ($(PLATFORM), solaris) endif ###################################################### -# Check for existence of MSDEVTOOLS_PATH on windows +# Check for existence of the extra tools on windows ###################################################### sane-msdevtools_path: ifeq ($(PLATFORM), windows) + ifneq ($(COMPILER_VERSION), VS2010) @if [ "$(MSDEVTOOLS_PATH)" != "" -a ! -r "$(MSDEVTOOLS_PATH)" ]; then \ $(ECHO) "ERROR: You do not have a valid MSDEVTOOLS_PATH setting. \n" \ " Please check your access to \n" \ @@ -1031,6 +1032,7 @@ ifeq ($(PLATFORM), windows) " and/or check your value of ALT_MSDEVTOOLS_PATH. \n" \ "" >> $(ERROR_FILE) ; \ fi + endif endif ###################################################### @@ -1439,10 +1441,24 @@ ifeq ($(PLATFORM), windows) endif ###################################################### -# Check for existence of INSTALL_MSSDK on windows +# Check for existence of the MSSDK on windows ###################################################### sane-install-mssdk_path: ifeq ($(PLATFORM), windows) + ifeq ($(COMPILER_VERSION), VS2010) + @if [ -z "$(WINDOWSSDKDIR)" ]; then \ + $(ECHO) "WARNING: Your WINDOWSSDKDIR setting is empty.\n" \ + " It is recommended to set ALT_WINDOWSSDKDIR.\n" \ + "" >> $(WARNING_FILE) ; \ + fi + @if [ ! -r "$(WINDOWSSDKDIR)" ]; then \ + $(ECHO) "ERROR: You do not have a valid WINDOWSSDKDIR setting. \n" \ + " Please check your access to \n" \ + " $(WINDOWSSDKDIR) \n" \ + " and/or check your value of ALT_WINDOWSSDKDIR. \n" \ + "" >> $(ERROR_FILE) ; \ + fi + endif @if [ -z "$(INSTALL_MSSDK)" ]; then \ $(ECHO) "WARNING: Your INSTALL_MSSDK setting is empty.\n" \ " It is recommended to set ALT_INSTALL_MSSDK.\n" \ diff --git a/jdk/make/jdk_generic_profile.sh b/jdk/make/jdk_generic_profile.sh index 4363a1b710e..151ecb65132 100644 --- a/jdk/make/jdk_generic_profile.sh +++ b/jdk/make/jdk_generic_profile.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 @@ -82,7 +82,6 @@ # ALT_CLOSED_JDK_IMPORT_PATH # Windows Only: # ALT_UNIXCOMMAND_PATH -# ALT_MSDEVTOOLS_PATH # ALT_DXSDK_PATH # ALT_MSVCRT_DLL_PATH # ALT_MSVCR71_DLL_PATH @@ -221,8 +220,6 @@ else # VisualStudio .NET 2003 VC++ 7.1 (VS71COMNTOOLS should be defined) vs_root=$(${cygpath} "${VS71COMNTOOLS}/../..") # Fill in PATH, LIB, and INCLUDE (unset all others to make sure) - msdev_root="${vs_root}/Common7/Tools" - msdevtools_path="${msdev_root}/bin" vc7_root="${vs_root}/Vc7" compiler_path="${vc7_root}/bin" platform_sdk="${vc7_root}/PlatformSDK" @@ -260,12 +257,6 @@ else else compiler_path="${platform_sdk}/Bin/win64/x86/AMD64" fi - if [ "${ALT_MSDEVTOOLS_PATH}" != "" ] ; then - msdevtools_path=${ALT_MSDEVTOOLS_PATH} - else - msdevtools_path="${platform_sdk}/Bin/win64/x86/AMD64" - fi - msdevtools_path="${compiler_path}" # LIB and INCLUDE must use ; as a separator include4sdk="${platform_sdk}/Include" include4sdk="${include4sdk};${platform_sdk}/Include/crt/sys" -- GitLab From 213481a24b80d7fd3fca25a250d020fa2ce35c48 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 22 Dec 2010 12:25:52 -0800 Subject: [PATCH 06/17] 7003845: README-builds document proper location of forest extension, provide alternatives Reviewed-by: robilad --- README | 38 +- README-builds.html | 1184 ++++++++++++++++++++------------------ get_source.sh | 33 ++ make/scripts/hgforest.sh | 104 ++++ 4 files changed, 790 insertions(+), 569 deletions(-) create mode 100644 get_source.sh create mode 100644 make/scripts/hgforest.sh diff --git a/README b/README index eef68df24a7..722131d683f 100644 --- a/README +++ b/README @@ -1,28 +1,38 @@ README: - This file should be located at the top of the OpenJDK Mercurial repository - forest. This top or enclosing repository will include a "make" directory, - and a Makefile at the very top of the repository. - It should also include the 6 repositories: "jdk", "hotspot", "langtools", - "corba", "jaxws" and "jaxp". + This file should be located at the top of the OpenJDK Mercurial root + repository. This root repository will include a "make" directory, + and a Makefile for building the entire OpenJDK. + A full OpenJDK repository set (forest) should also include the following + 6 nested repositories: + "jdk", "hotspot", "langtools", "corba", "jaxws" and "jaxp". + There are also several source downloads for the jax* repositories that + will be needed. + + This one root repository can be obtained with something like: + hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7 + To make sure you have all the nested repositories, you can run: + cd openjdk7 && sh ./get_source.sh + (This is identical to using the Mercurial Forest Extension command + 'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7'). + People unfamiliar with Mercurial should read the first few chapters of + the Mercurial book: http://hgbook.red-bean.com/read/ See http://openjdk.java.net/ for more information about the OpenJDK. Simple Build Instructions: + + 0. Get the necessary system software/packages installed on your system, see + http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html - 1. Download and install a JDK 6 from + 1. If you don't have a jdk6 installed, download and install a JDK 6 from http://java.sun.com/javase/downloads/index.jsp - Set the environment variable ALT_BOOTDIR to the location of this JDK 6. + Set the environment variable ALT_BOOTDIR to the location of JDK 6. - 2. Download and install the Binary Plugs for the most recent JDK7 from - http://download.java.net/openjdk/jdk7/ - Set the environment variable ALT_BINARY_PLUGS_PATH to the location of - these binary plugs. - - 3. Check the sanity of doing a build with the current machine: + 2. Check the sanity of doing a build with your current system: gnumake sanity See README-builds.html if you run into problems. - 4. Do a complete build of the jdk: + 3. Do a complete build of the OpenJDK: gnumake all The resulting JDK image should be found in build/*/j2sdk-image diff --git a/README-builds.html b/README-builds.html index 1c2504c4dc5..dd5005ee091 100644 --- a/README-builds.html +++ b/README-builds.html @@ -24,12 +24,12 @@

Introduction

- This README file contains build instructions for the - OpenJDK. - Building the source code for the - OpenJDK - requires - a certain degree of technical expertise. + This README file contains build instructions for the + OpenJDK. + Building the source code for the + OpenJDK + requires + a certain degree of technical expertise.

@@ -37,18 +37,23 @@
+ + +
+

Use of Mercurial

+
+ The OpenJDK sources are maintained with the revision control system + Mercurial. + If you are new to Mercurial, please see the + Beginner Guides + or refer to the Mercurial Book. + The first few chapters of the book provide an excellent overview of + Mercurial, what it is and how it works. +
+ For using Mercurial with the OpenJDK refer to the + + Developer Guide: Installing and Configuring Mercurial + section for more information. + The Forest Extension is not part of the Mercurial install, + and is optional, + but can be obtained with the following commands: +
+ + hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ YourHgForest + +
+ Once you have the file forest.py, you need to add these + lines to your ${HOME}/.hgrc file: +
+ + [extensions] +
forest = YourHgForest/forest.py + +
+ + +

Getting the Source

+
+ To get the entire set of OpenJDK Mercurial repositories + using the Forest Extension: +
+ + hg fclone http://openjdk.java.net/jdk7/jdk7 YourOpenJDK + +
+ To get the entire set of OpenJDK Mercurial repositories + without using the Forest Extension: +
+ + hg clone http://openjdk.java.net/jdk7/jdk7 YourOpenJDK +
cd YourOpenJDK +
sh ./get_source.sh + +
+ Once you have all the repositories, the + script make/scripts/hgforest.sh + can be used to repeat the same hg + command on every repository in the forest, e.g. +
+ + cd YourOpenJDK +
sh ./make/scripts/hgforest.sh pull -u + +
+ You may find this script make/scripts/hgforest.sh faster + than the hg forest commands provided by the + Forest Extension. +
+ +
+

Minimum Build Environments

@@ -116,8 +192,8 @@ specific platforms, and in fact creating these specific platforms may be difficult due to the age of some of this software.

- The minimum OS and C/C++ compiler versions needed for building the - OpenJDK: + The minimum OS and C/C++ compiler versions needed for building the + OpenJDK:

@@ -146,7 +222,7 @@ @@ -156,7 +232,7 @@ @@ -166,7 +242,7 @@ @@ -176,7 +252,7 @@ @@ -195,14 +271,14 @@
Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS
-

+

These same sources do indeed build on many more systems than the above older generation systems, again the above is just a minimum. -

+

Compilation problems with newer or different C/C++ compilers is a common problem. Similarly, compilation problems related to changes to the - /usr/include or system header files is also a + /usr/include or system header files is also a common problem with newer or unreleased OS versions. Please report these types of problems as bugs so that they can be dealt with accordingly. @@ -217,57 +293,57 @@

Fedora

-

Fedora 9

-

-

- After installing Fedora 9 +

Fedora 9

+

+

+ After installing Fedora 9 you need to install several build dependencies. The simplest way to do it is to execute the following commands as user - root: -

- yum-builddep java-openjdk -

- yum install gcc gcc-c++ -

+ root: +

+ yum-builddep java-openjdk +

+ yum install gcc gcc-c++ +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk +

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk

-

Fedora 10

-

-

- After installing Fedora 10 +

Fedora 10

+

+

+ After installing Fedora 10 you need to install several build dependencies. The simplest way to do it is to execute the following commands as user - root: -

- yum-builddep java-1.6.0-openjdk -

- yum install gcc gcc-c++ -

+ root: +

+ yum-builddep java-1.6.0-openjdk +

+ yum install gcc gcc-c++ +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk +

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk

-

Fedora 11

-

-

- After installing Fedora 11 +

Fedora 11

+

+

+ After installing Fedora 11 you need to install several build dependencies. The simplest way to do it is to execute the following commands as user - root: -

- yum-builddep java-1.6.0-openjdk -

- yum install gcc gcc-c++ -

+ root: +

+ yum-builddep java-1.6.0-openjdk +

+ yum install gcc gcc-c++ +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk +

CentOS 5.2

@@ -285,7 +361,7 @@

- Plus the following packages: + Plus the following packages:

  • cups devel: Cups Development Package
    • @@ -295,188 +371,188 @@

- 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 - - the freetype site. - Build and install with something like: + 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 + + the freetype site. + Build and install with something like:

./configure && make && sudo -u root make install

- Mercurial packages could not be found easily, but a Google - search should find ones, and they usually include Python if - it's needed. + Mercurial packages could not be found easily, but a Google + search should find ones, and they usually include Python if + it's needed.

Debian

Debian 5.0 (Lenny)

-

+
After installing Debian 5 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands as user root: -

- aptitude build-dep openjdk-6 -

- aptitude install openjdk-6-jdk libmotif-dev -

+

+ aptitude build-dep openjdk-6 +

+ aptitude install openjdk-6-jdk libmotif-dev +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

-

Ubuntu

+

Ubuntu

Ubuntu 8.04

-

+
After installing Ubuntu 8.04 you need to install several build dependencies. -

+

First, you need to enable the universe repository in the Software Sources application and reload the repository information. The Software Sources application is available under the System/Administration menu. -

+

The simplest way to install the build dependencies is to execute the following commands: -

- sudo aptitude build-dep openjdk-6 -

- sudo aptitude install openjdk-6-jdk -

+

+ sudo aptitude build-dep openjdk-6 +

+ sudo aptitude install openjdk-6-jdk +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

-

Ubuntu 8.10

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

+

Ubuntu 8.10

-

+
After installing Ubuntu 8.10 you need to install several build dependencies. The simplest way to do it is to execute the following commands: -

- sudo aptitude build-dep openjdk-6 -

- sudo aptitude install openjdk-6-jdk -

+

+ sudo aptitude build-dep openjdk-6 +

+ sudo aptitude install openjdk-6-jdk +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

-

Ubuntu 9.04

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

+

Ubuntu 9.04

-

+
After installing Ubuntu 9.04 you need to install several build dependencies. The simplest way to do it is to execute the following commands: -

- sudo aptitude build-dep openjdk-6 -

- sudo aptitude install openjdk-6-jdk -

+

+ sudo aptitude build-dep openjdk-6 +

+ sudo aptitude install openjdk-6-jdk +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

OpenSUSE

OpenSUSE 11.1

-

+
After installing OpenSUSE 11.1 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands: -

- sudo zypper source-install -d java-1_6_0-openjdk -

- sudo zypper install make -

+

+ sudo zypper source-install -d java-1_6_0-openjdk +

+ sudo zypper install make +

In addition, it is necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk +

Finally, you need to unset the JAVA_HOME environment variable: -

- export -n JAVA_HOME -

-
+

+ export -n JAVA_HOME +

+

Mandriva

Mandriva Linux One 2009 Spring

-

+
After installing Mandriva Linux One 2009 Spring you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands as user root: -

- urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel +

+ urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel

In addition, it is necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk +

OpenSolaris

OpenSolaris 2009.06

-

+
After installing OpenSolaris 2009.06 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands: -

- pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2 +

+ pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2

In addition, it is necessary to set a few environment variables for the build: -

- export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/ -

+

+ export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/ +

Finally, you need to make sure that the build process can find the Sun Studio compilers: -

- export PATH=$PATH:/opt/SunStudioExpress/bin/ -

+

+ export PATH=$PATH:/opt/SunStudioExpress/bin/ +

Source Directory Structure

- The source code for the OpenJDK is delivered in a set of - directories: - hotspot, - langtools, - corba, - jaxws, - jaxp, - and - jdk. - The hotspot directory contains the source code and make - files for building the OpenJDK Hotspot Virtual Machine. - The langtools directory contains the source code and make - files for building the OpenJDK javac and language tools. - The corba directory contains the source code and make - files for building the OpenJDK Corba files. - The jaxws directory contains the source code and make - files for building the OpenJDK JAXWS files. - The jaxp directory contains the source code and make - files for building the OpenJDK JAXP files. - The jdk directory contains the source code and make files for - building the OpenJDK runtime libraries and misc files. - The top level Makefile - is used to build the entire OpenJDK. + The source code for the OpenJDK is delivered in a set of + directories: + hotspot, + langtools, + corba, + jaxws, + jaxp, + and + jdk. + The hotspot directory contains the source code and make + files for building the OpenJDK Hotspot Virtual Machine. + The langtools directory contains the source code and make + files for building the OpenJDK javac and language tools. + The corba directory contains the source code and make + files for building the OpenJDK Corba files. + The jaxws directory contains the source code and make + files for building the OpenJDK JAXWS files. + The jaxp directory contains the source code and make + files for building the OpenJDK JAXP files. + The jdk directory contains the source code and make files for + building the OpenJDK runtime libraries and misc files. + The top level Makefile + is used to build the entire OpenJDK.

@@ -495,10 +571,10 @@ ALT_* variables (alternates) can be used to help the makefiles locate components.

- Refer to the bash/sh/ksh setup file - jdk/make/jdk_generic_profile.sh - if you need help in setting up your environment variables. - A build could be as simple as: + Refer to the bash/sh/ksh setup file + jdk/make/jdk_generic_profile.sh + if you need help in setting up your environment variables. + A build could be as simple as: 


                 bash
@@ -507,12 +583,12 @@

- Of course ksh or sh would work too. - But some customization will probably be necessary. - The sanity rule will make some basic checks on build - dependencies and generate appropriate warning messages - regarding missing, out of date, or newer than expected components - found on your system. + Of course ksh or sh would work too. + But some customization will probably be necessary. + The sanity rule will make some basic checks on build + dependencies and generate appropriate warning messages + regarding missing, out of date, or newer than expected components + found on your system.

@@ -559,14 +635,14 @@ version that has this problem fixed. The older 3.80 version of make.exe can be downloaded with this - link. + link. Use of this older 3.80 make.exe may require that you install the libintl2.dll library or libintl2 cygwin package which is no longer installed by default by the cygwin installer.
Also see the - mozilla developer center + mozilla developer center on this topic.
It's hoped that when make 3.82 starts shipping in a future cygwin @@ -574,19 +650,19 @@ In addition to the above 3.80 make.exe you can download this - www.cmake.org make.exe which will not have a libintl2.dll + www.cmake.org make.exe which will not have a libintl2.dll dependency.

- Information on GNU make, and access to ftp download sites, are - available on the - - GNU make web site - . - The latest source to GNU make is available at - - ftp.gnu.org/pub/gnu/make/. + Information on GNU make, and access to ftp download sites, are + available on the + + GNU make web site + . + The latest source to GNU make is available at + + ftp.gnu.org/pub/gnu/make/.

@@ -597,27 +673,27 @@ is a Pentium class processor or better, at least 256 MB of RAM, and approximately 1.5 GB of free disk space.

- X64 only: - The minimum recommended hardware for building the Linux - version is an AMD Opteron class processor, at least 512 MB of RAM, and - approximately 4 GB of free disk space. + X64 only: + The minimum recommended hardware for building the Linux + version is an AMD Opteron class processor, at least 512 MB of RAM, and + approximately 4 GB of free disk space.

- The build will use the tools contained in - /bin and - /usr/bin - of a standard installation of the Linux operating environment. - You should ensure that these directories are in your - PATH. + The build will use the tools contained in + /bin and + /usr/bin + of a standard installation of the Linux operating environment. + You should ensure that these directories are in your + PATH.

- Note that some Linux systems have a habit of pre-populating - your environment variables for you, for example JAVA_HOME - might get pre-defined for you to refer to the JDK installed on - your Linux system. - You will need to unset JAVA_HOME. - It's a good idea to run env and verify the - environment variables you are getting from the default system - settings make sense for building the - OpenJDK. + Note that some Linux systems have a habit of pre-populating + your environment variables for you, for example JAVA_HOME + might get pre-defined for you to refer to the JDK installed on + your Linux system. + You will need to unset JAVA_HOME. + It's a good idea to run env and verify the + environment variables you are getting from the default system + settings make sense for building the + OpenJDK.

Basic Linux Check List

@@ -639,7 +715,7 @@
  • Install or upgrade the FreeType development - package. + package.
  • Install @@ -660,23 +736,23 @@ Approximately 1.4 GB of free disk space is needed for a 32-bit build.

    - If you are building the 64-bit version, you should - run the command "isainfo -v" to verify that you have a - 64-bit installation, it should say sparcv9 or - amd64. - An additional 7 GB of free disk space is needed - for a 64-bit build. + If you are building the 64-bit version, you should + run the command "isainfo -v" to verify that you have a + 64-bit installation, it should say sparcv9 or + amd64. + An additional 7 GB of free disk space is needed + for a 64-bit build.

    - The build uses the tools contained in /usr/ccs/bin - and /usr/bin of a standard developer or full installation of - the Solaris operating environment. + The build uses the tools contained in /usr/ccs/bin + and /usr/bin of a standard developer or full installation of + the Solaris operating environment.

    - Solaris patches specific to the JDK can be downloaded from the - - SunSolve JDK Solaris patches download page. - You should ensure that the latest patch cluster for - your version of the Solaris operating environment has also - been installed. + Solaris patches specific to the JDK can be downloaded from the + + SunSolve JDK Solaris patches download page. + You should ensure that the latest patch cluster for + your version of the Solaris operating environment has also + been installed.

    Basic Solaris Check List

    @@ -731,10 +807,10 @@ because FAT32 doesn't support case-sensitivity in file names.

    - X64 only: - The minimum recommended hardware for building - the Windows X64 version is an AMD Opteron class processor, at least 1 - GB of RAM, and approximately 10 GB of free disk space. + X64 only: + The minimum recommended hardware for building + the Windows X64 version is an AMD Opteron class processor, at least 1 + GB of RAM, and approximately 10 GB of free disk space.

    Windows Paths

    @@ -753,18 +829,18 @@ (called 'mixed'), e.g. cygpath -s -m "path".

    - The makefiles will try to translate any pathnames supplied - to it into the C:/ style automatically. + The makefiles will try to translate any pathnames supplied + to it into the C:/ style automatically.

    - Note that use of CYGWIN creates a unique problem with regards to - setting PATH. Normally on Windows - the PATH variable contains directories - separated with the ";" character (Solaris and Linux uses ":"). - With CYGWIN, it uses ":", but that means that paths like "C:/path" - cannot be placed in the CYGWIN version of PATH and - instead CYGWIN uses something like /cygdrive/c/path - which CYGWIN understands, but only CYGWIN understands. - So be careful with paths on Windows. + Note that use of CYGWIN creates a unique problem with regards to + setting PATH. Normally on Windows + the PATH variable contains directories + separated with the ";" character (Solaris and Linux uses ":"). + With CYGWIN, it uses ":", but that means that paths like "C:/path" + cannot be placed in the CYGWIN version of PATH and + instead CYGWIN uses something like /cygdrive/c/path + which CYGWIN understands, but only CYGWIN understands. + So be careful with paths on Windows.

    Basic Windows Check List

    @@ -828,7 +904,7 @@ JDK 6, this is often called a bootstrap JDK. The JDK 6 binaries can be downloaded from Sun's JDK 6 download site. + target="_blank">JDK 6 download site. For build performance reasons is very important that this bootstrap JDK be made available on the local disk of the machine doing the build. @@ -841,12 +917,12 @@ in the PATH environment variable, although it's not required.

    - Solaris: - Some pre-installed JDK images may be available to you in the - directory /usr/jdk/instances. - If you don't set - ALT_BOOTDIR - the makefiles will look in that location for a JDK it can use. + Solaris: + Some pre-installed JDK images may be available to you in the + directory /usr/jdk/instances. + If you don't set + ALT_BOOTDIR + the makefiles will look in that location for a JDK it can use.

    Binary Plugs

    @@ -896,7 +972,7 @@ All OpenJDK builds require access to least Ant 1.6.5. The Ant tool is available from the - Ant download site. + Ant download site. You should always make sure ant is in your PATH, and on Windows you may also need to set ANT_HOME @@ -908,7 +984,7 @@

    Certificate Authority File (cacert)

    See - http://en.wikipedia.org/wiki/Certificate_Authority + http://en.wikipedia.org/wiki/Certificate_Authority for a better understanding of the Certificate Authority (CA). A certificates file named "cacerts" represents a system-wide keystore with CA certificates. @@ -942,121 +1018,121 @@
    At a minimum, the - Sun Studio 12 Update 1 Compilers + Sun Studio 12 Update 1 Compilers (containing version 5.10 of the C and C++ compilers) is required, including specific patches. -

    +

    The Solaris SPARC patch list is: -

      -
    • - 118683-05: SunOS 5.10: Patch for profiling libraries and assembler -
      • -
    • - 119963-21: SunOS 5.10: Shared library patch for C++ -
      • -
    • - 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch -
      • -
    • - 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler -
      • -
    • - 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 -
      • -
    • - 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler -
      • -
    • - 142371-01: Sun Studio 12.1 Update 1: Patch for dbx -
      • -
    • - 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling -
      • -
    • - 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 -
      • -
    • - 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools -
      • +
        +
      • + 118683-05: SunOS 5.10: Patch for profiling libraries and assembler +
        • +
      • + 119963-21: SunOS 5.10: Shared library patch for C++ +
        • +
      • + 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch +
        • +
      • + 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler +
        • +
      • + 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 +
        • +
      • + 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler +
        • +
      • + 142371-01: Sun Studio 12.1 Update 1: Patch for dbx +
        • +
      • + 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling +
        • +
      • + 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 +
        • +
      • + 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools +

      - The Solaris X86 patch list is: + The Solaris X86 patch list is:

        -
      • - 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler -
        • -
      • - 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 -
        • -
      • - 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch -
        • -
      • - 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend -
        • -
      • - 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler -
        • -
      • - 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler -
        • -
      • - 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools -
        • +
      • + 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler +
        • +
      • + 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 +
        • +
      • + 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch +
        • +
      • + 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend +
        • +
      • + 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler +
        • +
      • + 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler +
        • +
      • + 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools +

      - Set - ALT_COMPILER_PATH - to point to the location of - the compiler binaries, and place this location in the PATH. + Set + ALT_COMPILER_PATH + to point to the location of + the compiler binaries, and place this location in the PATH.

      - The Oracle Solaris Studio Express compilers at: - - Oracle Solaris Studio Express Download site - are also an option, although these compilers have not - been extensively used yet. + The Oracle Solaris Studio Express compilers at: + + Oracle Solaris Studio Express Download site + are also an option, although these compilers have not + been extensively used yet.

    Windows i586: Microsoft Visual Studio 2010 Compilers
    -

    -BEGIN WARNING: At this time (Spring/Summer 2010) JDK 7 is starting a transition to -use the newest VS2010 Microsoft compilers. These build instructions are updated -to show where we are going. We have a QA process to go through before -official builds actually use VS2010. So for now, official builds are -still using VS2003. No other compilers are known to build the entire JDK, -including non-open portions. -So for now you should be able to build with either VS2003 or VS2010. -We do not guarantee that VS2008 will work, although there is sufficient -makefile support to make at least basic JDK builds plausible. -Visual Studio 2010 Express compilers are now able to build all the -open source repositories, but this is 32 bit only. To build 64 bit -Windows binaries use the the 7.1 Windows SDK.END WARNING. -

    - The 32-bit OpenJDK Windows build - requires - Microsoft Visual Studio C++ 2010 (VS2010) Professional - Edition or Express compiler. - The compiler and other tools are expected to reside - in the location defined by the variable - VS100COMNTOOLS which - is set by the Microsoft Visual Studio installer. +

    + BEGIN WARNING: At this time (Spring/Summer 2010) JDK 7 is starting a transition to + use the newest VS2010 Microsoft compilers. These build instructions are updated + to show where we are going. We have a QA process to go through before + official builds actually use VS2010. So for now, official builds are + still using VS2003. No other compilers are known to build the entire JDK, + including non-open portions. + So for now you should be able to build with either VS2003 or VS2010. + We do not guarantee that VS2008 will work, although there is sufficient + makefile support to make at least basic JDK builds plausible. + Visual Studio 2010 Express compilers are now able to build all the + open source repositories, but this is 32 bit only. To build 64 bit + Windows binaries use the the 7.1 Windows SDK.END WARNING. +

    + The 32-bit OpenJDK Windows build + requires + Microsoft Visual Studio C++ 2010 (VS2010) Professional + Edition or Express compiler. + The compiler and other tools are expected to reside + in the location defined by the variable + VS100COMNTOOLS which + is set by the Microsoft Visual Studio installer.

    - Once the compiler is installed, - it is recommended that you run VCVARS32.BAT - to set the compiler environment variables - INCLUDE, - LIB, and - PATH - prior to building the - OpenJDK. - The above environment variables MUST be set. - This compiler also contains the Windows SDK v 7.0a, - which is an update to the Windows 7 SDK. + Once the compiler is installed, + it is recommended that you run VCVARS32.BAT + to set the compiler environment variables + INCLUDE, + LIB, and + PATH + prior to building the + OpenJDK. + The above environment variables MUST be set. + This compiler also contains the Windows SDK v 7.0a, + which is an update to the Windows 7 SDK.

    - WARNING: Make sure you check out the - CYGWIN link.exe WARNING. - The path /usr/bin must be after the path to the - Visual Studio product. + WARNING: Make sure you check out the + CYGWIN link.exe WARNING. + The path /usr/bin must be after the path to the + Visual Studio product.

    Windows x64: Microsoft Visual Studio 2010 Professional Compiler
    @@ -1069,22 +1145,22 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. you have VS2010 Professional.
    Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers. - For a free alternative for 64 bit builds, use the 7.1 SDK. - Microsoft say that to set up your paths for this run -
    +                For a free alternative for 64 bit builds, use the 7.1 SDK.
+                Microsoft say that to set up your paths for this run
+                
         c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64.
-
    
-                   What was tested is just directly setting up LIB, INCLUDE,
-                   PATH and based on the installation directories using the
-                   DOS short name appropriate for the system, (you will
-                   need to set them for yours, not just blindly copy this) eg :
-
    +                
    
+                What was tested is just directly setting up LIB, INCLUDE,
+                PATH and based on the installation directories using the
+                DOS short name appropriate for the system, (you will
+                need to set them for yours, not just blindly copy this) eg :
+                
         set VSINSTALLDIR=c:\PROGRA~2\MICROS~1.0
     set WindowsSdkDir=c:\PROGRA~1\MICROS~1\Windows\v7.1
     set PATH=%VSINSTALLDIR%\vc\bin\amd64;%VSINSTALLDIR%\Common7\IDE;%WindowsSdkDir%\bin;%PATH%
     set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include
     set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64
-
    
+

    Zip and Unzip

    @@ -1110,41 +1186,41 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. Companion CD/DVD, these often will be installed into /opt/sfw/cups.

    - Linux: - CUPS header files are required for building the - OpenJDK on Linux. - The Linux header files are usually available from a "cups" - development package, it's recommended that you try and use - the package provided by the particular version of Linux that - you are using. + Linux: + CUPS header files are required for building the + OpenJDK on Linux. + The Linux header files are usually available from a "cups" + development package, it's recommended that you try and use + the package provided by the particular version of Linux that + you are using.

    - The CUPS header files can always be downloaded from - www.cups.org. - The variable - ALT_CUPS_HEADERS_PATH - can be used to override the default location of the - CUPS Header files. + The CUPS header files can always be downloaded from + www.cups.org. + The variable + ALT_CUPS_HEADERS_PATH + can be used to override the default location of the + CUPS Header files.

    XRender Extension Headers (Solaris & Linux)

    - Solaris: - XRender header files are required for building the - OpenJDK on Solaris. - The XRender header file is included with the other X11 header files - in the package SFWxwinc on new enough versions of - Solaris and will be installed in - /usr/X11/include/X11/extensions/Xrender.h + Solaris: + XRender header files are required for building the + OpenJDK on Solaris. + The XRender header file is included with the other X11 header files + in the package SFWxwinc on new enough versions of + Solaris and will be installed in + /usr/X11/include/X11/extensions/Xrender.h

    - Linux: - XRender header files are required for building the - OpenJDK on Linux. - The Linux header files are usually available from a "Xrender" - development package, it's recommended that you try and use - the package provided by the particular distribution of Linux that - you are using. -

    + Linux: + XRender header files are required for building the + OpenJDK on Linux. + The Linux header files are usually available from a "Xrender" + development package, it's recommended that you try and use + the package provided by the particular distribution of Linux that + you are using. +

    FreeType 2

    @@ -1155,31 +1231,31 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. Note that you need development version of package that includes both FreeType library and header files.

    - You can always download latest FreeType version from the - FreeType website. + You can always download latest FreeType version from the + FreeType website.

    - Makefiles will try to pick FreeType from /usr/lib and /usr/include. - In case it is installed elsewhere you will need to set environment - variables - ALT_FREETYPE_LIB_PATH - and - ALT_FREETYPE_HEADERS_PATH - to refer to place where library and header files are installed. + Makefiles will try to pick FreeType from /usr/lib and /usr/include. + In case it is installed elsewhere you will need to set environment + variables + ALT_FREETYPE_LIB_PATH + and + ALT_FREETYPE_HEADERS_PATH + to refer to place where library and header files are installed.

    - Building the freetype 2 libraries from scratch is also possible, - however on Windows refer to the - - Windows FreeType DLL build instructions. + Building the freetype 2 libraries from scratch is also possible, + however on Windows refer to the + + Windows FreeType DLL build instructions.

    - Note that by default FreeType is built with byte code hinting - support disabled due to licensing restrictions. - In this case, text appearance and metrics are expected to - differ from Sun's official JDK build. - See - - the SourceForge FreeType2 Home Page - - for more information. + Note that by default FreeType is built with byte code hinting + support disabled due to licensing restrictions. + In this case, text appearance and metrics are expected to + differ from Sun's official JDK build. + See + + the SourceForge FreeType2 Home Page + + for more information.

    Advanced Linux Sound Architecture (ALSA) (Linux only)

    @@ -1195,25 +1271,25 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. The makefiles will check this emit a sanity error if it is missing or the wrong version.

    - In particular, older Linux systems will likely not have the - right version of ALSA installed, for example - Redhat AS 2.1 U2 and SuSE 8.1 do not include a sufficiently - recent ALSA distribution. - On rpm-based systems, you can see if ALSA is installed by - running this command: + In particular, older Linux systems will likely not have the + right version of ALSA installed, for example + Redhat AS 2.1 U2 and SuSE 8.1 do not include a sufficiently + recent ALSA distribution. + On rpm-based systems, you can see if ALSA is installed by + running this command: 

                         rpm -qa | grep alsa
    Both alsa and alsa-devel packages are needed.

    - If your distribution does not come with ALSA, and you can't - find ALSA packages built for your particular system, - you can try to install the pre-built ALSA rpm packages from - - www.freshrpms.net. - Note that installing a newer ALSA could - break sound output if an older version of ALSA was previously - installed on the system, but it will enable JDK compilation. + If your distribution does not come with ALSA, and you can't + find ALSA packages built for your particular system, + you can try to install the pre-built ALSA rpm packages from + + www.freshrpms.net. + Note that installing a newer ALSA could + break sound output if an older version of ALSA was previously + installed on the system, but it will enable JDK compilation.

    Installation: execute as root
    [i586]: rpm -Uv --force alsa-lib-devel-0.9.1-rh61.i386.rpm
    @@ -1228,7 +1304,7 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
    As a last resort you can go to the - Advanced Linux Sound Architecture Site and build it from + Advanced Linux Sound Architecture Site and build it from source.
    Download driver and library @@ -1256,9 +1332,9 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. building the JDK platform. To actually use ALSA sound drivers, more steps are necessary as outlined in the documentation on ALSA's homepage.

    - ALSA can be uninstalled by executing make uninstall first in - the alsa-lib-0.9.1 directory and then in - alsa-driver-0.9.1. + ALSA can be uninstalled by executing make uninstall first in + the alsa-lib-0.9.1 directory and then in + alsa-driver-0.9.1.

    There are no ALT* variables to change the assumed locations of ALSA, the makefiles will expect to find the ALSA include files and library at: @@ -1273,15 +1349,15 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. on Windows which can be supplied by CYGWIN.

    - The OpenJDK build requires CYGWIN version 1.5.12 or newer. - Information about CYGWIN can - be obtained from the CYGWIN website at - www.cygwin.com. + The OpenJDK build requires CYGWIN version 1.5.12 or newer. + Information about CYGWIN can + be obtained from the CYGWIN website at + www.cygwin.com.

    - By default CYGWIN doesn't install all the tools required for building - the OpenJDK. - Along with the default installation, you need to install - the following tools. + By default CYGWIN doesn't install all the tools required for building + the OpenJDK. + Along with the default installation, you need to install + the following tools.

    @@ -1298,21 +1374,21 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. + utilities + NOTE: See the GNU make section + processor @@ -1354,21 +1430,21 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
    Devel binutils The GNU assembler, linker and binary - utilities
    make.exe Devel make The GNU version of the 'make' utility built for CYGWIN.
    - NOTE: See the GNU make section
    m4.exe Interpreters m4 GNU implementation of the traditional Unix macro - processor
    cpio.exe

    - Note that the CYGWIN software can conflict with other non-CYGWIN - software on your Windows system. - CYGWIN provides a - FAQ for - known issues and problems, of particular interest is the - section on - - BLODA (applications that interfere with CYGWIN). + Note that the CYGWIN software can conflict with other non-CYGWIN + software on your Windows system. + CYGWIN provides a + FAQ for + known issues and problems, of particular interest is the + section on + + BLODA (applications that interfere with CYGWIN).

    - WARNING: - Be very careful with link.exe, it will conflict - with the Visual Studio version. You need the Visual Studio - version of link.exe, not the CYGWIN one. - So it's important that the Visual Studio paths in PATH preceed - the CYGWIN path /usr/bin. + WARNING: + Be very careful with link.exe, it will conflict + with the Visual Studio version. You need the Visual Studio + version of link.exe, not the CYGWIN one. + So it's important that the Visual Studio paths in PATH preceed + the CYGWIN path /usr/bin. Microsoft DirectX 9.0 SDK header files and libraries

    @@ -1377,7 +1453,7 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. OpenJDK. This SDK can be downloaded from - Microsoft DirectX 9.0 SDK (Summer 2004). + Microsoft DirectX 9.0 SDK (Summer 2004). If the link above becomes obsolete, the SDK can be found from the Microsoft Download Site (search with "DirectX 9.0 SDK Update Summer 2004"). @@ -1431,14 +1507,14 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.

    • - Solaris: - Note that ARCH_DATA_MODEL is really only needed on Solaris to - indicate you want to built the 64-bit version. - And before the Solaris 64-bit binaries can be used, they - must be merged with the binaries from a separate 32-bit build. - The merged binaries may then be used in either 32-bit or 64-bit mode, with - the selection occurring at runtime - with the -d32 or -d64 options. + Solaris: + Note that ARCH_DATA_MODEL is really only needed on Solaris to + indicate you want to built the 64-bit version. + And before the Solaris 64-bit binaries can be used, they + must be merged with the binaries from a separate 32-bit build. + The merged binaries may then be used in either 32-bit or 64-bit mode, with + the selection occurring at runtime + with the -d32 or -d64 options.

    @@ -1450,37 +1526,39 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. The default output directory is build/platform, where platform is one of -
      -
    • solaris-sparc
      • -
    • solaris-sparcv9
      • -
    • solaris-i586
      • -
    • solaris-amd64
      • -
    • linux-i586
      • -
    • linux-amd64
      • -
    • windows-i586
      • -
    • windows-amd64
      • -
    +
    +
      +
    • solaris-sparc
      • +
    • solaris-sparcv9
      • +
    • solaris-i586
      • +
    • solaris-amd64
      • +
    • linux-i586
      • +
    • linux-amd64
      • +
    • windows-i586
      • +
    • windows-amd64
      • +
    +
    In particular, the build/platform/j2sdk-image/bin directory should contain executables for the OpenJDK tools and utilities.

    - You can test that the build completed properly by using the build - to run the various demos that you will find in the - build/platform/j2sdk-image/demo - directory. + You can test that the build completed properly by using the build + to run the various demos that you will find in the + build/platform/j2sdk-image/demo + directory.

    - The provided regression tests can be run with the jtreg - utility from - the jtreg site. + The provided regression tests can be run with the jtreg + utility from + the jtreg site.

    Environment/Make Variables

    - Some of the - environment or make variables (just called variables in this - document) that can impact the build are: + Some of the + environment or make variables (just called variables in this + document) that can impact the build are:

    PATH
    @@ -1488,11 +1566,11 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
    • The location of the GNU make binary
    • The location of the Bootstrap JDK java - (see Bootstrap JDK)
      • + (see Bootstrap JDK)
    • The location of the C/C++ compilers - (see compilers)
      • + (see compilers)
    • The location or locations for the Unix command utilities - (e.g. /usr/bin)
      • + (e.g. /usr/bin)
    MILESTONE
    @@ -1694,17 +1772,17 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. Look for the check list of the platform you are building on in the Table of Contents.

    - You can validate your build environment by using the sanity - target. - Any errors listed - will stop the build from starting, and any warnings may result in - a flawed product build. - We strongly encourage you to evaluate every - sanity check warning and fix it if required, before you proceed - further with your build. + You can validate your build environment by using the sanity + target. + Any errors listed + will stop the build from starting, and any warnings may result in + a flawed product build. + We strongly encourage you to evaluate every + sanity check warning and fix it if required, before you proceed + further with your build.

    - Some of the more common problems with builds are briefly described - below, with suggestions for remedies. + Some of the more common problems with builds are briefly described + below, with suggestions for remedies.

    • Slow Builds: @@ -1715,15 +1793,15 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. machine, setting it to more than the the number of CPUs is probably not a good idea).

      - Creating the javadocs can be very slow, if you are running - javadoc, consider skipping that step. + Creating the javadocs can be very slow, if you are running + javadoc, consider skipping that step.

      - Faster hardware and more RAM always helps too. - The VM build tends to be CPU intensive (many C++ compiles), - and the rest of the JDK will often be disk intensive. + Faster hardware and more RAM always helps too. + The VM build tends to be CPU intensive (many C++ compiles), + and the rest of the JDK will often be disk intensive.

      - Faster compiles are possible using a tool called - ccache. + Faster compiles are possible using a tool called + ccache.

    • @@ -1732,10 +1810,10 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. If you see warnings that refer to file time stamps, e.g.
      Warning message: File `xxx' has modification time in - the future. + the future.
      Warning message: Clock skew detected. Your build may - be incomplete. + be incomplete.
      These warnings can occur when the clock on the build machine is out of sync with the timestamps on the source files. Other errors, apparently @@ -1747,9 +1825,9 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. when the pre-1.4 compiler ran across the new assert keyword in the 1.4 source code.

      - If you see these warnings, reset the clock on the build - machine, run "gmake clobber" or delete the directory - containing the build output, and restart the build from the beginning. + If you see these warnings, reset the clock on the build + machine, run "gmake clobber" or delete the directory + containing the build output, and restart the build from the beginning.

    • @@ -1776,32 +1854,28 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
      This is probably an issue with SELinux (See - http://en.wikipedia.org/wiki/SELinux). + http://en.wikipedia.org/wiki/SELinux). Parts of the VM is built without the -fPIC for performance reasons.

      - To completely disable SELinux: - -

        -
      1. $ su root
        2. -
      2. # system-config-securitylevel
        3. -
      3. In the window that appears, select the SELinux tab
        4. -
      4. Disable SELinux
        5. -
      - + To completely disable SELinux: +
        +
      1. $ su root
        2. +
      2. # system-config-securitylevel
        3. +
      3. In the window that appears, select the SELinux tab
        4. +
      4. Disable SELinux
        5. +

      - Alternatively, instead of completely disabling it you could - disable just this one check. - -

        -
      1. Select System->Administration->SELinux Management
        2. -
      2. In the SELinux Management Tool which appears, + Alternatively, instead of completely disabling it you could + disable just this one check. +
          +
        1. Select System->Administration->SELinux Management
          2. +
        2. In the SELinux Management Tool which appears, select "Boolean" from the menu on the left
          3. -
        3. Expand the "Memory Protection" group
          4. -
        4. Check the first item, labeled +
        5. Expand the "Memory Protection" group
          6. +
        6. Check the first item, labeled "Allow all unconfined executables to use libraries requiring text relocation ..."
          7. -
        -         +
    • @@ -1810,7 +1884,7 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. The CYGWIN software can conflict with other non-CYGWIN software. See the CYGWIN FAQ section on - BLODA (applications that interfere with CYGWIN). + BLODA (applications that interfere with CYGWIN).
    • diff --git a/get_source.sh b/get_source.sh new file mode 100644 index 00000000000..bc609b3ee8d --- /dev/null +++ b/get_source.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# +# Copyright (c) 2010, Oracle and/or its affiliates. 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. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Get clones of all nested repositories +sh ./make/scripts/hgforest.sh clone + +# Update all existing repositories to the latest sources +sh ./make/scripts/hgforest.sh pull -u + diff --git a/make/scripts/hgforest.sh b/make/scripts/hgforest.sh new file mode 100644 index 00000000000..7834826d8eb --- /dev/null +++ b/make/scripts/hgforest.sh @@ -0,0 +1,104 @@ +#!/bin/sh + +# +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Shell script for a fast parallel forest command + +tmp=/tmp/forest.$$ +rm -f -r ${tmp} +mkdir -p ${tmp} + +# Remove tmp area on A. B. Normal termination +trap 'rm -f -r ${tmp}' KILL +trap 'rm -f -r ${tmp}' EXIT + +# Only look in specific locations for possible forests (avoids long searches) +pull_default="" +if [ "$1" = "clone" -o "$1" = "fclone" ] ; then + subrepos="corba jaxp jaxws langtools jdk hotspot" + if [ -f .hg/hgrc ] ; then + pull_default=`hg paths default` + fi + if [ "${pull_default}" = "" ] ; then + echo "ERROR: Need initial clone with 'hg paths default' defined" + exit 1 + fi + repos="" + for i in ${subrepos} ; do + if [ ! -f ${i}/.hg/hgrc ] ; then + repos="${repos} ${i}" + fi + done + at_a_time=2 +else + hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null` + # Derive repository names from the .hg directory locations + repos="" + for i in ${hgdirs} ; do + repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`" + done + at_a_time=8 +fi + +# Any repos to deal with? +if [ "${repos}" = "" ] ; then + echo "No repositories to process." + exit +fi + +# Echo out what repositories we will process +echo "# Repos: ${repos}" + +# Run the supplied command on all repos in parallel, save output until end +n=0 +for i in ${repos} ; do + echo "Starting on ${i}" + n=`expr ${n} '+' 1` + ( + ( + if [ "$1" = "clone" -o "$1" = "fclone" ] ; then + cline="hg $* ${pull_default}/${i} ${i}" + echo "# ${cline}" + ( eval "${cline}" ) + else + cline="hg $*" + echo "# cd ${i} && ${cline}" + ( cd ${i} && eval "${cline}" ) + fi + echo "# exit code $?" + ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) & + if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then + sleep 5 + fi +done + +# Wait for all hg commands to complete +wait + +# Cleanup +rm -f -r ${tmp} + +# Terminate with exit 0 all the time (hard to know when to say "failed") +exit 0 + -- GitLab From cf458a1f543063f9336bad6cf4089b8f643c85b0 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Wed, 22 Dec 2010 15:57:04 -0800 Subject: [PATCH 07/17] Added tag jdk7-b123 for changeset 346d9718942b --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 86759295812..6a03d78b921 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -97,3 +97,4 @@ a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118 366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120 2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121 f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122 +ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123 -- GitLab From edd7bbf2396526b365430b1116e5e651f7aeae08 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Wed, 22 Dec 2010 15:57:14 -0800 Subject: [PATCH 08/17] Added tag jdk7-b123 for changeset 5d1dc8153960 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index b92574b671c..8122fc02445 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -136,3 +136,4 @@ f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120 3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121 3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122 5484e7c53fa7da5e869902437ee08a9ae10c1c69 hs20-b03 +9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 jdk7-b123 -- GitLab From 517fa29a09dd2b27ee85afa5c6858e527f89c4f2 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Wed, 22 Dec 2010 15:57:26 -0800 Subject: [PATCH 09/17] Added tag jdk7-b123 for changeset 8de47554f105 --- jdk/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/.hgtags b/jdk/.hgtags index b937fb28a60..e12216bcd6b 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -97,3 +97,4 @@ ecab7eefb8f2326fd90fb632f47f1b6f81e928f8 jdk7-b119 37d74e29687cf07c2bf9411af58c7e42440855c3 jdk7-b120 a661d8587b5d8986aacae086f5df66af9e1a96b1 jdk7-b121 ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122 +869190935eedee7750d955019ab2a1b80f0a13a8 jdk7-b123 -- GitLab From 088fd232f96df38b53c659360519d993105c9072 Mon Sep 17 00:00:00 2001 From: Erik Trimble Date: Wed, 22 Dec 2010 19:20:47 -0800 Subject: [PATCH 10/17] Added tag hs20-b04 for changeset 5d1dc8153960 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 8122fc02445..cb26cd3520f 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -137,3 +137,4 @@ f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120 3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122 5484e7c53fa7da5e869902437ee08a9ae10c1c69 hs20-b03 9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 jdk7-b123 +9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 hs20-b04 -- GitLab From d77b051398aa831dde2bc6402967721605b50337 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Thu, 23 Dec 2010 18:41:57 -0800 Subject: [PATCH 11/17] 7008723: Remove binary plugs creation and use from openjdk Reviewed-by: mchung, andrew, aph, dholmes --- Makefile | 10 +----- README-builds.html | 76 ---------------------------------------------- 2 files changed, 1 insertion(+), 85 deletions(-) diff --git a/Makefile b/Makefile index 6b296080ad9..7c5b2db01c0 100644 --- a/Makefile +++ b/Makefile @@ -156,12 +156,6 @@ ifeq ($(BUILD_DEPLOY), true) clobber:: deploy-clobber endif -ifeq ($(BUILD_JDK), true) - ifeq ($(BUNDLE_RULES_AVAILABLE), true) - generic_build_repo_series:: openjdk-binary-plugs-bundles - endif -endif - # 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. @@ -301,7 +295,6 @@ ifneq ($(SKIP_OPENJDK_BUILD), true) ifeq ($(BUILD_JDK), true) ifeq ($(BUNDLE_RULES_AVAILABLE), true) -OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME) OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output OPENJDK_BUILD_NAME \ = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) @@ -330,7 +323,6 @@ openjdk_build: GENERATE_DOCS=false \ ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ - ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \ ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \ ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ product_build ) @@ -545,7 +537,7 @@ examples_help: " ################################################################ -# Source and binary plug bundling +# Source bundling ################################################################ ifeq ($(BUNDLE_RULES_AVAILABLE), true) include $(BUNDLE_RULES) diff --git a/README-builds.html b/README-builds.html index 4b64ac22216..e48aaff3612 100644 --- a/README-builds.html +++ b/README-builds.html @@ -64,7 +64,6 @@
    • Build Dependencies
    -
    ALT_BINARY_PLUGS_PATH
    -
    - The location of the binary plugs installation. - See Binary Plugs for more information. - You should always have a local copy of a - recent Binary Plugs install image - and set this variable to that location. -
    ALT_JDK_IMPORT_PATH
    The location of a previously built JDK installation. @@ -1705,26 +1649,6 @@ Where each of these directories contain the import JDK image for that platform.
    -
    ALT_BUILD_BINARY_PLUGS_PATH
    -
    - These are useful in managing builds on multiple platforms. - The default network location for all of the binary plug images - for all platforms. - If ALT_BINARY_PLUGS_PATH - is not set, this directory will be used and should contain - the following directories: - solaris-sparc, - solaris-i586, - solaris-sparcv9, - solaris-amd64, - linux-i586, - linux-amd64, - windows-i586, - and - windows-amd64. - Where each of these directories contain the binary plugs image - for that platform. -
    Windows specific:
    -- GitLab From 1c49ac1a78e6c8dfe2267681af560fb118f695c7 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Thu, 23 Dec 2010 18:50:21 -0800 Subject: [PATCH 12/17] 7008723: Remove binary plugs creation and use from openjdk Reviewed-by: mchung, andrew, aph, dholmes --- jdk/README | 13 +- jdk/make/Makefile | 5 - jdk/make/com/sun/jmx/Makefile | 8 +- jdk/make/common/Defs.gmk | 88 ------- jdk/make/common/Library.gmk | 45 ---- jdk/make/common/Program.gmk | 22 -- jdk/make/common/Release.gmk | 10 - jdk/make/common/Sanity.gmk | 1 - jdk/make/common/internal/BinaryPlugs.gmk | 270 --------------------- jdk/make/common/shared/Sanity-Settings.gmk | 9 - jdk/make/common/shared/Sanity.gmk | 18 -- jdk/make/java/redist/Makefile | 12 +- jdk/make/javax/sound/Makefile | 2 - jdk/make/jdk_generic_profile.sh | 24 -- jdk/make/netbeans/README | 1 - jdk/make/sun/dcpr/Makefile | 2 - jdk/make/sun/font/t2k/Makefile | 2 - jdk/make/sun/management/Makefile | 8 +- 18 files changed, 10 insertions(+), 530 deletions(-) delete mode 100644 jdk/make/common/internal/BinaryPlugs.gmk diff --git a/jdk/README b/jdk/README index d774ab80b70..fec16f9520d 100644 --- a/jdk/README +++ b/jdk/README @@ -9,25 +9,20 @@ Simple Build Instructions: http://java.sun.com/javase/downloads/index.jsp Set the environment variable ALT_BOOTDIR to the location of this JDK 6. - 2. Download and install the Binary Plugs for the most recent JDK7 from - http://download.java.net/openjdk/jdk7/ - Set the environment variable ALT_BINARY_PLUGS_PATH to the location of - these binary plugs. - - 3. Either download and install the latest JDK7 from + 2. Either download and install the latest JDK7 from http://download.java.net/openjdk/jdk7/, or build your own complete OpenJDK7 by using the top level Makefile in the OpenJDK Mercurial forest. Set the environment variable ALT_JDK_IMPORT_PATH to the location of this latest JDK7 or OpenJDK7 build. - 4. Check the sanity of doing a build with the current machine: + 3. Check the sanity of doing a build with the current machine: cd make && gnumake sanity See README-builds.html if you run into problems. - 5. Do a partial build of the jdk: + 4. Do a partial build of the jdk: cd make && gnumake all - 6. Construct the images: + 5. Construct the images: cd make && gnumake images The resulting JDK image should be found in build/*/j2sdk-image diff --git a/jdk/make/Makefile b/jdk/make/Makefile index 30790befacc..36bf631d5b8 100644 --- a/jdk/make/Makefile +++ b/jdk/make/Makefile @@ -321,11 +321,6 @@ else $(ECHO) "Rule $@ does not apply on $(PLATFORM)-$(ARCH)" endif -# -# Binary Plug rules and macros -# -include $(BUILDDIR)/common/internal/BinaryPlugs.gmk - # # Test rule # diff --git a/jdk/make/com/sun/jmx/Makefile b/jdk/make/com/sun/jmx/Makefile index aefb1e7ec51..cc3393cbdf7 100644 --- a/jdk/make/com/sun/jmx/Makefile +++ b/jdk/make/com/sun/jmx/Makefile @@ -42,12 +42,8 @@ include $(BUILDDIR)/common/Defs.gmk # within common included gmk files : that is why the following for loop # has been duplicated. -# When building the openjdk, build snmp only if importing binary plugs, -ifdef OPENJDK - ifeq ($(IMPORT_BINARY_PLUGS),true) - SUBDIRS = snmp - endif -else +# When building the openjdk, no snmp +ifndef OPENJDK SUBDIRS = snmp endif diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk index 194986cb77e..278ffaf7ce7 100644 --- a/jdk/make/common/Defs.gmk +++ b/jdk/make/common/Defs.gmk @@ -109,83 +109,6 @@ else endif endif -# If OPENJDK is defined, we may still need to use some native libraries that -# exist only as part of the closed source. If the closed sources are not -# available, the libraries must have been pre-built. Since these libraries -# and the JDK internal interfaces to these are reasonably stable this is not -# a significant problem. But we do need to provide a way to locate them, -# including a way to point to a new one when there have been changes. -# -# If you have a formal binary plugs download, set ALT_BINARY_PLUGS_PATH -# to the location. -# (Optionally you can set ALT_CLOSED_JDK_IMPORT_PATH to point to the latest -# build JDK, or last promotion for this JDK version, but will not work -# on windows). -# -# As the OPENJDK is built, the binary plugs are used instead of building the -# libraries. -# Individual Makefiles that specify USE_BINARY_PLUG_LIBRARY, will get -# the binary plug copy (or a copy from a built JDK). -# -# See common/internal/BinaryPlugs.gmk for more information. -# -# Usage notes: -# -# ALT_BINARY_PLUGS_JARFILE is probably rarely needed. It can be used -# to identify the exact jar file to be used for all closed classes.. -# -# ALT_BINARY_PLUGS_PATH points to a directory containing precisely the -# binaries needed to build. -# -# ALT_BUILD_BINARY_PLUGS_PATH points to a directory containing binary plug dirs -# multiple architectures named using the standard conventions -# This is useful for build scripts that need to build multiple architectures -# of the OpenJDK. -# -# ALT_CLOSED_JDK_IMPORT_PATH points to the top-level of a specific platform -# JDK image. -# -# The precedence is that -# 1. ALT_BINARY_PLUGS_JARFILE overrides any other location of the classes -# 2. ALT_BINARY_PLUGS_PATH overrides all locations of classes and libraries -# 3. ALT_BUILD_BINARY_PLUGS_PATH is used to find a ALT_BINARY_PLUGS_PATH -# 4. ALT_CLOSED_JDK_IMPORT_PATH is used to locate classes and libraries -# Note: If any of the ALT_ variables are modified here, it is assumed -# that the build should be done with IMPORT_BINARY_PLUGS=true as -# well. Otherwise the default will be IMPORT_BINARY_PLUGS=false. -# Lastly, setting IMPORT_BINARY_PLUGS=false on the command line -# will override this logic, and plugs will not be imported. -# - -# Always needed, defines the name of the imported/exported jarfile -BINARY_PLUGS_JARNAME = rt-closed.jar - -ifdef OPENJDK - ifdef ALT_CLOSED_JDK_IMPORT_PATH - CLOSED_JDK_IMPORT_PATH = $(ALT_CLOSED_JDK_IMPORT_PATH) - BINARY_PLUGS_PATH = $(CLOSED_JDK_IMPORT_PATH) - BINARY_PLUGS_JARFILE = $(CLOSED_JDK_IMPORT_PATH)/jre/lib/rt.jar - IMPORT_BINARY_PLUGS=true - endif - ifdef ALT_BUILD_BINARY_PLUGS_PATH - BUILD_BINARY_PLUGS_PATH = $(ALT_BUILD_BINARY_PLUGS_PATH) - IMPORT_BINARY_PLUGS=true - else - BUILD_BINARY_PLUGS_PATH = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted/latest/openjdk/binaryplugs - endif - BINARY_PLUGS_PATH = $(BUILD_BINARY_PLUGS_PATH)/$(PLATFORM)-$(ARCH) - BINARY_PLUGS_JARFILE = $(BINARY_PLUGS_PATH)/jre/lib/$(BINARY_PLUGS_JARNAME) - ifdef ALT_BINARY_PLUGS_PATH - BINARY_PLUGS_PATH = $(ALT_BINARY_PLUGS_PATH) - BINARY_PLUGS_JARFILE = $(BINARY_PLUGS_PATH)/jre/lib/$(BINARY_PLUGS_JARNAME) - IMPORT_BINARY_PLUGS=true - endif - ifdef ALT_BINARY_PLUGS_JARFILE - BINARY_PLUGS_JARFILE = $(ALT_BINARY_PLUGS_JARFILE) - IMPORT_BINARY_PLUGS=true - endif -endif # OPENJDK - # # Get platform definitions # @@ -289,17 +212,6 @@ endif # PROGRAM LDLIBS_COMMON += $(EXTRA_LIBS) -# -# Default is to build, not import native binaries -# -ifndef IMPORT_NATIVE_BINARIES - IMPORT_NATIVE_BINARIES=false -endif -# If importing libraries in, no incremental builds -ifeq ($(IMPORT_NATIVE_BINARIES),true) - INCREMENTAL_BUILD=false -endif - # for generated libraries LIBDIR = $(OUTPUTDIR)/lib ABS_LIBDIR = $(ABS_OUTPUTDIR)/lib diff --git a/jdk/make/common/Library.gmk b/jdk/make/common/Library.gmk index 1278e526c93..2094ab79b73 100644 --- a/jdk/make/common/Library.gmk +++ b/jdk/make/common/Library.gmk @@ -77,26 +77,6 @@ else LINKER=$(LINK.c) endif -# FIXUP: unpack needs the zip .o files. So we must build zip? -# or fix unpack makefile so it uses Program.gmk. -ifneq ($(IMPORT_NATIVE_BINARIES),true) - COMPILE_IT=true -else - ifeq ($(LIBRARY),zip) - COMPILE_IT=true - else - COMPILE_IT=false - endif -endif - -# If a Makefile has specified a pre-compiled closed src lib, just copy it. -ifdef USE_BINARY_PLUG_LIBRARY - COMPILE_IT=false -endif - -# We either need to import (copy) libraries in, or build them -ifeq ($(COMPILE_IT),true) - $(ACTUAL_LIBRARY):: $(INIT) $(TEMPDIR) $(LIBDIR) $(BINDIR) $(EXTDIR) classheaders # @@ -275,31 +255,6 @@ lint.errors : $(FILES_ln) $(LINT.c) $(FILES_ln) $(LDLIBS) endif -else # COMPILE_IT - -# OpenJDK rule is first so any lib is preferentially copied from that location. -ifndef USE_BINARY_PLUG_LIBRARY - -# In this case we are just copying the file. -ifneq ($(LIBRARY), fdlibm) -# Copies in the file from the JDK_IMPORT_PATH area -$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/% - $(install-import-file) -$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/native_threads/% - $(install-import-file) -$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/headless/% - $(install-import-file) -$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/xawt/% - $(install-import-file) -else # fdlibm -$(ACTUAL_LIBRARY_DIR)/%: - $(prep-target) -endif # fdlibm - -endif # USE_BINARY_PLUG_LIBRARY - -endif # COMPILE_IT - # # Class libraries with JNI native methods get a include to the package. # diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk index b6eb8662f32..edac78ddf7a 100644 --- a/jdk/make/common/Program.gmk +++ b/jdk/make/common/Program.gmk @@ -105,15 +105,6 @@ endif FILES_o = \ $(OBJDIR)/main.$(OBJECT_SUFFIX) -# We either need to import (copy) binaries in, or build them -ifneq ($(IMPORT_NATIVE_BINARIES),true) - COMPILE_IT=true -else - COMPILE_IT=false -endif - -ifeq ($(COMPILE_IT),true) - $(ACTUAL_PROGRAM):: classes $(INIT) # @@ -192,19 +183,6 @@ $(ACTUAL_PROGRAM):: $(FILES_o) endif # PLATFORM -else # COMPILE_IT - -$(ACTUAL_PROGRAM):: - -# Copies in the file from the JDK_IMPORT_PATH area -$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/% - @$(install-import-file) -$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/bin/% - @$(install-import-file) - -endif # COMPILE_IT - - clean:: ifeq ($(PLATFORM), windows) $(RM) $(OBJDIR)/$(PROGRAM).rc diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index b8e95bea2ee..a7e2eb0c7d1 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -249,18 +249,8 @@ compare-image \ sec-files sec-files-win jgss-files :: @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..." -# -# Export binary plugs if not building OPENJDK -# -ifdef OPENJDK - EXPORT_BINARY_PLUGS = -else # !OPENJDK - EXPORT_BINARY_PLUGS = export-binary-plugs test-binary-plugs -endif # OPENJDK - # Order is important here, trim jre after jdk image is created images:: sanity-images post-sanity-images \ - $(EXPORT_BINARY_PLUGS) \ $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \ trim-image-jre trim-image-jdk \ process-image-jre process-image-jdk sec-files sec-files-win jgss-files diff --git a/jdk/make/common/Sanity.gmk b/jdk/make/common/Sanity.gmk index 57b0a1d7c82..eb303f9b956 100644 --- a/jdk/make/common/Sanity.gmk +++ b/jdk/make/common/Sanity.gmk @@ -85,7 +85,6 @@ sanity-all:: sanity-base \ sane-classpath \ sane-java_home \ sane-fonts \ - sane-binary-plugs \ sane-variant \ sane-ld_library_path \ sane-ld_library_path_64 \ diff --git a/jdk/make/common/internal/BinaryPlugs.gmk b/jdk/make/common/internal/BinaryPlugs.gmk deleted file mode 100644 index d5eeb6d5a62..00000000000 --- a/jdk/make/common/internal/BinaryPlugs.gmk +++ /dev/null @@ -1,270 +0,0 @@ -# -# Copyright (c) 2007, 2008, Oracle and/or its affiliates. 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. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -######################################################################## - -# Definitions for openjdk plugs (used by both import and export) - -# Names of native shared libraries - -PLUG_LIBRARY_NAMES= - -# Sub-directory where native shared libraries are located (e.g. jre/bin or...) - -PLUG_LOCATION_SUBDIR=$(ARCH_VM_SUBDIR) - -# Explicit classfile lists - -# WARNING: These classlists will not work with pattern rules, only used in -# shell commands. -# The \$$ patterns will fail in pattern rules, which want $$, -# but the $$ fails in shell commands. -# The shell commands are more important. -# Also, the $1 pattern in these names causes problems with the -# GNU make define feature, so you can't use these in define's. - -PLUG_JMF_CLASS_NAMES = \ -com/sun/jmx/snmp/SnmpDataTypeEnums.class \ -com/sun/jmx/snmp/SnmpDefinitions.class \ -com/sun/jmx/snmp/SnmpOid.class \ -com/sun/jmx/snmp/SnmpOidDatabase.class \ -com/sun/jmx/snmp/SnmpOidDatabaseSupport.class \ -com/sun/jmx/snmp/SnmpOidRecord.class \ -com/sun/jmx/snmp/SnmpOidTable.class \ -com/sun/jmx/snmp/SnmpOidTableSupport.class \ -com/sun/jmx/snmp/SnmpParameters.class \ -com/sun/jmx/snmp/SnmpPduPacket.class \ -com/sun/jmx/snmp/SnmpPeer.class \ -com/sun/jmx/snmp/SnmpTimeticks.class \ -com/sun/jmx/snmp/SnmpVarBind.class \ -com/sun/jmx/snmp/SnmpVarBindList.class \ -com/sun/jmx/snmp/Timestamp.class \ -com/sun/jmx/snmp/daemon/SendQ.class \ -com/sun/jmx/snmp/daemon/SnmpInformRequest.class \ -com/sun/jmx/snmp/daemon/SnmpQManager.class \ -com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \ -com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \ -com/sun/jmx/snmp/daemon/SnmpSendServer.class \ -com/sun/jmx/snmp/daemon/SnmpSession.class \ -com/sun/jmx/snmp/daemon/SnmpSocket.class \ -com/sun/jmx/snmp/daemon/SnmpTimerServer.class \ -com/sun/jmx/snmp/daemon/WaitQ.class - -# Class list temp files (used by both import and export of plugs) - -PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs -PLUG_CLASS_AREAS = jmf -PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist) - -# Create jargs file command - -define plug-create-jargs -@$(prep-target) -$(SED) -e "s@^@-C $(CLASSDESTDIR) @" $< > $@ -endef # plug-create-clist-jargs - -# Create clist (class name list) and jargs file (input to jar) -# Need these files to avoid long command lines which fail on some systems. - -$(PLUG_TEMPDIR)/jmf.clist: - @$(prep-target) - @for i in $(PLUG_JMF_CLASS_NAMES) ; do \ - $(ECHO) "$$i" >> $@; \ - done -$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS) - @$(prep-target) - $(CAT) $(PLUG_CLISTS) > $@ -$(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist - $(plug-create-jargs) -$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist - $(plug-create-jargs) - -# -# Specific to OPENJDK import of binary plugs -# - -ifdef OPENJDK - -# Import - -PLUG_IMPORT_DIR=$(BINARY_PLUGS_PATH) -PLUG_IMPORT_JARFILE=$(BINARY_PLUGS_JARFILE) - -# Import file command - -define import-binary-plug-file -@$(ECHO) "PLUG IMPORT: $(@F)" -$(install-non-module-file) -endef # import-binary-plug-file - -# Import classes command - -define import-binary-plug-classes -@$(MKDIR) -p $(CLASSDESTDIR) -@$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /' -($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1 $(BOOT_JAR_JFLAGS) ) -($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) ) -endef # import-binary-plug-classes - -# Import specific area classes (the classes are always created) - -import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist - $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist) - -# Import all classes from the jar file - -import-binary-plug-jar: \ - import-binary-plug-jmf-classes - -# Binary plug start/complete messages - -import-binary-plugs-started: - @$(ECHO) "BinaryPlugs import started: `date`" - @$(ECHO) "BINARY_PLUGS_PATH=$(BINARY_PLUGS_PATH)" -import-binary-plugs-completed: - @$(ECHO) "BinaryPlugs import completed: `date`" - -# Import lib files (only if they don't exist already) - -import-binary-plugs-libs: \ - $(PLUG_LIBRARY_NAMES:%=$(LIB_LOCATION)/%) - -# Import everything - -import-binary-plugs: \ - import-binary-plugs-started \ - import-binary-plugs-libs \ - import-binary-plug-jar \ - import-binary-plugs-completed - -# All these targets are phony (no filenames) - -.PHONY: import-binary-plugs-started \ - import-binary-plugs-completed \ - import-binary-plugs-libs \ - import-binary-plugs \ - import-binary-plug-jar \ - import-binary-plug-jmf-classes - -else # !OPENJDK - -# -# Specific to exporting binary plugs for OPENJDK (e.g. OPENJDK is NOT defined) -# - -# Export names (See make/common/Defs.gmk for BINARY_PLUGS_JARNAME definition) - -PLUG_EXPORT_DIRNAME=openjdk-binary-plugs-image -PLUG_EXPORT_DIR=$(OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME) -PLUG_EXPORT_JARFILE=$(PLUG_EXPORT_DIR)/jre/lib/$(BINARY_PLUGS_JARNAME) - -# Export file command - -define export-binary-plug-file -@$(ECHO) "PLUG EXPORT: $(@F)" -$(install-non-module-file) -endef # export-binary-plug-file - -# OpenJDK Binary Plug License - -$(PLUG_EXPORT_DIR)/LICENSE: $(CLOSED_SHARE_SRC)/doc/openjdk/binary-plugs/LICENSE - $(export-binary-plug-file) -export-binary-plugs-license: $(PLUG_EXPORT_DIR)/LICENSE - -# Create jar file of plug classes (always created) - -$(PLUG_EXPORT_JARFILE): $(PLUG_TEMPDIR)/all.clist $(PLUG_TEMPDIR)/all.jargs - @$(prep-target) - @$(ECHO) "PLUG EXPORT: $(@F)" - @$(CAT) $(PLUG_TEMPDIR)/all.clist | $(SED) -e 's/^/PLUG EXPORT: /' - $(BOOT_JAR_CMD) cf $@ @$(PLUG_TEMPDIR)/all.jargs $(BOOT_JAR_JFLAGS) - @$(java-vm-cleanup) -export-binary-plugs-jar: $(PLUG_EXPORT_JARFILE) - -# Export binary plug start/complete messages - -export-binary-plugs-started: - @$(ECHO) "BinaryPlugs export started: `date`" - @$(ECHO) "PLUG_EXPORT_DIR=$(PLUG_EXPORT_DIR)" - $(RM) -r $(PLUG_EXPORT_DIR) - @$(MKDIR) -p $(PLUG_EXPORT_DIR) - @$(MKDIR) -p $(PLUG_TEMPDIR) -export-binary-plugs-completed: - @$(RM) -r $(PLUG_TEMPDIR) - @$(ECHO) "BinaryPlugs export completed: `date`" - -# Export lib files (only if they don't exist already) - -export-binary-plugs-libs: \ - $(PLUG_LIBRARY_NAMES:%=$(PLUG_EXPORT_DIR)/$(PLUG_LOCATION_SUBDIR)/%) - -# Export everything - -export-binary-plugs: \ - export-binary-plugs-started \ - export-binary-plugs-libs \ - export-binary-plugs-license \ - export-binary-plugs-jar \ - export-binary-plugs-completed - -# All these targets are phony (no filenames) - -.PHONY: export-binary-plugs-started \ - export-binary-plugs-license \ - export-binary-plugs-jar \ - export-binary-plugs-libs \ - export-binary-plugs-completed \ - export-binary-plugs - -# Rules that test the export and import of plugs (only when you can export) - -TEST_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-testing-plugs -TEST_PLUG_COPY=$(TEST_OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME)-testcopy - -# Run export-binary-plugs first, then use this rule to test an import - -test-binary-plugs: $(TEST_PLUG_COPY) - $(RM) -r $(TEST_OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME) - $(MKDIR) -p $(TEST_OUTPUTDIR) - @$(ECHO) "Testing import of plugs" - ($(CD) $(JDK_TOPDIR)/make && \ - $(MAKE) OPENJDK=true \ - ALT_OUTPUTDIR=$(TEST_OUTPUTDIR) \ - ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH) \ - ALT_BINARY_PLUGS_PATH=$(TEST_PLUG_COPY) \ - import-binary-plugs ) - $(RM) -r $(TEST_OUTPUTDIR) - @$(ECHO) "Testing of plugs was successful" - -$(TEST_PLUG_COPY): - @$(ECHO) "Creating test plug copy" - $(RM) -r $@ - $(MKDIR) -p $(@D) - $(CP) -r -p $(PLUG_EXPORT_DIR) $@ - -.PHONY: test-binary-plugs - -endif # !OPENJDK - diff --git a/jdk/make/common/shared/Sanity-Settings.gmk b/jdk/make/common/shared/Sanity-Settings.gmk index d18ccf76758..3979d8a8ec5 100644 --- a/jdk/make/common/shared/Sanity-Settings.gmk +++ b/jdk/make/common/shared/Sanity-Settings.gmk @@ -246,16 +246,7 @@ ifdef OPENJDK ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings) ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH) ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH) - ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings) - ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS) - ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE) - ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH) - ALL_SETTINGS+=$(call addAltSetting,BUILD_BINARY_PLUGS_PATH) -else - ALL_SETTINGS+=$(call addHeading,OPENJDK Export Binary Plug Settings) - ALL_SETTINGS+=$(call addOptionalSetting,PLUG_EXPORT_DIRNAME) endif -ALL_SETTINGS+=$(call addOptionalSetting,PLUG_LIBRARY_NAMES) ifdef OPENJDK ALL_SETTINGS+=$(call addHeading,Previous JDK Settings) diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk index b53f73bfdbd..d66c1389b3e 100644 --- a/jdk/make/common/shared/Sanity.gmk +++ b/jdk/make/common/shared/Sanity.gmk @@ -183,7 +183,6 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk sane-classpath \ sane-java_home \ sane-fonts \ - sane-binary-plugs \ sane-variant \ sane-ld_library_path \ sane-ld_library_path_64 \ @@ -498,23 +497,6 @@ ifndef OPENJDK fi endif -###################################################### -# If building OPENJDK check pre-built binaries are -# available for binary plug source components. -###################################################### -ifdef OPENJDK -sane-binary-plugs: - ifeq ($(IMPORT_BINARY_PLUGS),true) - @if [ ! -d "$(BINARY_PLUGS_PATH)" ]; then \ - $(ECHO) "WARNING: Can't locate pre-built libraries. \n" \ - " Please check your access to \n" \ - " $(BINARY_PLUGS_PATH) \n" \ - " and/or check your value of ALT_BINARY_PLUGS_PATH. \n" \ - "" >> $(WARNING_FILE); \ - fi - endif -endif - ###################################################### # VARIANT must be set to DBG or OPT ###################################################### diff --git a/jdk/make/java/redist/Makefile b/jdk/make/java/redist/Makefile index 6f86be97f14..be2f886bbc9 100644 --- a/jdk/make/java/redist/Makefile +++ b/jdk/make/java/redist/Makefile @@ -272,17 +272,9 @@ $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt : $(HOTSPOT_KERNEL_PATH)/Xusage.tx $(install-file) # -# Specific to OpenJDK building +# Specific to non-OpenJDK building # -ifdef OPENJDK - - ifeq ($(IMPORT_BINARY_PLUGS),true) - include $(BUILDDIR)/common/internal/BinaryPlugs.gmk - - build: import-binary-plugs - endif - -else # !OPENJDK +ifndef OPENJDK INTERNAL_IMPORT_LIST += \ $(LIBDIR)/security/US_export_policy.jar \ diff --git a/jdk/make/javax/sound/Makefile b/jdk/make/javax/sound/Makefile index b8dac1f2800..e52c946ad8c 100644 --- a/jdk/make/javax/sound/Makefile +++ b/jdk/make/javax/sound/Makefile @@ -23,8 +23,6 @@ # questions. # -# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk - BUILDDIR = ../.. MODULE = sound PACKAGE = javax.sound diff --git a/jdk/make/jdk_generic_profile.sh b/jdk/make/jdk_generic_profile.sh index 151ecb65132..a498c46680f 100644 --- a/jdk/make/jdk_generic_profile.sh +++ b/jdk/make/jdk_generic_profile.sh @@ -78,8 +78,6 @@ # Attempts to set these variables for the JDK builds: # ALT_COMPILER_PATH # ALT_BOOTDIR -# ALT_BINARY_PLUGS_PATH -# ALT_CLOSED_JDK_IMPORT_PATH # Windows Only: # ALT_UNIXCOMMAND_PATH # ALT_DXSDK_PATH @@ -304,28 +302,6 @@ if [ "${ALT_JDK_IMPORT_PATH}" = "" -a -d ${jdk_instances}/${importjdk} ] ; then export ALT_JDK_IMPORT_PATH fi -# Get the latest JDK binary plugs or build to import pre-built binaries -if [ "${ALT_BINARY_PLUGS_PATH}" = "" ] ; then - binplugs=${jdk_instances}/openjdk-binary-plugs - jdkplugs=${jdk_instances}/${importjdk} - if [ -d ${binplugs} ] ; then - ALT_BINARY_PLUGS_PATH=${binplugs} - export ALT_BINARY_PLUGS_PATH - elif [ "${ALT_CLOSED_JDK_IMPORT_PATH}" = "" -a -d ${jdkplugs} ] ; then - ALT_CLOSED_JDK_IMPORT_PATH=${jdkplugs} - export ALT_CLOSED_JDK_IMPORT_PATH - fi - if [ "${ALT_BINARY_PLUGS_PATH}" = "" ] ; then - echo "WARNING: Missing ALT_BINARY_PLUGS_PATH: ${binplugs}" - fi -fi -if [ "${ALT_BINARY_PLUGS_PATH}" != "" -a ! -d "${ALT_BINARY_PLUGS_PATH}" ] ; then - echo "WARNING: Cannot access ALT_BINARY_PLUGS_PATH=${ALT_BINARY_PLUGS_PATH}" -fi -if [ "${ALT_CLOSED_JDK_IMPORT_PATH}" != "" -a ! -d "${ALT_CLOSED_JDK_IMPORT_PATH}" ] ; then - echo "WARNING: Cannot access ALT_CLOSED_JDK_IMPORT_PATH=${ALT_CLOSED_JDK_IMPORT_PATH}" -fi - # Export PATH setting PATH="${path4sdk}" export PATH diff --git a/jdk/make/netbeans/README b/jdk/make/netbeans/README index b23433401fa..a375b8b55e3 100644 --- a/jdk/make/netbeans/README +++ b/jdk/make/netbeans/README @@ -93,7 +93,6 @@ Configuring make.options=\ ALT_BOOTDIR=/home/me/bin/jdk1.6.0 \ - ALT_BINARY_PLUGS_PATH=/home/me/bin/openjdk-binary-plugs \ ALT_JDK_IMPORT_PATH=/home/me/bin/jdk1.7.0 \ OPENJDK=true diff --git a/jdk/make/sun/dcpr/Makefile b/jdk/make/sun/dcpr/Makefile index 054d49ef760..0d8003ef870 100644 --- a/jdk/make/sun/dcpr/Makefile +++ b/jdk/make/sun/dcpr/Makefile @@ -23,8 +23,6 @@ # questions. # -# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk - BUILDDIR = ../.. MODULE = java2d PACKAGE = sun.dc diff --git a/jdk/make/sun/font/t2k/Makefile b/jdk/make/sun/font/t2k/Makefile index 31a95122875..8f54a9ce944 100644 --- a/jdk/make/sun/font/t2k/Makefile +++ b/jdk/make/sun/font/t2k/Makefile @@ -23,8 +23,6 @@ # questions. # -# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk - # # Makefile for building t2k rasteriser. # diff --git a/jdk/make/sun/management/Makefile b/jdk/make/sun/management/Makefile index 65f6fbde263..4f04601d25b 100644 --- a/jdk/make/sun/management/Makefile +++ b/jdk/make/sun/management/Makefile @@ -37,12 +37,8 @@ MGMT_LIB_SRC = $(SHARE_SRC)/lib/management all build:: properties aclfile jmxremotefiles -# When building the openjdk, build snmp only if importing binary plugs, -ifdef OPENJDK - ifeq ($(IMPORT_BINARY_PLUGS),true) - SUBDIRS = snmp - endif -else +# When building the openjdk, no snmp +ifndef OPENJDK SUBDIRS = snmp endif SUBDIRS += jmxremote -- GitLab From e02ff5e906a3a230f155ce9e7f85c80a912695fa Mon Sep 17 00:00:00 2001 From: Erik Trimble Date: Fri, 24 Dec 2010 07:59:50 -0800 Subject: [PATCH 13/17] 7008759: Bump the HS20 build number to 05 Update the HS20 build number to 05 Reviewed-by: jcoomes --- hotspot/make/hotspot_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version index 57260490cc0..e0c46bb74d8 100644 --- a/hotspot/make/hotspot_version +++ b/hotspot/make/hotspot_version @@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2010 HS_MAJOR_VER=20 HS_MINOR_VER=0 -HS_BUILD_NUMBER=04 +HS_BUILD_NUMBER=05 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 -- GitLab From ce82625a2c3c3e9c32b591f14e8c1f039237eb1e Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Tue, 28 Dec 2010 15:52:09 -0800 Subject: [PATCH 14/17] 6962318: Update copyright year Reviewed-by: xdono --- make/Defs-internal.gmk | 2 +- make/deploy-rules.gmk | 2 +- make/hotspot-rules.gmk | 2 +- make/install-rules.gmk | 2 +- make/jprt.gmk | 2 +- make/sanity-rules.gmk | 2 +- make/scripts/update_copyright_year.sh | 189 ++++++++++++++++++++++++++ 7 files changed, 195 insertions(+), 6 deletions(-) create mode 100644 make/scripts/update_copyright_year.sh diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index cab13f38de8..907ee95ac1e 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 6b9f50c9767..1308d51518b 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. 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 diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk index 9a85b93f990..674ce633da0 100644 --- a/make/hotspot-rules.gmk +++ b/make/hotspot-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. 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 diff --git a/make/install-rules.gmk b/make/install-rules.gmk index 56b9baa05dd..8e1f189d521 100644 --- a/make/install-rules.gmk +++ b/make/install-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. 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 diff --git a/make/jprt.gmk b/make/jprt.gmk index 57fd1d32e34..49687d9921d 100644 --- a/make/jprt.gmk +++ b/make/jprt.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk index 1ab62f7d601..58345ad09f4 100644 --- a/make/sanity-rules.gmk +++ b/make/sanity-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. 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 diff --git a/make/scripts/update_copyright_year.sh b/make/scripts/update_copyright_year.sh new file mode 100644 index 00000000000..cd8b0a07e2f --- /dev/null +++ b/make/scripts/update_copyright_year.sh @@ -0,0 +1,189 @@ +#!/bin/sh -f + +# +# Copyright (c) 2010, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Script to update the Copyright YEAR range in Mercurial sources. +# (Originally from xdono, Thanks!) + +if [ "`uname -s`" = "SunOS" ] ; then + awk=nawk +else + awk=awk +fi + +# Stop on any error +set -e + +# Temp area +tmp=/tmp/`basename $0`.${USER}.$$ +rm -f -r ${tmp} +mkdir -p ${tmp} +total=0 + +# This year or supplied year +if [ "$1" != "" ] ; then + year="$1" +else + year=`date +%Y` +fi + +# Return true if it makes sense to edit this file +saneFileToCheck() +{ + if [ "$1" != "" -a -f $1 ] ; then + isText=`file "$1" | egrep -i '(text|source)' | cat` + hasCopyright=`grep 'Copyright' "$1" | cat` + lastLineCount=`tail -1 "$1" | wc -l` + if [ "${isText}" != "" \ + -a "${hasCopyright}" != "" \ + -a ${lastLineCount} -eq 1 ] ; then + echo "true" + else + echo "false" + fi + else + echo "false" + fi +} + +# Update the copyright year on a file +updateFile() # file +{ + changed="false" + if [ `saneFileToCheck "$1"` = "true" ] ; then + copyright="Copyright (c)" + company="Oracle" + rm -f $1.OLD + mv $1 $1.OLD + cat $1.OLD | \ + sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \ + sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \ + sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@" \ + > $1 + if ! diff -b -w $1.OLD $1 > /dev/null ; then \ + changed="true" + rm -f $1.OLD + else + rm -f $1 + mv $1.OLD $1 + fi + fi + echo "${changed}" +} + +# Update the copyright year on all files changed by this changeset +updateChangesetFiles() # changeset +{ + count=0 + files=${tmp}/files.$1 + rm -f ${files} + hg log --rev $1 -v --template '{files}\n' | expand \ + | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \ + > ${files} + if [ -f "${files}" -a -s "${files}" ] ; then + copyright="Copyright (c)" + company="Oracle" + fcount=`cat ${files}| wc -l` + for i in `cat ${files}` ; do + if [ `updateFile "${i}"` = "true" ] ; then + count=`expr ${count} '+' 1` + fi + done + if [ ${count} -gt 0 ] ; then + printf " UPDATED year on %d of %d files.\n" ${count} ${fcount} + total=`expr ${total} '+' ${count}` + else + printf " None of the %d files were changed.\n" ${fcount} + fi + else + printf " ERROR: No files changed in the changeset? Must be a mistake.\n" + set -x + ls -al ${files} + hg log --rev $1 -v --template '{files}\n' + hg log --rev $1 -v --template '{files}\n' | expand \ + | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' + set +x + exit 1 + fi + rm -f ${files} +} + +# Check if repository is clean +previous=`hg status|wc -l` +if [ ${previous} -ne 0 ] ; then + echo "WARNING: This repository contains previously edited working set files." + echo " hg status | wc -l = `hg status | wc -l`" +fi + +# Get all changesets this year +all_changesets=${tmp}/all_changesets +rm -f ${all_changesets} +hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n' > ${all_changesets} + +# Check changeset to see if it is Copyright only changes, filter changesets +if [ -s ${all_changesets} ] ; then + echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`" + index=0 + cat ${all_changesets} | while read changeset ; do + index=`expr ${index} '+' 1` + desc=${tmp}/desc.${changeset} + rm -f ${desc} + echo "------------------------------------------------" + hg log --rev ${changeset} --template '{desc}\n' > ${desc} + printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`" + if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then + printf " EXCLUDED tag changeset.\n" + elif cat ${desc} | fgrep -i rebrand > /dev/null ; then + printf " EXCLUDED rebrand changeset.\n" + elif cat ${desc} | fgrep -i copyright > /dev/null ; then + printf " EXCLUDED copyright changeset.\n" + else + updateChangesetFiles ${changeset} + fi + rm -f ${desc} + done +fi + +if [ ${total} -gt 0 ] ; then + echo "---------------------------------------------" + echo "Updated the copyright year on a total of ${total} files." + if [ ${previous} -eq 0 ] ; then + echo "This count should match the count of modified files in the repository: hg status -m" + else + echo "WARNING: This repository contained previously edited working set files." + fi + echo " hg status -m | wc -l = `hg status -m | wc -l`" +else + echo "---------------------------------------------" + echo "No files were changed" + if [ ${previous} -ne 0 ] ; then + echo "WARNING: This repository contained previously edited working set files." + fi + echo " hg status -m | wc -l = `hg status -m | wc -l`" +fi + +# Cleanup +rm -f -r ${tmp} +exit 0 + -- GitLab From 6b6a611c8e9495c9548d05f7b87812a004d063b8 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Tue, 28 Dec 2010 15:53:50 -0800 Subject: [PATCH 15/17] 6962318: Update copyright year Reviewed-by: xdono --- jdk/make/com/Makefile | 2 +- jdk/make/com/sun/Makefile | 2 +- jdk/make/com/sun/crypto/provider/Makefile | 2 +- jdk/make/com/sun/demo/Makefile | 2 +- jdk/make/com/sun/demo/jvmti/Makefile | 2 +- jdk/make/com/sun/java/Makefile | 2 +- jdk/make/com/sun/java/browser/Makefile | 2 +- jdk/make/com/sun/java/pack/Makefile | 2 +- jdk/make/com/sun/java/pack/prop/Makefile | 2 +- jdk/make/com/sun/jmx/Makefile | 2 +- jdk/make/com/sun/jndi/Makefile | 2 +- jdk/make/com/sun/jndi/cosnaming/Makefile | 2 +- jdk/make/com/sun/jndi/dns/Makefile | 2 +- jdk/make/com/sun/jndi/ldap/Makefile | 2 +- jdk/make/com/sun/jndi/rmi/Makefile | 2 +- jdk/make/com/sun/jndi/rmi/registry/Makefile | 2 +- jdk/make/com/sun/nio/Makefile | 2 +- jdk/make/com/sun/nio/sctp/FILES_java.gmk | 2 +- jdk/make/com/sun/nio/sctp/Makefile | 2 +- jdk/make/com/sun/nio/sctp/mapfile-vers | 2 +- jdk/make/com/sun/org/Makefile | 2 +- jdk/make/com/sun/org/apache/Makefile | 2 +- jdk/make/com/sun/org/apache/xml/Makefile | 2 +- jdk/make/com/sun/rowset/Makefile | 2 +- jdk/make/com/sun/script/Makefile | 2 +- jdk/make/com/sun/security/Makefile | 2 +- jdk/make/com/sun/security/auth/module/Makefile | 2 +- jdk/make/com/sun/servicetag/Makefile | 2 +- jdk/make/com/sun/tools/Makefile | 2 +- jdk/make/com/sun/tools/attach/Makefile | 2 +- jdk/make/com/sun/tracing/Makefile | 2 +- jdk/make/common/Cscope.gmk | 2 +- jdk/make/common/Defs-linux.gmk | 2 +- jdk/make/common/Defs-solaris.gmk | 2 +- jdk/make/common/Defs-windows.gmk | 2 +- jdk/make/common/Defs.gmk | 2 +- jdk/make/common/Demo.gmk | 2 +- jdk/make/common/Library.gmk | 2 +- jdk/make/common/Modules.gmk | 2 +- jdk/make/common/Program.gmk | 2 +- jdk/make/common/Release.gmk | 2 +- jdk/make/common/Sanity.gmk | 2 +- jdk/make/common/internal/Resources.gmk | 2 +- jdk/make/common/shared/Compiler-sun.gmk | 2 +- jdk/make/common/shared/Defs-control.gmk | 2 +- jdk/make/common/shared/Defs-java.gmk | 2 +- jdk/make/common/shared/Defs-linux.gmk | 2 +- jdk/make/common/shared/Defs-utils.gmk | 2 +- jdk/make/docs/CORE_PKGS.gmk | 2 +- jdk/make/docs/NON_CORE_PKGS.gmk | 2 +- jdk/make/java/Makefile | 2 +- jdk/make/java/awt/Makefile | 2 +- jdk/make/java/dyn/Makefile | 2 +- jdk/make/java/fdlibm/Makefile | 2 +- jdk/make/java/hpi/Makefile | 2 +- jdk/make/java/hpi/hpi_common.gmk | 2 +- jdk/make/java/hpi/native/Makefile | 2 +- jdk/make/java/hpi/windows/Makefile | 2 +- jdk/make/java/instrument/Makefile | 2 +- jdk/make/java/java/Makefile | 2 +- jdk/make/java/java/genlocales.gmk | 2 +- jdk/make/java/java_crw_demo/Makefile | 2 +- jdk/make/java/java_hprof_demo/Makefile | 2 +- jdk/make/java/jli/Makefile | 2 +- jdk/make/java/logging/Makefile | 2 +- jdk/make/java/main/Makefile | 2 +- jdk/make/java/main/java/Makefile | 2 +- jdk/make/java/main/javaw/Makefile | 2 +- jdk/make/java/management/Makefile | 2 +- jdk/make/java/net/FILES_c.gmk | 2 +- jdk/make/java/net/Makefile | 2 +- jdk/make/java/net/mapfile-vers | 2 +- jdk/make/java/nio/FILES_java.gmk | 2 +- jdk/make/java/nio/Makefile | 2 +- jdk/make/java/nio/mapfile-linux | 2 +- jdk/make/java/nio/mapfile-solaris | 2 +- jdk/make/java/npt/Makefile | 2 +- jdk/make/java/redist/Makefile | 2 +- jdk/make/java/redist/fonts/Makefile | 2 +- jdk/make/java/redist/sajdi/Makefile | 2 +- jdk/make/java/sql/Makefile | 2 +- jdk/make/java/sun_nio/Makefile | 2 +- jdk/make/java/text/base/Makefile | 2 +- jdk/make/java/util/FILES_java.gmk | 2 +- jdk/make/java/verify/Makefile | 2 +- jdk/make/java/zip/Makefile | 2 +- jdk/make/javax/Makefile | 2 +- jdk/make/javax/crypto/Makefile | 2 +- jdk/make/javax/imageio/Makefile | 2 +- jdk/make/javax/print/Makefile | 2 +- jdk/make/javax/rmi/Makefile | 2 +- jdk/make/javax/sound/Makefile | 2 +- jdk/make/javax/sound/jsoundalsa/Makefile | 2 +- jdk/make/javax/sound/jsoundds/Makefile | 2 +- jdk/make/javax/sql/Makefile | 2 +- jdk/make/javax/swing/FILES.gmk | 2 +- jdk/make/javax/swing/Makefile | 2 +- jdk/make/javax/swing/beaninfo/SwingBeans.gmk | 2 +- jdk/make/javax/swing/plaf/Makefile | 2 +- jdk/make/jpda/Makefile | 2 +- jdk/make/jpda/back/Makefile | 2 +- jdk/make/jpda/transport/Makefile | 2 +- jdk/make/jpda/transport/shmem/Makefile | 2 +- jdk/make/jpda/transport/socket/Makefile | 2 +- jdk/make/jpda/tty/Makefile | 2 +- jdk/make/jprt.gmk | 2 +- jdk/make/jprt.properties | 2 +- jdk/make/launchers/Makefile | 2 +- jdk/make/mkdemo/Makefile | 2 +- jdk/make/mkdemo/applets/Makefile | 2 +- jdk/make/mkdemo/jfc/Makefile | 2 +- jdk/make/mkdemo/jni/Makefile | 2 +- jdk/make/mkdemo/jvmti/hprof/Makefile | 2 +- jdk/make/mkdemo/management/Makefile | 2 +- jdk/make/mkdemo/nio/Makefile | 2 +- jdk/make/mkdemo/nio/zipfs/Makefile | 2 +- jdk/make/mkdemo/scripting/Makefile | 2 +- jdk/make/mksample/Makefile | 2 +- jdk/make/mksample/dtrace/Makefile | 2 +- jdk/make/mksample/jmx/Makefile | 2 +- jdk/make/mksample/jmx/jmx-scandir/Makefile | 2 +- jdk/make/mksample/nbproject/Makefile | 2 +- jdk/make/mksample/nio/Makefile | 2 +- jdk/make/mksample/nio/file/Makefile | 2 +- jdk/make/mksample/nio/multicast/Makefile | 2 +- jdk/make/mksample/nio/server/Makefile | 2 +- jdk/make/mksample/scripting/Makefile | 2 +- jdk/make/mksample/scripting/scriptpad/Makefile | 2 +- jdk/make/mksample/webservices/EbayClient/Makefile | 2 +- jdk/make/mksample/webservices/EbayServer/Makefile | 2 +- jdk/make/mksample/webservices/Makefile | 2 +- jdk/make/modules/Makefile | 2 +- jdk/make/modules/modules.config | 2 +- jdk/make/modules/optional.depconfig | 2 +- jdk/make/modules/tools/Makefile | 2 +- jdk/make/modules/tools/nbproject/project.properties | 2 +- jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java | 2 +- jdk/make/netbeans/world/build.xml | 2 +- jdk/make/org/Makefile | 2 +- jdk/make/org/ietf/Makefile | 2 +- jdk/make/sun/Makefile | 2 +- jdk/make/sun/applet/Makefile | 2 +- jdk/make/sun/awt/FILES_c_unix.gmk | 2 +- jdk/make/sun/awt/FILES_c_windows.gmk | 2 +- jdk/make/sun/awt/FILES_export_unix.gmk | 2 +- jdk/make/sun/awt/FILES_export_windows.gmk | 2 +- jdk/make/sun/awt/Makefile | 2 +- jdk/make/sun/awt/mapfile-mawt-vers | 2 +- jdk/make/sun/awt/mapfile-vers | 2 +- jdk/make/sun/awt/mapfile-vers-linux | 2 +- jdk/make/sun/cmm/Makefile | 2 +- jdk/make/sun/cmm/kcms/Makefile | 2 +- jdk/make/sun/cmm/lcms/FILES_c_unix.gmk | 2 +- jdk/make/sun/cmm/lcms/FILES_c_windows.gmk | 2 +- jdk/make/sun/cmm/lcms/Makefile | 2 +- jdk/make/sun/dcpr/Makefile | 2 +- jdk/make/sun/font/FILES_c.gmk | 2 +- jdk/make/sun/font/Makefile | 2 +- jdk/make/sun/font/t2k/Makefile | 2 +- jdk/make/sun/headless/Makefile | 2 +- jdk/make/sun/headless/mapfile-vers | 2 +- jdk/make/sun/image/Makefile | 2 +- jdk/make/sun/image/generic/Makefile | 2 +- jdk/make/sun/image/vis/Makefile | 2 +- jdk/make/sun/jar/Makefile | 2 +- jdk/make/sun/javazic/Makefile | 2 +- jdk/make/sun/jawt/Makefile | 2 +- jdk/make/sun/jconsole/Makefile | 2 +- jdk/make/sun/jdbc/Makefile | 2 +- jdk/make/sun/jdga/Makefile | 2 +- jdk/make/sun/jkernel/Makefile | 2 +- jdk/make/sun/jpeg/Makefile | 2 +- jdk/make/sun/launcher/Makefile | 2 +- jdk/make/sun/management/Makefile | 2 +- jdk/make/sun/native2ascii/Makefile | 2 +- jdk/make/sun/net/FILES_java.gmk | 2 +- jdk/make/sun/net/Makefile | 2 +- jdk/make/sun/net/others/Makefile | 2 +- jdk/make/sun/net/spi/Makefile | 2 +- jdk/make/sun/net/spi/nameservice/Makefile | 2 +- jdk/make/sun/net/spi/nameservice/dns/Makefile | 2 +- jdk/make/sun/nio/Makefile | 2 +- jdk/make/sun/nio/cs/FILES_java.gmk | 2 +- jdk/make/sun/nio/cs/Makefile | 2 +- jdk/make/sun/org/Makefile | 2 +- jdk/make/sun/org/mozilla/Makefile | 2 +- jdk/make/sun/org/mozilla/javascript/Makefile | 2 +- jdk/make/sun/pisces/Makefile | 2 +- jdk/make/sun/rmi/Makefile | 2 +- jdk/make/sun/rmi/cgi/Makefile | 2 +- jdk/make/sun/rmi/oldtools/Makefile | 2 +- jdk/make/sun/rmi/registry/Makefile | 2 +- jdk/make/sun/rmi/rmi/Makefile | 2 +- jdk/make/sun/rmi/rmic/Makefile | 2 +- jdk/make/sun/rmi/rmid/Makefile | 2 +- jdk/make/sun/security/Makefile | 2 +- jdk/make/sun/security/ec/Makefile | 2 +- jdk/make/sun/security/jgss/wrapper/Makefile | 2 +- jdk/make/sun/security/krb5/Makefile | 2 +- jdk/make/sun/security/mscapi/Makefile | 2 +- jdk/make/sun/security/pkcs11/Makefile | 2 +- jdk/make/sun/security/smartcardio/Makefile | 2 +- jdk/make/sun/serialver/Makefile | 2 +- jdk/make/sun/splashscreen/Makefile | 2 +- jdk/make/sun/text/Makefile | 2 +- jdk/make/sun/tools/Makefile | 2 +- jdk/make/sun/tracing/Makefile | 2 +- jdk/make/sun/tracing/dtrace/Makefile | 2 +- jdk/make/sun/xawt/FILES_c_unix.gmk | 2 +- jdk/make/sun/xawt/FILES_export_unix.gmk | 2 +- jdk/make/sun/xawt/Makefile | 2 +- jdk/make/sun/xawt/mapfile-vers | 2 +- jdk/make/tools/Makefile | 2 +- jdk/make/tools/freetypecheck/freetypecheck.c | 2 +- jdk/make/tools/src/build/tools/charsetmapping/JIS0213.java | 2 +- jdk/make/tools/src/build/tools/charsetmapping/Main.java | 2 +- jdk/make/tools/src/build/tools/charsetmapping/SBCS.java | 2 +- jdk/make/tools/src/build/tools/charsetmapping/Utils.java | 2 +- .../src/build/tools/generatecharacter/GenerateCharacter.java | 2 +- jdk/make/tools/src/build/tools/jarreorder/JarReorder.java | 2 +- jdk/make/tools/src/build/tools/javazic/RuleDay.java | 2 +- jdk/src/share/bin/main.c | 2 +- jdk/src/share/bin/parse_manifest.c | 2 +- jdk/src/share/bin/wildcard.c | 2 +- .../classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java | 2 +- .../classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java | 2 +- .../classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java | 2 +- .../classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java | 2 +- jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java | 2 +- .../classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java | 2 +- .../classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java | 2 +- .../com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java | 2 +- .../com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java | 2 +- .../classes/com/sun/imageio/spi/FileImageInputStreamSpi.java | 2 +- .../classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java | 2 +- .../com/sun/imageio/spi/InputStreamImageInputStreamSpi.java | 2 +- .../com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java | 2 +- .../classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java | 2 +- .../classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java | 2 +- .../share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java | 2 +- .../com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java | 2 +- .../com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java | 2 +- .../classes/com/sun/java/util/jar/pack/AdaptiveCoding.java | 2 +- .../share/classes/com/sun/java/util/jar/pack/BandStructure.java | 2 +- .../share/classes/com/sun/java/util/jar/pack/ClassWriter.java | 2 +- jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java | 2 +- jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java | 2 +- .../share/classes/com/sun/java/util/jar/pack/CodingChooser.java | 2 +- .../share/classes/com/sun/java/util/jar/pack/CodingMethod.java | 2 +- jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java | 2 +- jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java | 2 +- .../share/classes/com/sun/java/util/jar/pack/Instruction.java | 2 +- .../share/classes/com/sun/java/util/jar/pack/PackageReader.java | 2 +- .../share/classes/com/sun/java/util/jar/pack/PackageWriter.java | 2 +- .../classes/com/sun/java/util/jar/pack/PopulationCoding.java | 2 +- jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java | 2 +- .../classes/com/sun/jndi/rmi/registry/RegistryContext.java | 2 +- .../share/classes/com/sun/media/sound/AbstractMidiDevice.java | 2 +- .../com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 2 +- .../classes/com/sun/media/sound/ModelByteBufferWavetable.java | 2 +- jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java | 2 +- jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java | 2 +- jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 2 +- .../classes/com/sun/net/httpserver/BasicAuthenticator.java | 2 +- jdk/src/share/classes/com/sun/net/httpserver/Filter.java | 2 +- jdk/src/share/classes/com/sun/net/httpserver/Headers.java | 2 +- .../share/classes/com/sun/net/httpserver/HttpsConfigurator.java | 2 +- .../share/classes/com/sun/net/httpserver/HttpsParameters.java | 2 +- .../com/sun/rowset/internal/XmlReaderContentHandler.java | 2 +- jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java | 2 +- jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java | 2 +- jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java | 2 +- jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java | 2 +- .../classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java | 2 +- .../classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java | 2 +- jdk/src/share/classes/com/sun/servicetag/Registry.java | 2 +- jdk/src/share/classes/com/sun/servicetag/SunConnection.java | 2 +- .../share/classes/com/sun/servicetag/resources/register.html | 2 +- .../share/classes/com/sun/servicetag/resources/register_ja.html | 2 +- .../classes/com/sun/servicetag/resources/register_zh_CN.html | 2 +- .../classes/com/sun/tools/example/debug/tty/TTYResources.java | 2 +- jdk/src/share/classes/java/awt/AWTEvent.java | 2 +- jdk/src/share/classes/java/awt/AlphaComposite.java | 2 +- jdk/src/share/classes/java/awt/Canvas.java | 2 +- jdk/src/share/classes/java/awt/Color.java | 2 +- jdk/src/share/classes/java/awt/Component.java | 2 +- jdk/src/share/classes/java/awt/Container.java | 2 +- jdk/src/share/classes/java/awt/Dialog.java | 2 +- jdk/src/share/classes/java/awt/EventDispatchThread.java | 2 +- jdk/src/share/classes/java/awt/EventQueue.java | 2 +- jdk/src/share/classes/java/awt/FileDialog.java | 2 +- jdk/src/share/classes/java/awt/Font.java | 2 +- jdk/src/share/classes/java/awt/Frame.java | 2 +- jdk/src/share/classes/java/awt/GraphicsEnvironment.java | 2 +- jdk/src/share/classes/java/awt/GridBagConstraints.java | 2 +- jdk/src/share/classes/java/awt/KeyboardFocusManager.java | 2 +- jdk/src/share/classes/java/awt/ScrollPane.java | 2 +- jdk/src/share/classes/java/awt/Scrollbar.java | 2 +- jdk/src/share/classes/java/awt/SequencedEvent.java | 2 +- jdk/src/share/classes/java/awt/SplashScreen.java | 2 +- jdk/src/share/classes/java/awt/Toolkit.java | 2 +- jdk/src/share/classes/java/awt/Window.java | 2 +- jdk/src/share/classes/java/awt/event/ActionEvent.java | 2 +- jdk/src/share/classes/java/awt/event/InputEvent.java | 2 +- jdk/src/share/classes/java/awt/image/IndexColorModel.java | 2 +- jdk/src/share/classes/java/awt/image/SampleModel.java | 2 +- jdk/src/share/classes/java/beans/MetaData.java | 2 +- jdk/src/share/classes/java/beans/XMLDecoder.java | 2 +- jdk/src/share/classes/java/dyn/Linkage.java | 2 +- jdk/src/share/classes/java/dyn/MethodType.java | 2 +- jdk/src/share/classes/java/dyn/package-info.java | 2 +- jdk/src/share/classes/java/io/Bits.java | 2 +- jdk/src/share/classes/java/io/BufferedInputStream.java | 2 +- jdk/src/share/classes/java/io/ByteArrayInputStream.java | 2 +- jdk/src/share/classes/java/io/ByteArrayOutputStream.java | 2 +- jdk/src/share/classes/java/io/Closeable.java | 2 +- jdk/src/share/classes/java/io/FileOutputStream.java | 2 +- jdk/src/share/classes/java/io/FilterInputStream.java | 2 +- jdk/src/share/classes/java/io/ObjectInput.java | 2 +- jdk/src/share/classes/java/io/ObjectOutput.java | 2 +- jdk/src/share/classes/java/io/PushbackInputStream.java | 2 +- jdk/src/share/classes/java/io/package.html | 2 +- jdk/src/share/classes/java/lang/AbstractStringBuilder.java | 2 +- jdk/src/share/classes/java/lang/AssertionError.java | 2 +- jdk/src/share/classes/java/lang/Deprecated.java | 2 +- jdk/src/share/classes/java/lang/Error.java | 2 +- jdk/src/share/classes/java/lang/Exception.java | 2 +- jdk/src/share/classes/java/lang/Integer.java | 2 +- jdk/src/share/classes/java/lang/Iterable.java | 2 +- jdk/src/share/classes/java/lang/Math.java | 2 +- jdk/src/share/classes/java/lang/Object.java | 2 +- jdk/src/share/classes/java/lang/ProcessBuilder.java | 2 +- jdk/src/share/classes/java/lang/Readable.java | 2 +- jdk/src/share/classes/java/lang/RuntimeException.java | 2 +- jdk/src/share/classes/java/lang/String.java | 2 +- jdk/src/share/classes/java/lang/SuppressWarnings.java | 2 +- jdk/src/share/classes/java/lang/System.java | 2 +- jdk/src/share/classes/java/lang/Thread.java | 2 +- jdk/src/share/classes/java/lang/ThreadGroup.java | 2 +- jdk/src/share/classes/java/lang/reflect/Constructor.java | 2 +- jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java | 2 +- jdk/src/share/classes/java/net/DatagramSocket.java | 2 +- jdk/src/share/classes/java/net/HttpCookie.java | 2 +- jdk/src/share/classes/java/net/HttpURLConnection.java | 2 +- jdk/src/share/classes/java/net/Inet6Address.java | 2 +- jdk/src/share/classes/java/net/InetAddress.java | 2 +- jdk/src/share/classes/java/net/NetPermission.java | 2 +- jdk/src/share/classes/java/net/NetworkInterface.java | 2 +- jdk/src/share/classes/java/net/ServerSocket.java | 2 +- jdk/src/share/classes/java/net/SocketInputStream.java | 2 +- jdk/src/share/classes/java/net/SocksSocketImpl.java | 2 +- jdk/src/share/classes/java/net/URI.java | 2 +- jdk/src/share/classes/java/nio/Bits.java | 2 +- jdk/src/share/classes/java/nio/Direct-X-Buffer.java.template | 2 +- jdk/src/share/classes/java/nio/MappedByteBuffer.java | 2 +- jdk/src/share/classes/java/nio/StringCharBuffer.java | 2 +- .../classes/java/nio/channels/AsynchronousSocketChannel.java | 2 +- jdk/src/share/classes/java/nio/channels/FileLock.java | 2 +- jdk/src/share/classes/java/nio/channels/package-info.java | 2 +- .../java/nio/channels/spi/AbstractInterruptibleChannel.java | 2 +- .../share/classes/java/nio/channels/spi/AbstractSelector.java | 2 +- .../java/nio/channels/spi/AsynchronousChannelProvider.java | 2 +- jdk/src/share/classes/java/nio/charset/Charset.java | 2 +- jdk/src/share/classes/java/nio/charset/package.html | 2 +- jdk/src/share/classes/java/nio/file/DirectoryStream.java | 2 +- jdk/src/share/classes/java/nio/file/FileTreeWalker.java | 2 +- jdk/src/share/classes/java/nio/file/FileVisitOption.java | 2 +- jdk/src/share/classes/java/nio/file/FileVisitor.java | 2 +- jdk/src/share/classes/java/nio/file/Files.java | 2 +- jdk/src/share/classes/java/nio/file/Path.java | 2 +- jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java | 2 +- jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java | 2 +- jdk/src/share/classes/java/security/IdentityScope.java | 2 +- jdk/src/share/classes/java/security/Security.java | 2 +- jdk/src/share/classes/java/security/cert/PKIXParameters.java | 2 +- jdk/src/share/classes/java/text/CollationElementIterator.java | 2 +- jdk/src/share/classes/java/text/DateFormat.java | 2 +- jdk/src/share/classes/java/text/MessageFormat.java | 2 +- jdk/src/share/classes/java/text/NumberFormat.java | 2 +- jdk/src/share/classes/java/text/RuleBasedBreakIterator.java | 2 +- jdk/src/share/classes/java/util/AbstractCollection.java | 2 +- jdk/src/share/classes/java/util/AbstractList.java | 2 +- jdk/src/share/classes/java/util/AbstractMap.java | 2 +- jdk/src/share/classes/java/util/ArrayList.java | 2 +- jdk/src/share/classes/java/util/Arrays.java | 2 +- jdk/src/share/classes/java/util/Collection.java | 2 +- jdk/src/share/classes/java/util/Collections.java | 2 +- .../classes/java/util/ConcurrentModificationException.java | 2 +- jdk/src/share/classes/java/util/Currency.java | 2 +- jdk/src/share/classes/java/util/Date.java | 2 +- jdk/src/share/classes/java/util/FormattableFlags.java | 2 +- jdk/src/share/classes/java/util/Formatter.java | 2 +- jdk/src/share/classes/java/util/Hashtable.java | 2 +- jdk/src/share/classes/java/util/Iterator.java | 2 +- jdk/src/share/classes/java/util/LinkedList.java | 2 +- jdk/src/share/classes/java/util/List.java | 2 +- jdk/src/share/classes/java/util/ListResourceBundle.java | 2 +- jdk/src/share/classes/java/util/PriorityQueue.java | 2 +- jdk/src/share/classes/java/util/Properties.java | 2 +- jdk/src/share/classes/java/util/Random.java | 2 +- jdk/src/share/classes/java/util/Scanner.java | 2 +- jdk/src/share/classes/java/util/Stack.java | 2 +- jdk/src/share/classes/java/util/TreeMap.java | 2 +- jdk/src/share/classes/java/util/TreeSet.java | 2 +- jdk/src/share/classes/java/util/Vector.java | 2 +- jdk/src/share/classes/java/util/XMLUtils.java | 2 +- .../classes/java/util/concurrent/CopyOnWriteArrayList.java | 2 +- jdk/src/share/classes/java/util/jar/JarInputStream.java | 2 +- jdk/src/share/classes/java/util/logging/LogRecord.java | 2 +- jdk/src/share/classes/java/util/regex/Pattern.java | 2 +- jdk/src/share/classes/java/util/spi/CurrencyNameProvider.java | 2 +- jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java | 2 +- jdk/src/share/classes/java/util/zip/Deflater.java | 2 +- jdk/src/share/classes/java/util/zip/ZipFile.java | 2 +- .../share/classes/javax/imageio/stream/ImageInputStream.java | 2 +- .../share/classes/javax/management/remote/JMXServiceURL.java | 2 +- jdk/src/share/classes/javax/naming/event/EventDirContext.java | 2 +- jdk/src/share/classes/javax/naming/ldap/Control.java | 2 +- jdk/src/share/classes/javax/naming/ldap/ControlFactory.java | 2 +- jdk/src/share/classes/javax/naming/ldap/ExtendedRequest.java | 2 +- jdk/src/share/classes/javax/naming/ldap/ExtendedResponse.java | 2 +- jdk/src/share/classes/javax/naming/ldap/LdapName.java | 2 +- jdk/src/share/classes/javax/naming/ldap/Rdn.java | 2 +- .../classes/javax/naming/ldap/UnsolicitedNotification.java | 2 +- .../javax/naming/ldap/UnsolicitedNotificationListener.java | 2 +- jdk/src/share/classes/javax/net/SocketFactory.java | 2 +- jdk/src/share/classes/javax/net/ssl/SSLContext.java | 2 +- jdk/src/share/classes/javax/print/DocFlavor.java | 2 +- jdk/src/share/classes/javax/sound/midi/MidiDevice.java | 2 +- jdk/src/share/classes/javax/sound/midi/MidiSystem.java | 2 +- jdk/src/share/classes/javax/sound/midi/Receiver.java | 2 +- jdk/src/share/classes/javax/sound/midi/Transmitter.java | 2 +- jdk/src/share/classes/javax/sound/sampled/Line.java | 2 +- jdk/src/share/classes/javax/swing/AbstractButton.java | 2 +- jdk/src/share/classes/javax/swing/DebugGraphics.java | 2 +- jdk/src/share/classes/javax/swing/DefaultDesktopManager.java | 2 +- jdk/src/share/classes/javax/swing/GroupLayout.java | 2 +- jdk/src/share/classes/javax/swing/JColorChooser.java | 2 +- jdk/src/share/classes/javax/swing/JComponent.java | 2 +- jdk/src/share/classes/javax/swing/JDesktopPane.java | 2 +- jdk/src/share/classes/javax/swing/JEditorPane.java | 2 +- jdk/src/share/classes/javax/swing/JLayer.java | 2 +- jdk/src/share/classes/javax/swing/JList.java | 2 +- jdk/src/share/classes/javax/swing/JSplitPane.java | 2 +- jdk/src/share/classes/javax/swing/JTabbedPane.java | 2 +- jdk/src/share/classes/javax/swing/JTextField.java | 2 +- jdk/src/share/classes/javax/swing/JTree.java | 2 +- jdk/src/share/classes/javax/swing/JViewport.java | 2 +- jdk/src/share/classes/javax/swing/Popup.java | 2 +- jdk/src/share/classes/javax/swing/RepaintManager.java | 2 +- jdk/src/share/classes/javax/swing/SwingUtilities.java | 2 +- jdk/src/share/classes/javax/swing/ToolTipManager.java | 2 +- jdk/src/share/classes/javax/swing/UIDefaults.java | 2 +- jdk/src/share/classes/javax/swing/plaf/LayerUI.java | 2 +- .../classes/javax/swing/plaf/basic/BasicButtonListener.java | 2 +- .../share/classes/javax/swing/plaf/basic/BasicComboPopup.java | 2 +- .../classes/javax/swing/plaf/basic/BasicFileChooserUI.java | 2 +- .../share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java | 2 +- jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java | 2 +- .../share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java | 2 +- .../share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java | 2 +- .../share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java | 2 +- .../classes/javax/swing/plaf/basic/BasicTableHeaderUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java | 2 +- .../share/classes/javax/swing/plaf/basic/BasicViewportUI.java | 2 +- .../share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java | 2 +- .../share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java | 2 +- .../classes/javax/swing/plaf/synth/SynthColorChooserUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java | 2 +- .../classes/javax/swing/plaf/synth/SynthDesktopIconUI.java | 2 +- .../classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java | 2 +- .../classes/javax/swing/plaf/synth/SynthInternalFrameUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java | 2 +- .../classes/javax/swing/plaf/synth/SynthProgressBarUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java | 2 +- .../classes/javax/swing/plaf/synth/SynthTableHeaderUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthToolBarUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthToolTipUI.java | 2 +- jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java | 2 +- .../share/classes/javax/swing/plaf/synth/SynthViewportUI.java | 2 +- .../classes/javax/swing/table/DefaultTableCellRenderer.java | 2 +- jdk/src/share/classes/javax/swing/text/DefaultCaret.java | 2 +- jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java | 2 +- jdk/src/share/classes/javax/swing/text/DefaultFormatter.java | 2 +- jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java | 2 +- .../share/classes/javax/swing/text/DefaultStyledDocument.java | 2 +- jdk/src/share/classes/javax/swing/text/GlyphView.java | 2 +- .../share/classes/javax/swing/text/InternationalFormatter.java | 2 +- jdk/src/share/classes/javax/swing/text/JTextComponent.java | 2 +- jdk/src/share/classes/javax/swing/text/MaskFormatter.java | 2 +- jdk/src/share/classes/javax/swing/text/NumberFormatter.java | 2 +- jdk/src/share/classes/javax/swing/text/PlainDocument.java | 2 +- jdk/src/share/classes/javax/swing/text/TabSet.java | 2 +- jdk/src/share/classes/javax/swing/text/Utilities.java | 2 +- jdk/src/share/classes/javax/swing/text/WrappedPlainView.java | 2 +- jdk/src/share/classes/javax/swing/text/html/FormView.java | 2 +- jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java | 2 +- .../share/classes/javax/swing/text/html/MinimalHTMLWriter.java | 2 +- jdk/src/share/classes/javax/swing/text/html/StyleSheet.java | 2 +- jdk/src/share/classes/javax/swing/text/html/parser/Parser.java | 2 +- jdk/src/share/classes/javax/swing/text/rtf/AbstractFilter.java | 2 +- jdk/src/share/classes/sun/applet/resources/MsgAppletViewer.java | 2 +- .../classes/sun/applet/resources/MsgAppletViewer_pt_BR.java | 2 +- .../classes/sun/applet/resources/MsgAppletViewer_zh_CN.java | 2 +- jdk/src/share/classes/sun/awt/AWTAccessor.java | 2 +- jdk/src/share/classes/sun/awt/EmbeddedFrame.java | 2 +- jdk/src/share/classes/sun/awt/HKSCS.java | 2 +- jdk/src/share/classes/sun/awt/PlatformFont.java | 2 +- jdk/src/share/classes/sun/awt/SunToolkit.java | 2 +- jdk/src/share/classes/sun/awt/UngrabEvent.java | 2 +- jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java | 2 +- jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java | 2 +- jdk/src/share/classes/sun/awt/image/ImageRepresentation.java | 2 +- jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java | 2 +- jdk/src/share/classes/sun/dyn/AdapterMethodHandle.java | 2 +- jdk/src/share/classes/sun/dyn/BoundMethodHandle.java | 2 +- jdk/src/share/classes/sun/dyn/CallSiteImpl.java | 2 +- jdk/src/share/classes/sun/dyn/FilterGeneric.java | 2 +- jdk/src/share/classes/sun/dyn/FilterOneArgument.java | 2 +- jdk/src/share/classes/sun/dyn/FromGeneric.java | 2 +- jdk/src/share/classes/sun/dyn/Invokers.java | 2 +- jdk/src/share/classes/sun/dyn/MethodTypeImpl.java | 2 +- jdk/src/share/classes/sun/dyn/SpreadGeneric.java | 2 +- jdk/src/share/classes/sun/dyn/ToGeneric.java | 2 +- jdk/src/share/classes/sun/dyn/empty/Empty.java | 2 +- jdk/src/share/classes/sun/dyn/package-info.java | 2 +- jdk/src/share/classes/sun/dyn/util/BytecodeDescriptor.java | 2 +- jdk/src/share/classes/sun/dyn/util/BytecodeName.java | 2 +- jdk/src/share/classes/sun/dyn/util/ValueConversions.java | 2 +- jdk/src/share/classes/sun/dyn/util/VerifyAccess.java | 2 +- jdk/src/share/classes/sun/dyn/util/VerifyType.java | 2 +- jdk/src/share/classes/sun/dyn/util/Wrapper.java | 2 +- jdk/src/share/classes/sun/font/FontManagerFactory.java | 2 +- jdk/src/share/classes/sun/font/FontUtilities.java | 2 +- jdk/src/share/classes/sun/font/StrikeCache.java | 2 +- jdk/src/share/classes/sun/font/SunFontManager.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharBig5.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharBig5_Solaris.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharISO2022.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharISO2022JP.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharJISAutoDetect.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java | 2 +- jdk/src/share/classes/sun/io/ByteToCharUTF8.java | 2 +- jdk/src/share/classes/sun/io/CharToByteBig5.java | 2 +- jdk/src/share/classes/sun/io/CharToByteBig5_HKSCS.java | 2 +- jdk/src/share/classes/sun/io/CharToByteBig5_Solaris.java | 2 +- jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java | 2 +- jdk/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java | 2 +- jdk/src/share/classes/sun/io/CharToByteMS950_HKSCS.java | 2 +- jdk/src/share/classes/sun/io/CharToBytePCK.java | 2 +- jdk/src/share/classes/sun/io/CharToByteUnicode.java | 2 +- jdk/src/share/classes/sun/io/Converters.java | 2 +- jdk/src/share/classes/sun/java2d/Disposer.java | 2 +- .../share/classes/sun/java2d/HeadlessGraphicsEnvironment.java | 2 +- jdk/src/share/classes/sun/java2d/SurfaceData.java | 2 +- jdk/src/share/classes/sun/java2d/cmm/CMSManager.java | 2 +- jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +- jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java | 2 +- jdk/src/share/classes/sun/java2d/loops/DrawParallelogram.java | 2 +- jdk/src/share/classes/sun/java2d/loops/FillParallelogram.java | 2 +- jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java | 2 +- jdk/src/share/classes/sun/java2d/loops/RenderLoops.java | 2 +- jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java | 2 +- jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java | 2 +- jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java | 2 +- jdk/src/share/classes/sun/java2d/pisces/Curve.java | 2 +- jdk/src/share/classes/sun/java2d/pisces/Dasher.java | 2 +- jdk/src/share/classes/sun/java2d/pisces/Helpers.java | 2 +- jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java | 2 +- .../share/classes/sun/java2d/pisces/PiscesRenderingEngine.java | 2 +- jdk/src/share/classes/sun/java2d/pisces/Renderer.java | 2 +- jdk/src/share/classes/sun/java2d/pisces/Stroker.java | 2 +- .../classes/sun/java2d/pisces/TransformingPathConsumer2D.java | 2 +- jdk/src/share/classes/sun/jkernel/DownloadManager.java | 2 +- jdk/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java | 2 +- jdk/src/share/classes/sun/jvmstat/monitor/Monitor.java | 2 +- jdk/src/share/classes/sun/jvmstat/monitor/Units.java | 2 +- jdk/src/share/classes/sun/jvmstat/monitor/Variability.java | 2 +- .../sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java | 2 +- .../sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java | 2 +- .../classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java | 2 +- .../sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java | 2 +- .../classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java | 2 +- .../sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java | 2 +- .../sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java | 2 +- .../sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java | 2 +- .../share/classes/sun/launcher/resources/launcher_de.properties | 2 +- .../share/classes/sun/launcher/resources/launcher_es.properties | 2 +- .../share/classes/sun/launcher/resources/launcher_fr.properties | 2 +- .../share/classes/sun/launcher/resources/launcher_it.properties | 2 +- .../share/classes/sun/launcher/resources/launcher_ja.properties | 2 +- .../share/classes/sun/launcher/resources/launcher_ko.properties | 2 +- .../classes/sun/launcher/resources/launcher_pt_BR.properties | 2 +- .../share/classes/sun/launcher/resources/launcher_sv.properties | 2 +- .../classes/sun/launcher/resources/launcher_zh_CN.properties | 2 +- .../classes/sun/launcher/resources/launcher_zh_TW.properties | 2 +- jdk/src/share/classes/sun/management/Flag.java | 2 +- .../share/classes/sun/management/resources/agent_de.properties | 2 +- .../share/classes/sun/management/resources/agent_es.properties | 2 +- .../share/classes/sun/management/resources/agent_fr.properties | 2 +- .../share/classes/sun/management/resources/agent_it.properties | 2 +- .../share/classes/sun/management/resources/agent_ja.properties | 2 +- .../share/classes/sun/management/resources/agent_ko.properties | 2 +- .../classes/sun/management/resources/agent_pt_BR.properties | 2 +- .../share/classes/sun/management/resources/agent_sv.properties | 2 +- .../classes/sun/management/resources/agent_zh_CN.properties | 2 +- .../classes/sun/management/resources/agent_zh_TW.properties | 2 +- jdk/src/share/classes/sun/misc/BootClassLoaderHook.java | 2 +- jdk/src/share/classes/sun/misc/Launcher.java | 2 +- jdk/src/share/classes/sun/misc/VM.java | 2 +- jdk/src/share/classes/sun/net/InetAddressCachePolicy.java | 2 +- jdk/src/share/classes/sun/net/NetworkClient.java | 2 +- jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java | 2 +- .../share/classes/sun/net/httpserver/ChunkedInputStream.java | 2 +- jdk/src/share/classes/sun/net/httpserver/Event.java | 2 +- jdk/src/share/classes/sun/net/httpserver/ExchangeImpl.java | 2 +- .../classes/sun/net/httpserver/FixedLengthInputStream.java | 2 +- jdk/src/share/classes/sun/net/httpserver/HttpConnection.java | 2 +- jdk/src/share/classes/sun/net/httpserver/Request.java | 2 +- jdk/src/share/classes/sun/net/httpserver/SSLStreams.java | 2 +- jdk/src/share/classes/sun/net/httpserver/ServerConfig.java | 2 +- jdk/src/share/classes/sun/net/httpserver/ServerImpl.java | 2 +- jdk/src/share/classes/sun/net/www/MessageHeader.java | 2 +- jdk/src/share/classes/sun/net/www/MimeTable.java | 2 +- jdk/src/share/classes/sun/net/www/http/HttpClient.java | 2 +- .../classes/sun/net/www/protocol/file/FileURLConnection.java | 2 +- .../classes/sun/net/www/protocol/ftp/FtpURLConnection.java | 2 +- .../classes/sun/net/www/protocol/http/AuthenticationInfo.java | 2 +- .../classes/sun/net/www/protocol/http/BasicAuthentication.java | 2 +- .../share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 2 +- jdk/src/share/classes/sun/nio/ch/CompletedFuture.java | 2 +- jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java | 2 +- jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java | 2 +- jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java | 2 +- jdk/src/share/classes/sun/nio/ch/FileDispatcher.java | 2 +- jdk/src/share/classes/sun/nio/ch/IOUtil.java | 2 +- jdk/src/share/classes/sun/nio/ch/IOVecWrapper.java | 2 +- jdk/src/share/classes/sun/nio/ch/Interruptible.java | 2 +- jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java | 2 +- jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java | 2 +- jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java | 2 +- jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java | 2 +- jdk/src/share/classes/sun/nio/ch/Util.java | 2 +- jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java | 2 +- jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java | 2 +- jdk/src/share/classes/sun/nio/cs/UTF_8.java | 2 +- jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/GB18030.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/IBM33722.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/IBM964.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/PCK.java | 2 +- jdk/src/share/classes/sun/nio/cs/ext/SJIS.java | 2 +- jdk/src/share/classes/sun/nio/fs/AbstractPath.java | 2 +- jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java | 2 +- .../sun/rmi/registry/resources/rmiregistry_pt_BR.properties | 2 +- jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java | 2 +- jdk/src/share/classes/sun/rmi/rmic/resources/rmic.properties | 2 +- jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties | 2 +- .../share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties | 2 +- .../classes/sun/rmi/server/resources/rmid_pt_BR.properties | 2 +- jdk/src/share/classes/sun/security/jca/Providers.java | 2 +- jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java | 2 +- jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java | 2 +- .../classes/sun/security/pkcs11/wrapper/PKCS11Exception.java | 2 +- jdk/src/share/classes/sun/security/provider/JavaKeyStore.java | 2 +- jdk/src/share/classes/sun/security/ssl/Krb5Helper.java | 2 +- jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java | 2 +- jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java | 2 +- .../share/classes/sun/security/tools/JarSignerResources_ja.java | 2 +- .../classes/sun/security/tools/JarSignerResources_zh_CN.java | 2 +- jdk/src/share/classes/sun/security/util/AuthResources_de.java | 2 +- jdk/src/share/classes/sun/security/util/AuthResources_es.java | 2 +- jdk/src/share/classes/sun/security/util/AuthResources_fr.java | 2 +- jdk/src/share/classes/sun/security/util/AuthResources_it.java | 2 +- jdk/src/share/classes/sun/security/util/AuthResources_ja.java | 2 +- jdk/src/share/classes/sun/security/util/AuthResources_ko.java | 2 +- .../share/classes/sun/security/util/AuthResources_pt_BR.java | 2 +- jdk/src/share/classes/sun/security/util/AuthResources_sv.java | 2 +- .../share/classes/sun/security/util/AuthResources_zh_CN.java | 2 +- .../share/classes/sun/security/util/AuthResources_zh_TW.java | 2 +- jdk/src/share/classes/sun/security/util/Resources_fr.java | 2 +- jdk/src/share/classes/sun/security/util/Resources_it.java | 2 +- jdk/src/share/classes/sun/security/util/Resources_pt_BR.java | 2 +- jdk/src/share/classes/sun/security/x509/X509Key.java | 2 +- jdk/src/share/classes/sun/swing/SwingUtilities2.java | 2 +- .../classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java | 2 +- .../classes/sun/swing/table/DefaultTableCellHeaderRenderer.java | 2 +- jdk/src/share/classes/sun/text/resources/FormatData_be.java | 2 +- jdk/src/share/classes/sun/text/resources/FormatData_fr.java | 2 +- jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java | 2 +- jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java | 2 +- jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java | 2 +- jdk/src/share/classes/sun/tools/jar/Main.java | 2 +- .../share/classes/sun/tools/jar/resources/jar_pt_BR.properties | 2 +- .../classes/sun/tools/jconsole/resources/JConsoleResources.java | 2 +- .../sun/tools/jconsole/resources/JConsoleResources_ja.java | 2 +- .../sun/tools/jconsole/resources/JConsoleResources_zh_CN.java | 2 +- jdk/src/share/classes/sun/tools/jstat/Arguments.java | 2 +- jdk/src/share/classes/sun/tools/jstat/ExpressionResolver.java | 2 +- jdk/src/share/classes/sun/tools/jstat/JStatLogger.java | 2 +- jdk/src/share/classes/sun/tools/jstat/Jstat.java | 2 +- jdk/src/share/classes/sun/tools/jstat/OptionFinder.java | 2 +- jdk/src/share/classes/sun/tools/jstat/OptionLister.java | 2 +- jdk/src/share/classes/sun/tools/jstat/resources/jstat_options | 2 +- .../sun/tools/native2ascii/resources/MsgNative2ascii.java | 2 +- jdk/src/share/classes/sun/util/BuddhistCalendar.java | 2 +- jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java | 2 +- jdk/src/share/classes/sun/util/logging/PlatformLogger.java | 2 +- .../classes/sun/util/logging/resources/logging_pt_BR.properties | 2 +- .../share/classes/sun/util/resources/CalendarData_hu.properties | 2 +- .../classes/sun/util/resources/CurrencyNames_uk_UA.properties | 2 +- jdk/src/share/classes/sun/util/resources/LocaleNames.properties | 2 +- .../share/classes/sun/util/resources/LocaleNames_nl.properties | 2 +- .../share/classes/sun/util/resources/LocaleNames_zh.properties | 2 +- .../classes/sun/util/resources/LocaleNames_zh_TW.properties | 2 +- jdk/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java | 2 +- jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java | 2 +- jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java | 2 +- .../demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java | 2 +- .../demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java | 2 +- .../demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java | 2 +- jdk/src/share/demo/jvmti/hprof/sample.makefile.txt | 2 +- jdk/src/share/javavm/export/classfile_constants.h | 2 +- jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp | 2 +- jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 2 +- jdk/src/share/native/common/check_code.c | 2 +- jdk/src/share/native/common/jdk_util.c | 2 +- jdk/src/share/native/common/jni_util.c | 2 +- jdk/src/share/native/java/io/RandomAccessFile.c | 2 +- jdk/src/share/native/java/io/io_util.c | 2 +- jdk/src/share/native/java/io/io_util.h | 2 +- jdk/src/share/native/java/lang/Class.c | 2 +- jdk/src/share/native/java/lang/ClassLoader.c | 2 +- jdk/src/share/native/java/lang/System.c | 2 +- jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | 2 +- jdk/src/share/native/java/lang/java_props.h | 2 +- jdk/src/share/native/java/lang/reflect/Proxy.c | 2 +- jdk/src/share/native/java/net/net_util.c | 2 +- jdk/src/share/native/java/nio/Bits.c | 2 +- jdk/src/share/native/java/util/zip/Deflater.c | 2 +- jdk/src/share/native/java/util/zip/Inflater.c | 2 +- jdk/src/share/native/java/util/zip/ZipFile.c | 2 +- jdk/src/share/native/java/util/zip/zip_util.c | 2 +- jdk/src/share/native/java/util/zip/zip_util.h | 2 +- jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c | 2 +- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c | 2 +- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c | 2 +- jdk/src/share/native/sun/awt/medialib/safe_alloc.h | 2 +- jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 2 +- jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +- jdk/src/share/native/sun/font/AccelGlyphCache.c | 2 +- jdk/src/share/native/sun/font/fontscalerdefs.h | 2 +- jdk/src/share/native/sun/font/freetypeScaler.c | 2 +- jdk/src/share/native/sun/font/sunFont.c | 2 +- jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c | 2 +- jdk/src/share/native/sun/java2d/loops/Any3Byte.c | 2 +- jdk/src/share/native/sun/java2d/loops/Any4Byte.c | 2 +- jdk/src/share/native/sun/java2d/loops/AnyByte.c | 2 +- jdk/src/share/native/sun/java2d/loops/AnyInt.c | 2 +- jdk/src/share/native/sun/java2d/loops/AnyShort.c | 2 +- jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c | 2 +- jdk/src/share/native/sun/java2d/loops/FillParallelogram.c | 2 +- jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c | 2 +- jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h | 2 +- jdk/src/share/native/sun/java2d/loops/LoopMacros.h | 2 +- jdk/src/share/native/sun/java2d/loops/ProcessPath.c | 2 +- jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c | 2 +- jdk/src/share/native/sun/management/Flag.c | 2 +- jdk/src/share/native/sun/misc/VM.c | 2 +- jdk/src/share/native/sun/misc/VMSupport.c | 2 +- jdk/src/share/native/sun/security/ec/ECC_JNI.cpp | 2 +- jdk/src/share/sample/nio/file/Chmod.java | 2 +- jdk/src/share/sample/nio/file/Copy.java | 2 +- jdk/src/share/sample/nio/file/WatchDir.java | 2 +- jdk/src/solaris/bin/jexec.c | 2 +- jdk/src/solaris/classes/java/io/UnixFileSystem.java | 2 +- jdk/src/solaris/classes/java/lang/ProcessImpl.java | 2 +- jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux | 2 +- jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris | 2 +- jdk/src/solaris/classes/sun/awt/UNIXToolkit.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XWindow.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java | 2 +- jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | 2 +- jdk/src/solaris/classes/sun/awt/X11InputMethod.java | 2 +- .../sun/awt/fontconfigs/linux.fontconfig.Fedora.properties | 2 +- .../sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties | 2 +- .../classes/sun/awt/fontconfigs/solaris.fontconfig.properties | 2 +- jdk/src/solaris/classes/sun/awt/motif/MToolkit.java | 2 +- .../solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java | 2 +- jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java | 2 +- jdk/src/solaris/classes/sun/net/NetHooks.java | 2 +- jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java | 2 +- .../classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/PipeImpl.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/SctpNet.java | 2 +- jdk/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java | 2 +- .../classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java | 2 +- .../solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java | 2 +- jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java | 2 +- jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java | 2 +- jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java | 2 +- jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java | 2 +- jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java | 2 +- jdk/src/solaris/classes/sun/nio/fs/UnixPath.java | 2 +- .../solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 2 +- .../solaris/classes/sun/tools/attach/LinuxVirtualMachine.java | 2 +- .../solaris/classes/sun/tools/attach/SolarisVirtualMachine.java | 2 +- jdk/src/solaris/demo/jni/Poller/Poller.c | 2 +- jdk/src/solaris/native/java/io/FileOutputStream_md.c | 2 +- jdk/src/solaris/native/java/io/UnixFileSystem_md.c | 2 +- jdk/src/solaris/native/java/io/canonicalize_md.c | 2 +- jdk/src/solaris/native/java/io/io_util_md.c | 2 +- jdk/src/solaris/native/java/io/io_util_md.h | 2 +- jdk/src/solaris/native/java/lang/java_props_md.c | 2 +- jdk/src/solaris/native/java/lang/locale_str.h | 2 +- jdk/src/solaris/native/java/net/Inet4AddressImpl.c | 2 +- jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 2 +- jdk/src/solaris/native/java/net/NetworkInterface.c | 2 +- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | 2 +- jdk/src/solaris/native/java/net/PlainSocketImpl.c | 2 +- jdk/src/solaris/native/java/net/net_util_md.c | 2 +- jdk/src/solaris/native/java/net/net_util_md.h | 2 +- jdk/src/solaris/native/java/nio/MappedByteBuffer.c | 2 +- jdk/src/solaris/native/sun/awt/awt.h | 2 +- jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c | 2 +- jdk/src/solaris/native/sun/awt/awt_InputMethod.c | 2 +- jdk/src/solaris/native/sun/awt/awt_Robot.c | 2 +- jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c | 2 +- .../native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c | 2 +- .../native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c | 2 +- .../native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c | 2 +- .../native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c | 2 +- jdk/src/solaris/native/sun/awt/swing_GTKStyle.c | 2 +- jdk/src/solaris/native/sun/java2d/loops/java2d_Mlib.c | 2 +- jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c | 2 +- jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c | 2 +- jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 2 +- jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h | 2 +- jdk/src/solaris/native/sun/net/sdp/SdpSupport.c | 2 +- jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c | 2 +- jdk/src/solaris/native/sun/nio/ch/IOUtil.c | 2 +- jdk/src/solaris/native/sun/nio/ch/Net.c | 2 +- jdk/src/solaris/native/sun/nio/ch/SctpNet.c | 2 +- jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c | 2 +- .../native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c | 2 +- jdk/src/solaris/native/sun/xawt/XlibWrapper.c | 2 +- jdk/src/solaris/native/sun/xawt/awt_Desktop.c | 2 +- jdk/src/windows/classes/java/io/Win32FileSystem.java | 2 +- jdk/src/windows/classes/java/lang/ProcessImpl.java | 2 +- jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java | 2 +- .../windows/classes/sun/awt/shell/Win32ShellFolderManager2.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WFramePeer.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WInputMethod.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WToolkit.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java | 2 +- jdk/src/windows/classes/sun/awt/windows/fontconfig.properties | 2 +- .../windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java | 2 +- jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java | 2 +- .../classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java | 2 +- .../classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 2 +- jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java | 2 +- jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java | 2 +- jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java | 2 +- .../com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp | 2 +- jdk/src/windows/native/common/jni_util_md.c | 2 +- jdk/src/windows/native/java/io/FileOutputStream_md.c | 2 +- jdk/src/windows/native/java/io/WinNTFileSystem_md.c | 2 +- jdk/src/windows/native/java/io/io_util_md.c | 2 +- jdk/src/windows/native/java/io/io_util_md.h | 2 +- jdk/src/windows/native/java/lang/ProcessImpl_md.c | 2 +- jdk/src/windows/native/java/lang/java_props_md.c | 2 +- jdk/src/windows/native/java/net/NetworkInterface_winXP.c | 2 +- .../windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 2 +- jdk/src/windows/native/java/net/net_util_md.h | 2 +- jdk/src/windows/native/java/nio/MappedByteBuffer.c | 2 +- jdk/src/windows/native/java/util/TimeZone_md.c | 2 +- jdk/src/windows/native/sun/font/fontpath.c | 2 +- jdk/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp | 2 +- jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp | 2 +- jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h | 2 +- jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c | 2 +- .../windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 2 +- .../windows/native/sun/java2d/windows/GDIWindowSurfaceData.h | 2 +- jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp | 2 +- jdk/src/windows/native/sun/jkernel/DownloadDialog.cpp | 2 +- jdk/src/windows/native/sun/jkernel/DownloadHelper.cpp | 2 +- jdk/src/windows/native/sun/jkernel/kernel.rc | 2 +- jdk/src/windows/native/sun/jkernel/kernel_pt_BR.rc | 2 +- jdk/src/windows/native/sun/jkernel/stdafx.h | 2 +- jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c | 2 +- jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c | 2 +- jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c | 2 +- jdk/src/windows/native/sun/nio/ch/Net.c | 2 +- jdk/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c | 2 +- jdk/src/windows/native/sun/nio/ch/SocketChannelImpl.c | 2 +- jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c | 2 +- .../native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c | 2 +- jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c | 2 +- jdk/src/windows/native/sun/nio/ch/nio_util.h | 2 +- jdk/src/windows/native/sun/windows/WPrinterJob.cpp | 2 +- jdk/src/windows/native/sun/windows/awt.h | 2 +- jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_Choice.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_Choice.h | 2 +- jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_Desktop.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_Dialog.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_DnDDS.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_DrawingSurface.h | 2 +- jdk/src/windows/native/sun/windows/awt_FileDialog.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_FileDialog.h | 2 +- jdk/src/windows/native/sun/windows/awt_Font.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_InputMethod.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_MenuItem.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_PrintJob.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_Robot.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_TextArea.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_TextComponent.h | 2 +- jdk/src/windows/native/sun/windows/awt_TextField.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_TextField.h | 2 +- jdk/src/windows/native/sun/windows/awt_Toolkit.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_Toolkit.h | 2 +- jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp | 2 +- jdk/src/windows/native/sun/windows/awt_Window.cpp | 2 +- jdk/src/windows/native/sun/windows/awtmsg.h | 2 +- .../com/sun/crypto/provider/KeyFactory/TestProviderLeak.java | 2 +- jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java | 2 +- jdk/test/com/sun/crypto/provider/TLS/Utils.java | 2 +- jdk/test/com/sun/java/swing/plaf/gtk/Test6635110.java | 2 +- jdk/test/com/sun/jdi/PopAndInvokeTest.java | 2 +- jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh | 2 +- jdk/test/com/sun/net/httpserver/Test.java | 2 +- jdk/test/com/sun/net/httpserver/Test1.java | 2 +- jdk/test/com/sun/net/httpserver/Test11.java | 2 +- jdk/test/com/sun/net/httpserver/Test12.java | 2 +- jdk/test/com/sun/net/httpserver/Test13.java | 2 +- jdk/test/com/sun/net/httpserver/Test6a.java | 2 +- jdk/test/com/sun/net/httpserver/Test7a.java | 2 +- jdk/test/com/sun/net/httpserver/Test8a.java | 2 +- jdk/test/com/sun/net/httpserver/Test9.java | 2 +- jdk/test/com/sun/net/httpserver/Test9a.java | 2 +- jdk/test/com/sun/net/httpserver/bugs/6725892/Test.java | 2 +- jdk/test/com/sun/net/httpserver/bugs/B6361557.java | 2 +- jdk/test/com/sun/net/httpserver/bugs/B6373555.java | 2 +- jdk/test/com/sun/net/httpserver/bugs/B6401598.java | 2 +- jdk/test/com/sun/nio/sctp/SctpChannel/Connect.java | 2 +- jdk/test/com/sun/nio/sctp/SctpChannel/Send.java | 2 +- jdk/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java | 2 +- jdk/test/com/sun/nio/sctp/SctpMultiChannel/Send.java | 2 +- jdk/test/com/sun/servicetag/FindServiceTags.java | 2 +- jdk/test/com/sun/servicetag/JavaServiceTagTest1.java | 2 +- jdk/test/com/sun/servicetag/SystemRegistryTest.java | 2 +- jdk/test/com/sun/servicetag/Util.java | 2 +- jdk/test/com/sun/tools/attach/ProviderTests.sh | 2 +- jdk/test/com/sun/tracing/BasicFunctionality.java | 2 +- .../awt/EventDispatchThread/LoopRobustness/LoopRobustness.java | 2 +- jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java | 2 +- .../awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java | 2 +- .../awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java | 2 +- .../awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java | 2 +- .../event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java | 2 +- .../java/awt/regtesthelpers/process/ProcessCommunicator.java | 2 +- jdk/test/java/beans/Beans/Test4080522.java | 2 +- jdk/test/java/beans/EventHandler/Test6277246.java | 2 +- jdk/test/java/beans/EventHandler/Test6277266.java | 2 +- jdk/test/java/beans/Introspector/Test6277246.java | 2 +- jdk/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java | 2 +- jdk/test/java/io/BufferedReader/BigMark.java | 2 +- jdk/test/java/io/BufferedReader/ReadLineSync.java | 2 +- jdk/test/java/io/DataInputStream/OpsAfterClose.java | 2 +- jdk/test/java/io/DataInputStream/ReadFully.java | 2 +- jdk/test/java/io/File/Basic.java | 2 +- jdk/test/java/io/File/DeleteOnExit.java | 2 +- jdk/test/java/io/File/DeleteOnExitNPE.java | 2 +- jdk/test/java/io/File/IsHidden.java | 2 +- jdk/test/java/io/File/SetAccess.java | 2 +- jdk/test/java/io/File/SetReadOnly.java | 2 +- jdk/test/java/io/FileInputStream/LeadingSlash.java | 2 +- jdk/test/java/io/InputStream/OpsAfterClose.java | 2 +- jdk/test/java/io/InputStream/ReadParams.java | 2 +- jdk/test/java/io/InputStreamReader/GrowAfterEOF.java | 2 +- jdk/test/java/io/ObjectInputStream/ResolveProxyClass.java | 2 +- jdk/test/java/io/RandomAccessFile/EOF.java | 2 +- jdk/test/java/io/RandomAccessFile/ParameterCheck.java | 2 +- jdk/test/java/io/RandomAccessFile/ReadLine.java | 2 +- jdk/test/java/io/RandomAccessFile/Seek.java | 2 +- jdk/test/java/io/RandomAccessFile/WriteBytesChars.java | 2 +- jdk/test/java/io/RandomAccessFile/WriteUTF.java | 2 +- jdk/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java | 2 +- jdk/test/java/io/Reader/Skip.java | 2 +- jdk/test/java/io/Reader/SkipNegative.java | 2 +- .../java/io/Serializable/ClassCastExceptionDetail/Read.java | 2 +- .../Serializable/auditStreamSubclass/AuditStreamSubclass.java | 2 +- jdk/test/java/io/Serializable/backRefCNFException/Read.java | 2 +- .../java/io/Serializable/checkModifiers/CheckModifiers.java | 2 +- jdk/test/java/io/Serializable/classDescFlagConflict/Read.java | 2 +- .../java/io/Serializable/classDescHooks/ClassDescHooks.java | 2 +- jdk/test/java/io/Serializable/duplicateSerialFields/Test.java | 2 +- jdk/test/java/io/Serializable/enum/badResolve/Read.java | 2 +- jdk/test/java/io/Serializable/enum/constantSubclasses/Read.java | 2 +- jdk/test/java/io/Serializable/enum/missingConstant/Read.java | 2 +- jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh | 2 +- jdk/test/java/io/Serializable/fieldTypeString/Read.java | 2 +- jdk/test/java/io/Serializable/illegalHandle/Test.java | 2 +- jdk/test/java/io/Serializable/longString/LongString.java | 2 +- jdk/test/java/io/Serializable/oldTests/AnnotateClass.java | 2 +- jdk/test/java/io/Serializable/oldTests/ArrayFields.java | 2 +- jdk/test/java/io/Serializable/oldTests/ArraysOfArrays.java | 2 +- jdk/test/java/io/Serializable/oldTests/BinaryTree.java | 2 +- jdk/test/java/io/Serializable/oldTests/CircularList.java | 2 +- jdk/test/java/io/Serializable/oldTests/SimpleArrays.java | 2 +- jdk/test/java/io/Serializable/oldTests/WritePrimitive.java | 2 +- jdk/test/java/io/Serializable/packageAccess/Test.java | 2 +- jdk/test/java/io/Serializable/parents/EvolvedClass.java | 2 +- jdk/test/java/io/Serializable/parents/OriginalClass.java | 2 +- jdk/test/java/io/Serializable/proxy/Basic.java | 2 +- jdk/test/java/io/Serializable/proxy/skipMissing/Read.java | 2 +- jdk/test/java/io/Serializable/proxy/skipMissing/Write.java | 2 +- jdk/test/java/io/Serializable/readObjectNoData/Read.java | 2 +- jdk/test/java/io/Serializable/serialver/classpath/run.sh | 2 +- jdk/test/java/io/Serializable/serialver/nested/run.sh | 2 +- jdk/test/java/io/Serializable/skipWriteObject/Read.java | 2 +- jdk/test/java/io/Serializable/skippedObjCNFException/Read.java | 2 +- .../java/io/Serializable/stopCustomDeserialization/Read.java | 2 +- jdk/test/java/io/Serializable/unresolvedClassDesc/Read.java | 2 +- jdk/test/java/io/Serializable/unshared/Read.java | 2 +- jdk/test/java/io/Serializable/wrongReturnTypes/Read.java | 2 +- jdk/test/java/io/StreamTokenizer/Comment.java | 2 +- jdk/test/java/io/pathNames/GeneralWin32.java | 2 +- jdk/test/java/io/readBytes/ReadBytesBounds.java | 2 +- jdk/test/java/lang/ClassLoader/UninitializedParent.java | 2 +- jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh | 2 +- jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh | 2 +- .../lang/ClassLoader/defineClass/DefineClassByteBuffer.java | 2 +- jdk/test/java/lang/ClassLoader/findSystemClass/Loader.java | 2 +- jdk/test/java/lang/ProcessBuilder/Basic.java | 2 +- jdk/test/java/lang/Runtime/exec/ExecWithDir.java | 2 +- jdk/test/java/lang/String/Supplementary.java | 2 +- jdk/test/java/lang/StringBuffer/Supplementary.java | 2 +- jdk/test/java/lang/StringBuilder/Supplementary.java | 2 +- jdk/test/java/lang/StringCoding/CheckEncodings.sh | 2 +- jdk/test/java/lang/System/ExitFinalizersAndJIT.java | 2 +- jdk/test/java/lang/System/IgnoreNullSecurityManager.java | 2 +- jdk/test/java/lang/Thread/GenerifyStackTraces.java | 2 +- jdk/test/java/lang/Thread/StackTraces.java | 2 +- jdk/test/java/lang/annotation/ParameterAnnotations.java | 2 +- .../java/lang/management/ClassLoadingMXBean/LoadCounts.java | 2 +- .../java/lang/management/ManagementFactory/MXBeanProxyTest.java | 2 +- .../lang/management/MemoryMXBean/CollectionUsageThreshold.java | 2 +- .../MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh | 2 +- jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java | 2 +- .../java/lang/management/MemoryMXBean/MemoryManagement.java | 2 +- jdk/test/java/lang/management/MemoryMXBean/Pending.java | 2 +- .../java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java | 2 +- .../java/lang/management/MemoryPoolMXBean/ThresholdTest.java | 2 +- jdk/test/java/lang/management/RuntimeMXBean/UpTime.java | 2 +- jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java | 2 +- jdk/test/java/lang/management/ThreadMXBean/DisableTest.java | 2 +- jdk/test/java/lang/management/ThreadMXBean/EnableTest.java | 2 +- jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java | 2 +- .../java/lang/management/ThreadMXBean/FindMonitorDeadlock.java | 2 +- jdk/test/java/lang/management/ThreadMXBean/Locks.java | 2 +- jdk/test/java/lang/reflect/Proxy/Boxing.java | 2 +- jdk/test/java/lang/reflect/Proxy/ClassRestrictions.java | 2 +- jdk/test/java/lang/reflect/Proxy/returnTypes/Test.java | 2 +- jdk/test/java/net/Authenticator/B4769350.java | 2 +- jdk/test/java/net/BindException/Test.java | 2 +- jdk/test/java/net/CookieHandler/CookieHandlerTest.java | 2 +- jdk/test/java/net/CookieHandler/TestHttpCookie.java | 2 +- jdk/test/java/net/DatagramSocket/DatagramTimeout.java | 2 +- jdk/test/java/net/DatagramSocket/SendSize.java | 2 +- jdk/test/java/net/Inet6Address/B6214234.java | 2 +- jdk/test/java/net/Inet6Address/B6558853.java | 2 +- jdk/test/java/net/Inet6Address/serialize/Serialize.java | 2 +- jdk/test/java/net/InetAddress/CheckJNI.java | 2 +- jdk/test/java/net/MulticastSocket/NoLoopbackPackets.java | 2 +- jdk/test/java/net/MulticastSocket/SetOutgoingIf.java | 2 +- jdk/test/java/net/ProxySelector/B6737819.java | 2 +- jdk/test/java/net/ResponseCache/B6181108.java | 2 +- jdk/test/java/net/ResponseCache/ResponseCacheTest.java | 2 +- jdk/test/java/net/ResponseCache/getResponseCode.java | 2 +- .../java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java | 2 +- jdk/test/java/net/Socket/CloseAvailable.java | 2 +- jdk/test/java/net/Socket/DeadlockTest.java | 2 +- jdk/test/java/net/Socket/LingerTest.java | 2 +- jdk/test/java/net/Socket/LinkLocal.java | 2 +- jdk/test/java/net/Socket/ProxyCons.java | 2 +- jdk/test/java/net/Socket/ReadTimeout.java | 2 +- jdk/test/java/net/Socket/SetReceiveBufferSize.java | 2 +- jdk/test/java/net/Socket/SetSoLinger.java | 2 +- jdk/test/java/net/Socket/ShutdownBoth.java | 2 +- jdk/test/java/net/Socket/SoTimeout.java | 2 +- jdk/test/java/net/Socket/Timeout.java | 2 +- jdk/test/java/net/Socket/UrgentDataTest.java | 2 +- jdk/test/java/net/Socket/asyncClose/BrokenPipe.java | 2 +- jdk/test/java/net/Socket/setReuseAddress/Restart.java | 2 +- jdk/test/java/net/SocketInputStream/SocketClosedException.java | 2 +- jdk/test/java/net/SocketInputStream/SocketTimeout.java | 2 +- jdk/test/java/net/URI/Test.java | 2 +- jdk/test/java/net/URL/GetContent.java | 2 +- jdk/test/java/net/URL/TestIPv6Addresses.java | 2 +- jdk/test/java/net/URLClassLoader/ClassLoad.java | 2 +- jdk/test/java/net/URLClassLoader/HttpTest.java | 2 +- jdk/test/java/net/URLClassLoader/closetest/CloseTest.java | 2 +- jdk/test/java/net/URLConnection/B5052093.java | 2 +- jdk/test/java/net/URLConnection/DisconnectAfterEOF.java | 2 +- jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java | 2 +- jdk/test/java/net/URLConnection/HttpContinueStackOverflow.java | 2 +- jdk/test/java/net/URLConnection/Redirect307Test.java | 2 +- jdk/test/java/net/URLConnection/RedirectLimit.java | 2 +- jdk/test/java/net/URLConnection/ResendPostBody.java | 2 +- jdk/test/java/net/URLConnection/SetIfModifiedSince.java | 2 +- jdk/test/java/net/URLConnection/TimeoutTest.java | 2 +- jdk/test/java/net/URLConnection/URLConnectionHeaders.java | 2 +- jdk/test/java/net/URLConnection/ZeroContentLength.java | 2 +- .../net/URLConnection/contentHandler/UserContentHandler.java | 2 +- jdk/test/java/net/ipv6tests/B6521014.java | 2 +- jdk/test/java/net/ipv6tests/TcpTest.java | 2 +- jdk/test/java/net/ipv6tests/Tests.java | 2 +- jdk/test/java/nio/Buffer/StringCharBufferSliceTest.java | 2 +- jdk/test/java/nio/BufferPoolMXBean/Basic.java | 2 +- jdk/test/java/nio/MappedByteBuffer/Basic.java | 2 +- jdk/test/java/nio/MappedByteBuffer/Force.java | 2 +- jdk/test/java/nio/MappedByteBuffer/ZeroMap.java | 2 +- jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java | 2 +- jdk/test/java/nio/channels/AsynchronousChannelGroup/Basic.java | 2 +- .../java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java | 2 +- .../java/nio/channels/AsynchronousChannelGroup/Identity.java | 2 +- jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java | 2 +- jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java | 2 +- .../nio/channels/AsynchronousServerSocketChannel/Basic.java | 2 +- jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java | 2 +- jdk/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java | 2 +- jdk/test/java/nio/channels/Channels/Basic2.java | 2 +- jdk/test/java/nio/channels/Channels/Write.java | 2 +- .../java/nio/channels/DatagramChannel/AdaptDatagramSocket.java | 2 +- jdk/test/java/nio/channels/DatagramChannel/Connect.java | 2 +- jdk/test/java/nio/channels/DatagramChannel/EmptyBuffer.java | 2 +- jdk/test/java/nio/channels/DatagramChannel/NoSender.java | 2 +- jdk/test/java/nio/channels/DatagramChannel/ReceiveISA.java | 2 +- jdk/test/java/nio/channels/DatagramChannel/SRTest.java | 2 +- jdk/test/java/nio/channels/DatagramChannel/Sender.java | 2 +- .../java/nio/channels/DatagramChannel/SocketOptionTests.java | 2 +- jdk/test/java/nio/channels/FileChannel/Args.java | 2 +- .../java/nio/channels/FileChannel/ClosedChannelTransfer.java | 2 +- jdk/test/java/nio/channels/FileChannel/ExpandingMap.java | 2 +- jdk/test/java/nio/channels/FileChannel/Lock.java | 2 +- jdk/test/java/nio/channels/FileChannel/MapOverEnd.java | 2 +- jdk/test/java/nio/channels/FileChannel/MapReadOnly.java | 2 +- jdk/test/java/nio/channels/FileChannel/MapTest.java | 2 +- jdk/test/java/nio/channels/FileChannel/Mode.java | 2 +- jdk/test/java/nio/channels/FileChannel/Position.java | 2 +- jdk/test/java/nio/channels/FileChannel/Pread.java | 2 +- jdk/test/java/nio/channels/FileChannel/Pwrite.java | 2 +- jdk/test/java/nio/channels/FileChannel/Read.java | 2 +- jdk/test/java/nio/channels/FileChannel/ReadFull.java | 2 +- jdk/test/java/nio/channels/FileChannel/ReadToLimit.java | 2 +- .../java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java | 2 +- jdk/test/java/nio/channels/FileChannel/ScatteringRead.java | 2 +- jdk/test/java/nio/channels/FileChannel/Size.java | 2 +- jdk/test/java/nio/channels/FileChannel/Transfer.java | 2 +- jdk/test/java/nio/channels/FileChannel/TransferToChannel.java | 2 +- .../java/nio/channels/FileChannel/TransferToNonWritable.java | 2 +- jdk/test/java/nio/channels/FileChannel/Transfers.java | 2 +- jdk/test/java/nio/channels/FileChannel/Truncate.java | 2 +- jdk/test/java/nio/channels/FileChannel/TryLock.java | 2 +- jdk/test/java/nio/channels/FileChannel/Write.java | 2 +- jdk/test/java/nio/channels/Pipe/NonBlocking.java | 2 +- jdk/test/java/nio/channels/Pipe/SelectPipe.java | 2 +- jdk/test/java/nio/channels/SelectionKey/AtomicAttachTest.java | 2 +- jdk/test/java/nio/channels/Selector/BasicAccept.java | 2 +- jdk/test/java/nio/channels/Selector/BasicConnect.java | 2 +- jdk/test/java/nio/channels/Selector/ByteServer.java | 2 +- jdk/test/java/nio/channels/Selector/CheckLocking.java | 2 +- jdk/test/java/nio/channels/Selector/CloseInvalidatesKeys.java | 2 +- jdk/test/java/nio/channels/Selector/CloseThenRegister.java | 2 +- jdk/test/java/nio/channels/Selector/CloseWhenKeyIdle.java | 2 +- jdk/test/java/nio/channels/Selector/Connect.java | 2 +- jdk/test/java/nio/channels/Selector/ConnectWrite.java | 2 +- jdk/test/java/nio/channels/Selector/HelperSlowToDie.java | 2 +- jdk/test/java/nio/channels/Selector/KeysReady.java | 2 +- jdk/test/java/nio/channels/Selector/LotsOfChannels.java | 2 +- jdk/test/java/nio/channels/Selector/OpRead.java | 2 +- jdk/test/java/nio/channels/Selector/ReadAfterConnect.java | 2 +- jdk/test/java/nio/channels/Selector/RegAfterPreClose.java | 2 +- jdk/test/java/nio/channels/Selector/SelectAfterRead.java | 2 +- jdk/test/java/nio/channels/Selector/SelectAndCancel.java | 2 +- jdk/test/java/nio/channels/Selector/SelectWrite.java | 2 +- jdk/test/java/nio/channels/Selector/SelectorLimit.java | 2 +- jdk/test/java/nio/channels/Selector/SelectorTest.java | 2 +- jdk/test/java/nio/channels/Selector/WakeupNow.java | 2 +- jdk/test/java/nio/channels/Selector/WakeupOverflow.java | 2 +- jdk/test/java/nio/channels/Selector/WakeupSpeed.java | 2 +- jdk/test/java/nio/channels/Selector/lots_of_updates.sh | 2 +- .../nio/channels/ServerSocketChannel/SocketOptionTests.java | 2 +- jdk/test/java/nio/channels/SocketChannel/AdaptSocket.java | 2 +- jdk/test/java/nio/channels/SocketChannel/BigReadWrite.java | 2 +- jdk/test/java/nio/channels/SocketChannel/Bind.java | 2 +- jdk/test/java/nio/channels/SocketChannel/Close.java | 2 +- .../java/nio/channels/SocketChannel/CloseRegisteredChannel.java | 2 +- .../java/nio/channels/SocketChannel/CloseTimeoutChannel.java | 2 +- jdk/test/java/nio/channels/SocketChannel/IsConnectable.java | 2 +- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java | 2 +- jdk/test/java/nio/channels/SocketChannel/OpenLeak.java | 2 +- jdk/test/java/nio/channels/SocketChannel/SocketInheritance.java | 2 +- jdk/test/java/nio/channels/SocketChannel/SocketOptionTests.java | 2 +- jdk/test/java/nio/channels/SocketChannel/Trivial.java | 2 +- .../java/nio/channels/SocketChannel/UnboundSocketTests.java | 2 +- jdk/test/java/nio/channels/SocketChannel/VectorIO.java | 2 +- jdk/test/java/nio/channels/SocketChannel/Write.java | 2 +- jdk/test/java/nio/channels/etc/Shadow.java | 2 +- .../nio/channels/spi/AsynchronousChannelProvider/Provider1.java | 2 +- .../nio/channels/spi/AsynchronousChannelProvider/Provider2.java | 2 +- .../channels/spi/AsynchronousChannelProvider/custom_provider.sh | 2 +- .../spi/SelectorProvider/inheritedChannel/ClosedStreams.java | 2 +- .../spi/SelectorProvider/inheritedChannel/EchoTest.java | 2 +- jdk/test/java/nio/file/DirectoryStream/Basic.java | 2 +- jdk/test/java/nio/file/DirectoryStream/SecureDS.java | 2 +- jdk/test/java/nio/file/FileStore/Basic.java | 2 +- jdk/test/java/nio/file/Files/Misc.java | 2 +- jdk/test/java/nio/file/Files/PrintFileTree.java | 2 +- jdk/test/java/nio/file/Files/SkipSiblings.java | 2 +- jdk/test/java/nio/file/Files/TerminateWalk.java | 2 +- jdk/test/java/nio/file/Files/WalkWithSecurity.java | 2 +- jdk/test/java/nio/file/Files/walk_file_tree.sh | 2 +- jdk/test/java/nio/file/Path/CheckPermissions.java | 2 +- jdk/test/java/nio/file/Path/CopyAndMove.java | 2 +- jdk/test/java/nio/file/Path/InterruptCopy.java | 2 +- jdk/test/java/nio/file/Path/Misc.java | 2 +- jdk/test/java/nio/file/Path/PathOps.java | 2 +- jdk/test/java/nio/file/Path/delete_on_close.sh | 2 +- jdk/test/java/nio/file/TestUtil.java | 2 +- jdk/test/java/security/Provider/Turkish.java | 2 +- .../Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh | 2 +- jdk/test/java/util/Collection/BiggernYours.java | 2 +- jdk/test/java/util/Collection/IteratorAtEnd.java | 2 +- jdk/test/java/util/Collection/MOAT.java | 2 +- jdk/test/java/util/Collections/RacingCollections.java | 2 +- jdk/test/java/util/Deque/ChorusLine.java | 2 +- jdk/test/java/util/Formatter/Constructors.java | 2 +- jdk/test/java/util/Locale/PrintDefaultLocale.java | 2 +- jdk/test/java/util/Locale/data/deflocale.c | 2 +- jdk/test/java/util/Locale/data/deflocale.sh | 2 +- jdk/test/java/util/PluggableLocale/ExecTest.sh | 2 +- jdk/test/java/util/ResourceBundle/Bug4168625Test.java | 2 +- jdk/test/java/util/ResourceBundle/Bug6299235Test.sh | 2 +- jdk/test/java/util/ResourceBundle/Bug6359330.java | 2 +- jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh | 2 +- jdk/test/java/util/ResourceBundle/Test4300693.java | 2 +- jdk/test/java/util/ResourceBundle/TestBug4179766.java | 2 +- jdk/test/java/util/ServiceLoader/basic.sh | 2 +- jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java | 2 +- .../java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java | 2 +- .../java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java | 2 +- .../java/util/concurrent/CopyOnWriteArraySet/RacingCows.java | 2 +- jdk/test/java/util/concurrent/CyclicBarrier/Basic.java | 2 +- jdk/test/java/util/concurrent/Executors/AutoShutdown.java | 2 +- jdk/test/java/util/concurrent/Executors/Throws.java | 2 +- .../java/util/concurrent/FutureTask/BlockingTaskExecutor.java | 2 +- jdk/test/java/util/concurrent/FutureTask/Customized.java | 2 +- .../java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java | 2 +- jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java | 2 +- .../concurrent/ThreadPoolExecutor/ScheduledTickleService.java | 2 +- .../concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java | 2 +- .../java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java | 2 +- jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java | 2 +- jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java | 2 +- jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java | 2 +- .../concurrent/locks/ReentrantReadWriteLock/Bug6571733.java | 2 +- jdk/test/java/util/regex/RegExTest.java | 2 +- jdk/test/java/util/zip/ZipFile/ReadZip.java | 2 +- .../imageio/CachePremissionsTest/CachePermissionsTest.java | 2 +- jdk/test/javax/print/attribute/ServiceDialogTest.java | 2 +- jdk/test/javax/print/attribute/SidesPageRangesTest.java | 2 +- jdk/test/javax/script/ProviderTest.sh | 2 +- .../sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java | 2 +- .../midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java | 2 +- .../sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java | 2 +- .../sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java | 2 +- .../sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java | 2 +- .../sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java | 2 +- .../sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java | 2 +- .../midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java | 2 +- .../sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java | 2 +- .../sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java | 2 +- jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java | 2 +- .../javax/swing/JLayer/SerializationTest/SerializationTest.java | 2 +- jdk/test/javax/swing/JTextArea/Test6593649.java | 2 +- jdk/test/javax/swing/plaf/nimbus/Test6919629.java | 2 +- jdk/test/javax/swing/system/6799345/TestShutdown.java | 2 +- .../OnScreenRenderingResizeTest.java | 2 +- jdk/test/sun/java2d/GdiRendering/InsetClipping.java | 2 +- jdk/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java | 2 +- .../SourceClippingBlitTest/SourceClippingBlitTest.java | 2 +- .../SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java | 2 +- jdk/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java | 2 +- .../sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh | 2 +- jdk/test/sun/jvmstat/testlibrary/utils.sh | 2 +- .../management/jmxremote/bootstrap/GeneratePropertyPassword.sh | 2 +- jdk/test/sun/misc/BootClassLoaderHook/TestHook.java | 2 +- jdk/test/sun/net/ftp/FtpGetContent.java | 2 +- jdk/test/sun/net/ftp/FtpURL.java | 2 +- jdk/test/sun/net/sdp/ProbeIB.java | 2 +- jdk/test/sun/net/sdp/sanity.sh | 2 +- .../net/www/http/ChunkedInputStream/ChunkedEncodingTest.java | 2 +- .../ChunkedEncodingWithProgressMonitorTest.java | 2 +- jdk/test/sun/net/www/http/ChunkedOutputStream/Test.java | 2 +- jdk/test/sun/net/www/http/HttpClient/B6726695.java | 2 +- jdk/test/sun/net/www/http/HttpClient/MultiThreadTest.java | 2 +- jdk/test/sun/net/www/http/HttpClient/ProxyTest.java | 2 +- jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java | 2 +- .../sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java | 2 +- .../KeepAliveStreamCloseWithWrongContentLength.java | 2 +- jdk/test/sun/net/www/httptest/HttpServer.java | 2 +- jdk/test/sun/net/www/protocol/http/ChunkedErrorStream.java | 2 +- jdk/test/sun/net/www/protocol/http/DigestTest.java | 2 +- jdk/test/sun/nio/ch/Basic.java | 2 +- jdk/test/sun/nio/ch/TempBuffer.java | 2 +- jdk/test/sun/nio/cs/CheckHistoricalNames.java | 2 +- jdk/test/sun/nio/cs/FindDecoderBugs.java | 2 +- jdk/test/sun/nio/cs/ReadZero.java | 2 +- jdk/test/sun/nio/cs/Test4200310.sh | 2 +- jdk/test/sun/nio/cs/Test4206507.java | 2 +- jdk/test/sun/nio/cs/TestStringCoding.java | 2 +- jdk/test/sun/nio/cs/TestX11CNS.java | 2 +- jdk/test/sun/rmi/rmic/manifestClassPath/run.sh | 2 +- jdk/test/sun/security/krb5/auto/Context.java | 2 +- jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java | 2 +- jdk/test/sun/security/pkcs11/tls/TestPremaster.java | 2 +- .../ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java | 2 +- .../sun/net/www/protocol/https/HttpsURLConnection/B6226610.java | 2 +- .../net/www/protocol/https/HttpsURLConnection/HttpsPost.java | 2 +- .../sun/net/www/protocol/https/HttpsURLConnection/Redirect.java | 2 +- jdk/test/sun/text/resources/LocaleDataTest.java | 2 +- jdk/test/sun/tools/jps/jps-Vvml_2.sh | 2 +- jdk/test/sun/tools/jps/jps-help.sh | 2 +- jdk/test/sun/tools/jps/jps-m_2.sh | 2 +- jdk/test/sun/tools/jstat/jstatHelp.sh | 2 +- jdk/test/sun/tools/jstat/jstatOptions1.sh | 2 +- jdk/test/sun/tools/jstatd/jstatdDefaults.sh | 2 +- jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh | 2 +- jdk/test/sun/tools/jstatd/jstatdPort.sh | 2 +- jdk/test/sun/tools/jstatd/jstatdServerName.sh | 2 +- jdk/test/sun/tools/jstatd/jstatdUsage1.sh | 2 +- jdk/test/sun/util/logging/PlatformLoggerTest.java | 2 +- jdk/test/sun/util/resources/TimeZone/Bug6317929.java | 2 +- jdk/test/tools/jar/JarEntryTime.java | 2 +- jdk/test/tools/jar/index/MetaInf.java | 2 +- jdk/test/tools/launcher/ChangeDataModel.sh | 2 +- jdk/test/tools/launcher/DefaultLocaleTest.sh | 2 +- jdk/test/tools/launcher/UnicodeTest.sh | 2 +- 1410 files changed, 1410 insertions(+), 1410 deletions(-) diff --git a/jdk/make/com/Makefile b/jdk/make/com/Makefile index 37472ea3f3a..16b908c28f3 100644 --- a/jdk/make/com/Makefile +++ b/jdk/make/com/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/Makefile b/jdk/make/com/sun/Makefile index c1b2164e7ec..77e93b8f13b 100644 --- a/jdk/make/com/sun/Makefile +++ b/jdk/make/com/sun/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/crypto/provider/Makefile b/jdk/make/com/sun/crypto/provider/Makefile index bd7768917ee..3df93501c55 100644 --- a/jdk/make/com/sun/crypto/provider/Makefile +++ b/jdk/make/com/sun/crypto/provider/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/demo/Makefile b/jdk/make/com/sun/demo/Makefile index 3b1c162e9a9..e86dbbbb624 100644 --- a/jdk/make/com/sun/demo/Makefile +++ b/jdk/make/com/sun/demo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/jdk/make/com/sun/demo/jvmti/Makefile b/jdk/make/com/sun/demo/jvmti/Makefile index 413ac6658b2..b65716324b4 100644 --- a/jdk/make/com/sun/demo/jvmti/Makefile +++ b/jdk/make/com/sun/demo/jvmti/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/jdk/make/com/sun/java/Makefile b/jdk/make/com/sun/java/Makefile index 6938a5f5cf3..1294f5477b9 100644 --- a/jdk/make/com/sun/java/Makefile +++ b/jdk/make/com/sun/java/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/java/browser/Makefile b/jdk/make/com/sun/java/browser/Makefile index 44582394e5c..6efd52b6e99 100644 --- a/jdk/make/com/sun/java/browser/Makefile +++ b/jdk/make/com/sun/java/browser/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/java/pack/Makefile b/jdk/make/com/sun/java/pack/Makefile index ae6aaae7a2b..6b5b0bfc241 100644 --- a/jdk/make/com/sun/java/pack/Makefile +++ b/jdk/make/com/sun/java/pack/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/java/pack/prop/Makefile b/jdk/make/com/sun/java/pack/prop/Makefile index bb1131c838c..7f8ac7f76cc 100644 --- a/jdk/make/com/sun/java/pack/prop/Makefile +++ b/jdk/make/com/sun/java/pack/prop/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/jmx/Makefile b/jdk/make/com/sun/jmx/Makefile index cc3393cbdf7..2f036de3576 100644 --- a/jdk/make/com/sun/jmx/Makefile +++ b/jdk/make/com/sun/jmx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/jndi/Makefile b/jdk/make/com/sun/jndi/Makefile index bf202ca86d8..12f4318eb40 100644 --- a/jdk/make/com/sun/jndi/Makefile +++ b/jdk/make/com/sun/jndi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/jndi/cosnaming/Makefile b/jdk/make/com/sun/jndi/cosnaming/Makefile index f4fd1f454b5..73a64ecd846 100644 --- a/jdk/make/com/sun/jndi/cosnaming/Makefile +++ b/jdk/make/com/sun/jndi/cosnaming/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/jndi/dns/Makefile b/jdk/make/com/sun/jndi/dns/Makefile index ae3fbaa30b9..ccb98d84837 100644 --- a/jdk/make/com/sun/jndi/dns/Makefile +++ b/jdk/make/com/sun/jndi/dns/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/jndi/ldap/Makefile b/jdk/make/com/sun/jndi/ldap/Makefile index a7a1fb57022..eaf663841c7 100644 --- a/jdk/make/com/sun/jndi/ldap/Makefile +++ b/jdk/make/com/sun/jndi/ldap/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/jndi/rmi/Makefile b/jdk/make/com/sun/jndi/rmi/Makefile index 08eeaca85bd..3fc3a096faa 100644 --- a/jdk/make/com/sun/jndi/rmi/Makefile +++ b/jdk/make/com/sun/jndi/rmi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/jndi/rmi/registry/Makefile b/jdk/make/com/sun/jndi/rmi/registry/Makefile index 1071fd3b93c..1138bc94bd8 100644 --- a/jdk/make/com/sun/jndi/rmi/registry/Makefile +++ b/jdk/make/com/sun/jndi/rmi/registry/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/nio/Makefile b/jdk/make/com/sun/nio/Makefile index 2f429865df1..bdff717c863 100644 --- a/jdk/make/com/sun/nio/Makefile +++ b/jdk/make/com/sun/nio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/nio/sctp/FILES_java.gmk b/jdk/make/com/sun/nio/sctp/FILES_java.gmk index f195a121c2f..9d9c1a98e91 100644 --- a/jdk/make/com/sun/nio/sctp/FILES_java.gmk +++ b/jdk/make/com/sun/nio/sctp/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/nio/sctp/Makefile b/jdk/make/com/sun/nio/sctp/Makefile index 309d25266c5..a3d9d0db477 100644 --- a/jdk/make/com/sun/nio/sctp/Makefile +++ b/jdk/make/com/sun/nio/sctp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/nio/sctp/mapfile-vers b/jdk/make/com/sun/nio/sctp/mapfile-vers index cc5ef89df50..058995ecaa8 100644 --- a/jdk/make/com/sun/nio/sctp/mapfile-vers +++ b/jdk/make/com/sun/nio/sctp/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/org/Makefile b/jdk/make/com/sun/org/Makefile index 80e6e1d7a8a..1d1e45a8575 100644 --- a/jdk/make/com/sun/org/Makefile +++ b/jdk/make/com/sun/org/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/org/apache/Makefile b/jdk/make/com/sun/org/apache/Makefile index 91a92dc414a..51a320bde0a 100644 --- a/jdk/make/com/sun/org/apache/Makefile +++ b/jdk/make/com/sun/org/apache/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/org/apache/xml/Makefile b/jdk/make/com/sun/org/apache/xml/Makefile index 5bfdcbfe253..195c9089308 100644 --- a/jdk/make/com/sun/org/apache/xml/Makefile +++ b/jdk/make/com/sun/org/apache/xml/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/rowset/Makefile b/jdk/make/com/sun/rowset/Makefile index c94566fe11b..3a73d987827 100644 --- a/jdk/make/com/sun/rowset/Makefile +++ b/jdk/make/com/sun/rowset/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/script/Makefile b/jdk/make/com/sun/script/Makefile index ad97bc1d296..e30127e1b67 100644 --- a/jdk/make/com/sun/script/Makefile +++ b/jdk/make/com/sun/script/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/security/Makefile b/jdk/make/com/sun/security/Makefile index b71beb67ed6..bdd6eceb2a2 100644 --- a/jdk/make/com/sun/security/Makefile +++ b/jdk/make/com/sun/security/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/security/auth/module/Makefile b/jdk/make/com/sun/security/auth/module/Makefile index 5d8d0d72163..0de24cd7be3 100644 --- a/jdk/make/com/sun/security/auth/module/Makefile +++ b/jdk/make/com/sun/security/auth/module/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/servicetag/Makefile b/jdk/make/com/sun/servicetag/Makefile index 3d8ff5f56d1..a0d384d4f90 100644 --- a/jdk/make/com/sun/servicetag/Makefile +++ b/jdk/make/com/sun/servicetag/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/tools/Makefile b/jdk/make/com/sun/tools/Makefile index 97e1a970c11..6f14dbdbc30 100644 --- a/jdk/make/com/sun/tools/Makefile +++ b/jdk/make/com/sun/tools/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/tools/attach/Makefile b/jdk/make/com/sun/tools/attach/Makefile index 39647f7c3ca..100562c9363 100644 --- a/jdk/make/com/sun/tools/attach/Makefile +++ b/jdk/make/com/sun/tools/attach/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/com/sun/tracing/Makefile b/jdk/make/com/sun/tracing/Makefile index 45e0733e227..b253fb70041 100644 --- a/jdk/make/com/sun/tracing/Makefile +++ b/jdk/make/com/sun/tracing/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Cscope.gmk b/jdk/make/common/Cscope.gmk index 79da2fc9e30..812fd5f0d12 100644 --- a/jdk/make/common/Cscope.gmk +++ b/jdk/make/common/Cscope.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk index df8cba2eced..6acbaa4b686 100644 --- a/jdk/make/common/Defs-linux.gmk +++ b/jdk/make/common/Defs-linux.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Defs-solaris.gmk b/jdk/make/common/Defs-solaris.gmk index f5da940cd64..637bff575fc 100644 --- a/jdk/make/common/Defs-solaris.gmk +++ b/jdk/make/common/Defs-solaris.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Defs-windows.gmk b/jdk/make/common/Defs-windows.gmk index ffdc891a805..1ac0e7e0f29 100644 --- a/jdk/make/common/Defs-windows.gmk +++ b/jdk/make/common/Defs-windows.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk index 278ffaf7ce7..29abffd261e 100644 --- a/jdk/make/common/Defs.gmk +++ b/jdk/make/common/Defs.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Demo.gmk b/jdk/make/common/Demo.gmk index 3937a70a247..0ba5bc19707 100644 --- a/jdk/make/common/Demo.gmk +++ b/jdk/make/common/Demo.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Library.gmk b/jdk/make/common/Library.gmk index 2094ab79b73..71758275689 100644 --- a/jdk/make/common/Library.gmk +++ b/jdk/make/common/Library.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Modules.gmk b/jdk/make/common/Modules.gmk index d21a0b3dd5b..0bca87467f0 100644 --- a/jdk/make/common/Modules.gmk +++ b/jdk/make/common/Modules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk index edac78ddf7a..005236149d6 100644 --- a/jdk/make/common/Program.gmk +++ b/jdk/make/common/Program.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index a7e2eb0c7d1..834d3379875 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/Sanity.gmk b/jdk/make/common/Sanity.gmk index eb303f9b956..7a01efbd51d 100644 --- a/jdk/make/common/Sanity.gmk +++ b/jdk/make/common/Sanity.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/internal/Resources.gmk b/jdk/make/common/internal/Resources.gmk index 63a61188261..e7841fce6ae 100644 --- a/jdk/make/common/internal/Resources.gmk +++ b/jdk/make/common/internal/Resources.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/shared/Compiler-sun.gmk b/jdk/make/common/shared/Compiler-sun.gmk index 22425a84a07..3881d393dc9 100644 --- a/jdk/make/common/shared/Compiler-sun.gmk +++ b/jdk/make/common/shared/Compiler-sun.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/shared/Defs-control.gmk b/jdk/make/common/shared/Defs-control.gmk index 4e545ca996b..13eb20b1da4 100644 --- a/jdk/make/common/shared/Defs-control.gmk +++ b/jdk/make/common/shared/Defs-control.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/shared/Defs-java.gmk b/jdk/make/common/shared/Defs-java.gmk index 5d766980ea1..c6026d90b27 100644 --- a/jdk/make/common/shared/Defs-java.gmk +++ b/jdk/make/common/shared/Defs-java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/shared/Defs-linux.gmk b/jdk/make/common/shared/Defs-linux.gmk index 71272540c05..a6be5365021 100644 --- a/jdk/make/common/shared/Defs-linux.gmk +++ b/jdk/make/common/shared/Defs-linux.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk index 10bad59bdf3..01bb982466f 100644 --- a/jdk/make/common/shared/Defs-utils.gmk +++ b/jdk/make/common/shared/Defs-utils.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/docs/CORE_PKGS.gmk b/jdk/make/docs/CORE_PKGS.gmk index 31aaeb1b5d8..66a03df3978 100644 --- a/jdk/make/docs/CORE_PKGS.gmk +++ b/jdk/make/docs/CORE_PKGS.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/docs/NON_CORE_PKGS.gmk b/jdk/make/docs/NON_CORE_PKGS.gmk index 180241483c1..05dca34fff3 100644 --- a/jdk/make/docs/NON_CORE_PKGS.gmk +++ b/jdk/make/docs/NON_CORE_PKGS.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/Makefile b/jdk/make/java/Makefile index 74601778249..3a697d2ff86 100644 --- a/jdk/make/java/Makefile +++ b/jdk/make/java/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/awt/Makefile b/jdk/make/java/awt/Makefile index decb3cea894..b53d05773a5 100644 --- a/jdk/make/java/awt/Makefile +++ b/jdk/make/java/awt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/dyn/Makefile b/jdk/make/java/dyn/Makefile index a85b5168126..61ca68800b6 100644 --- a/jdk/make/java/dyn/Makefile +++ b/jdk/make/java/dyn/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/fdlibm/Makefile b/jdk/make/java/fdlibm/Makefile index da9d1b93c97..584f67e2dc9 100644 --- a/jdk/make/java/fdlibm/Makefile +++ b/jdk/make/java/fdlibm/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/hpi/Makefile b/jdk/make/java/hpi/Makefile index c5d79de8a6d..3d3688a9970 100644 --- a/jdk/make/java/hpi/Makefile +++ b/jdk/make/java/hpi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/hpi/hpi_common.gmk b/jdk/make/java/hpi/hpi_common.gmk index 025d2de1084..df5796f10e2 100644 --- a/jdk/make/java/hpi/hpi_common.gmk +++ b/jdk/make/java/hpi/hpi_common.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/hpi/native/Makefile b/jdk/make/java/hpi/native/Makefile index 1e0b9ac17fd..2655e8248f8 100644 --- a/jdk/make/java/hpi/native/Makefile +++ b/jdk/make/java/hpi/native/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/hpi/windows/Makefile b/jdk/make/java/hpi/windows/Makefile index e36f0bd4c1b..bf6f818fdf4 100644 --- a/jdk/make/java/hpi/windows/Makefile +++ b/jdk/make/java/hpi/windows/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/instrument/Makefile b/jdk/make/java/instrument/Makefile index 35386e1846c..f63c7ae78af 100644 --- a/jdk/make/java/instrument/Makefile +++ b/jdk/make/java/instrument/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile index 827a0ec176f..c8cbb30ec56 100644 --- a/jdk/make/java/java/Makefile +++ b/jdk/make/java/java/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/java/genlocales.gmk b/jdk/make/java/java/genlocales.gmk index a4f5465a288..b08239cbac9 100644 --- a/jdk/make/java/java/genlocales.gmk +++ b/jdk/make/java/java/genlocales.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/java_crw_demo/Makefile b/jdk/make/java/java_crw_demo/Makefile index 7b52ee33585..c1393b97b8f 100644 --- a/jdk/make/java/java_crw_demo/Makefile +++ b/jdk/make/java/java_crw_demo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/java_hprof_demo/Makefile b/jdk/make/java/java_hprof_demo/Makefile index b6d0539adc9..99421b205a8 100644 --- a/jdk/make/java/java_hprof_demo/Makefile +++ b/jdk/make/java/java_hprof_demo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/jli/Makefile b/jdk/make/java/jli/Makefile index 9c1b9bc7c83..928df6405f4 100644 --- a/jdk/make/java/jli/Makefile +++ b/jdk/make/java/jli/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/logging/Makefile b/jdk/make/java/logging/Makefile index 133925417ca..aa5e05c1022 100644 --- a/jdk/make/java/logging/Makefile +++ b/jdk/make/java/logging/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/main/Makefile b/jdk/make/java/main/Makefile index 08d683bf82b..9eb14ab24d8 100644 --- a/jdk/make/java/main/Makefile +++ b/jdk/make/java/main/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/main/java/Makefile b/jdk/make/java/main/java/Makefile index 0a3cec46b95..7f9e8992ad0 100644 --- a/jdk/make/java/main/java/Makefile +++ b/jdk/make/java/main/java/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/main/javaw/Makefile b/jdk/make/java/main/javaw/Makefile index 1ce44942ebb..920cbbc7c61 100644 --- a/jdk/make/java/main/javaw/Makefile +++ b/jdk/make/java/main/javaw/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/management/Makefile b/jdk/make/java/management/Makefile index e8a29613464..7330307488a 100644 --- a/jdk/make/java/management/Makefile +++ b/jdk/make/java/management/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/net/FILES_c.gmk b/jdk/make/java/net/FILES_c.gmk index 29ce70a6e68..4b7d005f848 100644 --- a/jdk/make/java/net/FILES_c.gmk +++ b/jdk/make/java/net/FILES_c.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/net/Makefile b/jdk/make/java/net/Makefile index db034f2511e..bd8801e5a56 100644 --- a/jdk/make/java/net/Makefile +++ b/jdk/make/java/net/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/net/mapfile-vers b/jdk/make/java/net/mapfile-vers index 0e9a46755d4..5018471c1ef 100644 --- a/jdk/make/java/net/mapfile-vers +++ b/jdk/make/java/net/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/nio/FILES_java.gmk b/jdk/make/java/nio/FILES_java.gmk index 5a00e3172f3..cb416fe0932 100644 --- a/jdk/make/java/nio/FILES_java.gmk +++ b/jdk/make/java/nio/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile index b5c931ac687..c0a03c23d42 100644 --- a/jdk/make/java/nio/Makefile +++ b/jdk/make/java/nio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/nio/mapfile-linux b/jdk/make/java/nio/mapfile-linux index c3645c5ed05..c8fef869d43 100644 --- a/jdk/make/java/nio/mapfile-linux +++ b/jdk/make/java/nio/mapfile-linux @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/nio/mapfile-solaris b/jdk/make/java/nio/mapfile-solaris index e0dff0a32f3..978aa205ce9 100644 --- a/jdk/make/java/nio/mapfile-solaris +++ b/jdk/make/java/nio/mapfile-solaris @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/npt/Makefile b/jdk/make/java/npt/Makefile index c08918cedce..a7a8264b268 100644 --- a/jdk/make/java/npt/Makefile +++ b/jdk/make/java/npt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/redist/Makefile b/jdk/make/java/redist/Makefile index be2f886bbc9..9f4d420aa42 100644 --- a/jdk/make/java/redist/Makefile +++ b/jdk/make/java/redist/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/redist/fonts/Makefile b/jdk/make/java/redist/fonts/Makefile index f91eca19279..475e5a7d2ad 100644 --- a/jdk/make/java/redist/fonts/Makefile +++ b/jdk/make/java/redist/fonts/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/redist/sajdi/Makefile b/jdk/make/java/redist/sajdi/Makefile index 800e468ac62..5044fd01592 100644 --- a/jdk/make/java/redist/sajdi/Makefile +++ b/jdk/make/java/redist/sajdi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/sql/Makefile b/jdk/make/java/sql/Makefile index 5150d80f482..5a4bd4f5a3b 100644 --- a/jdk/make/java/sql/Makefile +++ b/jdk/make/java/sql/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/sun_nio/Makefile b/jdk/make/java/sun_nio/Makefile index 9d96e1abc02..a2f2f6d6141 100644 --- a/jdk/make/java/sun_nio/Makefile +++ b/jdk/make/java/sun_nio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/text/base/Makefile b/jdk/make/java/text/base/Makefile index b6fd1fef17a..2b754932526 100644 --- a/jdk/make/java/text/base/Makefile +++ b/jdk/make/java/text/base/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/util/FILES_java.gmk b/jdk/make/java/util/FILES_java.gmk index 5571bbf81db..8746e024bdf 100644 --- a/jdk/make/java/util/FILES_java.gmk +++ b/jdk/make/java/util/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/verify/Makefile b/jdk/make/java/verify/Makefile index 7605fc0f1c3..00f610a6491 100644 --- a/jdk/make/java/verify/Makefile +++ b/jdk/make/java/verify/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/java/zip/Makefile b/jdk/make/java/zip/Makefile index 6e8b3204452..914609cf7e1 100644 --- a/jdk/make/java/zip/Makefile +++ b/jdk/make/java/zip/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/Makefile b/jdk/make/javax/Makefile index 35a7b8bd884..a58a1b1eb5a 100644 --- a/jdk/make/javax/Makefile +++ b/jdk/make/javax/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/crypto/Makefile b/jdk/make/javax/crypto/Makefile index 6b93498ec68..b5ceae0ed67 100644 --- a/jdk/make/javax/crypto/Makefile +++ b/jdk/make/javax/crypto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/imageio/Makefile b/jdk/make/javax/imageio/Makefile index cad3049cf5e..1768964b098 100644 --- a/jdk/make/javax/imageio/Makefile +++ b/jdk/make/javax/imageio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/print/Makefile b/jdk/make/javax/print/Makefile index f812c46e26b..863dd6611fa 100644 --- a/jdk/make/javax/print/Makefile +++ b/jdk/make/javax/print/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/rmi/Makefile b/jdk/make/javax/rmi/Makefile index d4571619384..a540008039a 100644 --- a/jdk/make/javax/rmi/Makefile +++ b/jdk/make/javax/rmi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/sound/Makefile b/jdk/make/javax/sound/Makefile index e52c946ad8c..645b9b3a097 100644 --- a/jdk/make/javax/sound/Makefile +++ b/jdk/make/javax/sound/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/sound/jsoundalsa/Makefile b/jdk/make/javax/sound/jsoundalsa/Makefile index 32a4d1337e4..3fc6232c8b0 100644 --- a/jdk/make/javax/sound/jsoundalsa/Makefile +++ b/jdk/make/javax/sound/jsoundalsa/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/sound/jsoundds/Makefile b/jdk/make/javax/sound/jsoundds/Makefile index e38a98535ef..e731732a6c2 100644 --- a/jdk/make/javax/sound/jsoundds/Makefile +++ b/jdk/make/javax/sound/jsoundds/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/sql/Makefile b/jdk/make/javax/sql/Makefile index 0c171c3cbdd..a678c21073b 100644 --- a/jdk/make/javax/sql/Makefile +++ b/jdk/make/javax/sql/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/swing/FILES.gmk b/jdk/make/javax/swing/FILES.gmk index 3b528c819db..c1ba62f797a 100644 --- a/jdk/make/javax/swing/FILES.gmk +++ b/jdk/make/javax/swing/FILES.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/swing/Makefile b/jdk/make/javax/swing/Makefile index 3fcd659e07d..200c8f9b9d0 100644 --- a/jdk/make/javax/swing/Makefile +++ b/jdk/make/javax/swing/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk b/jdk/make/javax/swing/beaninfo/SwingBeans.gmk index bba1d859541..9be6a668ebd 100644 --- a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk +++ b/jdk/make/javax/swing/beaninfo/SwingBeans.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/javax/swing/plaf/Makefile b/jdk/make/javax/swing/plaf/Makefile index 2510fabf34b..0355f5ed3fb 100644 --- a/jdk/make/javax/swing/plaf/Makefile +++ b/jdk/make/javax/swing/plaf/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jpda/Makefile b/jdk/make/jpda/Makefile index 03bc16e1980..ae6fb8bfa81 100644 --- a/jdk/make/jpda/Makefile +++ b/jdk/make/jpda/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jpda/back/Makefile b/jdk/make/jpda/back/Makefile index 56edb964a09..cf94227f3c6 100644 --- a/jdk/make/jpda/back/Makefile +++ b/jdk/make/jpda/back/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jpda/transport/Makefile b/jdk/make/jpda/transport/Makefile index 8accbf8f448..9f5dbf14328 100644 --- a/jdk/make/jpda/transport/Makefile +++ b/jdk/make/jpda/transport/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jpda/transport/shmem/Makefile b/jdk/make/jpda/transport/shmem/Makefile index cbb0d3ce486..caa9eced912 100644 --- a/jdk/make/jpda/transport/shmem/Makefile +++ b/jdk/make/jpda/transport/shmem/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jpda/transport/socket/Makefile b/jdk/make/jpda/transport/socket/Makefile index ee7980c7bdf..3c654f57edc 100644 --- a/jdk/make/jpda/transport/socket/Makefile +++ b/jdk/make/jpda/transport/socket/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jpda/tty/Makefile b/jdk/make/jpda/tty/Makefile index f7353fe7803..3e53414eab3 100644 --- a/jdk/make/jpda/tty/Makefile +++ b/jdk/make/jpda/tty/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jprt.gmk b/jdk/make/jprt.gmk index 3ad4c188243..cf79b8242d8 100644 --- a/jdk/make/jprt.gmk +++ b/jdk/make/jprt.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties index 6c725c39930..7cb87c1e3a3 100644 --- a/jdk/make/jprt.properties +++ b/jdk/make/jprt.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/launchers/Makefile b/jdk/make/launchers/Makefile index c6d45f7827a..c6564126baf 100644 --- a/jdk/make/launchers/Makefile +++ b/jdk/make/launchers/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/Makefile b/jdk/make/mkdemo/Makefile index 5a54d2795cd..1e1739467cc 100644 --- a/jdk/make/mkdemo/Makefile +++ b/jdk/make/mkdemo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/applets/Makefile b/jdk/make/mkdemo/applets/Makefile index 22ca53c7766..370ad81906f 100644 --- a/jdk/make/mkdemo/applets/Makefile +++ b/jdk/make/mkdemo/applets/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/jfc/Makefile b/jdk/make/mkdemo/jfc/Makefile index 254a11b20ad..35ab79b70c9 100644 --- a/jdk/make/mkdemo/jfc/Makefile +++ b/jdk/make/mkdemo/jfc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/jni/Makefile b/jdk/make/mkdemo/jni/Makefile index da039c9a90b..b24a5f32ac6 100644 --- a/jdk/make/mkdemo/jni/Makefile +++ b/jdk/make/mkdemo/jni/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/jvmti/hprof/Makefile b/jdk/make/mkdemo/jvmti/hprof/Makefile index b0c703f6734..e2529192a8e 100644 --- a/jdk/make/mkdemo/jvmti/hprof/Makefile +++ b/jdk/make/mkdemo/jvmti/hprof/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/management/Makefile b/jdk/make/mkdemo/management/Makefile index 38831c893d4..80b1eee90b6 100644 --- a/jdk/make/mkdemo/management/Makefile +++ b/jdk/make/mkdemo/management/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/nio/Makefile b/jdk/make/mkdemo/nio/Makefile index 26dc772b213..9bb3b0ba671 100644 --- a/jdk/make/mkdemo/nio/Makefile +++ b/jdk/make/mkdemo/nio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/nio/zipfs/Makefile b/jdk/make/mkdemo/nio/zipfs/Makefile index e1120d8a6f4..2696c413fea 100644 --- a/jdk/make/mkdemo/nio/zipfs/Makefile +++ b/jdk/make/mkdemo/nio/zipfs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mkdemo/scripting/Makefile b/jdk/make/mkdemo/scripting/Makefile index 93cfe1adb98..0bf3fe736a9 100644 --- a/jdk/make/mkdemo/scripting/Makefile +++ b/jdk/make/mkdemo/scripting/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/Makefile b/jdk/make/mksample/Makefile index aa05475f466..8528e92328b 100644 --- a/jdk/make/mksample/Makefile +++ b/jdk/make/mksample/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/dtrace/Makefile b/jdk/make/mksample/dtrace/Makefile index 1bd620c8ebd..86914546ec6 100644 --- a/jdk/make/mksample/dtrace/Makefile +++ b/jdk/make/mksample/dtrace/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/jmx/Makefile b/jdk/make/mksample/jmx/Makefile index 3dbf284cea4..5a2e2eab43d 100644 --- a/jdk/make/mksample/jmx/Makefile +++ b/jdk/make/mksample/jmx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/jmx/jmx-scandir/Makefile b/jdk/make/mksample/jmx/jmx-scandir/Makefile index 14c50833e11..2dab96070fd 100644 --- a/jdk/make/mksample/jmx/jmx-scandir/Makefile +++ b/jdk/make/mksample/jmx/jmx-scandir/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/nbproject/Makefile b/jdk/make/mksample/nbproject/Makefile index 4936a7a5651..a77771a8f5a 100644 --- a/jdk/make/mksample/nbproject/Makefile +++ b/jdk/make/mksample/nbproject/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/nio/Makefile b/jdk/make/mksample/nio/Makefile index b4217deb05e..7c7736b0bcf 100644 --- a/jdk/make/mksample/nio/Makefile +++ b/jdk/make/mksample/nio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/nio/file/Makefile b/jdk/make/mksample/nio/file/Makefile index ab76b4dabbb..6632aa0f336 100644 --- a/jdk/make/mksample/nio/file/Makefile +++ b/jdk/make/mksample/nio/file/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/nio/multicast/Makefile b/jdk/make/mksample/nio/multicast/Makefile index f5cf079ea01..380b51ef50c 100644 --- a/jdk/make/mksample/nio/multicast/Makefile +++ b/jdk/make/mksample/nio/multicast/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/nio/server/Makefile b/jdk/make/mksample/nio/server/Makefile index 68d03b728e7..e7e246e5db6 100644 --- a/jdk/make/mksample/nio/server/Makefile +++ b/jdk/make/mksample/nio/server/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/scripting/Makefile b/jdk/make/mksample/scripting/Makefile index 99284f461da..96a096e05a4 100644 --- a/jdk/make/mksample/scripting/Makefile +++ b/jdk/make/mksample/scripting/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/scripting/scriptpad/Makefile b/jdk/make/mksample/scripting/scriptpad/Makefile index a04c14e74ec..917b3da81b1 100644 --- a/jdk/make/mksample/scripting/scriptpad/Makefile +++ b/jdk/make/mksample/scripting/scriptpad/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/webservices/EbayClient/Makefile b/jdk/make/mksample/webservices/EbayClient/Makefile index 1926cd33a53..04adedc2410 100644 --- a/jdk/make/mksample/webservices/EbayClient/Makefile +++ b/jdk/make/mksample/webservices/EbayClient/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/webservices/EbayServer/Makefile b/jdk/make/mksample/webservices/EbayServer/Makefile index 87451d95fcb..13c01e89702 100644 --- a/jdk/make/mksample/webservices/EbayServer/Makefile +++ b/jdk/make/mksample/webservices/EbayServer/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/mksample/webservices/Makefile b/jdk/make/mksample/webservices/Makefile index d53fa5ceafa..bb26fd99878 100644 --- a/jdk/make/mksample/webservices/Makefile +++ b/jdk/make/mksample/webservices/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/modules/Makefile b/jdk/make/modules/Makefile index 9fa458b6035..c31ff5a03ad 100644 --- a/jdk/make/modules/Makefile +++ b/jdk/make/modules/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/modules/modules.config b/jdk/make/modules/modules.config index e50f81b6d91..f7910378ab5 100644 --- a/jdk/make/modules/modules.config +++ b/jdk/make/modules/modules.config @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/modules/optional.depconfig b/jdk/make/modules/optional.depconfig index 6e57c617602..65aa09c24e2 100644 --- a/jdk/make/modules/optional.depconfig +++ b/jdk/make/modules/optional.depconfig @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/modules/tools/Makefile b/jdk/make/modules/tools/Makefile index 20d47390b5f..d630469c9fd 100644 --- a/jdk/make/modules/tools/Makefile +++ b/jdk/make/modules/tools/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/modules/tools/nbproject/project.properties b/jdk/make/modules/tools/nbproject/project.properties index 3d5371edbcf..4bbbab44110 100644 --- a/jdk/make/modules/tools/nbproject/project.properties +++ b/jdk/make/modules/tools/nbproject/project.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java b/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java index e64221b6b53..1a27834b216 100644 --- a/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java +++ b/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 diff --git a/jdk/make/netbeans/world/build.xml b/jdk/make/netbeans/world/build.xml index b502c2835fe..84e38b7f2a9 100644 --- a/jdk/make/netbeans/world/build.xml +++ b/jdk/make/netbeans/world/build.xml @@ -1,5 +1,5 @@