Merge
authorlana
Thu, 07 May 2015 20:50:07 -0700
changeset 30380 aca452591e50
parent 30319 376fd031edd2 (current diff)
parent 30379 42d3c3090d20 (diff)
child 30381 098f4aed1a53
Merge
jdk/src/java.management/share/classes/META-INF/services/sun.management.spi.PlatformMBeanProvider
jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
jdk/src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
jdk/src/java.management/share/classes/com/sun/management/GarbageCollectorMXBean.java
jdk/src/java.management/share/classes/com/sun/management/GcInfo.java
jdk/src/java.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
jdk/src/java.management/share/classes/com/sun/management/OperatingSystemMXBean.java
jdk/src/java.management/share/classes/com/sun/management/ThreadMXBean.java
jdk/src/java.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
jdk/src/java.management/share/classes/com/sun/management/VMOption.java
jdk/src/java.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java
jdk/src/java.management/share/classes/com/sun/management/package-info.java
jdk/src/java.management/share/classes/sun/management/DiagnosticCommandArgumentInfo.java
jdk/src/java.management/share/classes/sun/management/DiagnosticCommandImpl.java
jdk/src/java.management/share/classes/sun/management/DiagnosticCommandInfo.java
jdk/src/java.management/share/classes/sun/management/Flag.java
jdk/src/java.management/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java
jdk/src/java.management/share/classes/sun/management/GcInfoBuilder.java
jdk/src/java.management/share/classes/sun/management/GcInfoCompositeData.java
jdk/src/java.management/share/classes/sun/management/HotSpotDiagnostic.java
jdk/src/java.management/share/classes/sun/management/ManagementFactory.java
jdk/src/java.management/share/classes/sun/management/VMOptionCompositeData.java
jdk/src/java.management/share/native/libmanagement/DiagnosticCommandImpl.c
jdk/src/java.management/share/native/libmanagement/Flag.c
jdk/src/java.management/share/native/libmanagement/GcInfoBuilder.c
jdk/src/java.management/share/native/libmanagement/HotSpotDiagnostic.c
jdk/src/java.management/unix/classes/sun/management/OperatingSystemImpl.java
jdk/src/java.management/unix/native/libmanagement/LinuxOperatingSystem.c
jdk/src/java.management/unix/native/libmanagement/MacosxOperatingSystem.c
jdk/src/java.management/unix/native/libmanagement/OperatingSystemImpl.c
jdk/src/java.management/unix/native/libmanagement/SolarisOperatingSystem.c
jdk/src/java.management/windows/classes/sun/management/OperatingSystemImpl.java
jdk/src/java.management/windows/native/libmanagement/OperatingSystemImpl.c
jdk/test/java/lang/management/ThreadMXBean/Semaphore.java
jdk/test/sun/management/jmxremote/startstop/JMXStartStopDoSomething.java
--- a/jdk/make/Import.gmk	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/Import.gmk	Thu May 07 20:50:07 2015 -0700
@@ -32,11 +32,11 @@
 
 # Put the libraries here. Different locations for different target OS types.
 ifneq ($(OPENJDK_TARGET_OS), windows)
-  HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
+  HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
   BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)
   SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent$(OPENJDK_TARGET_CPU_LIBDIR)
 else
-  HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/bin
+  HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/bin
   BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
   SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent
 endif
@@ -80,11 +80,11 @@
 ################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig$(SHARED_LIBRARY_SUFFIX).dSYM) \
-      $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
+  JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig$(SHARED_LIBRARY_SUFFIX).dSYM) \
+      $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
 else
-  JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
-      $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
+  JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
+      $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
 endif
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
--- a/jdk/make/data/tzdata/VERSION	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/data/tzdata/VERSION	Thu May 07 20:50:07 2015 -0700
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2015b
+tzdata2015d
--- a/jdk/make/data/tzdata/africa	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/data/tzdata/africa	Thu May 07 20:50:07 2015 -0700
@@ -342,35 +342,29 @@
 # above) says DST had no affect on electricity consumption.  There is
 # no information about when DST will end this fall.  See:
 # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
+
+# From Steffen Thorsen (2015-04-08):
+# Egypt will start DST on midnight after Thursday, April 30, 2015.
+# This is based on a law (no 35) from May 15, 2014 saying it starts the last
+# Thursday of April....  Clocks will still be turned back for Ramadan, but
+# dates not yet announced....
+# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
+# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
+
+# From Ahmed Nazmy (2015-04-20):
+# Egypt's ministers cabinet just announced ... that it will cancel DST at
+# least for 2015.
 #
-# For now, guess that later spring and fall transitions will use
-# 2010's rules, and guess that Egypt will switch to standard time at
-# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
-# first Friday after Ramadan.  To implement this,
-# transition dates for 2015 through 2037 were determined by running
-# the following program under GNU Emacs 24.3, with the results integrated
-# by hand into the table below.  Ramadan again intrudes on the guessed
-# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
-# (let ((islamic-year 1436))
-#   (while (< islamic-year 1460)
-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-#           (friday 5))
-#       (while (/= friday (mod a 7))
-#         (setq a (1- a)))
-#       (while (/= friday (mod b 7))
-#         (setq b (1+ b)))
-#       (setq a (1- a))
-#       (setq b (1- b))
-#       (setq a (calendar-gregorian-from-absolute a))
-#       (setq b (calendar-gregorian-from-absolute b))
-#       (insert
-#        (format
-#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
-#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-#     (setq islamic-year (+ 1 islamic-year))))
+# From Tim Parenti (2015-04-20):
+# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx
+# "Egypt's cabinet agreed on Monday not to switch clocks for daylight saving
+# time this summer, and carry out studies on the possibility of canceling the
+# practice altogether in future years."
+#
+# From Paul Eggert (2015-04-20):
+# For now, assume DST will be canceled.  Any resumption would likely
+# use different rules anyway.
+
 Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
 Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
 Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
@@ -379,22 +373,7 @@
 Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
 Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
 Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
-Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
-Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
-Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
-Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
-Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
-Rule	Egypt	2017	only	-	May	25	24:00	0	-
-Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
-Rule	Egypt	2018	only	-	May	10	24:00	0	-
-Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
-Rule	Egypt	2019	only	-	May	 2	24:00	0	-
-Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
-Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
-Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
-Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
-Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
+Rule	Egypt	2014	only	-	Sep	lastThu	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
--- a/jdk/make/data/tzdata/antarctica	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/data/tzdata/antarctica	Thu May 07 20:50:07 2015 -0700
@@ -38,41 +38,6 @@
 # I made up all time zone abbreviations mentioned here; corrections welcome!
 # FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
 
-# These rules are stolen from the 'southamerica' file.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
-Rule	ArgAQ	1964	1966	-	Oct	15	0:00	1:00	S
-Rule	ArgAQ	1967	only	-	Apr	 2	0:00	0	-
-Rule	ArgAQ	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
-Rule	ArgAQ	1968	1969	-	Apr	Sun>=1	0:00	0	-
-Rule	ArgAQ	1974	only	-	Jan	23	0:00	1:00	S
-Rule	ArgAQ	1974	only	-	May	 1	0:00	0	-
-Rule	ChileAQ	1972	1986	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	1987	only	-	Apr	12	3:00u	0	-
-Rule	ChileAQ	1988	1989	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
-Rule	ChileAQ	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	1990	only	-	Mar	18	3:00u	0	-
-Rule	ChileAQ	1990	only	-	Sep	16	4:00u	1:00	S
-Rule	ChileAQ	1991	1996	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	1997	only	-	Mar	30	3:00u	0	-
-Rule	ChileAQ	1998	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1998	only	-	Sep	27	4:00u	1:00	S
-Rule	ChileAQ	1999	only	-	Apr	 4	3:00u	0	-
-Rule	ChileAQ	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	2000	2007	-	Mar	Sun>=9	3:00u	0	-
-# N.B.: the end of March 29 in Chile is March 30 in Universal time,
-# which is used below in specifying the transition.
-Rule	ChileAQ	2008	only	-	Mar	30	3:00u	0	-
-Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
-Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
-Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	ChileAQ	2012	2015	-	Apr	Sun>=23	3:00u	0	-
-Rule	ChileAQ	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
-
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
 # Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
@@ -367,21 +332,7 @@
 # USA - year-round bases
 #
 # Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
-#
-# From Ethan Dicks (1996-10-06):
-# It keeps the same time as Punta Arenas, Chile, because, just like us
-# and the South Pole, that's the other end of their supply line....
-# I verified with someone who was there that since 1980,
-# Palmer has followed Chile.  Prior to that, before the Falklands War,
-# Palmer used to be supplied from Argentina.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Palmer	0	-	zzz	1965
-			-4:00	ArgAQ	AR%sT	1969 Oct  5
-			-3:00	ArgAQ	AR%sT	1982 May
-			-4:00	ChileAQ	CL%sT	2015 Apr 26 3:00u
-			-3:00	-	CLT
-#
+# See 'southamerica' for Antarctica/Palmer, since it uses South American DST.
 #
 # McMurdo Station, Ross Island, since 1955-12
 # Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
--- a/jdk/make/data/tzdata/backward	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/data/tzdata/backward	Thu May 07 20:50:07 2015 -0700
@@ -43,6 +43,7 @@
 Link	America/Indiana/Knox	America/Knox_IN
 Link	America/Kentucky/Louisville	America/Louisville
 Link	America/Argentina/Mendoza	America/Mendoza
+Link	America/Toronto		America/Montreal
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Argentina/Cordoba	America/Rosario
 Link	America/Denver		America/Shiprock
--- a/jdk/make/data/tzdata/europe	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/data/tzdata/europe	Thu May 07 20:50:07 2015 -0700
@@ -99,7 +99,7 @@
 #        1:00:14    SET           Swedish (1879-1899)*
 #        2:00       EET EEST      Eastern Europe
 #        3:00       FET           Further-eastern Europe (2011-2014)*
-#        3:00       MSK MSD  MSM* Moscow
+#        3:00       MSK MSD  MSM* Minsk, Moscow
 
 # From Peter Ilieve (1994-12-04),
 # The original six [EU members]: Belgium, France, (West) Germany, Italy,
--- a/jdk/make/data/tzdata/northamerica	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/data/tzdata/northamerica	Thu May 07 20:50:07 2015 -0700
@@ -250,9 +250,14 @@
 # The law doesn't give abbreviations.
 #
 # From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
-# Public law 106-564 (2000-12-23) introduced the abbreviation
-# "Chamorro Standard Time" for time in Guam and the Northern Marianas.
-# See the file "australasia".
+# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
+# for time in Guam and the Northern Marianas.  See the file "australasia".
+#
+# From Paul Eggert (2015-04-17):
+# HST and HDT are standardized abbreviations for Hawaii-Aleutian
+# standard and daylight times.  See section 9.47 (p 234) of the
+# U.S. Government Printing Office Style Manual (2008)
+# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
 
 # From Arthur David Olson, 2005-08-09
 # The following was signed into law on 2005-08-08.
@@ -559,7 +564,7 @@
 			-11:00	-	BST	1969
 			-11:00	US	B%sT	1983 Oct 30  2:00
 			-10:00	US	AH%sT	1983 Nov 30
-			-10:00	US	HA%sT
+			-10:00	US	H%sT
 # The following switches don't quite make our 1970 cutoff.
 #
 # Shanks writes that part of southwest Alaska (e.g. Aniak)
@@ -1354,14 +1359,9 @@
 
 # Quebec
 
-# From Paul Eggert (2013-08-30):
-# Since 1970 most of Quebec has been like Toronto.
-# However, because earlier versions of the tz database mistakenly relied on data
-# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
-# a separate entry was created for most of Quebec.  We're loath to lose
-# its pre-1970 info, even though the tz database is normally limited to
-# zones that differ after 1970, so keep this otherwise out-of-scope entry.
-
+# From Paul Eggert (2015-03-24):
+# See America/Toronto for most of Quebec, including Montreal.
+#
 # Matthews and Vincent (1998) also write that Quebec east of the -63
 # meridian is supposed to observe AST, but residents as far east as
 # Natashquan use EST/EDT, and residents east of Natashquan use AST.
@@ -1375,39 +1375,10 @@
 # For lack of better info, guess this practice began around 1970, contra to
 # Shanks & Pottenger who have this region observing AST/ADT.
 
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
-Rule	Mont	1917	only	-	Apr	24	0:00	0	S
-Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
-Rule	Mont	1919	only	-	Oct	25	2:30	0	S
-Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
-Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
-Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
-Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
-Rule	Mont	1924	only	-	May	17	2:00	1:00	D
-Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
-Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
-Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
-Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
-Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
-Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
-Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
-Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
 			-4:00	Canada	A%sT	1970
 			-4:00	-	AST
-Zone America/Montreal	-4:54:16 -	LMT	1884
-			-5:00	Mont	E%sT	1918
-			-5:00	Canada	E%sT	1919
-			-5:00	Mont	E%sT	1942 Feb  9  2:00s
-			-5:00	Canada	E%sT	1946
-			-5:00	Mont	E%sT	1974
-			-5:00	Canada	E%sT
 
 # Ontario
 
@@ -1898,17 +1869,115 @@
 # Dawson switched to PST in 1973.  Inuvik switched to MST in 1979.
 # Mathew Englander (1996-10-07) gives the following refs:
 #	* 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
-#	c. 7 defines Yukon standard time as UTC-9.  This is still valid;
+#	c. 7 defines Yukon standard time as UTC-9....
 #	see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
+#	[http://canlii.ca/t/7vhg]
 #	* C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
 #	* O.I.C. 1980/02 established DST.
 #	* O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
-# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go
-# with Englander.
-# From Chris Walton (2006-06-26):
-# Here is a link to the old daylight saving portion of the interpretation
-# act which was last updated in 1987:
-# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf
+
+# From Brian Inglis (2015-04-14):
+#
+# I tried to trace the history of Yukon time and found the following
+# regulations, giving the reference title and URL if found, regulation name,
+# and relevant quote if available.  Each regulation specifically revokes its
+# predecessor.  The final reference is to the current Interpretation Act
+# authorizing and resulting from these regulatory changes.
+#
+# Only recent regulations were retrievable via Yukon government site search or
+# index, and only some via Canadian legal sources.  Other sources used include
+# articles titled "Standard Time and Time Zones in Canada" from JRASC via ADS
+# Abstracts, cited by ADO for 1932 ..., and updated versions from 1958 and
+# 1970 quoted below; each article includes current extracts from provincial
+# and territorial ST and DST regulations at the end, summaries and details of
+# standard times and daylight saving time at many locations across Canada,
+# with time zone maps, tables and calculations for Canadian Sunrise, Sunset,
+# and LMST; they also cover many countries and global locations, with a chart
+# and table showing current Universal Time offsets, and may be useful as
+# another source of information for 1970 and earlier.
+#
+# * Standard Time and Time Zones in Canada; Smith, C.C.; JRASC, Vol. 26,
+#   pp.49-77; February 1932; SAO/NASA Astrophysics Data System (ADS)
+#   http://adsabs.harvard.edu/abs/1932JRASC..26...49S from p.75:
+#   Yukon Interpretation Ordinance
+#   Yukon standard time is the local mean time at the one hundred and
+#   thirty-fifth meridian.
+#
+# * Standard Time and Time Zones in Canada; Smith, C.C.; Thomson, Malcolm M.;
+#   JRASC, Vol. 52, pp.193-223; October 1958; SAO/NASA Astrophysics Data System
+#   (ADS) http://adsabs.harvard.edu/abs/1958JRASC..52..193S from pp.220-1:
+#   Yukon Interpretation Ordinance, 1955, Chap. 16.
+#
+#     (1) Subject to this section, standard time shall be reckoned as nine
+#     hours behind Greenwich Time and called Yukon Standard Time.
+#
+#     (2) Notwithstanding subsection (1), the Commissioner may make regulations
+#     varying the manner of reckoning standard time.
+#
+# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance
+#   http://? - no online source found
+#
+# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC,
+#   Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS)
+#   http://adsabs.harvard.edu/abs/1970JRASC..64..129T from p.156: Yukon
+#   Territory Commissioner's Order 1967-59 Interpretation Ordinance ...
+#
+#     1. Commissioner's Order 1966-20 dated at Whitehorse in the Yukon
+#     Territory on 27th January, 1966, is hereby revoked.
+#
+#     2. Yukon (East) Standard Time as defined by section 36 of the
+#     Interpretation Ordinance from and after mid-night on the 28th day of May,
+#     1967 shall be reckoned in the same manner as Pacific Standard Time, that
+#     is to say, eight hours behind Greenwich Time in the area of the Yukon
+#     Territory lying east of the 138th degree longitude west.
+#
+#     3. In the remainder of the Territory, lying west of the 138th degree
+#     longitude west, Yukon (West) Standard Time shall be reckoned as nine
+#     hours behind Greenwich Time.
+#
+# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
+#   http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
+#   C.O. 1973/214 INTERPRETATION ACT ...
+#
+#     1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
+#     revoked.
+#
+#     2. Yukon Standard Time as defined by section 36 of the Interpretation
+#     Act from and after midnight on the twenty-eighth day of October, 1973
+#     shall be reckoned in the same manner as Pacific Standard Time, that is
+#     to say eight hours behind Greenwich Time.
+#
+# * O.I.C. 1980/02 INTERPRETATION ACT
+#   http://? - no online source found
+#
+# * Yukon Daylight Saving Time, YOIC 1987/56
+#   http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
+#   O.I.C. 1987/056 INTERPRETATION ACT ...
+#
+#   In every year between
+#     (a) two o'clock in the morning in the first Sunday in April, and
+#     (b) two o'clock in the morning in the last Sunday in October,
+#   Standard Time shall be reckoned as seven hours behind Greenwich Time and
+#   called Yukon Daylight Saving Time.
+#   ...
+#   Dated ... 9th day of March, A.D., 1987.
+#
+# * Yukon Daylight Saving Time 2006, YOIC 2006/127
+#   http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
+#   O.I.C. 2006/127 INTERPRETATION ACT ...
+#
+#     1. In Yukon each year the time for general purposes shall be 7 hours
+#     behind Greenwich mean time during the period commencing at two o'clock
+#     in the forenoon on the second Sunday of March and ending at two o'clock
+#     in the forenoon on the first Sunday of November and shall be called
+#     Yukon Daylight Saving Time.
+#
+#     2. Order-in-Council 1987/56 is revoked.
+#
+#     3. This order comes into force January 1, 2007.
+#
+# * Interpretation Act, RSY 2002, c 125
+# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
 
 # From Rives McDow (1999-09-04):
 # Nunavut ... moved ... to incorporate the whole territory into one time zone.
@@ -2134,7 +2203,7 @@
 			-7:00	NT_YK	M%sT	1980
 			-7:00	Canada	M%sT
 Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
-			-9:00	NT_YK	Y%sT	1966 Jul  1  2:00
+			-9:00	NT_YK	Y%sT	1967 May 28  0:00
 			-8:00	NT_YK	P%sT	1980
 			-8:00	Canada	P%sT
 Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
--- a/jdk/make/data/tzdata/southamerica	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/data/tzdata/southamerica	Thu May 07 20:50:07 2015 -0700
@@ -1121,6 +1121,60 @@
 
 # Chile
 
+# From Paul Eggert (2015-04-03):
+# Shanks & Pottenger says America/Santiago introduced standard time in
+# 1890 and rounds its UTC offset to 70W40; guess that in practice this
+# was the same offset as in 1916-1919.  It also says Pacific/Easter
+# standardized on 109W22 in 1890; assume this didn't change the clocks.
+#
+# Dates for America/Santiago from 1910 to 2004 are primarily from
+# the following source, cited by Oscar van Vlijmen (2006-10-08):
+# [1] Chile Law
+# http://www.webexhibits.org/daylightsaving/chile.html
+# This contains a copy of a this official table:
+# Cambios en la hora oficial de Chile desde 1900 (retrieved 2008-03-30)
+# http://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
+# [1] needs several corrections, though.
+#
+# The first set of corrections is from:
+# [2] History of the Official Time of Chile
+# http://www.horaoficial.cl/ing/horaof_ing.html (retrieved 2012-03-06).  See:
+# http://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
+# This is an English translation of:
+# Historia de la hora oficial de Chile (retrieved 2012-10-24).  See:
+# http://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
+# A fancier Spanish version (requiring mouse-clicking) is at:
+# http://www.horaoficial.cl/historia_hora.html
+# Conflicts between [1] and [2] were resolved as follows:
+#
+#  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
+#    Boletín Nº 1, Aviso Nº 1 (1910).  Go with [2].
+#
+#  - [1] says SMT was -4:42:45, [2] says Chile's official time from
+#    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
+#    Astronomical Observatory (OAN), then located in what is now
+#    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
+#
+#  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
+#    Boletín Nº 22, Aviso Nº 129/1918 (1918-08-23).  Go with [2].
+#
+#  - [1] does not give times for transitions; assume they occur
+#    at midnight mainland time, the current common practice.  However,
+#    go with [2]'s specification of 23:00 for the 1947-05-21 transition.
+#
+# Another correction to [1] is from Jesper Nørgaard Welen, who
+# wrote (2006-10-08), "I think that there are some obvious mistakes in
+# the suggested link from Oscar van Vlijmen,... for instance entry 66
+# says that GMT-4 ended 1990-09-12 while entry 67 only begins GMT-3 at
+# 1990-09-15 (they should have been 1990-09-15 and 1990-09-16
+# respectively), but anyhow it clears up some doubts too."
+#
+# Data for Pacific/Easter from 1910 through 1967 come from Shanks &
+# Pottenger.  After that, for lack of better info assume
+# Pacific/Easter is always two hours behind America/Santiago;
+# this is known to work for DST transitions starting in 2008 and
+# may well be true for earlier transitions.
+
 # From Eduardo Krell (1995-10-19):
 # The law says to switch to DST at midnight [24:00] on the second SATURDAY
 # of October....  The law is the same for March and October.
@@ -1133,78 +1187,35 @@
 # Because of the same drought, the government decided to end DST later,
 # on April 3, (one-time change).
 
-# From Oscar van Vlijmen (2006-10-08):
-# http://www.horaoficial.cl/cambio.htm
-
-# From Jesper Nørgaard Welen (2006-10-08):
-# I think that there are some obvious mistakes in the suggested link
-# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
-# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
-# (they should have been 1990-09-15 and 1990-09-16 respectively), but
-# anyhow it clears up some doubts too.
-
-# From Paul Eggert (2014-08-12):
-# The following data entries for Chile and America/Santiago are from
-# <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by
-# Jesper Nørgaard Welen.  The data entries for Pacific/Easter are from Shanks
-# & Pottenger, except with DST transitions after 1932 cloned from
-# America/Santiago.  The pre-1980 Pacific/Easter data entries are dubious,
-# but we have no other source.
-
 # From Germán Poo-Caamaño (2008-03-03):
 # Due to drought, Chile extends Daylight Time in three weeks.  This
 # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
 # and Saturday 3/29 at 22:00 for Pacific/Easter)
 # The Supreme Decree is located at
 # http://www.shoa.cl/servicios/supremo316.pdf
-# and the instructions for 2008 are located in:
-# http://www.horaoficial.cl/cambio.htm
-
+#
 # From José Miguel Garrido (2008-03-05):
-# ...
-# You could see the announces of the change on
 # http://www.shoa.cl/noticias/2008/04hora/hora.htm
 
 # From Angel Chiang (2010-03-04):
 # Subject: DST in Chile exceptionally extended to 3 April due to earthquake
 # http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
-# (in Spanish, last paragraph).
 #
-# This is breaking news. There should be more information available later.
-
 # From Arthur David Olson (2010-03-06):
 # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
 
-# From Glenn Eychaner (2011-03-02):
-# It appears that the Chilean government has decided to postpone the
-# change from summer time to winter time again, by three weeks to April
-# 2nd:
-# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
-#
-# This is not yet reflected in the official "cambio de hora" site, but
-# probably will be soon:
-# http://www.horaoficial.cl/cambio.htm
-
-# From Arthur David Olson (2011-03-02):
-# The emol.com article mentions a water shortage as the cause of the
-# postponement, which may mean that it's not a permanent change.
-
 # From Glenn Eychaner (2011-03-28):
-# The article:
 # http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
-#
 # In English:
 # Chile's clocks will go back an hour this year on the 7th of May instead
 # of this Saturday. They will go forward again the 3rd Saturday in
-# August, not in October as they have since 1968. This is a pilot plan
-# which will be reevaluated in 2012.
+# August, not in October as they have since 1968.
 
 # From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
 # As stated in the website of the Chilean Energy Ministry
 # http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
 # The Chilean Government has decided to postpone the entrance into winter time
-# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
-# been yet formalized but it will within the next days.
+# (to leave DST) from March 11 2012 to April 28th 2012....
 # Quote from the website communication:
 #
 # 6. For the year 2012, the dates of entry into winter time will be as follows:
@@ -1237,17 +1248,9 @@
 # From Paul Eggert (2015-03-03):
 # For now, assume that the extension will persist indefinitely.
 
-# NOTE: ChileAQ rules for Antarctic bases are stored separately in the
-# 'antarctica' file.
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
+Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-Rule	Chile	1942	only	-	Jun	 1	4:00u	0	-
-Rule	Chile	1942	only	-	Aug	 1	5:00u	1:00	S
-Rule	Chile	1946	only	-	Jul	15	4:00u	1:00	S
-Rule	Chile	1946	only	-	Sep	 1	3:00u	0:00	-
-Rule	Chile	1947	only	-	Apr	 1	4:00u	0	-
 Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
 Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
 Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
@@ -1258,10 +1261,8 @@
 Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
 Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
-Rule	Chile	1988	1989	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
-Rule	Chile	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1990	only	-	Mar	18	3:00u	0	-
+Rule	Chile	1988	1990	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
 Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
@@ -1284,15 +1285,21 @@
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santiago	-4:42:46 -	LMT	1890
-			-4:42:46 -	SMT	1910        # Santiago Mean Time
+			-4:42:46 -	SMT	1910 Jan 10 # Santiago Mean Time
 			-5:00	-	CLT	1916 Jul  1 # Chile Time
-			-4:42:46 -	SMT	1918 Sep  1 # Santiago Mean Time
-			-4:00	-	CLT	1919 Jul  1 # Chile Time
-			-4:42:46 -	SMT	1927 Sep  1 # Santiago Mean Time
-			-5:00	Chile	CL%sT	1947 May 22 # Chile Time
+			-4:42:46 -	SMT	1918 Sep 10
+			-4:00	-	CLT	1919 Jul  1
+			-4:42:46 -	SMT	1927 Sep  1
+			-5:00	Chile	CL%sT	1932 Sep  1
+			-4:00	-	CLT	1942 Jun  1
+			-5:00	-	CLT	1942 Aug  1
+			-4:00	-	CLT	1946 Jul 15
+			-4:00	1:00	CLST	1946 Sep  1 # central Chile
+			-4:00	-	CLT	1947 Apr  1
+			-5:00	-	CLT	1947 May 21 23:00
 			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
 			-3:00	-	CLT
-Zone Pacific/Easter	-7:17:44 -	LMT	1890
+Zone Pacific/Easter	-7:17:28 -	LMT	1890
 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
 			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
 			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
@@ -1302,6 +1309,25 @@
 # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
 # and Antarctic bases, are like America/Santiago.
 
+# Antarctic base using South American rules
+# (See the file 'antarctica' for more.)
+#
+# Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
+#
+# From Ethan Dicks (1996-10-06):
+# It keeps the same time as Punta Arenas, Chile, because, just like us
+# and the South Pole, that's the other end of their supply line....
+# I verified with someone who was there that since 1980,
+# Palmer has followed Chile.  Prior to that, before the Falklands War,
+# Palmer used to be supplied from Argentina.
+#
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Antarctica/Palmer	0	-	zzz	1965
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1982 May
+			-4:00	Chile	CL%sT	2015 Apr 26 3:00u
+			-3:00	-	CLT
+
 # Colombia
 
 # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest.  He writes,
--- a/jdk/make/lib/Awt2dLibraries.gmk	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Thu May 07 20:50:07 2015 -0700
@@ -827,7 +827,7 @@
     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
   endif
 
-  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
+  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
       $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
       $(LIBJAVA_HEADER_FLAGS) \
       #
--- a/jdk/make/lib/Lib-java.instrument.gmk	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/lib/Lib-java.instrument.gmk	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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
@@ -25,6 +25,9 @@
 
 include LibCommon.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, jdk, lib/Lib-java.instrument.gmk))
+
 ################################################################################
 
 LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/java.instrument/share/native/libinstrument \
--- a/jdk/make/lib/Lib-java.management.gmk	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/lib/Lib-java.management.gmk	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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
@@ -30,33 +30,14 @@
 
 ################################################################################
 
-BUILD_LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \
+LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \
     $(JDK_TOPDIR)/src/java.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement
-BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
-    $(addprefix -I,$(BUILD_LIBMANAGEMENT_SRC)) \
+LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
+    $(addprefix -I,$(LIBMANAGEMENT_SRC)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.management \
     $(LIBJAVA_HEADER_FLAGS) \
     #
 
-# In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
-# a binary that is compatible with windows versions older than 7/2008R2.
-# See MSDN documentation for GetProcessMemoryInfo for more information.
-BUILD_LIBMANAGEMENT_CFLAGS += -DPSAPI_VERSION=1
-
-BUILD_LIBMANAGEMENT_EXCLUDES :=
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
-  BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), linux)
-  BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
-  BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
-endif
-
 LIBMANAGEMENT_OPTIMIZATION := HIGH
 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
   ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
@@ -64,17 +45,13 @@
   endif
 endif
 
-# Make it possible to override this variable
-LIBMANAGEMENT_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers
-
 $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
     LIBRARY := management, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(BUILD_LIBMANAGEMENT_SRC), \
-    EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
+    SRC := $(LIBMANAGEMENT_SRC), \
     OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
-    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(BUILD_LIBMANAGEMENT_CFLAGS), \
-    MAPFILE := $(LIBMANAGEMENT_MAPFILE), \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(LIBMANAGEMENT_CFLAGS), \
+    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_solaris := -lkstat, \
--- a/jdk/make/lib/Lib-jdk.hprof.agent.gmk	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/lib/Lib-jdk.hprof.agent.gmk	Thu May 07 20:50:07 2015 -0700
@@ -49,6 +49,7 @@
     CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
         $(BUILD_LIBHPROF_CFLAGS), \
     CFLAGS_debug := -DHPROF_LOGGING, \
+    CFLAGS_windows := -D_WINSOCK_DEPRECATED_NO_WARNINGS, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libhprof/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/lib/Lib-jdk.management.gmk	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,80 @@
+#
+# Copyright (c) 2015, 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.
+#
+
+include LibCommon.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, jdk, lib/Lib-jdk.management.gmk))
+
+################################################################################
+
+LIBMANAGEMENT_EXT_SRC += $(JDK_TOPDIR)/src/jdk.management/share/native/libmanagement_ext \
+    $(JDK_TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_ext       \
+    $(JDK_TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS)/native/libmanagement_ext
+LIBMANAGEMENT_EXT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
+    $(addprefix -I,$(LIBMANAGEMENT_EXT_SRC)) \
+    -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management \
+    $(LIBJAVA_HEADER_FLAGS) \
+    #
+
+# In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
+# a binary that is compatible with windows versions older than 7/2008R2.
+# See MSDN documentation for GetProcessMemoryInfo for more information.
+BUILD_LIBMANAGEMENT_EXT_CFLAGS += -DPSAPI_VERSION=1
+
+LIBMANAGEMENT_EXT_OPTIMIZATION := HIGH
+ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
+  ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+    LIBMANAGEMENT_EXT_OPTIMIZATION := LOW
+  endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT_EXT, \
+    LIBRARY := management_ext, \
+    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+    SRC := $(LIBMANAGEMENT_EXT_SRC), \
+    LANG := C, \
+    OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
+    CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(LIBMANAGEMENT_EXT_CFLAGS), \
+    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement_ext/mapfile-vers, \
+    LDFLAGS := $(LDFLAGS_JDKLIB) \
+        $(call SET_SHARED_LIBRARY_ORIGIN), \
+    LDFLAGS_solaris := -lkstat, \
+    LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+    LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
+    LDFLAGS_SUFFIX_aix := -lperfstat,\
+    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
+    RC_FLAGS := $(RC_FLAGS) \
+        -D "JDK_FNAME=management_ext.dll" \
+        -D "JDK_INTERNAL_NAME=management_ext" \
+        -D "JDK_FTYPE=0x2L", \
+    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmanagement_ext, \
+    DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBMANAGEMENT_EXT): $(call FindLib, java.base, java)
+
+TARGETS += $(BUILD_LIBMANAGEMENT_EXT)
+
+################################################################################
--- a/jdk/make/mapfiles/libmanagement/mapfile-vers	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/mapfiles/libmanagement/mapfile-vers	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, 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
@@ -27,37 +27,10 @@
 
 SUNWprivate_1.1 {
 	global:
-	    Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize0;
-	    Java_sun_management_OperatingSystemImpl_getFreePhysicalMemorySize0;
-	    Java_sun_management_OperatingSystemImpl_getFreeSwapSpaceSize0;
-	    Java_sun_management_OperatingSystemImpl_getMaxFileDescriptorCount0;
-	    Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount0;
-	    Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0;
-	    Java_sun_management_OperatingSystemImpl_getProcessCpuTime0;
-	    Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0;
-	    Java_sun_management_OperatingSystemImpl_getTotalPhysicalMemorySize0;
-	    Java_sun_management_OperatingSystemImpl_getTotalSwapSpaceSize0;
-	    Java_sun_management_OperatingSystemImpl_initialize0;
 	    Java_sun_management_ClassLoadingImpl_setVerboseClass;
-            Java_sun_management_DiagnosticCommandImpl_executeDiagnosticCommand;
-            Java_sun_management_DiagnosticCommandImpl_getDiagnosticCommands;
-            Java_sun_management_DiagnosticCommandImpl_getDiagnosticCommandInfo;
-            Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled;
-	    Java_sun_management_FileSystemImpl_isAccessUserOnly0;
-	    Java_sun_management_Flag_getAllFlagNames;
-	    Java_sun_management_Flag_getFlags;
-	    Java_sun_management_Flag_getInternalFlagCount;
-	    Java_sun_management_Flag_initialize;
-	    Java_sun_management_Flag_setLongValue;
-	    Java_sun_management_Flag_setBooleanValue;
-	    Java_sun_management_Flag_setStringValue;
-	    Java_sun_management_GarbageCollectorImpl_getCollectionCount;
+            Java_sun_management_FileSystemImpl_isAccessUserOnly0;
+            Java_sun_management_GarbageCollectorImpl_getCollectionCount;
 	    Java_sun_management_GarbageCollectorImpl_getCollectionTime;
-	    Java_sun_management_GarbageCollectorImpl_setNotificationEnabled;
-	    Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
-	    Java_sun_management_GcInfoBuilder_getLastGcInfo0;
-	    Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
-	    Java_sun_management_HotSpotDiagnostic_dumpHeap0;
 	    Java_sun_management_HotspotThread_getInternalThreadCount;
 	    Java_sun_management_HotspotThread_getInternalThreadTimes0;
 	    Java_sun_management_MemoryImpl_getMemoryManagers0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/mapfiles/libmanagement_ext/mapfile-vers	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2015, 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.
+#
+
+# Define library interface.
+
+SUNWprivate_1.1 {
+	global:
+	    Java_com_sun_management_internal_OperatingSystemImpl_getCommittedVirtualMemorySize0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getFreePhysicalMemorySize0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getFreeSwapSpaceSize0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getMaxFileDescriptorCount0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getOpenFileDescriptorCount0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuTime0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getSystemCpuLoad0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getTotalPhysicalMemorySize0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_getTotalSwapSpaceSize0;
+	    Java_com_sun_management_internal_OperatingSystemImpl_initialize0;
+            Java_com_sun_management_internal_DiagnosticCommandImpl_executeDiagnosticCommand;
+            Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommands;
+            Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo;
+            Java_com_sun_management_internal_DiagnosticCommandImpl_setNotificationEnabled;
+	    Java_com_sun_management_internal_Flag_getAllFlagNames;
+	    Java_com_sun_management_internal_Flag_getFlags;
+	    Java_com_sun_management_internal_Flag_getInternalFlagCount;
+	    Java_com_sun_management_internal_Flag_initialize;
+	    Java_com_sun_management_internal_Flag_setLongValue;
+	    Java_com_sun_management_internal_Flag_setBooleanValue;
+	    Java_com_sun_management_internal_Flag_setStringValue;
+            Java_com_sun_management_internal_GarbageCollectorExtImpl_setNotificationEnabled;
+	    Java_com_sun_management_internal_GcInfoBuilder_fillGcAttributeInfo;
+	    Java_com_sun_management_internal_GcInfoBuilder_getLastGcInfo0;
+	    Java_com_sun_management_internal_GcInfoBuilder_getNumGcExtAttributes;
+	    Java_com_sun_management_internal_HotSpotDiagnostic_dumpHeap0;
+            JNI_OnLoad;
+	local:
+	    *;
+};
--- a/jdk/make/src/classes/build/tools/module/boot.modules	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/make/src/classes/build/tools/module/boot.modules	Thu May 07 20:50:07 2015 -0700
@@ -22,6 +22,7 @@
 jdk.hprof.agent
 jdk.httpserver
 jdk.jfr
+jdk.management
 jdk.management.cmm
 jdk.naming.rmi
 jdk.sctp
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java	Thu May 07 20:50:07 2015 -0700
@@ -38,7 +38,17 @@
  * under section 6.5. It needs to be constructed w/ an initialized
  * cipher object, and initial counter block(ICB). Given an input X
  * of arbitrary length, it processes and returns an output which has
- * the same length as X.
+ * the same length as X. The invariants of this class are:
+ *
+ * (1) The length of intialCounterBlk (and also of its clones, e.g.,
+ * fields counter and counterSave) is equal to AES_BLOCK_SIZE.
+ *
+ * (2) After construction, the field counter never becomes null, it
+ * always contains a byte array of length AES_BLOCK_SIZE.
+ *
+ * If any invariant is broken, failures can occur because the
+ * AESCrypt.encryptBlock method can be intrinsified on the HotSpot VM
+ * (see JDK-8067648 for details).
  *
  * <p>This function is used in the implementation of GCM mode.
  *
@@ -59,6 +69,10 @@
     // NOTE: cipher should already be initialized
     GCTR(SymmetricCipher cipher, byte[] initialCounterBlk) {
         this.aes = cipher;
+        if (initialCounterBlk.length != AES_BLOCK_SIZE) {
+            throw new RuntimeException("length of initial counter block (" + initialCounterBlk.length +
+                                       ") not equal to AES_BLOCK_SIZE (" + AES_BLOCK_SIZE + ")");
+        }
         this.icb = initialCounterBlk;
         this.counter = icb.clone();
     }
@@ -137,6 +151,8 @@
      * Restores the content of this object to the previous saved one.
      */
     void restore() {
-        this.counter = this.counterSave;
+        if (this.counterSave != null) {
+            this.counter = this.counterSave;
+        }
     }
 }
--- a/jdk/src/java.base/share/classes/java/lang/Class.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/Class.java	Thu May 07 20:50:07 2015 -0700
@@ -1312,7 +1312,7 @@
         // e) Anonymous classes
 
 
-        // JVM Spec 4.8.6: A class must have an EnclosingMethod
+        // JVM Spec 4.7.7: A class must have an EnclosingMethod
         // attribute if and only if it is a local class or an
         // anonymous class.
         EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo();
@@ -1357,28 +1357,7 @@
             simpleName = getName();
             return simpleName.substring(simpleName.lastIndexOf('.')+1); // strip the package name
         }
-        // According to JLS3 "Binary Compatibility" (13.1) the binary
-        // name of non-package classes (not top level) is the binary
-        // name of the immediately enclosing class followed by a '$' followed by:
-        // (for nested and inner classes): the simple name.
-        // (for local classes): 1 or more digits followed by the simple name.
-        // (for anonymous classes): 1 or more digits.
-
-        // Since getSimpleBinaryName() will strip the binary name of
-        // the immediately enclosing class, we are now looking at a
-        // string that matches the regular expression "\$[0-9]*"
-        // followed by a simple name (considering the simple of an
-        // anonymous class to be the empty string).
-
-        // Remove leading "\$[0-9]*" from the name
-        int length = simpleName.length();
-        if (length < 1 || simpleName.charAt(0) != '$')
-            throw new InternalError("Malformed class name");
-        int index = 1;
-        while (index < length && isAsciiDigit(simpleName.charAt(index)))
-            index++;
-        // Eventually, this is the empty string iff this is an anonymous class
-        return simpleName.substring(index);
+        return simpleName;
     }
 
     /**
@@ -1489,20 +1468,20 @@
         Class<?> enclosingClass = getEnclosingClass();
         if (enclosingClass == null) // top level class
             return null;
-        // Otherwise, strip the enclosing class' name
-        try {
-            return getName().substring(enclosingClass.getName().length());
-        } catch (IndexOutOfBoundsException ex) {
-            throw new InternalError("Malformed class name", ex);
-        }
+        String name = getSimpleBinaryName0();
+        if (name == null) // anonymous class
+            return "";
+        return name;
     }
 
+    private native String getSimpleBinaryName0();
+
     /**
      * Returns {@code true} if this is a local class or an anonymous
      * class.  Returns {@code false} otherwise.
      */
     private boolean isLocalOrAnonymousClass() {
-        // JVM Spec 4.8.6: A class must have an EnclosingMethod
+        // JVM Spec 4.7.7: A class must have an EnclosingMethod
         // attribute if and only if it is a local class or an
         // anonymous class.
         return getEnclosingMethodInfo() != null;
--- a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java	Thu May 07 20:50:07 2015 -0700
@@ -333,6 +333,19 @@
  *   "../../../technotes/guides/plugin/developer_guide/rsa_how.html#use">
  *   usePolicy Permission</a>.</td>
  * </tr>
+ *
+ * <tr>
+ *   <td>localeServiceProvider</td>
+ *   <td>This {@code RuntimePermission} is required to be granted to
+ *   classes which subclass and implement
+ *   {@code java.util.spi.LocaleServiceProvider}. The permission is
+ *   checked during invocation of the abstract base class constructor.
+ *   This permission ensures trust in classes which implement this
+ *   security-sensitive provider mechanism. </td>
+ *   <td>See <a href= "../util/spi/LocaleServiceProvider.html">
+ *   {@code java.util.spi.LocaleServiceProvider}</a> for more
+ *   information.</td>
+ * </tr>
  * </table>
  *
  * @see java.security.BasicPermission
--- a/jdk/src/java.base/share/classes/java/lang/invoke/CallSite.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/CallSite.java	Thu May 07 20:50:07 2015 -0700
@@ -25,9 +25,10 @@
 
 package java.lang.invoke;
 
-import sun.invoke.empty.Empty;
 import static java.lang.invoke.MethodHandleStatics.*;
 import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
+import java.lang.reflect.Field;
+import sun.misc.Cleaner;
 
 /**
  * A {@code CallSite} is a holder for a variable {@link MethodHandle},
@@ -136,6 +137,50 @@
     }
 
     /**
+     * {@code CallSite} dependency context.
+     * VM uses context class to store nmethod dependencies on the call site target.
+     * Can be in 2 states: (a) null; or (b) {@code Cleaner} instance pointing to some Class instance.
+     * Lazily initialized when CallSite instance is linked to some indy call site or VM needs
+     * it to store dependencies. As a corollary, "null" context means there are no dependencies
+     * registered yet. {@code Cleaner} is used in 2 roles:
+     *   (a) context class access for VM;
+     *   (b) stale context class cleanup.
+     * {@code Cleaner} holds the context class until cleanup action is finished (see {@code PhantomReference}).
+     * Though it's impossible to get the context class using {@code Reference.get()}, VM extracts it directly
+     * from {@code Reference.referent} field.
+     */
+    private volatile Cleaner context = null;
+
+    /**
+     * Default context.
+     * VM uses it to initialize non-linked CallSite context.
+     */
+    private static class DefaultContext {}
+    private static final Cleaner DEFAULT_CONTEXT = makeContext(DefaultContext.class, null);
+
+    private static Cleaner makeContext(Class<?> referent, final CallSite holder) {
+        return Cleaner.create(referent,
+                new Runnable() {
+                    @Override public void run() {
+                        MethodHandleNatives.invalidateDependentNMethods(holder);
+                    }
+                });
+    }
+
+    /** Initialize context class used for nmethod dependency tracking */
+    /*package-private*/
+    void initContext(Class<?> newContext) {
+        // If there are concurrent actions, exactly one succeeds.
+        if (context == null) {
+            UNSAFE.compareAndSwapObject(this, CONTEXT_OFFSET, /*expected=*/null, makeContext(newContext, this));
+            // No need to care about failed CAS attempt.
+            // Since initContext is called from indy call site linkage in newContext class, there's no risk
+            // that the context class becomes dead while corresponding context cleaner is alive (causing cleanup
+            // action in the wrong context).
+        }
+    }
+
+    /**
      * Returns the type of this call site's target.
      * Although targets may change, any call site's type is permanent, and can never change to an unequal type.
      * The {@code setTarget} method enforces this invariant by refusing any new target that does
@@ -246,11 +291,13 @@
     }
 
     // unsafe stuff:
-    private static final long TARGET_OFFSET;
+    private static final long  TARGET_OFFSET;
+    private static final long CONTEXT_OFFSET;
     static {
         try {
-            TARGET_OFFSET = UNSAFE.objectFieldOffset(CallSite.class.getDeclaredField("target"));
-        } catch (Exception ex) { throw new Error(ex); }
+            TARGET_OFFSET  = UNSAFE.objectFieldOffset(CallSite.class.getDeclaredField("target"));
+            CONTEXT_OFFSET = UNSAFE.objectFieldOffset(CallSite.class.getDeclaredField("context"));
+        } catch (Exception ex) { throw newInternalError(ex); }
     }
 
     /*package-private*/
--- a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java	Thu May 07 20:50:07 2015 -0700
@@ -691,10 +691,4 @@
             }
         }
     }
-
-    @Override
-    void customize() {
-        assert(form.customized == null);
-        // No need to customize DMHs.
-    }
 }
--- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Thu May 07 20:50:07 2015 -0700
@@ -847,11 +847,7 @@
             refKind = REF_invokeVirtual;
         }
 
-        if (member.getDeclaringClass().isInterface() && refKind == REF_invokeVirtual) {
-            // Methods from Object declared in an interface can be resolved by JVM to invokevirtual kind.
-            // Need to convert it back to invokeinterface to pass verification and make the invocation works as expected.
-            refKind = REF_invokeInterface;
-        }
+        assert(!(member.getDeclaringClass().isInterface() && refKind == REF_invokeVirtual));
 
         // push arguments
         emitPushArguments(name);
--- a/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java	Thu May 07 20:50:07 2015 -0700
@@ -281,7 +281,7 @@
             outArgs[0] = names[CHECK_TYPE];
         }
         if (CHECK_CUSTOM != -1) {
-            names[CHECK_CUSTOM] = new Name(NF_checkCustomized, names[CALL_MH]);
+            names[CHECK_CUSTOM] = new Name(NF_checkCustomized, outArgs[0]);
         }
         names[LINKER_CALL] = new Name(outCallType, outArgs);
         lform = new LambdaForm(debugName, INARG_LIMIT, names);
@@ -394,6 +394,7 @@
     @ForceInline
     void checkCustomized(Object o) {
         MethodHandle mh = (MethodHandle)o;
+        if (MethodHandleImpl.isCompileConstant(mh)) return;
         if (mh.form.customized == null) {
             maybeCustomize(mh);
         }
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -722,6 +722,13 @@
         return result;
     }
 
+    // Intrinsified by C2. Returns true if obj is a compile-time constant.
+    @LambdaForm.Hidden
+    static
+    boolean isCompileConstant(Object obj) {
+        return false;
+    }
+
     static
     MethodHandle makeGuardWithTest(MethodHandle test,
                                    MethodHandle target,
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -55,121 +55,42 @@
     static native Object staticFieldBase(MemberName self);  // e.g., returns clazz
     static native Object getMemberVMInfo(MemberName self);  // returns {vmindex,vmtarget}
 
-    /// MethodHandle support
-
-    /** Fetch MH-related JVM parameter.
-     *  which=0 retrieves MethodHandlePushLimit
-     *  which=1 retrieves stack slot push size (in address units)
-     */
-    static native int getConstant(int which);
-
-    static final boolean COUNT_GWT;
-
     /// CallSite support
 
     /** Tell the JVM that we need to change the target of a CallSite. */
     static native void setCallSiteTargetNormal(CallSite site, MethodHandle target);
     static native void setCallSiteTargetVolatile(CallSite site, MethodHandle target);
 
+    /** Invalidate CallSite context: clean up dependent nmethods and reset call site context to initial state (null). */
+    static native void invalidateDependentNMethods(CallSite site);
+
     private static native void registerNatives();
     static {
         registerNatives();
-        COUNT_GWT                   = getConstant(Constants.GC_COUNT_GWT) != 0;
 
         // The JVM calls MethodHandleNatives.<clinit>.  Cascade the <clinit> calls as needed:
         MethodHandleImpl.initStatics();
     }
 
-    // All compile-time constants go here.
-    // There is an opportunity to check them against the JVM's idea of them.
+    /**
+     * Compile-time constants go here. This collection exists not only for
+     * reference from clients, but also for ensuring the VM and JDK agree on the
+     * values of these constants (see {@link #verifyConstants()}).
+     */
     static class Constants {
         Constants() { } // static only
-        // MethodHandleImpl
-        static final int // for getConstant
-                GC_COUNT_GWT = 4,
-                GC_LAMBDA_SUPPORT = 5;
 
-        // MemberName
-        // The JVM uses values of -2 and above for vtable indexes.
-        // Field values are simple positive offsets.
-        // Ref: src/share/vm/oops/methodOop.hpp
-        // This value is negative enough to avoid such numbers,
-        // but not too negative.
-        static final int
-                MN_IS_METHOD           = 0x00010000, // method (not constructor)
-                MN_IS_CONSTRUCTOR      = 0x00020000, // constructor
-                MN_IS_FIELD            = 0x00040000, // field
-                MN_IS_TYPE             = 0x00080000, // nested type
-                MN_CALLER_SENSITIVE    = 0x00100000, // @CallerSensitive annotation detected
-                MN_REFERENCE_KIND_SHIFT = 24, // refKind
-                MN_REFERENCE_KIND_MASK = 0x0F000000 >> MN_REFERENCE_KIND_SHIFT,
-                // The SEARCH_* bits are not for MN.flags but for the matchFlags argument of MHN.getMembers:
-                MN_SEARCH_SUPERCLASSES = 0x00100000,
-                MN_SEARCH_INTERFACES   = 0x00200000;
-
-        /**
-         * Basic types as encoded in the JVM.  These code values are not
-         * intended for use outside this class.  They are used as part of
-         * a private interface between the JVM and this class.
-         */
         static final int
-            T_BOOLEAN  =  4,
-            T_CHAR     =  5,
-            T_FLOAT    =  6,
-            T_DOUBLE   =  7,
-            T_BYTE     =  8,
-            T_SHORT    =  9,
-            T_INT      = 10,
-            T_LONG     = 11,
-            T_OBJECT   = 12,
-            //T_ARRAY    = 13
-            T_VOID     = 14,
-            //T_ADDRESS  = 15
-            T_ILLEGAL  = 99;
-
-        /**
-         * Constant pool entry types.
-         */
-        static final byte
-            CONSTANT_Utf8                = 1,
-            CONSTANT_Integer             = 3,
-            CONSTANT_Float               = 4,
-            CONSTANT_Long                = 5,
-            CONSTANT_Double              = 6,
-            CONSTANT_Class               = 7,
-            CONSTANT_String              = 8,
-            CONSTANT_Fieldref            = 9,
-            CONSTANT_Methodref           = 10,
-            CONSTANT_InterfaceMethodref  = 11,
-            CONSTANT_NameAndType         = 12,
-            CONSTANT_MethodHandle        = 15,  // JSR 292
-            CONSTANT_MethodType          = 16,  // JSR 292
-            CONSTANT_InvokeDynamic       = 18,
-            CONSTANT_LIMIT               = 19;   // Limit to tags found in classfiles
-
-        /**
-         * Access modifier flags.
-         */
-        static final char
-            ACC_PUBLIC                 = 0x0001,
-            ACC_PRIVATE                = 0x0002,
-            ACC_PROTECTED              = 0x0004,
-            ACC_STATIC                 = 0x0008,
-            ACC_FINAL                  = 0x0010,
-            ACC_SYNCHRONIZED           = 0x0020,
-            ACC_VOLATILE               = 0x0040,
-            ACC_TRANSIENT              = 0x0080,
-            ACC_NATIVE                 = 0x0100,
-            ACC_INTERFACE              = 0x0200,
-            ACC_ABSTRACT               = 0x0400,
-            ACC_STRICT                 = 0x0800,
-            ACC_SYNTHETIC              = 0x1000,
-            ACC_ANNOTATION             = 0x2000,
-            ACC_ENUM                   = 0x4000,
-            // aliases:
-            ACC_SUPER                  = ACC_SYNCHRONIZED,
-            ACC_BRIDGE                 = ACC_VOLATILE,
-            ACC_VARARGS                = ACC_TRANSIENT;
+            MN_IS_METHOD           = 0x00010000, // method (not constructor)
+            MN_IS_CONSTRUCTOR      = 0x00020000, // constructor
+            MN_IS_FIELD            = 0x00040000, // field
+            MN_IS_TYPE             = 0x00080000, // nested type
+            MN_CALLER_SENSITIVE    = 0x00100000, // @CallerSensitive annotation detected
+            MN_REFERENCE_KIND_SHIFT = 24, // refKind
+            MN_REFERENCE_KIND_MASK = 0x0F000000 >> MN_REFERENCE_KIND_SHIFT,
+            // The SEARCH_* bits are not for MN.flags but for the matchFlags argument of MHN.getMembers:
+            MN_SEARCH_SUPERCLASSES = 0x00100000,
+            MN_SEARCH_INTERFACES   = 0x00200000;
 
         /**
          * Constant pool reference-kind codes, as used by CONSTANT_MethodHandle CP entries.
@@ -314,6 +235,7 @@
             return Invokers.linkToTargetMethod(type);
         } else {
             appendixResult[0] = callSite;
+            callSite.initContext(caller);
             return Invokers.linkToCallSiteMethod(type);
         }
     }
--- a/jdk/src/java.base/share/classes/java/nio/Bits.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/nio/Bits.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -567,32 +567,13 @@
 
     // -- Processor and memory-system properties --
 
-    private static final ByteOrder byteOrder;
+    private static final ByteOrder byteOrder
+        = unsafe.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
 
     static ByteOrder byteOrder() {
-        if (byteOrder == null)
-            throw new Error("Unknown byte order");
         return byteOrder;
     }
 
-    static {
-        long a = unsafe.allocateMemory(8);
-        try {
-            unsafe.putLong(a, 0x0102030405060708L);
-            byte b = unsafe.getByte(a);
-            switch (b) {
-            case 0x01: byteOrder = ByteOrder.BIG_ENDIAN;     break;
-            case 0x08: byteOrder = ByteOrder.LITTLE_ENDIAN;  break;
-            default:
-                assert false;
-                byteOrder = null;
-            }
-        } finally {
-            unsafe.freeMemory(a);
-        }
-    }
-
-
     private static int pageSize = -1;
 
     static int pageSize() {
@@ -605,17 +586,9 @@
         return (int)(size + (long)pageSize() - 1L) / pageSize();
     }
 
-    private static boolean unaligned;
-    private static boolean unalignedKnown = false;
+    private static boolean unaligned = unsafe.unalignedAccess();
 
     static boolean unaligned() {
-        if (unalignedKnown)
-            return unaligned;
-        String arch = AccessController.doPrivileged(
-            new sun.security.action.GetPropertyAction("os.arch"));
-        unaligned = arch.equals("i386") || arch.equals("x86")
-            || arch.equals("amd64") || arch.equals("x86_64");
-        unalignedKnown = true;
         return unaligned;
     }
 
--- a/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -27,6 +27,7 @@
 
 package java.nio;
 
+import sun.misc.Unsafe;
 
 /**
 #if[rw]
@@ -52,6 +53,16 @@
 #end[rw]
     */
 
+#if[byte]
+
+    // Cached unsafe-access object
+    private static final Unsafe unsafe = Bits.unsafe();
+
+    // Cached array base offset
+    private static final long arrayBaseOffset = unsafe.arrayBaseOffset($type$[].class);
+
+#end[byte]
+
     Heap$Type$Buffer$RW$(int cap, int lim) {            // package-private
 #if[rw]
         super(-1, 0, lim, cap, new $type$[cap], 0);
@@ -131,6 +142,12 @@
         return i + offset;
     }
 
+#if[byte]
+    private long byteOffset(long i) {
+        return arrayBaseOffset + i + offset;
+    }
+#end[byte]
+
     public $type$ get() {
         return hb[ix(nextGetIndex())];
     }
@@ -256,18 +273,18 @@
 #if[rw]
 
     public char getChar() {
-        return Bits.getChar(this, ix(nextGetIndex(2)), bigEndian);
+        return unsafe.getCharUnaligned(hb, byteOffset(nextGetIndex(2)), bigEndian);
     }
 
     public char getChar(int i) {
-        return Bits.getChar(this, ix(checkIndex(i, 2)), bigEndian);
+        return unsafe.getCharUnaligned(hb, byteOffset(checkIndex(i, 2)), bigEndian);
     }
 
 #end[rw]
 
     public $Type$Buffer putChar(char x) {
 #if[rw]
-        Bits.putChar(this, ix(nextPutIndex(2)), x, bigEndian);
+        unsafe.putCharUnaligned(hb, byteOffset(nextPutIndex(2)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -276,7 +293,7 @@
 
     public $Type$Buffer putChar(int i, char x) {
 #if[rw]
-        Bits.putChar(this, ix(checkIndex(i, 2)), x, bigEndian);
+        unsafe.putCharUnaligned(hb, byteOffset(checkIndex(i, 2)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -307,18 +324,18 @@
 #if[rw]
 
     public short getShort() {
-        return Bits.getShort(this, ix(nextGetIndex(2)), bigEndian);
+        return unsafe.getShortUnaligned(hb, byteOffset(nextGetIndex(2)), bigEndian);
     }
 
     public short getShort(int i) {
-        return Bits.getShort(this, ix(checkIndex(i, 2)), bigEndian);
+        return unsafe.getShortUnaligned(hb, byteOffset(checkIndex(i, 2)), bigEndian);
     }
 
 #end[rw]
 
     public $Type$Buffer putShort(short x) {
 #if[rw]
-        Bits.putShort(this, ix(nextPutIndex(2)), x, bigEndian);
+        unsafe.putShortUnaligned(hb, byteOffset(nextPutIndex(2)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -327,7 +344,7 @@
 
     public $Type$Buffer putShort(int i, short x) {
 #if[rw]
-        Bits.putShort(this, ix(checkIndex(i, 2)), x, bigEndian);
+        unsafe.putShortUnaligned(hb, byteOffset(checkIndex(i, 2)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -358,18 +375,18 @@
 #if[rw]
 
     public int getInt() {
-        return Bits.getInt(this, ix(nextGetIndex(4)), bigEndian);
+        return unsafe.getIntUnaligned(hb, byteOffset(nextGetIndex(4)), bigEndian);
     }
 
     public int getInt(int i) {
-        return Bits.getInt(this, ix(checkIndex(i, 4)), bigEndian);
+        return unsafe.getIntUnaligned(hb, byteOffset(checkIndex(i, 4)), bigEndian);
     }
 
 #end[rw]
 
     public $Type$Buffer putInt(int x) {
 #if[rw]
-        Bits.putInt(this, ix(nextPutIndex(4)), x, bigEndian);
+        unsafe.putIntUnaligned(hb, byteOffset(nextPutIndex(4)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -378,7 +395,7 @@
 
     public $Type$Buffer putInt(int i, int x) {
 #if[rw]
-        Bits.putInt(this, ix(checkIndex(i, 4)), x, bigEndian);
+        unsafe.putIntUnaligned(hb, byteOffset(checkIndex(i, 4)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -409,18 +426,18 @@
 #if[rw]
 
     public long getLong() {
-        return Bits.getLong(this, ix(nextGetIndex(8)), bigEndian);
+        return unsafe.getLongUnaligned(hb, byteOffset(nextGetIndex(8)), bigEndian);
     }
 
     public long getLong(int i) {
-        return Bits.getLong(this, ix(checkIndex(i, 8)), bigEndian);
+        return unsafe.getLongUnaligned(hb, byteOffset(checkIndex(i, 8)), bigEndian);
     }
 
 #end[rw]
 
     public $Type$Buffer putLong(long x) {
 #if[rw]
-        Bits.putLong(this, ix(nextPutIndex(8)), x, bigEndian);
+        unsafe.putLongUnaligned(hb, byteOffset(nextPutIndex(8)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -429,7 +446,7 @@
 
     public $Type$Buffer putLong(int i, long x) {
 #if[rw]
-        Bits.putLong(this, ix(checkIndex(i, 8)), x, bigEndian);
+        unsafe.putLongUnaligned(hb, byteOffset(checkIndex(i, 8)), x, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -460,18 +477,21 @@
 #if[rw]
 
     public float getFloat() {
-        return Bits.getFloat(this, ix(nextGetIndex(4)), bigEndian);
+        int x = unsafe.getIntUnaligned(hb, byteOffset(nextPutIndex(4)), bigEndian);
+        return Float.intBitsToFloat(x);
     }
 
     public float getFloat(int i) {
-        return Bits.getFloat(this, ix(checkIndex(i, 4)), bigEndian);
+        int x = unsafe.getIntUnaligned(hb, byteOffset(checkIndex(i, 4)), bigEndian);
+        return Float.intBitsToFloat(x);
     }
 
 #end[rw]
 
     public $Type$Buffer putFloat(float x) {
 #if[rw]
-        Bits.putFloat(this, ix(nextPutIndex(4)), x, bigEndian);
+        int y = Float.floatToRawIntBits(x);
+        unsafe.putIntUnaligned(hb, byteOffset(nextPutIndex(4)), y, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -480,7 +500,8 @@
 
     public $Type$Buffer putFloat(int i, float x) {
 #if[rw]
-        Bits.putFloat(this, ix(checkIndex(i, 4)), x, bigEndian);
+        int y = Float.floatToRawIntBits(x);
+        unsafe.putIntUnaligned(hb, byteOffset(checkIndex(i, 4)), y, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -511,18 +532,21 @@
 #if[rw]
 
     public double getDouble() {
-        return Bits.getDouble(this, ix(nextGetIndex(8)), bigEndian);
+        long x = unsafe.getLongUnaligned(hb, byteOffset(nextGetIndex(8)), bigEndian);
+        return Double.longBitsToDouble(x);
     }
 
     public double getDouble(int i) {
-        return Bits.getDouble(this, ix(checkIndex(i, 8)), bigEndian);
+        long x = unsafe.getLongUnaligned(hb, byteOffset(checkIndex(i, 8)), bigEndian);
+        return Double.longBitsToDouble(x);
     }
 
 #end[rw]
 
     public $Type$Buffer putDouble(double x) {
 #if[rw]
-        Bits.putDouble(this, ix(nextPutIndex(8)), x, bigEndian);
+        long y = Double.doubleToRawLongBits(x);
+        unsafe.putLongUnaligned(hb, byteOffset(nextPutIndex(8)), y, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
@@ -531,7 +555,8 @@
 
     public $Type$Buffer putDouble(int i, double x) {
 #if[rw]
-        Bits.putDouble(this, ix(checkIndex(i, 8)), x, bigEndian);
+        long y = Double.doubleToRawLongBits(x);
+        unsafe.putLongUnaligned(hb, byteOffset(checkIndex(i, 8)), y, bigEndian);
         return this;
 #else[rw]
         throw new ReadOnlyBufferException();
--- a/jdk/src/java.base/share/classes/java/nio/file/Files.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/nio/file/Files.java	Thu May 07 20:50:07 2015 -0700
@@ -2851,7 +2851,10 @@
      * @throws  SecurityException
      *          In the case of the default provider, and a security manager is
      *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file.
+     *          method is invoked to check write access to the file. The {@link
+     *          SecurityManager#checkDelete(String) checkDelete} method is
+     *          invoked to check delete access if the file is opened with the
+     *          {@code DELETE_ON_CLOSE} option.
      *
      * @see #write(Path,Iterable,Charset,OpenOption[])
      */
@@ -2893,7 +2896,10 @@
      * @throws  SecurityException
      *          In the case of the default provider, and a security manager is
      *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file.
+     *          method is invoked to check write access to the file. The {@link
+     *          SecurityManager#checkDelete(String) checkDelete} method is
+     *          invoked to check delete access if the file is opened with the
+     *          {@code DELETE_ON_CLOSE} option.
      *
      * @since 1.8
      */
@@ -3290,7 +3296,10 @@
      * @throws  SecurityException
      *          In the case of the default provider, and a security manager is
      *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file.
+     *          method is invoked to check write access to the file. The {@link
+     *          SecurityManager#checkDelete(String) checkDelete} method is
+     *          invoked to check delete access if the file is opened with the
+     *          {@code DELETE_ON_CLOSE} option.
      */
     public static Path write(Path path, byte[] bytes, OpenOption... options)
         throws IOException
@@ -3350,7 +3359,10 @@
      * @throws  SecurityException
      *          In the case of the default provider, and a security manager is
      *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file.
+     *          method is invoked to check write access to the file. The {@link
+     *          SecurityManager#checkDelete(String) checkDelete} method is
+     *          invoked to check delete access if the file is opened with the
+     *          {@code DELETE_ON_CLOSE} option.
      */
     public static Path write(Path path, Iterable<? extends CharSequence> lines,
                              Charset cs, OpenOption... options)
@@ -3398,7 +3410,10 @@
      * @throws  SecurityException
      *          In the case of the default provider, and a security manager is
      *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file.
+     *          method is invoked to check write access to the file. The {@link
+     *          SecurityManager#checkDelete(String) checkDelete} method is
+     *          invoked to check delete access if the file is opened with the
+     *          {@code DELETE_ON_CLOSE} option.
      *
      * @since 1.8
      */
--- a/jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java	Thu May 07 20:50:07 2015 -0700
@@ -104,6 +104,10 @@
      */
     private static final long serialVersionUID = -6946044323557704546L;
     /**
+     * The transition epoch-second.
+     */
+    private final long epochSecond;
+    /**
      * The local transition date-time at the transition.
      */
     private final LocalDateTime transition;
@@ -152,6 +156,7 @@
      * @param offsetAfter  the offset at and after the transition, not null
      */
     ZoneOffsetTransition(LocalDateTime transition, ZoneOffset offsetBefore, ZoneOffset offsetAfter) {
+        this.epochSecond = transition.toEpochSecond(offsetBefore);
         this.transition = transition;
         this.offsetBefore = offsetBefore;
         this.offsetAfter = offsetAfter;
@@ -165,6 +170,7 @@
      * @param offsetAfter  the offset at and after the transition, not null
      */
     ZoneOffsetTransition(long epochSecond, ZoneOffset offsetBefore, ZoneOffset offsetAfter) {
+        this.epochSecond = epochSecond;
         this.transition = LocalDateTime.ofEpochSecond(epochSecond, 0, offsetBefore);
         this.offsetBefore = offsetBefore;
         this.offsetAfter = offsetAfter;
@@ -209,7 +215,7 @@
      * @throws IOException if an error occurs
      */
     void writeExternal(DataOutput out) throws IOException {
-        Ser.writeEpochSec(toEpochSecond(), out);
+        Ser.writeEpochSec(epochSecond, out);
         Ser.writeOffset(offsetBefore, out);
         Ser.writeOffset(offsetAfter, out);
     }
@@ -253,7 +259,7 @@
      * @return the transition epoch second
      */
     public long toEpochSecond() {
-        return transition.toEpochSecond(offsetBefore);
+        return epochSecond;
     }
 
     //-------------------------------------------------------------------------
@@ -397,7 +403,13 @@
      */
     @Override
     public int compareTo(ZoneOffsetTransition transition) {
-        return this.getInstant().compareTo(transition.getInstant());
+        if (epochSecond < transition.epochSecond) {
+            return -1;
+        } else if (epochSecond > transition.epochSecond) {
+            return 1;
+        } else {
+            return this.getInstant().compareTo(transition.getInstant());
+        }
     }
 
     //-----------------------------------------------------------------------
@@ -416,7 +428,8 @@
         }
         if (other instanceof ZoneOffsetTransition) {
             ZoneOffsetTransition d = (ZoneOffsetTransition) other;
-            return transition.equals(d.transition) &&
+            return epochSecond == d.epochSecond &&
+                transition.equals(d.transition) &&
                 offsetBefore.equals(d.offsetBefore) && offsetAfter.equals(d.offsetAfter);
         }
         return false;
--- a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java	Thu May 07 20:50:07 2015 -0700
@@ -183,7 +183,7 @@
      * <p>
      * Unless the reference {@code x} being stored is either null
      * or matches the field type, the results are undefined.
-     * If the reference {@code o} is non-null, car marks or
+     * If the reference {@code o} is non-null, card marks or
      * other store barriers for that object (if the VM requires them)
      * are updated.
      * @see #putInt(Object, long, int)
@@ -219,6 +219,35 @@
     /** @see #putInt(Object, long, int) */
     public native void    putDouble(Object o, long offset, double x);
 
+    // These read VM internal data.
+
+    /**
+     * Fetches an uncompressed reference value from a given native variable
+     * ignoring the VM's compressed references mode.
+     *
+     * @param address a memory address locating the variable
+     * @return the value fetched from the indicated native variable
+     */
+    public native Object getUncompressedObject(long address);
+
+    /**
+     * Fetches the {@link java.lang.Class} Java mirror for the given native
+     * metaspace {@code Klass} pointer.
+     *
+     * @param metaspaceKlass a native metaspace {@code Klass} pointer
+     * @return the {@link java.lang.Class} Java mirror
+     */
+    public native Class<?> getJavaMirror(long metaspaceKlass);
+
+    /**
+     * Fetches a native metaspace {@code Klass} pointer for the given Java
+     * object.
+     *
+     * @param o Java heap object for which to fetch the class pointer
+     * @return a native metaspace {@code Klass} pointer
+     */
+    public native long getKlassPointer(Object o);
+
     // These work on values in the C heap.
 
     /**
@@ -934,4 +963,347 @@
     private static void throwIllegalAccessError() {
         throw new IllegalAccessError();
     }
+
+    /**
+     * @return Returns true if the native byte ordering of this
+     * platform is big-endian, false if it is little-endian.
+     */
+    public final boolean isBigEndian() { return BE; }
+
+    /**
+     * @return Returns true if this platform is capable of performing
+     * accesses at addresses which are not aligned for the type of the
+     * primitive type being accessed, false otherwise.
+     */
+    public final boolean unalignedAccess() { return unalignedAccess; }
+
+    /**
+     * Fetches a value at some byte offset into a given Java object.
+     * More specifically, fetches a value within the given object
+     * <code>o</code> at the given offset, or (if <code>o</code> is
+     * null) from the memory address whose numerical value is the
+     * given offset.  <p>
+     *
+     * The specification of this method is the same as {@link
+     * #getLong(Object, long)} except that the offset does not need to
+     * have been obtained from {@link #objectFieldOffset} on the
+     * {@link java.lang.reflect.Field} of some Java field.  The value
+     * in memory is raw data, and need not correspond to any Java
+     * variable.  Unless <code>o</code> is null, the value accessed
+     * must be entirely within the allocated object.  The endianness
+     * of the value in memory is the endianness of the native platform.
+     *
+     * <p> The read will be atomic with respect to the largest power
+     * of two that divides the GCD of the offset and the storage size.
+     * For example, getLongUnaligned will make atomic reads of 2-, 4-,
+     * or 8-byte storage units if the offset is zero mod 2, 4, or 8,
+     * respectively.  There are no other guarantees of atomicity.
+     * <p>
+     * 8-byte atomicity is only guaranteed on platforms on which
+     * support atomic accesses to longs.
+     *
+     * @param o Java heap object in which the value resides, if any, else
+     *        null
+     * @param offset The offset in bytes from the start of the object
+     * @return the value fetched from the indicated object
+     * @throws RuntimeException No defined exceptions are thrown, not even
+     *         {@link NullPointerException}
+     * @since 1.9
+     */
+    public final long getLongUnaligned(Object o, long offset) {
+        if ((offset & 7) == 0) {
+            return getLong(o, offset);
+        } else if ((offset & 3) == 0) {
+            return makeLong(getInt(o, offset),
+                            getInt(o, offset + 4));
+        } else if ((offset & 1) == 0) {
+            return makeLong(getShort(o, offset),
+                            getShort(o, offset + 2),
+                            getShort(o, offset + 4),
+                            getShort(o, offset + 6));
+        } else {
+            return makeLong(getByte(o, offset),
+                            getByte(o, offset + 1),
+                            getByte(o, offset + 2),
+                            getByte(o, offset + 3),
+                            getByte(o, offset + 4),
+                            getByte(o, offset + 5),
+                            getByte(o, offset + 6),
+                            getByte(o, offset + 7));
+        }
+    }
+    /**
+     * As {@link #getLongUnaligned(Object, long)} but with an
+     * additional argument which specifies the endianness of the value
+     * as stored in memory.
+     *
+     * @param o Java heap object in which the variable resides
+     * @param offset The offset in bytes from the start of the object
+     * @param bigEndian The endianness of the value
+     * @return the value fetched from the indicated object
+     * @since 1.9
+     */
+    public final long getLongUnaligned(Object o, long offset, boolean bigEndian) {
+        return convEndian(bigEndian, getLongUnaligned(o, offset));
+    }
+
+    /** @see #getLongUnaligned(Object, long) */
+    public final int getIntUnaligned(Object o, long offset) {
+        if ((offset & 3) == 0) {
+            return getInt(o, offset);
+        } else if ((offset & 1) == 0) {
+            return makeInt(getShort(o, offset),
+                           getShort(o, offset + 2));
+        } else {
+            return makeInt(getByte(o, offset),
+                           getByte(o, offset + 1),
+                           getByte(o, offset + 2),
+                           getByte(o, offset + 3));
+        }
+    }
+    /** @see #getLongUnaligned(Object, long, boolean) */
+    public final int getIntUnaligned(Object o, long offset, boolean bigEndian) {
+        return convEndian(bigEndian, getIntUnaligned(o, offset));
+    }
+
+    /** @see #getLongUnaligned(Object, long) */
+    public final short getShortUnaligned(Object o, long offset) {
+        if ((offset & 1) == 0) {
+            return getShort(o, offset);
+        } else {
+            return makeShort(getByte(o, offset),
+                             getByte(o, offset + 1));
+        }
+    }
+    /** @see #getLongUnaligned(Object, long, boolean) */
+    public final short getShortUnaligned(Object o, long offset, boolean bigEndian) {
+        return convEndian(bigEndian, getShortUnaligned(o, offset));
+    }
+
+    /** @see #getLongUnaligned(Object, long) */
+    public final char getCharUnaligned(Object o, long offset) {
+        return (char)getShortUnaligned(o, offset);
+    }
+    /** @see #getLongUnaligned(Object, long, boolean) */
+    public final char getCharUnaligned(Object o, long offset, boolean bigEndian) {
+        return convEndian(bigEndian, getCharUnaligned(o, offset));
+    }
+
+    /**
+     * Stores a value at some byte offset into a given Java object.
+     * <p>
+     * The specification of this method is the same as {@link
+     * #getLong(Object, long)} except that the offset does not need to
+     * have been obtained from {@link #objectFieldOffset} on the
+     * {@link java.lang.reflect.Field} of some Java field.  The value
+     * in memory is raw data, and need not correspond to any Java
+     * variable.  The endianness of the value in memory is the
+     * endianness of the native platform.
+     * <p>
+     * The write will be atomic with respect to the largest power of
+     * two that divides the GCD of the offset and the storage size.
+     * For example, putLongUnaligned will make atomic writes of 2-, 4-,
+     * or 8-byte storage units if the offset is zero mod 2, 4, or 8,
+     * respectively.  There are no other guarantees of atomicity.
+     * <p>
+     * 8-byte atomicity is only guaranteed on platforms on which
+     * support atomic accesses to longs.
+     * <p>
+     *
+     * @param o Java heap object in which the value resides, if any, else
+     *        null
+     * @param offset The offset in bytes from the start of the object
+     * @param x the value to store
+     * @throws RuntimeException No defined exceptions are thrown, not even
+     *         {@link NullPointerException}
+     * @since 1.9
+     */
+    public final void putLongUnaligned(Object o, long offset, long x) {
+        if ((offset & 7) == 0) {
+            putLong(o, offset, x);
+        } else if ((offset & 3) == 0) {
+            putLongParts(o, offset,
+                         (int)(x >> 0),
+                         (int)(x >>> 32));
+        } else if ((offset & 1) == 0) {
+            putLongParts(o, offset,
+                         (short)(x >>> 0),
+                         (short)(x >>> 16),
+                         (short)(x >>> 32),
+                         (short)(x >>> 48));
+        } else {
+            putLongParts(o, offset,
+                         (byte)(x >>> 0),
+                         (byte)(x >>> 8),
+                         (byte)(x >>> 16),
+                         (byte)(x >>> 24),
+                         (byte)(x >>> 32),
+                         (byte)(x >>> 40),
+                         (byte)(x >>> 48),
+                         (byte)(x >>> 56));
+        }
+    }
+    /**
+     * As {@link #putLongUnaligned(Object, long, long)} but with an additional
+     * argument which specifies the endianness of the value as stored in memory.
+     * @param o Java heap object in which the value resides
+     * @param offset The offset in bytes from the start of the object
+     * @param x the value to store
+     * @param bigEndian The endianness of the value
+     * @throws RuntimeException No defined exceptions are thrown, not even
+     *         {@link NullPointerException}
+     * @since 1.9
+     */
+    public final void putLongUnaligned(Object o, long offset, long x, boolean bigEndian) {
+        putLongUnaligned(o, offset, convEndian(bigEndian, x));
+    }
+
+    /** @see #putLongUnaligned(Object, long, long) */
+    public final void putIntUnaligned(Object o, long offset, int x) {
+        if ((offset & 3) == 0) {
+            putInt(o, offset, x);
+        } else if ((offset & 1) == 0) {
+            putIntParts(o, offset,
+                        (short)(x >> 0),
+                        (short)(x >>> 16));
+        } else {
+            putIntParts(o, offset,
+                        (byte)(x >>> 0),
+                        (byte)(x >>> 8),
+                        (byte)(x >>> 16),
+                        (byte)(x >>> 24));
+        }
+    }
+    /** @see #putLongUnaligned(Object, long, long, boolean) */
+    public final void putIntUnaligned(Object o, long offset, int x, boolean bigEndian) {
+        putIntUnaligned(o, offset, convEndian(bigEndian, x));
+    }
+
+    /** @see #putLongUnaligned(Object, long, long) */
+    public final void putShortUnaligned(Object o, long offset, short x) {
+        if ((offset & 1) == 0) {
+            putShort(o, offset, x);
+        } else {
+            putShortParts(o, offset,
+                          (byte)(x >>> 0),
+                          (byte)(x >>> 8));
+        }
+    }
+    /** @see #putLongUnaligned(Object, long, long, boolean) */
+    public final void putShortUnaligned(Object o, long offset, short x, boolean bigEndian) {
+        putShortUnaligned(o, offset, convEndian(bigEndian, x));
+    }
+
+    /** @see #putLongUnaligned(Object, long, long) */
+    public final void putCharUnaligned(Object o, long offset, char x) {
+        putShortUnaligned(o, offset, (short)x);
+    }
+    /** @see #putLongUnaligned(Object, long, long, boolean) */
+    public final void putCharUnaligned(Object o, long offset, char x, boolean bigEndian) {
+        putCharUnaligned(o, offset, convEndian(bigEndian, x));
+    }
+
+    // JVM interface methods
+    private native boolean unalignedAccess0();
+    private native boolean isBigEndian0();
+
+    // BE is true iff the native endianness of this platform is big.
+    private static final boolean BE = theUnsafe.isBigEndian0();
+
+    // unalignedAccess is true iff this platform can perform unaligned accesses.
+    private static final boolean unalignedAccess = theUnsafe.unalignedAccess0();
+
+    private static int pickPos(int top, int pos) { return BE ? top - pos : pos; }
+
+    // These methods construct integers from bytes.  The byte ordering
+    // is the native endianness of this platform.
+    private static long makeLong(byte i0, byte i1, byte i2, byte i3, byte i4, byte i5, byte i6, byte i7) {
+        return ((toUnsignedLong(i0) << pickPos(56, 0))
+              | (toUnsignedLong(i1) << pickPos(56, 8))
+              | (toUnsignedLong(i2) << pickPos(56, 16))
+              | (toUnsignedLong(i3) << pickPos(56, 24))
+              | (toUnsignedLong(i4) << pickPos(56, 32))
+              | (toUnsignedLong(i5) << pickPos(56, 40))
+              | (toUnsignedLong(i6) << pickPos(56, 48))
+              | (toUnsignedLong(i7) << pickPos(56, 56)));
+    }
+    private static long makeLong(short i0, short i1, short i2, short i3) {
+        return ((toUnsignedLong(i0) << pickPos(48, 0))
+              | (toUnsignedLong(i1) << pickPos(48, 16))
+              | (toUnsignedLong(i2) << pickPos(48, 32))
+              | (toUnsignedLong(i3) << pickPos(48, 48)));
+    }
+    private static long makeLong(int i0, int i1) {
+        return (toUnsignedLong(i0) << pickPos(32, 0))
+             | (toUnsignedLong(i1) << pickPos(32, 32));
+    }
+    private static int makeInt(short i0, short i1) {
+        return (toUnsignedInt(i0) << pickPos(16, 0))
+             | (toUnsignedInt(i1) << pickPos(16, 16));
+    }
+    private static int makeInt(byte i0, byte i1, byte i2, byte i3) {
+        return ((toUnsignedInt(i0) << pickPos(24, 0))
+              | (toUnsignedInt(i1) << pickPos(24, 8))
+              | (toUnsignedInt(i2) << pickPos(24, 16))
+              | (toUnsignedInt(i3) << pickPos(24, 24)));
+    }
+    private static short makeShort(byte i0, byte i1) {
+        return (short)((toUnsignedInt(i0) << pickPos(8, 0))
+                     | (toUnsignedInt(i1) << pickPos(8, 8)));
+    }
+
+    private static byte  pick(byte  le, byte  be) { return BE ? be : le; }
+    private static short pick(short le, short be) { return BE ? be : le; }
+    private static int   pick(int   le, int   be) { return BE ? be : le; }
+
+    // These methods write integers to memory from smaller parts
+    // provided by their caller.  The ordering in which these parts
+    // are written is the native endianness of this platform.
+    private void putLongParts(Object o, long offset, byte i0, byte i1, byte i2, byte i3, byte i4, byte i5, byte i6, byte i7) {
+        putByte(o, offset + 0, pick(i0, i7));
+        putByte(o, offset + 1, pick(i1, i6));
+        putByte(o, offset + 2, pick(i2, i5));
+        putByte(o, offset + 3, pick(i3, i4));
+        putByte(o, offset + 4, pick(i4, i3));
+        putByte(o, offset + 5, pick(i5, i2));
+        putByte(o, offset + 6, pick(i6, i1));
+        putByte(o, offset + 7, pick(i7, i0));
+    }
+    private void putLongParts(Object o, long offset, short i0, short i1, short i2, short i3) {
+        putShort(o, offset + 0, pick(i0, i3));
+        putShort(o, offset + 2, pick(i1, i2));
+        putShort(o, offset + 4, pick(i2, i1));
+        putShort(o, offset + 6, pick(i3, i0));
+    }
+    private void putLongParts(Object o, long offset, int i0, int i1) {
+        putInt(o, offset + 0, pick(i0, i1));
+        putInt(o, offset + 4, pick(i1, i0));
+    }
+    private void putIntParts(Object o, long offset, short i0, short i1) {
+        putShort(o, offset + 0, pick(i0, i1));
+        putShort(o, offset + 2, pick(i1, i0));
+    }
+    private void putIntParts(Object o, long offset, byte i0, byte i1, byte i2, byte i3) {
+        putByte(o, offset + 0, pick(i0, i3));
+        putByte(o, offset + 1, pick(i1, i2));
+        putByte(o, offset + 2, pick(i2, i1));
+        putByte(o, offset + 3, pick(i3, i0));
+    }
+    private void putShortParts(Object o, long offset, byte i0, byte i1) {
+        putByte(o, offset + 0, pick(i0, i1));
+        putByte(o, offset + 1, pick(i1, i0));
+    }
+
+    // Zero-extend an integer
+    private static int toUnsignedInt(byte n)    { return n & 0xff; }
+    private static int toUnsignedInt(short n)   { return n & 0xffff; }
+    private static long toUnsignedLong(byte n)  { return n & 0xffl; }
+    private static long toUnsignedLong(short n) { return n & 0xffffl; }
+    private static long toUnsignedLong(int n)   { return n & 0xffffffffl; }
+
+    // Maybe byte-reverse an integer
+    private static char convEndian(boolean big, char n)   { return big == BE ? n : Character.reverseBytes(n); }
+    private static short convEndian(boolean big, short n) { return big == BE ? n : Short.reverseBytes(n)    ; }
+    private static int convEndian(boolean big, int n)     { return big == BE ? n : Integer.reverseBytes(n)  ; }
+    private static long convEndian(boolean big, long n)   { return big == BE ? n : Long.reverseBytes(n)     ; }
 }
--- a/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java	Thu May 07 20:50:07 2015 -0700
@@ -33,7 +33,7 @@
  * <code>AccessController.doPrivileged</code>.
  *
  * <p>The following code retrieves the boolean value of the system
- * property named <code>"prop"</code> as a privileged action: <p>
+ * property named <code>"prop"</code> as a privileged action:
  *
  * <pre>
  * boolean b = java.security.AccessController.doPrivileged
--- a/jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java	Thu May 07 20:50:07 2015 -0700
@@ -35,7 +35,7 @@
  * <code>AccessController.doPrivileged</code>.
  *
  * <p>The following code retrieves the boolean value of the security
- * property named <code>"prop"</code> as a privileged action: <p>
+ * property named <code>"prop"</code> as a privileged action:
  *
  * <pre>
  * boolean b = java.security.AccessController.doPrivileged
--- a/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java	Thu May 07 20:50:07 2015 -0700
@@ -36,7 +36,7 @@
  * property named <code>"prop"</code> as a privileged action. Since it does
  * not pass a default value to be used in case the property
  * <code>"prop"</code> is not defined, it has to check the result for
- * <code>null</code>: <p>
+ * <code>null</code>:
  *
  * <pre>
  * Integer tmp = java.security.AccessController.doPrivileged
@@ -50,7 +50,7 @@
  * <p>The following code retrieves the integer value of the system
  * property named <code>"prop"</code> as a privileged action, and also passes
  * a default value to be used in case the property <code>"prop"</code> is not
- * defined: <p>
+ * defined:
  *
  * <pre>
  * int i = ((Integer)java.security.AccessController.doPrivileged(
@@ -84,7 +84,7 @@
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetIntegerAction(String theProp, int defaultVal) {
         this.theProp = theProp;
--- a/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java	Thu May 07 20:50:07 2015 -0700
@@ -36,7 +36,7 @@
  * property named <code>"prop"</code> as a privileged action. Since it does
  * not pass a default value to be used in case the property
  * <code>"prop"</code> is not defined, it has to check the result for
- * <code>null</code>: <p>
+ * <code>null</code>:
  *
  * <pre>
  * Long tmp = java.security.AccessController.doPrivileged
@@ -50,7 +50,7 @@
  * <p>The following code retrieves the <code>Long</code> value of the system
  * property named <code>"prop"</code> as a privileged action, and also passes
  * a default value to be used in case the property <code>"prop"</code> is not
- * defined: <p>
+ * defined:
  *
  * <pre>
  * long l = java.security.AccessController.doPrivileged
@@ -83,7 +83,7 @@
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetLongAction(String theProp, long defaultVal) {
         this.theProp = theProp;
--- a/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java	Thu May 07 20:50:07 2015 -0700
@@ -33,7 +33,7 @@
  * <code>AccessController.doPrivileged</code>.
  *
  * <p>The following code retrieves the value of the system
- * property named <code>"prop"</code> as a privileged action: <p>
+ * property named <code>"prop"</code> as a privileged action:
  *
  * <pre>
  * String s = java.security.AccessController.doPrivileged
@@ -66,7 +66,7 @@
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetPropertyAction(String theProp, String defaultVal) {
         this.theProp = theProp;
--- a/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java	Thu May 07 20:50:07 2015 -0700
@@ -117,7 +117,7 @@
     /**
      * This method exists for compatibility with JCE only. It will be removed
      * once JCE has been changed to use the replacement method.
-     * @deprecated use getServices(List<ServiceId>) instead
+     * @deprecated use {@code getServices(List<ServiceId>)} instead
      */
     @Deprecated
     public static List<Service> getServices(String type,
--- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java	Thu May 07 20:50:07 2015 -0700
@@ -353,7 +353,7 @@
     /**
      * This method exists for compatibility with JCE only. It will be removed
      * once JCE has been changed to use the replacement method.
-     * @deprecated use getServices(List<ServiceId>) instead
+     * @deprecated use {@code getServices(List<ServiceId>)} instead
      */
     @Deprecated
     public List<Service> getServices(String type, List<String> algorithms) {
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java	Thu May 07 20:50:07 2015 -0700
@@ -51,7 +51,6 @@
  * in string form, its value is a (single-valued)
  * byte array that is the SET's encoding.
  *
- * <P>
  * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER>
  *
  * <TR>
@@ -476,7 +475,7 @@
      * Construct a PKCS9Attribute from its encoding on an input
      * stream.
      *
-     * @param val the DerValue representing the DER encoding of the attribute.
+     * @param derVal the DerValue representing the DER encoding of the attribute.
      * @exception IOException on parsing error.
      */
     public PKCS9Attribute(DerValue derVal) throws IOException {
--- a/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -1642,23 +1642,22 @@
             Entry entry = entries.get(alias);
 
             // certificate chain
-            int chainLen = 1;
-            Certificate[] certs = null;
+            Certificate[] certs;
 
             if (entry instanceof PrivateKeyEntry) {
                 PrivateKeyEntry keyEntry = (PrivateKeyEntry) entry;
-                    if (keyEntry.chain == null) {
-                        chainLen = 0;
-                    } else {
-                        chainLen = keyEntry.chain.length;
-                    }
-                certs = keyEntry.chain;
-
+                if (keyEntry.chain != null) {
+                    certs = keyEntry.chain;
+                } else {
+                    certs = new Certificate[0];
+                }
             } else if (entry instanceof CertEntry) {
-               certs = new Certificate[]{((CertEntry) entry).cert};
+                certs = new Certificate[]{((CertEntry) entry).cert};
+            } else {
+                certs = new Certificate[0];
             }
 
-            for (int i = 0; i < chainLen; i++) {
+            for (int i = 0; i < certs.length; i++) {
                 // create SafeBag of Type CertBag
                 DerOutputStream safeBag = new DerOutputStream();
                 safeBag.putOID(CertBag_OID);
--- a/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -88,13 +88,8 @@
 
     // Return whether this platform supports full speed int/long memory access
     // at unaligned addresses.
-    // This code was copied from java.nio.Bits because there is no equivalent
-    // public API.
     private static boolean unaligned() {
-        String arch = java.security.AccessController.doPrivileged
-            (new sun.security.action.GetPropertyAction("os.arch", ""));
-        return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64")
-            || arch.equals("x86_64");
+        return unsafe.unalignedAccess();
     }
 
     /**
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java	Thu May 07 20:50:07 2015 -0700
@@ -186,7 +186,7 @@
  * <p> Case is unimportant for the identifiers (<code>permission</code>,
  * <code>signedBy</code>, <code>codeBase</code>, etc.) but is
  * significant for the <i>Type</i>
- * or for any string that is passed in as a value. <p>
+ * or for any string that is passed in as a value.
  *
  * <p> An example of two entries in a policy configuration file is
  * <pre>
@@ -212,7 +212,7 @@
  *  with one or more Principal class/name pairs.  The exact
  *  replacement performed depends upon the contents of the
  *  grant clause to which the permission belongs.
- *<p>
+ * <p>
  *
  *  If the grant clause does not contain any principal information,
  *  the permission will be ignored (permissions containing
@@ -220,11 +220,11 @@
  *  of a principal-based grant clause).  For example, BarPermission
  *  will always be ignored in the following grant clause:
  *
- *<pre>
+ * <pre>
  *    grant codebase "www.foo.com", signedby "duke" {
  *      permission BarPermission "... ${{self}} ...";
  *    };
- *</pre>
+ * </pre>
  *
  *  If the grant clause contains principal information, <b>${{self}}</b>
  *  will be replaced with that same principal information.
@@ -389,7 +389,7 @@
      * <p>Case is unimportant for the identifiers (<code>permission</code>,
      * <code>signedBy</code>, <code>codeBase</code>, etc.) but is
      * significant for the <i>Type</i>
-     * or for any string that is passed in as a value. <p>
+     * or for any string that is passed in as a value.
      *
      * <p>An example of two entries in a policy configuration file is
      * <pre>
@@ -399,7 +399,7 @@
      *   grant signedBy "Duke" {
      *          permission java.io.FilePermission "/tmp/*", "read,write";
      *   };
-     * <p>
+     *
      *   // grant everyone the following permission
      *
      *   grant {
@@ -1044,8 +1044,8 @@
      * the ProtectionDomain and tests whether the permission is
      * granted.
      *
-     * @param domain the ProtectionDomain to test
-     * @param permission the Permission object to be tested for implication.
+     * @param pd the ProtectionDomain to test
+     * @param p the Permission object to be tested for implication.
      *
      * @return true if "permission" is a proper subset of a permission
      * granted to this ProtectionDomain.
@@ -1093,8 +1093,6 @@
      * originally granted permission, as well as the Class and name
      * for the respective <code>Principal</code>.
      *
-     * <p>
-     *
      * @param domain the Permissions granted to this
      *          <code>ProtectionDomain</code> are returned.
      *
@@ -1131,7 +1129,7 @@
      * Examines this Policy and creates a PermissionCollection object with
      * the set of permissions for the specified CodeSource.
      *
-     * @param CodeSource the codesource associated with the caller.
+     * @param codesource the CodeSource associated with the caller.
      * This encapsulates the original location of the code (where the code
      * came from) and the public key(s) of its signer.
      *
@@ -1430,9 +1428,7 @@
     }
 
     /**
-     * <p>
-     *
-     * @param sp the SelfPermission that needs to be expanded <p>
+     * @param sp the SelfPermission that needs to be expanded.
      *
      * @param entryPs list of principals for the Policy entry.
      *
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java	Thu May 07 20:50:07 2015 -0700
@@ -45,19 +45,19 @@
  * is represented as a separate
  * persistent configuration.  The configuration may be stored as a
  * flat ASCII file, as a serialized binary file of
- * the Policy class, or as a database. <p>
+ * the Policy class, or as a database.
  *
  * <p>The Java runtime creates one global Policy object, which is used to
  * represent the static policy configuration file.  It is consulted by
  * a ProtectionDomain when the protection domain initializes its set of
- * permissions. <p>
+ * permissions.
  *
  * <p>The Policy <code>init</code> method parses the policy
  * configuration file, and then
  * populates the Policy object.  The Policy object is agnostic in that
  * it is not involved in making policy decisions.  It is merely the
  * Java runtime representation of the persistent policy configuration
- * file. <p>
+ * file.
  *
  * <p>When a protection domain needs to initialize its set of
  * permissions, it executes code such as the following
@@ -842,8 +842,7 @@
 
     /**
      * Each grant entry in the policy configuration file is
-     * represented by a
-     * GrantEntry object.  <p>
+     * represented by a GrantEntry object.
      *
      * <p>
      * For example, the entry
@@ -1094,7 +1093,7 @@
     /**
      * Each permission entry in the policy configuration file is
      * represented by a
-     * PermissionEntry object.  <p>
+     * PermissionEntry object.
      *
      * <p>
      * For example, the entry
--- a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java	Thu May 07 20:50:07 2015 -0700
@@ -208,7 +208,7 @@
     /**
      * Generates a user-specified number of random bytes.
      *
-     * @param bytes the array to be filled in with random bytes.
+     * @param result the array to be filled in with random bytes.
      */
     @Override
     public synchronized void engineNextBytes(byte[] result) {
--- a/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java	Thu May 07 20:50:07 2015 -0700
@@ -41,7 +41,7 @@
 import sun.security.pkcs.ParsingException;
 
 /**
- * This class defines a certificate factory for X.509 v3 certificates &
+ * This class defines a certificate factory for X.509 v3 certificates {@literal &}
  * certification paths, and X.509 v2 certificate revocation lists (CRLs).
  *
  * @author Jan Luehe
@@ -536,7 +536,7 @@
      * after the newline character after the -----END SOMETHING----- line.
      *
      * @param is the InputStream
-     * @returns byte block or null if end of stream
+     * @return byte block or null if end of stream
      * @throws IOException If any parsing error
      */
     private static byte[] readOneBlock(InputStream is) throws IOException {
@@ -664,7 +664,7 @@
      * @param is    Read from this InputStream
      * @param bout  Write into this OutputStream
      * @param tag   Tag already read (-1 mean not read)
-     * @returns     The current tag, used to check EOC in indefinite-length BER
+     * @return     The current tag, used to check EOC in indefinite-length BER
      * @throws IOException Any parsing error
      */
     private static int readBERInternal(InputStream is,
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java	Thu May 07 20:50:07 2015 -0700
@@ -75,10 +75,10 @@
  * values <code>SUCCEED</code> and <code>FAIL</code> mean that we've come to
  * the end of the build process, and there will not be any more entries in
  * the list.
- * <p>
+ *
  * @see sun.security.provider.certpath.BuildStep
  * @see sun.security.provider.certpath.Vertex
- * <p>
+ *
  * @author  seth proctor
  * @since   1.4
  */
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java	Thu May 07 20:50:07 2015 -0700
@@ -93,7 +93,7 @@
     /**
      * return vertex description for this build step
      *
-     * @returns Vertex
+     * @return Vertex
      */
     public Vertex getVertex() {
         return vertex;
@@ -102,7 +102,7 @@
     /**
      * return the certificate associated with this build step
      *
-     * @returns X509Certificate
+     * @return X509Certificate
      */
     public X509Certificate getCertificate() {
         return cert;
@@ -112,7 +112,7 @@
      * return string form of issuer name from certificate associated with this
      * build step
      *
-     * @returns String form of issuer name or null, if no certificate.
+     * @return String form of issuer name or null, if no certificate.
      */
     public String getIssuerName() {
         return getIssuerName(null);
@@ -125,7 +125,7 @@
      *
      * @param defaultName name to use as default if unable to return an issuer
      * name from the certificate, or if no certificate.
-     * @returns String form of issuer name or defaultName, if no certificate or
+     * @return String form of issuer name or defaultName, if no certificate or
      * exception received while trying to extract issuer name from certificate.
      */
     public String getIssuerName(String defaultName) {
@@ -137,7 +137,7 @@
      * return string form of subject name from certificate associated with this
      * build step.
      *
-     * @returns String form of subject name or null, if no certificate.
+     * @return String form of subject name or null, if no certificate.
      */
     public String getSubjectName() {
         return getSubjectName(null);
@@ -151,7 +151,7 @@
      *
      * @param defaultName name to use as default if unable to return a subject
      * name from the certificate, or if no certificate.
-     * @returns String form of subject name or defaultName, if no certificate or
+     * @return String form of subject name or defaultName, if no certificate or
      * if an exception was received while attempting to extract the subject name
      * from the certificate.
      */
@@ -163,7 +163,7 @@
     /**
      * return the exception associated with this build step.
      *
-     * @returns Throwable
+     * @return Throwable
      */
     public Throwable getThrowable() {
         return throwable;
@@ -173,7 +173,7 @@
      * return the result code associated with this build step.  The result codes
      * are POSSIBLE, FOLLOW, BACK, FAIL, SUCCEED.
      *
-     * @returns int result code
+     * @return int result code
      */
     public int getResult() {
         return result;
@@ -184,7 +184,7 @@
      * with this build step.
      *
      * @param   res    result code
-     * @returns String string representing meaning of the result code
+     * @return String string representing meaning of the result code
      */
     public String resultToString(int res) {
         String resultString = "";
@@ -216,7 +216,7 @@
      * return a string representation of this build step, showing minimal
      * detail.
      *
-     * @returns String
+     * @return String
      */
     @Override
     public String toString() {
@@ -243,7 +243,7 @@
      * the vertex state appropriate to the result of this build step, and the
      * certificate contents.
      *
-     * @returns String
+     * @return String
      */
     public String verboseToString() {
         String out = resultToString(getResult());
@@ -269,7 +269,7 @@
      * return a string representation of this build step, including all possible
      * detail of the vertex state, but not including the certificate contents.
      *
-     * @returns String
+     * @return String
      */
     public String fullToString() {
         return resultToString(getResult()) + vertex.toString();
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java	Thu May 07 20:50:07 2015 -0700
@@ -849,7 +849,7 @@
      * @param initPolicies the Set of policies required by the user
      * @param currCertPolicies the CertificatePoliciesExtension of the
      * certificate being processed
-     * @returns the root node of the valid policy tree after modification
+     * @return the root node of the valid policy tree after modification
      * @exception CertPathValidatorException Exception thrown if error occurs.
      */
     private static PolicyNodeImpl removeInvalidNodes(PolicyNodeImpl rootNode,
@@ -909,7 +909,7 @@
      * valid policy tree is null. Marks each node of the returned tree
      * immutable and thread-safe.
      *
-     * @returns the root node of the valid policy tree, or null if
+     * @return the root node of the valid policy tree, or null if
      * the valid policy tree is null
      */
     PolicyNode getPolicyTree() {
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java	Thu May 07 20:50:07 2015 -0700
@@ -67,7 +67,7 @@
     /**
      * return the certificate for this vertex
      *
-     * @returns X509Certificate
+     * @return X509Certificate
      */
     public X509Certificate getCertificate() {
         return cert;
@@ -78,7 +78,7 @@
      * adjacency list that contains certificates that could follow this
      * certificate.
      *
-     * @returns int index for this vertex, or -1 if no following certificates.
+     * @return int index for this vertex, or -1 if no following certificates.
      */
     public int getIndex() {
         return index;
@@ -99,7 +99,7 @@
      * return the throwable associated with this vertex;
      * returns null if none.
      *
-     * @returns Throwable
+     * @return Throwable
      */
     public Throwable getThrowable() {
         return throwable;
@@ -118,7 +118,7 @@
     /**
      * Return full string representation of vertex
      *
-     * @returns String representation of vertex
+     * @return String representation of vertex
      */
     @Override
     public String toString() {
@@ -129,7 +129,7 @@
      * Return string representation of this vertex's
      * certificate information.
      *
-     * @returns String representation of certificate info
+     * @return String representation of certificate info
      */
     public String certToString() {
         StringBuilder sb = new StringBuilder();
@@ -197,7 +197,7 @@
      * return Vertex throwable as String compatible with
      * the way toString returns other information
      *
-     * @returns String form of exception (or "none")
+     * @return String form of exception (or "none")
      */
     public String throwableToString() {
         StringBuilder sb = new StringBuilder("Exception:  ");
@@ -214,7 +214,7 @@
      * the way other Vertex.xToString() methods display
      * information.
      *
-     * @returns String form of index as "Last cert?  [Yes/No]
+     * @return String form of index as "Last cert?  [Yes/No]
      */
     public String moreToString() {
         StringBuilder sb = new StringBuilder("Last cert?  ");
@@ -227,7 +227,7 @@
      * return Vertex index as String compatible with
      * the way other Vertex.xToString() methods displays other information.
      *
-     * @returns String form of index as "Index:     [numeric index]"
+     * @return String form of index as "Index:     [numeric index]"
      */
     public String indexToString() {
         return "Index:      " + index + "\n";
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java	Thu May 07 20:50:07 2015 -0700
@@ -133,7 +133,7 @@
      *
      * @param modulusLen the bit length of the RSA modulus.
      * @param exponent the RSA exponent
-     * @param minModulusLen if > 0, check to see if modulusLen is at
+     * @param minModulusLen if {@literal > 0}, check to see if modulusLen is at
      *        least this long, otherwise unused.
      * @param maxModulusLen caller will allow this max number of bits.
      *        Allow the smaller of the system-defined maximum and this param.
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java	Thu May 07 20:50:07 2015 -0700
@@ -39,11 +39,13 @@
  *
  * Checks for a particular version number should generally take this form:
  *
+ * <pre>{@code
  * if (protocolVersion.v >= ProtocolVersion.TLS10) {
  *   // TLS 1.0 code goes here
  * } else {
  *   // SSL 3.0 code here
  * }
+ * }</pre>
  *
  * @author  Andreas Sterbenz
  * @since   1.4.1
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java	Thu May 07 20:50:07 2015 -0700
@@ -68,7 +68,7 @@
     /**
      * Creates a timestamper that connects to the specified TSA.
      *
-     * @param tsa The location of the TSA. It must be an HTTP or HTTPS URI.
+     * @param tsaURI The location of the TSA. It must be an HTTP or HTTPS URI.
      * @throws IllegalArgumentException if tsaURI is not an HTTP or HTTPS URI
      */
     public HttpTimestamper(URI tsaURI) {
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java	Thu May 07 20:50:07 2015 -0700
@@ -112,7 +112,7 @@
     /**
      * Sets an object identifier for the Time-Stamp Protocol policy.
      *
-     * @param version The policy object identifier.
+     * @param policyId The policy object identifier.
      */
     public void setPolicyId(String policyId) {
         this.policyId = policyId;
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java	Thu May 07 20:50:07 2015 -0700
@@ -83,8 +83,8 @@
     /**
      * Constructs an object to store a timestamp token.
      *
-     * @param status A buffer containing the ASN.1 BER encoding of the
-     *               TSTInfo element defined in RFC 3161.
+     * @param timestampTokenInfo A buffer containing the ASN.1 BER encoding of the
+     *                           TSTInfo element defined in RFC 3161.
      */
     public TimestampToken(byte[] timestampTokenInfo) throws IOException {
         if (timestampTokenInfo == null) {
--- a/jdk/src/java.base/share/classes/sun/security/tools/PathList.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/PathList.java	Thu May 07 20:50:07 2015 -0700
@@ -42,7 +42,7 @@
      * Utility method for appending path from pathFrom to pathTo.
      *
      * @param pathTo the target path
-     * @param pathSource the path to be appended to pathTo
+     * @param pathFrom the path to be appended to pathTo
      * @return the resulting path
      */
     public static String appendPath(String pathTo, String pathFrom) {
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java	Thu May 07 20:50:07 2015 -0700
@@ -1887,7 +1887,7 @@
 
     /**
      * Load the srckeystore from a stream, used in -importkeystore
-     * @returns the src KeyStore
+     * @return the src KeyStore
      */
     KeyStore loadSourceKeyStore() throws Exception {
         boolean isPkcs11 = false;
@@ -2005,7 +2005,7 @@
 
     /**
      * Import a single entry named alias from srckeystore
-     * @returns 1 if the import action succeed
+     * @return  1 if the import action succeed
      *          0 if user choose to ignore an alias-dumplicated entry
      *          2 if setEntry throws Exception
      */
@@ -2836,7 +2836,7 @@
     /**
      * Prompts user for alias name.
      * @param prompt the {0} of "Enter {0} alias name:  " in prompt line
-     * @returns the string entered by the user, without the \n at the end
+     * @return the string entered by the user, without the \n at the end
      */
     private String getAlias(String prompt) throws Exception {
         if (prompt != null) {
@@ -2854,7 +2854,7 @@
     /**
      * Prompts user for an input string from the command line (System.in)
      * @prompt the prompt string printed
-     * @returns the string entered by the user, without the \n at the end
+     * @return the string entered by the user, without the \n at the end
      */
     private String inputStringFromStdin(String prompt) throws Exception {
         System.err.print(prompt);
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -420,8 +420,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/util/BitArray.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/BitArray.java	Thu May 07 20:50:07 2015 -0700
@@ -66,10 +66,10 @@
 
     /**
      * Creates a BitArray of the specified size, initialized from the
-     * specified byte array.  The most significant bit of a[0] gets
+     * specified byte array.  The most significant bit of {@code a[0]} gets
      * index zero in the BitArray.  The array a must be large enough
      * to specify a value for every bit in the BitArray.  In other words,
-     * 8*a.length <= length.
+     * {@code 8*a.length <= length}.
      */
     public BitArray(int length, byte[] a) throws IllegalArgumentException {
 
--- a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java	Thu May 07 20:50:07 2015 -0700
@@ -44,8 +44,9 @@
      *
      * @param  bytes1 first byte array to compare.
      * @param  bytes2 second byte array to compare.
-     * @return negative number if bytes1 < bytes2, 0 if bytes1 == bytes2,
-     * positive number if bytes1 > bytes2.
+     * @return negative number if {@code bytes1 < bytes2},
+     *         0 if {@code bytes1 == bytes2},
+     *         positive number if {@code bytes1 > bytes2}.
      *
      * @exception <code>ClassCastException</code>
      * if either argument is not a byte array.
--- a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java	Thu May 07 20:50:07 2015 -0700
@@ -44,8 +44,9 @@
      *
      * @param  bytes1 first byte array to compare.
      * @param  bytes2 second byte array to compare.
-     * @return negative number if bytes1 < bytes2, 0 if bytes1 == bytes2,
-     * positive number if bytes1 > bytes2.
+     * @return negative number if {@code bytes1 < bytes2},
+     *         0 if {@code bytes1 == bytes2},
+     *         positive number if {@code bytes1 > bytes2}.
      *
      * @exception <code>ClassCastException</code>
      * if either argument is not a byte array.
--- a/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java	Thu May 07 20:50:07 2015 -0700
@@ -103,7 +103,7 @@
      * @param tag the DER value of the context-specific tag that replaces
      * original tag of the value in the output, such as in
      * <pre>
-     *          <em> <field> [N] IMPLICIT <type></em>
+     *          <em> {@code <field> [N] IMPLICIT <type>}</em>
      * </pre>
      * For example, <em>FooLength [1] IMPLICIT INTEGER</em>, with value=4;
      * would be encoded as "81 01 04"  whereas in explicit
@@ -245,7 +245,7 @@
      * Marshals a DER bit string on the output stream.
      * The bit strings need not be byte-aligned.
      *
-     * @param bits the bit string, MSB first
+     * @param ba the bit string, MSB first
      */
     public void putUnalignedBitString(BitArray ba) throws IOException {
         byte[] bits = ba.toByteArray();
@@ -260,7 +260,7 @@
      * Marshals a truncated DER bit string on the output stream.
      * The bit strings need not be byte-aligned.
      *
-     * @param bits the bit string, MSB first
+     * @param ba the bit string, MSB first
      */
     public void putTruncatedUnalignedBitString(BitArray ba) throws IOException {
         putUnalignedBitString(ba.truncate());
@@ -516,7 +516,7 @@
     /**
      * Put the encoding of the length in the stream.
      *
-     * @params len the length of the attribute.
+     * @param len the length of the attribute.
      * @exception IOException on writing errors.
      */
     public void putLength(int len) throws IOException {
@@ -550,11 +550,11 @@
     /**
      * Put the tag of the attribute in the stream.
      *
-     * @params class the tag class type, one of UNIVERSAL, CONTEXT,
-     *                            APPLICATION or PRIVATE
-     * @params form if true, the value is constructed, otherwise it is
+     * @param tagClass the tag class type, one of UNIVERSAL, CONTEXT,
+     *        APPLICATION or PRIVATE
+     * @param form if true, the value is constructed, otherwise it is
      * primitive.
-     * @params val the tag value
+     * @param val the tag value
      */
     public void putTag(byte tagClass, boolean form, byte val) {
         byte tag = (byte)(tagClass | val);
--- a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java	Thu May 07 20:50:07 2015 -0700
@@ -301,7 +301,7 @@
      *
      * @param buf the buffer
      * @param offset start point of the single DER-encoded dataum
-     * @param length how many bytes are in the encoded datum
+     * @param len how many bytes are in the encoded datum
      */
     public DerValue(byte[] buf, int offset, int len) throws IOException {
         data = init(true, new ByteArrayInputStream(buf, offset, len));
@@ -594,7 +594,7 @@
      * Returns an ASN.1 BIT STRING value, with the tag assumed implicit
      * based on the parameter.  The bit string must be byte-aligned.
      *
-     * @params tagImplicit if true, the tag is assumed implicit.
+     * @param tagImplicit if true, the tag is assumed implicit.
      * @return the bit string held in this value
      */
     public byte[] getBitString(boolean tagImplicit) throws IOException {
@@ -610,7 +610,7 @@
      * Returns an ASN.1 BIT STRING value, with the tag assumed implicit
      * based on the parameter.  The bit string need not be byte-aligned.
      *
-     * @params tagImplicit if true, the tag is assumed implicit.
+     * @param tagImplicit if true, the tag is assumed implicit.
      * @return the bit string held in this value
      */
     public BitArray getUnalignedBitString(boolean tagImplicit)
@@ -750,7 +750,7 @@
      * encoding, so that bitwise equality of the encoded values is an
      * efficient way to establish equivalence of the unencoded values.
      *
-     * @param other the object being compared with this one
+     * @param o the object being compared with this one
      */
     @Override
     public boolean equals(Object o) {
@@ -892,11 +892,11 @@
     /**
      * Create the tag of the attribute.
      *
-     * @params class the tag class type, one of UNIVERSAL, CONTEXT,
+     * @param tagClass the tag class type, one of UNIVERSAL, CONTEXT,
      *               APPLICATION or PRIVATE
-     * @params form if true, the value is constructed, otherwise it
+     * @param form if true, the value is constructed, otherwise it
      * is primitive.
-     * @params val the tag value
+     * @param val the tag value
      */
     public static byte createTag(byte tagClass, boolean form, byte val) {
         byte tag = (byte)(tagClass | val);
@@ -910,7 +910,7 @@
      * Set the tag of the attribute. Commonly used to reset the
      * tag value used for IMPLICIT encodings.
      *
-     * @params tag the tag value
+     * @param tag the tag value
      */
     public void resetTag(byte tag) {
         this.tag = tag;
--- a/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java	Thu May 07 20:50:07 2015 -0700
@@ -100,11 +100,10 @@
      * <P>
      * Note that this method is only apply to DHPublicKey at present.
      *
-     * @param  publicKey
-     *         the key object, cannot be null
+     * @param  key the key object, cannot be null
      *
-     * @throws NullPointerException if {@code publicKey} is null
-     * @throws InvalidKeyException if {@code publicKey} is invalid
+     * @throws NullPointerException if {@code key} is null
+     * @throws InvalidKeyException if {@code key} is invalid
      */
     public static final void validate(Key key)
             throws InvalidKeyException {
@@ -165,7 +164,8 @@
      * version numbers in a manner indistinguishable from correctly
      * formatted RSA blocks.
      *
-     * RFC 5246 describes the approach as :
+     * RFC 5246 describes the approach as:
+     * <pre>{@literal
      *
      *  1. Generate a string R of 48 random bytes
      *
@@ -183,6 +183,7 @@
      *        premaster secret = M
      *
      * Note that #2 should have completed before the call to this method.
+     * }</pre>
      *
      * @param  clientVersion the version of the TLS protocol by which the
      *         client wishes to communicate during this session
@@ -190,7 +191,7 @@
      *         contains the lower of that suggested by the client in the client
      *         hello and the highest supported by the server.
      * @param  encoded the encoded key in its "RAW" encoding format
-     * @param  isFailover whether or not the previous decryption of the
+     * @param  isFailOver whether or not the previous decryption of the
      *         encrypted PreMasterSecret message run into problem
      * @return the polished PreMasterSecret key in its "RAW" encoding format
      */
--- a/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java	Thu May 07 20:50:07 2015 -0700
@@ -59,7 +59,7 @@
      *
      * @pos set by
      *
-     * @returns false if end of bytes has been reached, otherwise returns
+     * @return false if end of bytes has been reached, otherwise returns
      *          true
      */
     @SuppressWarnings("fallthrough")
--- a/jdk/src/java.base/share/classes/sun/security/util/PendingException.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/PendingException.java	Thu May 07 20:50:07 2015 -0700
@@ -47,8 +47,6 @@
      * A detail message is a String that describes this particular
      * exception.
      *
-     * <p>
-     *
      * @param msg the detail message.
      */
     public PendingException(String msg) {
--- a/jdk/src/java.base/share/classes/sun/security/util/Resources.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/Resources.java	Thu May 07 20:50:07 2015 -0700
@@ -26,7 +26,7 @@
 package sun.security.util;
 
 /**
- * <p> This class represents the <code>ResourceBundle</code>
+ * This class represents the <code>ResourceBundle</code>
  * for javax.security.auth and sun.security.
  *
  */
@@ -160,8 +160,6 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
-     * <p>
-     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override
--- a/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java	Thu May 07 20:50:07 2015 -0700
@@ -159,7 +159,7 @@
      * unknown signature related files (those starting with SIG- with
      * an optional [A-Z0-9]{1,3} extension right inside META-INF).
      *
-     * @param s file name
+     * @param name file name
      * @return true if the input file name is signature related
      */
     public static boolean isSigningRelated(String name) {
--- a/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java	Thu May 07 20:50:07 2015 -0700
@@ -36,7 +36,7 @@
 
 /**
  * Validator implementation built on the PKIX CertPath API. This
- * implementation will be emphasized going forward.<p>
+ * implementation will be emphasized going forward.
  * <p>
  * Note that the validate() implementation tries to use a PKIX validator
  * if that appears possible and a PKIX builder otherwise. This increases
--- a/jdk/src/java.base/share/classes/sun/security/validator/Validator.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/validator/Validator.java	Thu May 07 20:50:07 2015 -0700
@@ -228,7 +228,7 @@
      * used (see JSSE X509TrustManager specification). In the future, it
      * could be used to pass in a PKCS#7 object for code signing to check time
      * stamps.
-     * <p>
+     *
      * @return a non-empty chain that was used to validate the path. The
      * end entity cert is at index 0, the trust anchor at index n-1.
      */
--- a/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java	Thu May 07 20:50:07 2015 -0700
@@ -39,7 +39,7 @@
  * NIST/IETF standard DER encoding.  These are used to implement the Digital
  * Signature Standard (DSS), FIPS 186.
  *
- * <P><em><b>NOTE:</b>  DSS/DSA Algorithm IDs may be created without these
+ * <P><em><b>NOTE:</b></em>  DSS/DSA Algorithm IDs may be created without these
  * parameters.  Use of DSS/DSA in modes where parameters are
  * either implicit (e.g. a default applicable to a site or a larger scope),
  * or are derived from some Certificate Authority's DSS certificate, is
@@ -49,8 +49,8 @@
  * that we have a certificate called <code>currentCert</code> which doesn't
  * contain DSS/DSA parameters and we need to derive DSS/DSA parameters
  * from a CA's certificate called <code>caCert</code>.
- * <p>
- * <code><pre>
+ *
+ * <pre>{@code
  * // key containing parameters to use
  * DSAPublicKey cAKey = (DSAPublicKey)(caCert.getPublicKey());
  * // key without parameters
@@ -63,7 +63,7 @@
  *                                            cAKeyParams.getQ(),
  *                                            cAKeyParams.getG());
  * DSAPublicKey usableKey = kf.generatePublic(ks);
- * </pre></code>
+ * }</pre>
  *
  * @see java.security.interfaces.DSAParams
  * @see java.security.interfaces.DSAPublicKey
--- a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -58,7 +58,7 @@
  *         accessMethod          OBJECT IDENTIFIER,
  *         accessLocation        GeneralName  }
  * </pre>
- * <p>
+ *
  * @see Extension
  * @see CertAttrSet
  */
--- a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -117,17 +117,17 @@
      * The default constructor for this extension.  Null parameters make
      * the element optional (not present).
      *
-     * @param id the KeyIdentifier associated with this extension.
+     * @param kid the KeyIdentifier associated with this extension.
      * @param names the GeneralNames associated with this extension
-     * @param serialNum the CertificateSerialNumber associated with
-     *         this extension.
+     * @param sn the CertificateSerialNumber associated with
+     *        this extension.
      * @exception IOException on error.
      */
-    public AuthorityKeyIdentifierExtension(KeyIdentifier kid, GeneralNames name,
+    public AuthorityKeyIdentifierExtension(KeyIdentifier kid, GeneralNames names,
                                            SerialNumber sn)
     throws IOException {
         this.id = kid;
-        this.names = name;
+        this.names = names;
         this.serialNum = sn;
 
         this.extensionId = PKIXExtensions.AuthorityKey_Id;
--- a/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -71,7 +71,7 @@
  *
  * CRLDistPointsSyntax ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
  * </pre>
- * <p>
+ *
  * @author Anne Anderson
  * @author Andreas Sterbenz
  * @since 1.4.2
--- a/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java	Thu May 07 20:50:07 2015 -0700
@@ -57,7 +57,7 @@
     /**
      * Default constructor for the certificate attribute.
      *
-     * @param serial the serial number for the certificate.
+     * @param num the serial number for the certificate.
      */
     public CertificateSerialNumber(BigInteger num) {
       this.serial = new SerialNumber(num);
@@ -66,7 +66,7 @@
     /**
      * Default constructor for the certificate attribute.
      *
-     * @param serial the serial number for the certificate.
+     * @param num the serial number for the certificate.
      */
     public CertificateSerialNumber(int num) {
       this.serial = new SerialNumber(num);
--- a/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java	Thu May 07 20:50:07 2015 -0700
@@ -44,7 +44,7 @@
  * the DNS representation for Internet mail addresses (wpolk.nist.gov
  * instead of wpolk@nist.gov) is not permitted; such identities are to
  * be encoded as rfc822Name.
- * <p>
+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  */
@@ -186,9 +186,9 @@
      * domain name comparisons for all present domain functions are done in a
      * case-insensitive manner, assuming an ASCII character set, and a high
      * order zero bit.
-     * <p>
+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
      *          not supported for this name type.
      */
@@ -228,7 +228,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java	Thu May 07 20:50:07 2015 -0700
@@ -143,9 +143,9 @@
      * Constructor for the class using GeneralNames for DistributionPointName
      *
      * @param fullName the GeneralNames of the distribution point; may be null
-     * @param reasons the CRL reasons included in the CRL at this distribution
+     * @param reasonFlags the CRL reasons included in the CRL at this distribution
      *        point; may be null
-     * @param issuer the name(s) of the CRL issuer for the CRL at this
+     * @param crlIssuer the name(s) of the CRL issuer for the CRL at this
      *        distribution point; may be null
      */
     public DistributionPoint(GeneralNames fullName, boolean[] reasonFlags,
@@ -165,9 +165,9 @@
      *
      * @param relativeName the RelativeDistinguishedName of the distribution
      *        point; may not be null
-     * @param reasons the CRL reasons included in the CRL at this distribution
+     * @param reasonFlags the CRL reasons included in the CRL at this distribution
      *        point; may be null
-     * @param issuer the name(s) of the CRL issuer for the CRL at this
+     * @param crlIssuer the name(s) of the CRL issuer for the CRL at this
      *        distribution point; may not be null or empty.
      */
     public DistributionPoint(RDN relativeName, boolean[] reasonFlags,
--- a/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java	Thu May 07 20:50:07 2015 -0700
@@ -146,7 +146,7 @@
     /**
      * Return the assignerName
      *
-     * @returns String assignerName
+     * @return String assignerName
      */
     public String getAssignerName() {
         return assigner;
@@ -155,7 +155,7 @@
     /**
      * Return the partyName
      *
-     * @returns String partyName
+     * @return String partyName
      */
     public String getPartyName() {
         return party;
@@ -166,7 +166,7 @@
      * comparison without regard to type of the partyName and
      * the assignerName.
      *
-     * @returns true if the two names match
+     * @return true if the two names match
      */
     public boolean equals(Object other) {
         if (!(other instanceof EDIPartyName))
@@ -226,7 +226,7 @@
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but comparison operations are
      *          not supported for this name type.
      */
@@ -247,7 +247,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -75,7 +75,7 @@
  * processed independently and the certificate MUST only be used for a
  * purpose consistent with both fields.  If there is no purpose
  * consistent with both fields, then the certificate MUST NOT be used
- * for any purpose.<p>
+ * for any purpose.
  *
  * @since       1.4
  */
--- a/jdk/src/java.base/share/classes/sun/security/x509/Extension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/Extension.java	Thu May 07 20:50:07 2015 -0700
@@ -50,11 +50,11 @@
  * }
  * </pre>
  * All subclasses need to implement a constructor of the form
- * <pre>
+ * <pre>{@code
  *     <subclass> (Boolean, Object)
- * </pre>
+ * }</pre>
  * where the Object is typically an array of DER encoded bytes.
- * <p>
+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  */
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -116,6 +116,15 @@
             }
             break;
 
+        case GeneralNameInterface.NAME_X400:
+            if (encName.isContextSpecific() && encName.isConstructed()) {
+                encName.resetTag(DerValue.tag_IA5String);
+                name = new X400Address(encName);
+            } else {
+                throw new IOException("Invalid encoding of X400Address name");
+            }
+            break;
+
         case GeneralNameInterface.NAME_URI:
             if (encName.isContextSpecific() && !encName.isConstructed()) {
                 encName.resetTag(DerValue.tag_IA5String);
@@ -193,7 +202,7 @@
      * Compare this GeneralName with another
      *
      * @param other GeneralName to compare to this
-     * @returns true if match
+     * @return true if match
      */
     public boolean equals(Object other) {
         if (this == other) {
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java	Thu May 07 20:50:07 2015 -0700
@@ -85,7 +85,7 @@
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but comparison operations are
      *          not supported for this name type.
      */
@@ -96,7 +96,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     int subtreeDepth() throws UnsupportedOperationException;
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java	Thu May 07 20:50:07 2015 -0700
@@ -126,7 +126,7 @@
     /**
      * compare this GeneralNames to other object for equality
      *
-     * @returns true iff this equals other
+     * @return true if this equals obj
      */
     public boolean equals(Object obj) {
         if (this == obj) {
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java	Thu May 07 20:50:07 2015 -0700
@@ -56,9 +56,9 @@
     /**
      * The default constructor for the class.
      *
-     * @params name the GeneralName
-     * @params min the minimum BaseDistance
-     * @params max the maximum BaseDistance
+     * @param name the GeneralName
+     * @param min the minimum BaseDistance
+     * @param max the maximum BaseDistance
      */
     public GeneralSubtree(GeneralName name, int min, int max) {
         this.name = name;
@@ -142,7 +142,7 @@
      * Compare this GeneralSubtree with another
      *
      * @param other GeneralSubtree to compare to this
-     * @returns true if match
+     * @return true if match
      */
     public boolean equals(Object other) {
         if (!(other instanceof GeneralSubtree))
@@ -187,7 +187,7 @@
     /**
      * Encode the GeneralSubtree.
      *
-     * @params out the DerOutputStream to encode this object to.
+     * @param out the DerOutputStream to encode this object to.
      */
     public void encode(DerOutputStream out) throws IOException {
         DerOutputStream seq = new DerOutputStream();
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java	Thu May 07 20:50:07 2015 -0700
@@ -37,7 +37,6 @@
  * <pre>
  * GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
  * </pre>
- * </p>
  *
  *
  * @author Amit Kapoor
@@ -132,7 +131,7 @@
     /**
      * Encode the GeneralSubtrees.
      *
-     * @params out the DerOutputStrean to encode this object to.
+     * @param out the DerOutputStrean to encode this object to.
      */
     public void encode(DerOutputStream out) throws IOException {
         DerOutputStream seq = new DerOutputStream();
@@ -147,8 +146,8 @@
      * Compare two general subtrees by comparing the subtrees
      * of each.
      *
-     * @param other GeneralSubtrees to compare to this
-     * @returns true if match
+     * @param obj GeneralSubtrees to compare to this
+     * @return true if match
      */
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -236,8 +235,8 @@
      * create a subtree containing an instance of the input
      * name type that widens all other names of that type.
      *
-     * @params name GeneralNameInterface name
-     * @returns GeneralSubtree containing widest name of that type
+     * @param name GeneralNameInterface name
+     * @return GeneralSubtree containing widest name of that type
      * @throws RuntimeException on error (should not occur)
      */
     private GeneralSubtree createWidestSubtree(GeneralNameInterface name) {
@@ -309,10 +308,10 @@
      *     the result contains the name in other.  This means that
      *     the name is now constrained in some way, whereas before it was
      *     completely permitted.
-     * <ul>
+     * </ul>
      *
      * @param other GeneralSubtrees to be intersected with this
-     * @returns GeneralSubtrees to be merged with excluded; these are
+     * @return  GeneralSubtrees to be merged with excluded; these are
      *          empty-valued name types corresponding to entries that were
      *          of the same type but did not share the same subtree between
      *          this and other. Returns null if no such.
--- a/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java	Thu May 07 20:50:07 2015 -0700
@@ -75,7 +75,7 @@
     /**
      * Create the IPAddressName object from the passed encoded Der value.
      *
-     * @params derValue the encoded DER IPAddressName.
+     * @param derValue the encoded DER IPAddressName.
      * @exception IOException on error.
      */
     public IPAddressName(DerValue derValue) throws IOException {
@@ -85,7 +85,7 @@
     /**
      * Create the IPAddressName object with the specified octets.
      *
-     * @params address the IP address
+     * @param address the IP address
      * @throws IOException if address is not a valid IPv4 or IPv6 address
      */
     public IPAddressName(byte[] address) throws IOException {
@@ -106,7 +106,7 @@
 
     /**
      * Create an IPAddressName from a String.
-     * [IETF RFC1338 Supernetting & IETF RFC1519 Classless Inter-Domain
+     * [IETF RFC1338 Supernetting {@literal &} IETF RFC1519 Classless Inter-Domain
      * Routing (CIDR)] For IPv4 addresses, the forms are
      * "b1.b2.b3.b4" or "b1.b2.b3.b4/m1.m2.m3.m4", where b1 - b4 are decimal
      * byte values 0-255 and m1 - m4 are decimal mask values
@@ -118,7 +118,7 @@
      * of the address. If /n is used, n is a decimal number indicating how many
      * of the leftmost contiguous bits of the address comprise the prefix for
      * this subnet. Internally, a mask value is created using the prefix length.
-     * <p>
+     *
      * @param name String form of IPAddressName
      * @throws IOException if name can not be converted to a valid IPv4 or IPv6
      *     address
@@ -224,7 +224,7 @@
     /**
      * Encode the IPAddress name into the DerOutputStream.
      *
-     * @params out the DER stream to encode the IPAddressName to.
+     * @param out the DER stream to encode the IPAddressName to.
      * @exception IOException on encoding errors.
      */
     public void encode(DerOutputStream out) throws IOException {
@@ -384,9 +384,9 @@
      * constraint for "class C" subnet 10.9.8.0 shall be represented as the
      * octets 0A 09 08 00 FF FF FF 00, representing the CIDR notation
      * 10.9.8.0/255.255.255.0.
-     * <p>
+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but
      * narrowing and widening are not supported for this name type.
      */
@@ -479,7 +479,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -50,13 +50,13 @@
  * This extension MUST be critical.
  * <p>
  * The ASN.1 syntax for this extension is:
- * <code><pre>
+ * <pre>{@code
  * id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-ce 54 }
  *
  * InhibitAnyPolicy ::= SkipCerts
  *
  * SkipCerts ::= INTEGER (0..MAX)
- * </pre></code>
+ * }</pre>
  * @author Anne Anderson
  * @see CertAttrSet
  * @see Extension
@@ -211,7 +211,7 @@
      * Get the attribute value.
      *
      * @param name name of attribute to get.  Must be SKIP_CERTS.
-     * @returns value of the attribute.  In this case it will be of type
+     * @return value of the attribute.  In this case it will be of type
      *          Integer.
      * @throws IOException on error
      */
@@ -244,7 +244,7 @@
      * Return an enumeration of names of attributes existing within this
      * attribute.
      *
-     * @returns enumeration of elements
+     * @return enumeration of elements
      */
     public Enumeration<String> getElements() {
         AttributeNameEnumeration elements = new AttributeNameEnumeration();
@@ -255,7 +255,7 @@
     /**
      * Return the name of this attribute.
      *
-     * @returns name of attribute.
+     * @return name of attribute.
      */
     public String getName() {
         return (NAME);
--- a/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java	Thu May 07 20:50:07 2015 -0700
@@ -69,7 +69,7 @@
      * <li>The keyIdentifier is composed of the 160-bit SHA-1 hash of the
      * value of the BIT STRING subjectPublicKey (excluding the tag,
      * length, and number of unused bits).
-     * <p>
+     *
      * <li>The keyIdentifier is composed of a four bit type field with
      * the value 0100 followed by the least significant 60 bits of the
      * SHA-1 hash of the value of the BIT STRING subjectPublicKey.
--- a/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -328,7 +328,7 @@
      * (k)  If excludedSubtrees is present in the certificate, set the
      * excluded subtrees state variable to the union of its previous
      * value and the value indicated in the extension field.
-     * <p>
+     *
      * @param newConstraints additional NameConstraints to be applied
      * @throws IOException on error
      */
@@ -406,7 +406,7 @@
      * the excluded subtrees state variables.
      *
      * @param cert X509Certificate to be verified
-     * @returns true if certificate verifies successfully
+     * @return true if certificate verifies successfully
      * @throws IOException on error
      */
     public boolean verify(X509Certificate cert) throws IOException {
@@ -484,7 +484,7 @@
      * permitted and excluded subtrees variables.
      *
      * @param name GeneralNameInterface name to be verified
-     * @returns true if certificate verifies successfully
+     * @return true if certificate verifies successfully
      * @throws IOException on error
      */
     public boolean verify(GeneralNameInterface name) throws IOException {
@@ -566,7 +566,7 @@
      * NameConstraints.
      *
      * @param subject the certificate's subject name
-     * @returns true if certificate verifies successfully
+     * @return true if certificate verifies successfully
      * @throws IOException on error
      */
     public boolean verifyRFC822SpecialCase(X500Name subject) throws IOException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java	Thu May 07 20:50:07 2015 -0700
@@ -33,8 +33,8 @@
 import sun.security.util.*;
 
 /**
- * This class defines the mapping from OID & name to classes and vice
- * versa.  Used by CertificateExtensions & PKCS10 to get the java
+ * This class defines the mapping from OID {@literal &} name to classes and vice
+ * versa.  Used by CertificateExtensions {@literal &} PKCS10 to get the java
  * classes associated with a particular OID/name.
  *
  * @author Amit Kapoor
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java	Thu May 07 20:50:07 2015 -0700
@@ -55,7 +55,7 @@
     /**
      * Create the OIDName object with the specified name.
      *
-     * @param name the OIDName.
+     * @param oid the OIDName.
      */
     public OIDName(ObjectIdentifier oid) {
         this.oid = oid;
@@ -143,7 +143,7 @@
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
      *          not supported for this name type.
      */
@@ -166,7 +166,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java	Thu May 07 20:50:07 2015 -0700
@@ -237,7 +237,7 @@
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but
      *         comparison operations are not supported for this name type.
      */
@@ -258,7 +258,7 @@
      * Return subtree depth of this name for purposes of determining
      * NameConstraints minimum and maximum bounds.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() {
--- a/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -88,9 +88,9 @@
      *
      * @param maps the List of CertificatePolicyMap.
      */
-    public PolicyMappingsExtension(List<CertificatePolicyMap> map)
+    public PolicyMappingsExtension(List<CertificatePolicyMap> maps)
             throws IOException {
-        this.maps = map;
+        this.maps = maps;
         this.extensionId = PKIXExtensions.PolicyMappings_Id;
         this.critical = true;
         encodeThis();
@@ -108,8 +108,8 @@
     /**
      * Create the extension from the passed DER encoded value.
      *
-     * @params critical true if the extension is to be treated as critical.
-     * @params value an array of DER encoded bytes of the actual value.
+     * @param critical true if the extension is to be treated as critical.
+     * @param value an array of DER encoded bytes of the actual value.
      * @exception ClassCastException if value is not an array of bytes
      * @exception IOException on error.
      */
--- a/jdk/src/java.base/share/classes/sun/security/x509/RDN.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/RDN.java	Thu May 07 20:50:07 2015 -0700
@@ -95,7 +95,7 @@
      * preceded by '\'.
      *
      * @param name String form of RDN
-     * @param keyword an additional mapping of keywords to OIDs
+     * @param keywordMap an additional mapping of keywords to OIDs
      * @throws IOException on parsing error
      */
     public RDN(String name, Map<String, String> keywordMap) throws IOException {
@@ -307,7 +307,7 @@
      * Calculates a hash code value for the object.  Objects
      * which are equal will also have the same hashcode.
      *
-     * @returns int hashCode value
+     * @return int hashCode value
      */
     public int hashCode() {
         return toRFC2253String(true).hashCode();
@@ -316,8 +316,8 @@
     /*
      * return specified attribute value from RDN
      *
-     * @params oid ObjectIdentifier of attribute to be found
-     * @returns DerValue of attribute value; null if attribute does not exist
+     * @param oid ObjectIdentifier of attribute to be found
+     * @return DerValue of attribute value; null if attribute does not exist
      */
     DerValue findAttribute(ObjectIdentifier oid) {
         for (int i = 0; i < assertion.length; i++) {
--- a/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java	Thu May 07 20:50:07 2015 -0700
@@ -174,9 +174,9 @@
      * surrounded in parentheses) after it, and is not surrounded by "&lt;" and
      * "&gt;". Note that while upper and lower case letters are allowed in an
      * RFC 822 addr-spec, no significance is attached to the case.
-     * <p>
+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
      *          not supported for this name type.
      */
@@ -232,7 +232,7 @@
      * Return subtree depth of this name for purposes of determining
      * NameConstraints minimum and maximum bounds.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java	Thu May 07 20:50:07 2015 -0700
@@ -62,7 +62,7 @@
  *          accessMethod          OBJECT IDENTIFIER,
  *          accessLocation        GeneralName  }
  * </pre>
- * <p>
+ *
  * @see Extension
  * @see CertAttrSet
  */
--- a/jdk/src/java.base/share/classes/sun/security/x509/URIName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/URIName.java	Thu May 07 20:50:07 2015 -0700
@@ -52,10 +52,10 @@
  * <p>
  * [RFC1738] In general, URLs are written as follows:
  * <pre>
- * <scheme>:<scheme-specific-part>
+ * {@code <scheme>:<scheme-specific-part>}
  * </pre>
- * A URL contains the name of the scheme being used (<scheme>) followed
- * by a colon and then a string (the <scheme-specific-part>) whose
+ * A URL contains the name of the scheme being used ({@code <scheme>}) followed
+ * by a colon and then a string (the {@code <scheme-specific-part>}) whose
  * interpretation depends on the scheme.
  * <p>
  * While the syntax for the rest of the URL may vary depending on the
@@ -63,13 +63,13 @@
  * of an IP-based protocol to a specified host on the Internet use a
  * common syntax for the scheme-specific data:
  * <pre>
- * //<user>:<password>@<host>:<port>/<url-path>
+ * {@code //<user>:<password>@<host>:<port>/<url-path>}
  * </pre>
  * [RFC2732] specifies that an IPv6 address contained inside a URL
  * must be enclosed in square brackets (to allow distinguishing the
  * colons that separate IPv6 components from the colons that separate
  * scheme-specific data.
- * <p>
+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  * @author Sean Mullan
@@ -246,7 +246,7 @@
     /**
      * Return the scheme name portion of a URIName
      *
-     * @returns scheme portion of full name
+     * @return scheme portion of full name
      */
     public String getScheme() {
         return uri.getScheme();
@@ -255,7 +255,7 @@
     /**
      * Return the host name or IP address portion of the URIName
      *
-     * @returns host name or IP address portion of full name
+     * @return host name or IP address portion of full name
      */
     public String getHost() {
         return host;
@@ -266,7 +266,7 @@
      * DNSName, then this host object does not include any
      * initial "." on the name.
      *
-     * @returns host name as DNSName or IPAddressName
+     * @return host name as DNSName or IPAddressName
      */
     public Object getHostObject() {
         if (hostIP != null) {
@@ -308,9 +308,9 @@
      * abc.def.xyz.com.  However, the constraint ".xyz.com" is not satisfied
      * by "xyz.com".  When the constraint does not begin with a period, it
      * specifies a host.
-     * <p>
+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but
      *  narrowing and widening are not supported for this name type.
      */
@@ -377,7 +377,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java	Thu May 07 20:50:07 2015 -0700
@@ -73,7 +73,6 @@
      * Create the object, decoding the values from the passed DER stream.
      *
      * @param derVal the DerValue decoded from the stream.
-     * @param tag the tag the value is encoded under.
      * @exception IOException on decoding errors.
      */
     public UniqueIdentity(DerValue derVal) throws IOException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java	Thu May 07 20:50:07 2015 -0700
@@ -340,7 +340,7 @@
     /**
      * Create the X400Address object from the specified byte array
      *
-     * @param nameValue value of the name as a byte array
+     * @param value value of the name as a byte array
      */
     public X400Address(byte[] value) {
         nameValue = value;
@@ -392,7 +392,7 @@
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but comparison operations are
      *          not supported for this name type.
      */
@@ -413,7 +413,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java	Thu May 07 20:50:07 2015 -0700
@@ -84,14 +84,14 @@
  * <li>attribute values encoded in different types (e.g.,
  *    PrintableString and BMPString) may be assumed to represent
  *    different strings;
- * <p>
+ *
  * <li>attribute values in types other than PrintableString are case
  *    sensitive (this permits matching of attribute values as binary
  *    objects);
- * <p>
+ *
  * <li>attribute values in PrintableString are not case sensitive
  *    (e.g., "Marianne Swanson" is the same as "MARIANNE SWANSON"); and
- * <p>
+ *
  * <li>attribute values in PrintableString are compared after
  *    removing leading and trailing white space and converting internal
  *    substrings of one or more consecutive white space characters to a
@@ -1242,12 +1242,13 @@
      *   <li>NAME_NARROWS = 1: input name narrows this name
      *   <li>NAME_WIDENS = 2: input name widens this name
      *   <li>NAME_SAME_TYPE = 3: input name does not match or narrow this name,
-     &       but is same type
-     * </ul>.  These results are used in checking NameConstraints during
+     *       but is same type.
+     * </ul>
+     * These results are used in checking NameConstraints during
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but
      *         narrowing and widening are not supported for this name type.
      */
@@ -1313,7 +1314,7 @@
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -125,7 +125,7 @@
     /**
      * Unmarshals a revoked certificate from its encoded form.
      *
-     * @param derVal the DER value containing the revoked certificate.
+     * @param derValue the DER value containing the revoked certificate.
      * @exception CRLException on parsing errors.
      */
     public X509CRLEntryImpl(DerValue derValue) throws CRLException {
@@ -271,7 +271,7 @@
     /**
      * get Reason Code from CRL entry.
      *
-     * @returns Integer or null, if no such extension
+     * @return Integer or null, if no such extension
      * @throws IOException on error
      */
     public Integer getReasonCode() throws IOException {
@@ -432,7 +432,7 @@
      * get an extension
      *
      * @param oid ObjectIdentifier of extension desired
-     * @returns Extension of type <extension> or null, if not found
+     * @return Extension of type {@code <extension>} or null, if not found
      */
     public Extension getExtension(ObjectIdentifier oid) {
         if (extensions == null)
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -185,8 +185,8 @@
      * Initial CRL constructor, no revoked certs, and no extensions.
      *
      * @param issuer the name of the CA issuing this CRL.
-     * @param thisUpdate the Date of this issue.
-     * @param nextUpdate the Date of the next CRL.
+     * @param thisDate the Date of this issue.
+     * @param nextDate the Date of the next CRL.
      */
     public X509CRLImpl(X500Name issuer, Date thisDate, Date nextDate) {
         this.issuer = issuer;
@@ -198,8 +198,8 @@
      * CRL constructor, revoked certs, no extensions.
      *
      * @param issuer the name of the CA issuing this CRL.
-     * @param thisUpdate the Date of this issue.
-     * @param nextUpdate the Date of the next CRL.
+     * @param thisDate the Date of this issue.
+     * @param nextDate the Date of the next CRL.
      * @param badCerts the array of CRL entries.
      *
      * @exception CRLException on parsing/construction errors.
@@ -237,8 +237,8 @@
      * CRL constructor, revoked certs and extensions.
      *
      * @param issuer the name of the CA issuing this CRL.
-     * @param thisUpdate the Date of this issue.
-     * @param nextUpdate the Date of the next CRL.
+     * @param thisDate the Date of this issue.
+     * @param nextDate the Date of the next CRL.
      * @param badCerts the array of CRL entries.
      * @param crlExts the CRL extensions.
      *
@@ -832,8 +832,8 @@
     /**
      * return the AuthorityKeyIdentifier, if any.
      *
-     * @returns AuthorityKeyIdentifier or null
-     *          (if no AuthorityKeyIdentifierExtension)
+     * @return AuthorityKeyIdentifier or null
+     *         (if no AuthorityKeyIdentifierExtension)
      * @throws IOException on error
      */
     public KeyIdentifier getAuthKeyId() throws IOException {
@@ -850,7 +850,7 @@
     /**
      * return the AuthorityKeyIdentifierExtension, if any.
      *
-     * @returns AuthorityKeyIdentifierExtension or null (if no such extension)
+     * @return AuthorityKeyIdentifierExtension or null (if no such extension)
      * @throws IOException on error
      */
     public AuthorityKeyIdentifierExtension getAuthKeyIdExtension()
@@ -862,7 +862,7 @@
     /**
      * return the CRLNumberExtension, if any.
      *
-     * @returns CRLNumberExtension or null (if no such extension)
+     * @return CRLNumberExtension or null (if no such extension)
      * @throws IOException on error
      */
     public CRLNumberExtension getCRLNumberExtension() throws IOException {
@@ -873,7 +873,7 @@
     /**
      * return the CRL number from the CRLNumberExtension, if any.
      *
-     * @returns number or null (if no such extension)
+     * @return number or null (if no such extension)
      * @throws IOException on error
      */
     public BigInteger getCRLNumber() throws IOException {
@@ -889,7 +889,7 @@
     /**
      * return the DeltaCRLIndicatorExtension, if any.
      *
-     * @returns DeltaCRLIndicatorExtension or null (if no such extension)
+     * @return DeltaCRLIndicatorExtension or null (if no such extension)
      * @throws IOException on error
      */
     public DeltaCRLIndicatorExtension getDeltaCRLIndicatorExtension()
@@ -902,7 +902,7 @@
     /**
      * return the base CRL number from the DeltaCRLIndicatorExtension, if any.
      *
-     * @returns number or null (if no such extension)
+     * @return number or null (if no such extension)
      * @throws IOException on error
      */
     public BigInteger getBaseCRLNumber() throws IOException {
@@ -918,7 +918,7 @@
     /**
      * return the IssuerAlternativeNameExtension, if any.
      *
-     * @returns IssuerAlternativeNameExtension or null (if no such extension)
+     * @return IssuerAlternativeNameExtension or null (if no such extension)
      * @throws IOException on error
      */
     public IssuerAlternativeNameExtension getIssuerAltNameExtension()
@@ -930,8 +930,8 @@
     /**
      * return the IssuingDistributionPointExtension, if any.
      *
-     * @returns IssuingDistributionPointExtension or null
-     *          (if no such extension)
+     * @return IssuingDistributionPointExtension or null
+     *         (if no such extension)
      * @throws IOException on error
      */
     public IssuingDistributionPointExtension
@@ -1043,7 +1043,7 @@
      * get an extension
      *
      * @param oid ObjectIdentifier of extension desired
-     * @returns Object of type <extension> or null, if not found
+     * @return Object of type {@code <extension>} or null, if not found
      * @throws IOException on error
      */
     public Object getExtension(ObjectIdentifier oid) {
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -247,7 +247,7 @@
      * read input stream as HEX-encoded DER-encoded bytes
      *
      * @param in InputStream to read
-     * @returns DerValue corresponding to decoded HEX-encoded bytes
+     * @return DerValue corresponding to decoded HEX-encoded bytes
      * @throws IOException if stream can not be interpreted as RFC1421
      *                     encoded bytes
      */
@@ -289,8 +289,8 @@
      * Construct an initialized X509 Certificate. The certificate is stored
      * in raw form and has to be signed to be useful.
      *
-     * @params info the X509CertificateInfo which the Certificate is to be
-     *              created from.
+     * @param certInfo the X509CertificateInfo which the Certificate is to be
+     *             created from.
      */
     public X509CertImpl(X509CertInfo certInfo) {
         this.info = certInfo;
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -38,8 +38,9 @@
 /**
  * The X509CertInfo class represents X.509 certificate information.
  *
- * <P>X.509 certificates have several base data elements, including:<UL>
+ * <P>X.509 certificates have several base data elements, including:
  *
+ * <UL>
  * <LI>The <em>Subject Name</em>, an X.500 Distinguished Name for
  *      the entity (subject) for which the certificate was issued.
  *
@@ -54,6 +55,7 @@
  *
  * <LI>A <em>Serial Number</em> assigned by the CA, for use in
  *      certificate revocation and other applications.
+ * </UL>
  *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
@@ -356,8 +358,8 @@
     /**
      * Set the certificate attribute.
      *
-     * @params name the name of the Certificate attribute.
-     * @params val the value of the Certificate attribute.
+     * @param name the name of the Certificate attribute.
+     * @param val the value of the Certificate attribute.
      * @exception CertificateException on invalid attributes.
      * @exception IOException on other errors.
      */
@@ -446,7 +448,7 @@
     /**
      * Delete the certificate attribute.
      *
-     * @params name the name of the Certificate attribute.
+     * @param name the name of the Certificate attribute.
      * @exception CertificateException on invalid attributes.
      * @exception IOException on other errors.
      */
@@ -525,7 +527,7 @@
     /**
      * Get the certificate attribute.
      *
-     * @params name the name of the Certificate attribute.
+     * @param name the name of the Certificate attribute.
      *
      * @exception CertificateException on invalid attributes.
      * @exception IOException on other errors.
@@ -812,7 +814,7 @@
     /**
      * Set the version number of the certificate.
      *
-     * @params val the Object class value for the Extensions
+     * @param val the Object class value for the Extensions
      * @exception CertificateException on invalid data.
      */
     private void setVersion(Object val) throws CertificateException {
@@ -825,7 +827,7 @@
     /**
      * Set the serial number of the certificate.
      *
-     * @params val the Object class value for the CertificateSerialNumber
+     * @param val the Object class value for the CertificateSerialNumber
      * @exception CertificateException on invalid data.
      */
     private void setSerialNumber(Object val) throws CertificateException {
@@ -838,7 +840,7 @@
     /**
      * Set the algorithm id of the certificate.
      *
-     * @params val the Object class value for the AlgorithmId
+     * @param val the Object class value for the AlgorithmId
      * @exception CertificateException on invalid data.
      */
     private void setAlgorithmId(Object val) throws CertificateException {
@@ -852,7 +854,7 @@
     /**
      * Set the issuer name of the certificate.
      *
-     * @params val the Object class value for the issuer
+     * @param val the Object class value for the issuer
      * @exception CertificateException on invalid data.
      */
     private void setIssuer(Object val) throws CertificateException {
@@ -866,7 +868,7 @@
     /**
      * Set the validity interval of the certificate.
      *
-     * @params val the Object class value for the CertificateValidity
+     * @param val the Object class value for the CertificateValidity
      * @exception CertificateException on invalid data.
      */
     private void setValidity(Object val) throws CertificateException {
@@ -880,7 +882,7 @@
     /**
      * Set the subject name of the certificate.
      *
-     * @params val the Object class value for the Subject
+     * @param val the Object class value for the Subject
      * @exception CertificateException on invalid data.
      */
     private void setSubject(Object val) throws CertificateException {
@@ -894,7 +896,7 @@
     /**
      * Set the public key in the certificate.
      *
-     * @params val the Object class value for the PublicKey
+     * @param val the Object class value for the PublicKey
      * @exception CertificateException on invalid data.
      */
     private void setKey(Object val) throws CertificateException {
@@ -908,7 +910,7 @@
     /**
      * Set the Issuer Unique Identity in the certificate.
      *
-     * @params val the Object class value for the IssuerUniqueId
+     * @param val the Object class value for the IssuerUniqueId
      * @exception CertificateException
      */
     private void setIssuerUniqueId(Object val) throws CertificateException {
@@ -925,7 +927,7 @@
     /**
      * Set the Subject Unique Identity in the certificate.
      *
-     * @params val the Object class value for the SubjectUniqueId
+     * @param val the Object class value for the SubjectUniqueId
      * @exception CertificateException
      */
     private void setSubjectUniqueId(Object val) throws CertificateException {
@@ -942,7 +944,7 @@
     /**
      * Set the extensions in the certificate.
      *
-     * @params val the Object class value for the Extensions
+     * @param val the Object class value for the Extensions
      * @exception CertificateException
      */
     private void setExtensions(Object val) throws CertificateException {
--- a/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java	Thu May 07 20:50:07 2015 -0700
@@ -152,9 +152,6 @@
         String GST[] = new String[] {"Gulf Standard Time", "GST",
                                      "Gulf Daylight Time", "GDT",
                                      "Gulf Time", "GT"};
-        String HAST[] = new String[] {"Hawaii-Aleutian Standard Time", "HAST",
-                                      "Hawaii-Aleutian Daylight Time", "HADT",
-                                      "Hawaii-Aleutian Time", "HAT"};
         String HKT[] =  new String[] {"Hong Kong Time", "HKT",
                                       "Hong Kong Summer Time", "HKST",
                                       "Hong Kong Time", "HKT"};
@@ -371,7 +368,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -393,7 +390,7 @@
                                                "Paraguay Summer Time", "PYST",
                                                "Paraguay Time", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/java.base/share/native/include/jvm.h	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/native/include/jvm.h	Thu May 07 20:50:07 2015 -0700
@@ -395,6 +395,9 @@
 JNIEXPORT jclass JNICALL
 JVM_GetDeclaringClass(JNIEnv *env, jclass ofClass);
 
+JNIEXPORT jstring JNICALL
+JVM_GetSimpleBinaryName(JNIEnv *env, jclass ofClass);
+
 /* Generics support (JDK 1.5) */
 JNIEXPORT jstring JNICALL
 JVM_GetClassSignature(JNIEnv *env, jclass cls);
--- a/jdk/src/java.base/share/native/libjava/Class.c	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.base/share/native/libjava/Class.c	Thu May 07 20:50:07 2015 -0700
@@ -67,6 +67,7 @@
     {"getProtectionDomain0", "()" PD,       (void *)&JVM_GetProtectionDomain},
     {"getDeclaredClasses0",  "()[" CLS,      (void *)&JVM_GetDeclaredClasses},
     {"getDeclaringClass0",   "()" CLS,      (void *)&JVM_GetDeclaringClass},
+    {"getSimpleBinaryName0", "()" STR,      (void *)&JVM_GetSimpleBinaryName},
     {"getGenericSignature0", "()" STR,      (void *)&JVM_GetClassSignature},
     {"getRawAnnotations",      "()" BA,        (void *)&JVM_GetClassAnnotations},
     {"getConstantPool",     "()" CPL,       (void *)&JVM_GetClassConstantPool},
--- a/jdk/src/java.management/share/classes/META-INF/services/sun.management.spi.PlatformMBeanProvider	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2015, 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.
-#
-com.sun.management.internal.PlatformMBeanProviderImpl
--- a/jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package com.sun.management;
-
-import java.lang.management.PlatformManagedObject;
-import javax.management.DynamicMBean;
-
-/**
- * Management interface for the diagnostic commands for the HotSpot Virtual Machine.
- *
- * <p>The {@code DiagnosticCommandMBean} is registered to the
- * {@linkplain java.lang.management.ManagementFactory#getPlatformMBeanServer
- * platform MBeanServer} as are other platform MBeans.
- *
- * <p>The {@link javax.management.ObjectName ObjectName} for uniquely identifying
- * the diagnostic MBean within an MBeanServer is:
- * <blockquote>
- *    {@code com.sun.management:type=DiagnosticCommand}
- * </blockquote>
- *
- * <p>This MBean is a {@link javax.management.DynamicMBean DynamicMBean}
- * and also a {@link javax.management.NotificationEmitter}.
- * The {@code DiagnosticCommandMBean} is generated at runtime and is subject to
- * modifications during the lifetime of the Java virtual machine.
- *
- * A <em>diagnostic command</em> is represented as an operation of
- * the {@code DiagnosticCommandMBean} interface. Each diagnostic command has:
- * <ul>
- * <li>the diagnostic command name which is the name being referenced in
- *     the HotSpot Virtual Machine</li>
- * <li>the MBean operation name which is the
- *     {@linkplain javax.management.MBeanOperationInfo#getName() name}
- *     generated for the diagnostic command operation invocation.
- *     The MBean operation name is implementation dependent</li>
- * </ul>
- *
- * The recommended way to transform a diagnostic command name into a MBean
- * operation name is as follows:
- * <ul>
- * <li>All characters from the first one to the first dot are set to be
- *      lower-case characters</li>
- * <li>Every dot or underline character is removed and the following
- *   character is set to be an upper-case character</li>
- * <li>All other characters are copied without modification</li>
- * </ul>
- *
- * <p>The diagnostic command name is always provided with the meta-data on the
- * operation in a field named {@code dcmd.name} (see below).
- *
- * <p>A diagnostic command may or may not support options or arguments.
- * All the operations return {@code String} and either take
- * no parameter for operations that do not support any option or argument,
- * or take a {@code String[]} parameter for operations that support at least
- * one option or argument.
- * Each option or argument must be stored in a single String.
- * Options or arguments split across several String instances are not supported.
- *
- * <p>The distinction between options and arguments: options are identified by
- * the option name while arguments are identified by their position in the
- * command line. Options and arguments are processed in the order of the array
- * passed to the invocation method.
- *
- * <p>Like any operation of a dynamic MBean, each of these operations is
- * described by {@link javax.management.MBeanOperationInfo MBeanOperationInfo}
- * instance. Here's the values returned by this object:
- * <ul>
- *  <li>{@link javax.management.MBeanOperationInfo#getName() getName()}
- *      returns the operation name generated from the diagnostic command name</li>
- *  <li>{@link javax.management.MBeanOperationInfo#getDescription() getDescription()}
- *      returns the diagnostic command description
- *      (the same as the one return in the 'help' command)</li>
- *  <li>{@link javax.management.MBeanOperationInfo#getImpact() getImpact()}
- *      returns {@code ACTION_INFO}</li>
- *  <li>{@link javax.management.MBeanOperationInfo#getReturnType() getReturnType()}
- *      returns {@code java.lang.String}</li>
- *  <li>{@link javax.management.MBeanOperationInfo#getDescriptor() getDescriptor()}
- *      returns a Descriptor instance (see below)</li>
- * </ul>
- *
- * <p>The {@link javax.management.Descriptor Descriptor}
- * is a collection of fields containing additional
- * meta-data for a JMX element. A field is a name and an associated value.
- * The additional meta-data provided for an operation associated with a
- * diagnostic command are described in the table below:
- *
- * <table border="1" cellpadding="5">
- *   <tr>
- *     <th>Name</th><th>Type</th><th>Description</th>
- *   </tr>
- *   <tr>
- *     <td>dcmd.name</td><td>String</td>
- *     <td>The original diagnostic command name (not the operation name)</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.description</td><td>String</td>
- *     <td>The diagnostic command description</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.help</td><td>String</td>
- *     <td>The full help message for this diagnostic command (same output as
- *          the one produced by the 'help' command)</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.vmImpact</td><td>String</td>
- *     <td>The impact of the diagnostic command,
- *      this value is the same as the one printed in the 'impact'
- *      section of the help message of the diagnostic command, and it
- *      is different from the getImpact() of the MBeanOperationInfo</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.enabled</td><td>boolean</td>
- *     <td>True if the diagnostic command is enabled, false otherwise</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.permissionClass</td><td>String</td>
- *     <td>Some diagnostic command might require a specific permission to be
- *          executed, in addition to the MBeanPermission to invoke their
- *          associated MBean operation. This field returns the fully qualified
- *          name of the permission class or null if no permission is required
- *   </td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.permissionName</td><td>String</td>
- *     <td>The fist argument of the permission required to execute this
- *          diagnostic command or null if no permission is required</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.permissionAction</td><td>String</td>
- *     <td>The second argument of the permission required to execute this
- *          diagnostic command or null if the permission constructor has only
- *          one argument (like the ManagementPermission) or if no permission
- *          is required</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.arguments</td><td>Descriptor</td>
- *     <td>A Descriptor instance containing the descriptions of options and
- *          arguments supported by the diagnostic command (see below)</td>
- *   </tr>
- * </table>
- *
- * <p>The description of parameters (options or arguments) of a diagnostic
- * command is provided within a Descriptor instance. In this Descriptor,
- * each field name is a parameter name, and each field value is itself
- * a Descriptor instance. The fields provided in this second Descriptor
- * instance are described in the table below:
- *
- * <table border="1" cellpadding="5">
- *   <tr>
- *     <th>Name</th><th>Type</th><th>Description</th>
- *   </tr>
- *   <tr>
- *     <td>dcmd.arg.name</td><td>String</td>
- *     <td>The name of the parameter</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.arg.type</td><td>String</td>
- *     <td>The type of the parameter. The returned String is the name of a type
- *          recognized by the diagnostic command parser. These types are not
- *          Java types and are implementation dependent.
- *          </td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.arg.description</td><td>String</td>
- *     <td>The parameter description</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.arg.isMandatory</td><td>boolean</td>
- *     <td>True if the parameter is mandatory, false otherwise</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.arg.isOption</td><td>boolean</td>
- *     <td>True if the parameter is an option, false if it is an argument</td>
- *   </tr>
- *   <tr>
- *     <td>dcmd.arg.isMultiple</td><td>boolean</td>
- *     <td>True if the parameter can be specified several times, false
- *          otherwise</td>
- *   </tr>
- * </table>
- *
- * <p>When the set of diagnostic commands currently supported by the Java
- * Virtual Machine is modified, the {@code DiagnosticCommandMBean} emits
- * a {@link javax.management.Notification} with a
- * {@linkplain javax.management.Notification#getType() type} of
- * <a href="{@docRoot}/../../../../api/javax/management/MBeanInfo.html#info-changed">
- * {@code "jmx.mbean.info.changed"}</a> and a
- * {@linkplain javax.management.Notification#getUserData() userData} that
- * is the new {@code MBeanInfo}.
- *
- * @since 1.8
- */
-public interface DiagnosticCommandMBean extends DynamicMBean
-{
-
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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.
- */
-
-package com.sun.management;
-
-import javax.management.Notification;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataView;
-import javax.management.openmbean.CompositeType;
-import java.util.Collection;
-import java.util.Collections;
-import sun.management.GarbageCollectionNotifInfoCompositeData;
-
-/**
- * The information about a garbage collection
- *
- * <p>
- * A garbage collection notification is emitted by {@link GarbageCollectorMXBean}
- * when the Java virtual machine completes a garbage collection action
- * The notification emitted will contain the garbage collection notification
- * information about the status of the memory:
- * <ul>
- *   <li>The name of the garbage collector used to perform the collection.</li>
- *   <li>The action performed by the garbage collector.</li>
- *   <li>The cause of the garbage collection action.</li>
- *   <li>A {@link GcInfo} object containing some statistics about the GC cycle
-          (start time, end time) and the memory usage before and after
-          the GC cycle.</li>
- * </ul>
- *
- * <p>
- * A {@link CompositeData CompositeData} representing
- * the {@code GarbageCollectionNotificationInfo} object
- * is stored in the
- * {@linkplain javax.management.Notification#setUserData userdata}
- * of a {@linkplain javax.management.Notification notification}.
- * The {@link #from from} method is provided to convert from
- * a {@code CompositeData} to a {@code GarbageCollectionNotificationInfo}
- * object. For example:
- *
- * <blockquote><pre>
- *      Notification notif;
- *
- *      // receive the notification emitted by a GarbageCollectorMXBean and set to notif
- *      ...
- *
- *      String notifType = notif.getType();
- *      if (notifType.equals(GarbageCollectionNotificationInfo.GARBAGE_COLLECTION_NOTIFICATION)) {
- *          // retrieve the garbage collection notification information
- *          CompositeData cd = (CompositeData) notif.getUserData();
- *          GarbageCollectionNotificationInfo info = GarbageCollectionNotificationInfo.from(cd);
- *          ....
- *      }
- * </pre></blockquote>
- *
- * <p>
- * The type of the notification emitted by a {@code GarbageCollectorMXBean} is:
- * <ul>
- *   <li>A {@linkplain #GARBAGE_COLLECTION_NOTIFICATION garbage collection notification}.
- *       <br>Used by every notification emitted by the garbage collector, the details about
- *             the notification are provided in the {@linkplain #getGcAction action} String
- *       </li>
- * </ul>
- **/
-
-@jdk.Exported
-public class GarbageCollectionNotificationInfo implements  CompositeDataView {
-
-    private final String gcName;
-    private final String gcAction;
-    private final String gcCause;
-    private final GcInfo gcInfo;
-    private final CompositeData cdata;
-
-    /**
-     * Notification type denoting that
-     * the Java virtual machine has completed a garbage collection cycle.
-     * This notification is emitted by a {@link GarbageCollectorMXBean}.
-     * The value of this notification type is
-     * {@code com.sun.management.gc.notification}.
-     */
-    public static final String GARBAGE_COLLECTION_NOTIFICATION =
-        "com.sun.management.gc.notification";
-
-    /**
-     * Constructs a {@code GarbageCollectionNotificationInfo} object.
-     *
-     * @param gcName The name of the garbage collector used to perform the collection
-     * @param gcAction The name of the action performed by the garbage collector
-     * @param gcCause The cause of the garbage collection action
-     * @param gcInfo  a GcInfo object providing statistics about the GC cycle
-     */
-    public GarbageCollectionNotificationInfo(String gcName,
-                                             String gcAction,
-                                             String gcCause,
-                                             GcInfo gcInfo)  {
-        if (gcName == null) {
-            throw new NullPointerException("Null gcName");
-        }
-        if (gcAction == null) {
-            throw new NullPointerException("Null gcAction");
-        }
-        if (gcCause == null) {
-            throw new NullPointerException("Null gcCause");
-        }
-        this.gcName = gcName;
-        this.gcAction = gcAction;
-        this.gcCause = gcCause;
-        this.gcInfo = gcInfo;
-        this.cdata = new GarbageCollectionNotifInfoCompositeData(this);
-    }
-
-    GarbageCollectionNotificationInfo(CompositeData cd) {
-        GarbageCollectionNotifInfoCompositeData.validateCompositeData(cd);
-
-        this.gcName = GarbageCollectionNotifInfoCompositeData.getGcName(cd);
-        this.gcAction = GarbageCollectionNotifInfoCompositeData.getGcAction(cd);
-        this.gcCause = GarbageCollectionNotifInfoCompositeData.getGcCause(cd);
-        this.gcInfo = GarbageCollectionNotifInfoCompositeData.getGcInfo(cd);
-        this.cdata = cd;
-    }
-
-    /**
-     * Returns the name of the garbage collector used to perform the collection
-     *
-     * @return the name of the garbage collector used to perform the collection
-     */
-    public String getGcName() {
-        return gcName;
-    }
-
-    /**
-     * Returns the action performed by the garbage collector
-     *
-     * @return the action performed by the garbage collector
-     */
-    public String getGcAction() {
-        return gcAction;
-    }
-
-    /**
-     * Returns the cause of the garbage collection
-     *
-     * @return the cause of the garbage collection
-     */
-    public String getGcCause() {
-        return gcCause;
-    }
-
-    /**
-     * Returns the GC information related to the last garbage collection
-     *
-     * @return the GC information related to the
-     * last garbage collection
-     */
-    public GcInfo getGcInfo() {
-        return gcInfo;
-    }
-
-    /**
-     * Returns a {@code GarbageCollectionNotificationInfo} object represented by the
-     * given {@code CompositeData}.
-     * The given {@code CompositeData} must contain
-     * the following attributes:
-     * <blockquote>
-     * <table border>
-     * <tr>
-     *   <th align=left>Attribute Name</th>
-     *   <th align=left>Type</th>
-     * </tr>
-     * <tr>
-     *   <td>gcName</td>
-     *   <td>{@code java.lang.String}</td>
-     * </tr>
-     * <tr>
-     *   <td>gcAction</td>
-     *   <td>{@code java.lang.String}</td>
-     * </tr>
-     * <tr>
-     *   <td>gcCause</td>
-     *   <td>{@code java.lang.String}</td>
-     * </tr>
-     * <tr>
-     *   <td>gcInfo</td>
-     *   <td>{@code javax.management.openmbean.CompositeData}</td>
-     * </tr>
-     * </table>
-     * </blockquote>
-     *
-     * @param cd {@code CompositeData} representing a
-     *           {@code GarbageCollectionNotificationInfo}
-     *
-     * @throws IllegalArgumentException if {@code cd} does not
-     *   represent a {@code GarbaageCollectionNotificationInfo} object.
-     *
-     * @return a {@code GarbageCollectionNotificationInfo} object represented
-     *         by {@code cd} if {@code cd} is not {@code null};
-     *         {@code null} otherwise.
-     */
-    public static GarbageCollectionNotificationInfo from(CompositeData cd) {
-        if (cd == null) {
-            return null;
-        }
-
-        if (cd instanceof GarbageCollectionNotifInfoCompositeData) {
-            return ((GarbageCollectionNotifInfoCompositeData) cd).getGarbageCollectionNotifInfo();
-        } else {
-            return new GarbageCollectionNotificationInfo(cd);
-        }
-    }
-
-    public CompositeData toCompositeData(CompositeType ct) {
-        return cdata;
-    }
-
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/GarbageCollectorMXBean.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-package com.sun.management;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeType;
-
-/**
- * Platform-specific management interface for a garbage collector
- * which performs collections in cycles.
- *
- * <p> This platform extension is only available to the garbage
- * collection implementation that supports this extension.
- *
- * @author  Mandy Chung
- * @since   1.5
- */
-@jdk.Exported
-public interface GarbageCollectorMXBean
-    extends java.lang.management.GarbageCollectorMXBean {
-
-    /**
-     * Returns the GC information about the most recent GC.
-     * This method returns a {@link GcInfo}.
-     * If no GC information is available, <tt>null</tt> is returned.
-     * The collector-specific attributes, if any, can be obtained
-     * via the {@link CompositeData CompositeData} interface.
-     * <p>
-     * <b>MBeanServer access:</b>
-     * The mapped type of <tt>GcInfo</tt> is <tt>CompositeData</tt>
-     * with attributes specified in {@link GcInfo#from GcInfo}.
-     *
-     * @return a <tt>GcInfo</tt> object representing
-     * the most GC information; or <tt>null</tt> if no GC
-     * information available.
-     */
-    public GcInfo getLastGcInfo();
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/GcInfo.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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.
- */
-
-package com.sun.management;
-
-import java.lang.management.MemoryUsage;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataView;
-import javax.management.openmbean.CompositeType;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import sun.management.GcInfoCompositeData;
-import sun.management.GcInfoBuilder;
-
-/**
- * Garbage collection information.  It contains the following
- * information for one garbage collection as well as GC-specific
- * attributes:
- * <blockquote>
- * <ul>
- *   <li>Start time</li>
- *   <li>End time</li>
- *   <li>Duration</li>
- *   <li>Memory usage before the collection starts</li>
- *   <li>Memory usage after the collection ends</li>
- * </ul>
- * </blockquote>
- *
- * <p>
- * {@code GcInfo} is a {@link CompositeData CompositeData}
- * The GC-specific attributes can be obtained via the CompositeData
- * interface.  This is a historical relic, and other classes should
- * not copy this pattern.  Use {@link CompositeDataView} instead.
- *
- * <h4>MXBean Mapping</h4>
- * {@code GcInfo} is mapped to a {@link CompositeData CompositeData}
- * with attributes as specified in the {@link #from from} method.
- *
- * @author  Mandy Chung
- * @since   1.5
- */
-@jdk.Exported
-public class GcInfo implements CompositeData, CompositeDataView {
-    private final long index;
-    private final long startTime;
-    private final long endTime;
-    private final Map<String, MemoryUsage> usageBeforeGc;
-    private final Map<String, MemoryUsage> usageAfterGc;
-    private final Object[] extAttributes;
-    private final CompositeData cdata;
-    private final GcInfoBuilder builder;
-
-    private GcInfo(GcInfoBuilder builder,
-                   long index, long startTime, long endTime,
-                   MemoryUsage[] muBeforeGc,
-                   MemoryUsage[] muAfterGc,
-                   Object[] extAttributes) {
-        this.builder       = builder;
-        this.index         = index;
-        this.startTime     = startTime;
-        this.endTime       = endTime;
-        String[] poolNames = builder.getPoolNames();
-        this.usageBeforeGc = new HashMap<String, MemoryUsage>(poolNames.length);
-        this.usageAfterGc = new HashMap<String, MemoryUsage>(poolNames.length);
-        for (int i = 0; i < poolNames.length; i++) {
-            this.usageBeforeGc.put(poolNames[i],  muBeforeGc[i]);
-            this.usageAfterGc.put(poolNames[i],  muAfterGc[i]);
-        }
-        this.extAttributes = extAttributes;
-        this.cdata = new GcInfoCompositeData(this, builder, extAttributes);
-    }
-
-    private GcInfo(CompositeData cd) {
-        GcInfoCompositeData.validateCompositeData(cd);
-
-        this.index         = GcInfoCompositeData.getId(cd);
-        this.startTime     = GcInfoCompositeData.getStartTime(cd);
-        this.endTime       = GcInfoCompositeData.getEndTime(cd);
-        this.usageBeforeGc = GcInfoCompositeData.getMemoryUsageBeforeGc(cd);
-        this.usageAfterGc  = GcInfoCompositeData.getMemoryUsageAfterGc(cd);
-        this.extAttributes = null;
-        this.builder       = null;
-        this.cdata         = cd;
-    }
-
-    /**
-     * Returns the identifier of this garbage collection which is
-     * the number of collections that this collector has done.
-     *
-     * @return the identifier of this garbage collection which is
-     * the number of collections that this collector has done.
-     */
-    public long getId() {
-        return index;
-    }
-
-    /**
-     * Returns the start time of this GC in milliseconds
-     * since the Java virtual machine was started.
-     *
-     * @return the start time of this GC.
-     */
-    public long getStartTime() {
-        return startTime;
-    }
-
-    /**
-     * Returns the end time of this GC in milliseconds
-     * since the Java virtual machine was started.
-     *
-     * @return the end time of this GC.
-     */
-    public long getEndTime() {
-        return endTime;
-    }
-
-    /**
-     * Returns the elapsed time of this GC in milliseconds.
-     *
-     * @return the elapsed time of this GC in milliseconds.
-     */
-    public long getDuration() {
-        return endTime - startTime;
-    }
-
-    /**
-     * Returns the memory usage of all memory pools
-     * at the beginning of this GC.
-     * This method returns
-     * a {@code Map} of the name of a memory pool
-     * to the memory usage of the corresponding
-     * memory pool before GC starts.
-     *
-     * @return a {@code Map} of memory pool names to the memory
-     * usage of a memory pool before GC starts.
-     */
-    public Map<String, MemoryUsage> getMemoryUsageBeforeGc() {
-        return Collections.unmodifiableMap(usageBeforeGc);
-    }
-
-    /**
-     * Returns the memory usage of all memory pools
-     * at the end of this GC.
-     * This method returns
-     * a {@code Map} of the name of a memory pool
-     * to the memory usage of the corresponding
-     * memory pool when GC finishes.
-     *
-     * @return a {@code Map} of memory pool names to the memory
-     * usage of a memory pool when GC finishes.
-     */
-    public Map<String, MemoryUsage> getMemoryUsageAfterGc() {
-        return Collections.unmodifiableMap(usageAfterGc);
-    }
-
-   /**
-     * Returns a {@code GcInfo} object represented by the
-     * given {@code CompositeData}. The given
-     * {@code CompositeData} must contain
-     * all the following attributes:
-     *
-     * <blockquote>
-     * <table border>
-     * <tr>
-     *   <th align=left>Attribute Name</th>
-     *   <th align=left>Type</th>
-     * </tr>
-     * <tr>
-     *   <td>index</td>
-     *   <td>{@code java.lang.Long}</td>
-     * </tr>
-     * <tr>
-     *   <td>startTime</td>
-     *   <td>{@code java.lang.Long}</td>
-     * </tr>
-     * <tr>
-     *   <td>endTime</td>
-     *   <td>{@code java.lang.Long}</td>
-     * </tr>
-     * <tr>
-     *   <td>memoryUsageBeforeGc</td>
-     *   <td>{@code javax.management.openmbean.TabularData}</td>
-     * </tr>
-     * <tr>
-     *   <td>memoryUsageAfterGc</td>
-     *   <td>{@code javax.management.openmbean.TabularData}</td>
-     * </tr>
-     * </table>
-     * </blockquote>
-     *
-     * @throws IllegalArgumentException if {@code cd} does not
-     *   represent a {@code GcInfo} object with the attributes
-     *   described above.
-     *
-     * @return a {@code GcInfo} object represented by {@code cd}
-     * if {@code cd} is not {@code null}; {@code null} otherwise.
-     */
-    public static GcInfo from(CompositeData cd) {
-        if (cd == null) {
-            return null;
-        }
-
-        if (cd instanceof GcInfoCompositeData) {
-            return ((GcInfoCompositeData) cd).getGcInfo();
-        } else {
-            return new GcInfo(cd);
-        }
-
-    }
-
-    // Implementation of the CompositeData interface
-    public boolean containsKey(String key) {
-        return cdata.containsKey(key);
-    }
-
-    public boolean containsValue(Object value) {
-        return cdata.containsValue(value);
-    }
-
-    public boolean equals(Object obj) {
-        return cdata.equals(obj);
-    }
-
-    public Object get(String key) {
-        return cdata.get(key);
-    }
-
-    public Object[] getAll(String[] keys) {
-        return cdata.getAll(keys);
-    }
-
-    public CompositeType getCompositeType() {
-        return cdata.getCompositeType();
-    }
-
-    public int hashCode() {
-        return cdata.hashCode();
-    }
-
-    public String toString() {
-        return cdata.toString();
-    }
-
-    public Collection<?> values() {
-        return cdata.values();
-    }
-
-    /**
-     * Return the {@code CompositeData} representation of this
-     * {@code GcInfo}, including any GC-specific attributes.  The
-     * returned value will have at least all the attributes described
-     * in the {@link #from(CompositeData) from} method, plus optionally
-     * other attributes.
-     *
-     * @param ct the {@code CompositeType} that the caller expects.
-     * This parameter is ignored and can be null.
-     *
-     * @return the {@code CompositeData} representation.
-     */
-    public CompositeData toCompositeData(CompositeType ct) {
-        return cdata;
-    }
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2005, 2014, 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.
- */
-
-package com.sun.management;
-
-import java.lang.management.PlatformManagedObject;
-
-/**
- * Diagnostic management interface for the HotSpot Virtual Machine.
- *
- * <p>The diagnostic MBean is registered to the platform MBeanServer
- * as are other platform MBeans.
- *
- * <p>The <tt>ObjectName</tt> for uniquely identifying the diagnostic
- * MXBean within an MBeanServer is:
- * <blockquote>
- *    <tt>com.sun.management:type=HotSpotDiagnostic</tt>
- * </blockquote>
-.*
- * It can be obtained by calling the
- * {@link PlatformManagedObject#getObjectName} method.
- *
- * All methods throw a {@code NullPointerException} if any input argument is
- * {@code null} unless it's stated otherwise.
- *
- * @see java.lang.management.ManagementFactory#getPlatformMXBeans(Class)
- */
-@jdk.Exported
-public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
-    /**
-     * Dumps the heap to the <tt>outputFile</tt> file in the same
-     * format as the hprof heap dump.
-     * <p>
-     * If this method is called remotely from another process,
-     * the heap dump output is written to a file named <tt>outputFile</tt>
-     * on the machine where the target VM is running.  If outputFile is
-     * a relative path, it is relative to the working directory where
-     * the target VM was started.
-     *
-     * @param  outputFile the system-dependent filename
-     * @param  live if <tt>true</tt> dump only <i>live</i> objects
-     *         i.e. objects that are reachable from others
-     * @throws IOException if the <tt>outputFile</tt>
-     *                     cannot be created, opened, or written to.
-     * @throws UnsupportedOperationException if this operation is not supported.
-     * @throws NullPointerException if <tt>outputFile</tt> is <tt>null</tt>.
-     * @throws SecurityException
-     *         If a security manager exists and its {@link
-     *         java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *         method denies write access to the named file
-     *         or the caller does not have ManagmentPermission("control").
-     */
-    public void dumpHeap(String outputFile, boolean live) throws java.io.IOException;
-
-    /**
-     * Returns a list of <tt>VMOption</tt> objects for all diagnostic options.
-     * A diagnostic option is a {@link VMOption#isWriteable writeable}
-     * VM option that can be set dynamically mainly for troubleshooting
-     * and diagnosis.
-     *
-     * @return a list of <tt>VMOption</tt> objects for all diagnostic options.
-     */
-    public java.util.List<VMOption> getDiagnosticOptions();
-
-    /**
-     * Returns a <tt>VMOption</tt> object for a VM option of the given
-     * name.
-     *
-     * @return a <tt>VMOption</tt> object for a VM option of the given name.
-     * @throws NullPointerException if name is <tt>null</tt>.
-     * @throws IllegalArgumentException if a VM option of the given name
-     *                                     does not exist.
-     */
-    public VMOption getVMOption(String name);
-
-    /**
-     * Sets a VM option of the given name to the specified value.
-     * The new value will be reflected in a new <tt>VMOption</tt>
-     * object returned by the {@link #getVMOption} method or
-     * the {@link #getDiagnosticOptions} method.  This method does
-     * not change the value of this <tt>VMOption</tt> object.
-     *
-     * @param name Name of a VM option
-     * @param value New value of the VM option to be set
-     *
-     * @throws IllegalArgumentException if the VM option of the given name
-     *                                     does not exist.
-     * @throws IllegalArgumentException if the new value is invalid.
-     * @throws IllegalArgumentException if the VM option is not writable.
-     * @throws NullPointerException if name or value is <tt>null</tt>.
-     *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and the caller does not have
-     *     ManagementPermission("control").
-     */
-    public void setVMOption(String name, String value);
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/OperatingSystemMXBean.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-package com.sun.management;
-
-/**
- * Platform-specific management interface for the operating system
- * on which the Java virtual machine is running.
- *
- * <p>
- * The <tt>OperatingSystemMXBean</tt> object returned by
- * {@link java.lang.management.ManagementFactory#getOperatingSystemMXBean()}
- * is an instance of the implementation class of this interface
- * or {@link UnixOperatingSystemMXBean} interface depending on
- * its underlying operating system.
- *
- * @author  Mandy Chung
- * @since   1.5
- */
-@jdk.Exported
-public interface OperatingSystemMXBean extends
-    java.lang.management.OperatingSystemMXBean {
-
-    /**
-     * Returns the amount of virtual memory that is guaranteed to
-     * be available to the running process in bytes,
-     * or <tt>-1</tt> if this operation is not supported.
-     *
-     * @return the amount of virtual memory that is guaranteed to
-     * be available to the running process in bytes,
-     * or <tt>-1</tt> if this operation is not supported.
-     */
-    public long getCommittedVirtualMemorySize();
-
-    /**
-     * Returns the total amount of swap space in bytes.
-     *
-     * @return the total amount of swap space in bytes.
-     */
-    public long getTotalSwapSpaceSize();
-
-    /**
-     * Returns the amount of free swap space in bytes.
-     *
-     * @return the amount of free swap space in bytes.
-     */
-    public long getFreeSwapSpaceSize();
-
-    /**
-     * Returns the CPU time used by the process on which the Java
-     * virtual machine is running in nanoseconds.  The returned value
-     * is of nanoseconds precision but not necessarily nanoseconds
-     * accuracy.  This method returns <tt>-1</tt> if the
-     * the platform does not support this operation.
-     *
-     * @return the CPU time used by the process in nanoseconds,
-     * or <tt>-1</tt> if this operation is not supported.
-     */
-    public long getProcessCpuTime();
-
-    /**
-     * Returns the amount of free physical memory in bytes.
-     *
-     * @return the amount of free physical memory in bytes.
-     */
-    public long getFreePhysicalMemorySize();
-
-    /**
-     * Returns the total amount of physical memory in bytes.
-     *
-     * @return the total amount of physical memory in  bytes.
-     */
-    public long getTotalPhysicalMemorySize();
-
-    /**
-     * Returns the "recent cpu usage" for the whole system. This value is a
-     * double in the [0.0,1.0] interval. A value of 0.0 means that all CPUs
-     * were idle during the recent period of time observed, while a value
-     * of 1.0 means that all CPUs were actively running 100% of the time
-     * during the recent period being observed. All values betweens 0.0 and
-     * 1.0 are possible depending of the activities going on in the system.
-     * If the system recent cpu usage is not available, the method returns a
-     * negative value.
-     *
-     * @return the "recent cpu usage" for the whole system; a negative
-     * value if not available.
-     * @since   1.7
-     */
-    public double getSystemCpuLoad();
-
-    /**
-     * Returns the "recent cpu usage" for the Java Virtual Machine process.
-     * This value is a double in the [0.0,1.0] interval. A value of 0.0 means
-     * that none of the CPUs were running threads from the JVM process during
-     * the recent period of time observed, while a value of 1.0 means that all
-     * CPUs were actively running threads from the JVM 100% of the time
-     * during the recent period being observed. Threads from the JVM include
-     * the application threads as well as the JVM internal threads. All values
-     * betweens 0.0 and 1.0 are possible depending of the activities going on
-     * in the JVM process and the whole system. If the Java Virtual Machine
-     * recent CPU usage is not available, the method returns a negative value.
-     *
-     * @return the "recent cpu usage" for the Java Virtual Machine process;
-     * a negative value if not available.
-     * @since   1.7
-     */
-    public double getProcessCpuLoad();
-
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/ThreadMXBean.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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.
- */
-
-package com.sun.management;
-
-import java.util.Map;
-
-/**
- * Platform-specific management interface for the thread system
- * of the Java virtual machine.
- * <p>
- * This platform extension is only available to a thread
- * implementation that supports this extension.
- *
- * @author  Paul Hohensee
- * @since   6u25
- */
-
-@jdk.Exported
-public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
-    /**
-     * Returns the total CPU time for each thread whose ID is
-     * in the input array {@code ids} in nanoseconds.
-     * The returned values are of nanoseconds precision but
-     * not necessarily nanoseconds accuracy.
-     * <p>
-     * This method is equivalent to calling the
-     * {@link ThreadMXBean#getThreadCpuTime(long)}
-     * method for each thread ID in the input array {@code ids} and setting the
-     * returned value in the corresponding element of the returned array.
-     *
-     * @param ids an array of thread IDs.
-     * @return an array of long values, each of which is the amount of CPU
-     * time the thread whose ID is in the corresponding element of the input
-     * array of IDs has used,
-     * if the thread of a specified ID exists, the thread is alive,
-     * and CPU time measurement is enabled;
-     * {@code -1} otherwise.
-     *
-     * @throws NullPointerException if {@code ids} is {@code null}
-     * @throws IllegalArgumentException if any element in the input array
-     *         {@code ids} is {@code <=} {@code 0}.
-     * @throws java.lang.UnsupportedOperationException if the Java
-     *         virtual machine implementation does not support CPU time
-     *         measurement.
-     *
-     * @see ThreadMXBean#getThreadCpuTime(long)
-     * @see #getThreadUserTime
-     * @see ThreadMXBean#isThreadCpuTimeSupported
-     * @see ThreadMXBean#isThreadCpuTimeEnabled
-     * @see ThreadMXBean#setThreadCpuTimeEnabled
-     */
-    public long[] getThreadCpuTime(long[] ids);
-
-    /**
-     * Returns the CPU time that each thread whose ID is in the input array
-     * {@code ids} has executed in user mode in nanoseconds.
-     * The returned values are of nanoseconds precision but
-     * not necessarily nanoseconds accuracy.
-     * <p>
-     * This method is equivalent to calling the
-     * {@link ThreadMXBean#getThreadUserTime(long)}
-     * method for each thread ID in the input array {@code ids} and setting the
-     * returned value in the corresponding element of the returned array.
-     *
-     * @param ids an array of thread IDs.
-     * @return an array of long values, each of which is the amount of user
-     * mode CPU time the thread whose ID is in the corresponding element of
-     * the input array of IDs has used,
-     * if the thread of a specified ID exists, the thread is alive,
-     * and CPU time measurement is enabled;
-     * {@code -1} otherwise.
-     *
-     * @throws NullPointerException if {@code ids} is {@code null}
-     * @throws IllegalArgumentException if any element in the input array
-     *         {@code ids} is {@code <=} {@code 0}.
-     * @throws java.lang.UnsupportedOperationException if the Java
-     *         virtual machine implementation does not support CPU time
-     *         measurement.
-     *
-     * @see ThreadMXBean#getThreadUserTime(long)
-     * @see #getThreadCpuTime
-     * @see ThreadMXBean#isThreadCpuTimeSupported
-     * @see ThreadMXBean#isThreadCpuTimeEnabled
-     * @see ThreadMXBean#setThreadCpuTimeEnabled
-     */
-    public long[] getThreadUserTime(long[] ids);
-
-    /**
-     * Returns an approximation of the total amount of memory, in bytes,
-     * allocated in heap memory for the thread of the specified ID.
-     * The returned value is an approximation because some Java virtual machine
-     * implementations may use object allocation mechanisms that result in a
-     * delay between the time an object is allocated and the time its size is
-     * recorded.
-     * <p>
-     * If the thread of the specified ID is not alive or does not exist,
-     * this method returns {@code -1}. If thread memory allocation measurement
-     * is disabled, this method returns {@code -1}.
-     * A thread is alive if it has been started and has not yet died.
-     * <p>
-     * If thread memory allocation measurement is enabled after the thread has
-     * started, the Java virtual machine implementation may choose any time up
-     * to and including the time that the capability is enabled as the point
-     * where thread memory allocation measurement starts.
-     *
-     * @param id the thread ID of a thread
-     * @return an approximation of the total memory allocated, in bytes, in
-     * heap memory for a thread of the specified ID
-     * if the thread of the specified ID exists, the thread is alive,
-     * and thread memory allocation measurement is enabled;
-     * {@code -1} otherwise.
-     *
-     * @throws IllegalArgumentException if {@code id} {@code <=} {@code 0}.
-     * @throws java.lang.UnsupportedOperationException if the Java virtual
-     *         machine implementation does not support thread memory allocation
-     *         measurement.
-     *
-     * @see #isThreadAllocatedMemorySupported
-     * @see #isThreadAllocatedMemoryEnabled
-     * @see #setThreadAllocatedMemoryEnabled
-     */
-    public long getThreadAllocatedBytes(long id);
-
-    /**
-     * Returns an approximation of the total amount of memory, in bytes,
-     * allocated in heap memory for each thread whose ID is in the input
-     * array {@code ids}.
-     * The returned values are approximations because some Java virtual machine
-     * implementations may use object allocation mechanisms that result in a
-     * delay between the time an object is allocated and the time its size is
-     * recorded.
-     * <p>
-     * This method is equivalent to calling the
-     * {@link #getThreadAllocatedBytes(long)}
-     * method for each thread ID in the input array {@code ids} and setting the
-     * returned value in the corresponding element of the returned array.
-     *
-     * @param ids an array of thread IDs.
-     * @return an array of long values, each of which is an approximation of
-     * the total memory allocated, in bytes, in heap memory for the thread
-     * whose ID is in the corresponding element of the input array of IDs.
-     *
-     * @throws NullPointerException if {@code ids} is {@code null}
-     * @throws IllegalArgumentException if any element in the input array
-     *         {@code ids} is {@code <=} {@code 0}.
-     * @throws java.lang.UnsupportedOperationException if the Java virtual
-     *         machine implementation does not support thread memory allocation
-     *         measurement.
-     *
-     * @see #getThreadAllocatedBytes(long)
-     * @see #isThreadAllocatedMemorySupported
-     * @see #isThreadAllocatedMemoryEnabled
-     * @see #setThreadAllocatedMemoryEnabled
-     */
-    public long[] getThreadAllocatedBytes(long[] ids);
-
-    /**
-     * Tests if the Java virtual machine implementation supports thread memory
-     * allocation measurement.
-     *
-     * @return
-     *   {@code true}
-     *     if the Java virtual machine implementation supports thread memory
-     *     allocation measurement;
-     *   {@code false} otherwise.
-     */
-    public boolean isThreadAllocatedMemorySupported();
-
-    /**
-     * Tests if thread memory allocation measurement is enabled.
-     *
-     * @return {@code true} if thread memory allocation measurement is enabled;
-     *         {@code false} otherwise.
-     *
-     * @throws java.lang.UnsupportedOperationException if the Java virtual
-     *         machine does not support thread memory allocation measurement.
-     *
-     * @see #isThreadAllocatedMemorySupported
-     */
-    public boolean isThreadAllocatedMemoryEnabled();
-
-    /**
-     * Enables or disables thread memory allocation measurement.  The default
-     * is platform dependent.
-     *
-     * @param enable {@code true} to enable;
-     *               {@code false} to disable.
-     *
-     * @throws java.lang.UnsupportedOperationException if the Java virtual
-     *         machine does not support thread memory allocation measurement.
-     *
-     * @throws java.lang.SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
-     *
-     * @see #isThreadAllocatedMemorySupported
-     */
-    public void setThreadAllocatedMemoryEnabled(boolean enable);
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-package com.sun.management;
-
-/**
- * Platform-specific management interface for the Unix
- * operating system on which the Java virtual machine is running.
- *
- * @author  Mandy Chung
- * @since   1.5
- */
-@jdk.Exported
-public interface UnixOperatingSystemMXBean extends
-    com.sun.management.OperatingSystemMXBean {
-
-    /**
-     * Returns the number of open file descriptors.
-     *
-     * @return the number of open file descriptors.
-     */
-    public long getOpenFileDescriptorCount();
-
-    /**
-     * Returns the maximum number of file descriptors.
-     *
-     * @return the maximum number of file descriptors.
-     */
-    public long getMaxFileDescriptorCount();
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/VMOption.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, 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.
- */
-
-package com.sun.management;
-
-import sun.management.VMOptionCompositeData;
-import javax.management.openmbean.CompositeData;
-
-/**
- * Information about a VM option including its value and
- * where the value came from which is referred as its
- * {@link VMOption.Origin <i>origin</i>}.
- * <p>
- * Each VM option has a default value.  A VM option can
- * be set at VM creation time typically as a command line
- * argument to the launcher or an argument passed to the
- * VM created using the JNI invocation interface.
- * In addition, a VM option may be set via an environment
- * variable or a configuration file. A VM option can also
- * be set dynamically via a management interface after
- * the VM was started.
- *
- * A {@code VMOption} contains the value of a VM option
- * and the origin of that value at the time this {@code VMOption}
- * object was constructed.  The value of the VM option
- * may be changed after the {@code VMOption} object was constructed,
- *
- * @see <a href="{@docRoot}/../../../../technotes/guides/vm/index.html">
- *         Java Virtual Machine</a>
- * @author Mandy Chung
- * @since 1.6
- */
-@jdk.Exported
-public class VMOption {
-    private String name;
-    private String value;
-    private boolean writeable;
-    private Origin origin;
-
-    /**
-     * Origin of the value of a VM option.  It tells where the
-     * value of a VM option came from.
-     *
-     * @since 1.6
-     */
-    @jdk.Exported
-    public enum Origin {
-        /**
-         * The VM option has not been set and its value
-         * is the default value.
-         */
-        DEFAULT,
-        /**
-         * The VM option was set at VM creation time typically
-         * as a command line argument to the launcher or
-         * an argument passed to the VM created using the
-         * JNI invocation interface.
-         */
-        VM_CREATION,
-        /**
-         * The VM option was set via an environment variable.
-         */
-        ENVIRON_VAR,
-        /**
-         * The VM option was set via a configuration file.
-         */
-        CONFIG_FILE,
-        /**
-         * The VM option was set via the management interface after the VM
-         * was started.
-         */
-        MANAGEMENT,
-        /**
-         * The VM option was set via the VM ergonomic support.
-         */
-        ERGONOMIC,
-        /**
-         * The VM option was set using the attach framework.
-         * @since 1.9
-         */
-        ATTACH_ON_DEMAND,
-        /**
-         * The VM option was set via some other mechanism.
-         */
-        OTHER
-    }
-
-    /**
-     * Constructs a {@code VMOption}.
-     *
-     * @param name Name of a VM option.
-     * @param value Value of a VM option.
-     * @param writeable {@code true} if a VM option can be set dynamically,
-     *                  or {@code false} otherwise.
-     * @param origin where the value of a VM option came from.
-     *
-     * @throws NullPointerException if the name or value is {@code null}
-     */
-    public VMOption(String name, String value, boolean writeable, Origin origin) {
-        this.name = name;
-        this.value = value;
-        this.writeable = writeable;
-        this.origin = origin;
-    }
-
-    /**
-     * Constructs a {@code VMOption} object from a
-     * {@link CompositeData CompositeData}.
-     */
-    private VMOption(CompositeData cd) {
-        // validate the input composite data
-        VMOptionCompositeData.validateCompositeData(cd);
-
-        this.name = VMOptionCompositeData.getName(cd);
-        this.value = VMOptionCompositeData.getValue(cd);
-        this.writeable = VMOptionCompositeData.isWriteable(cd);
-        this.origin = VMOptionCompositeData.getOrigin(cd);
-    }
-
-    /**
-     * Returns the name of this VM option.
-     *
-     * @return the name of this VM option.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the value of this VM option at the time when
-     * this {@code VMOption} was created. The value could have been changed.
-     *
-     * @return the value of the VM option at the time when
-     *         this {@code VMOption} was created.
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Returns the origin of the value of this VM option. That is,
-     * where the value of this VM option came from.
-     *
-     * @return where the value of this VM option came from.
-     */
-    public Origin getOrigin() {
-        return origin;
-    }
-
-    /**
-     * Tests if this VM option is writeable.  If this VM option is writeable,
-     * it can be set by the {@link HotSpotDiagnosticMXBean#setVMOption
-     * HotSpotDiagnosticMXBean.setVMOption} method.
-     *
-     * @return {@code true} if this VM option is writeable; {@code false}
-     * otherwise.
-     */
-    public boolean isWriteable() {
-        return writeable;
-    }
-
-    public String toString() {
-        return "VM option: " + getName() +
-               " value: " + value + " " +
-               " origin: " + origin + " " +
-               (writeable ? "(read-write)" : "(read-only)");
-    }
-
-    /**
-     * Returns a {@code VMOption} object represented by the
-     * given {@code CompositeData}. The given {@code CompositeData}
-     * must contain the following attributes:
-     *
-     * <blockquote>
-     * <table border>
-     * <tr>
-     *   <th align=left>Attribute Name</th>
-     *   <th align=left>Type</th>
-     * </tr>
-     * <tr>
-     *   <td>name</td>
-     *   <td>{@code java.lang.String}</td>
-     * </tr>
-     * <tr>
-     *   <td>value</td>
-     *   <td>{@code java.lang.String}</td>
-     * </tr>
-     * <tr>
-     *   <td>origin</td>
-     *   <td>{@code java.lang.String}</td>
-     * </tr>
-     * <tr>
-     *   <td>writeable</td>
-     *   <td>{@code java.lang.Boolean}</td>
-     * </tr>
-     * </table>
-     * </blockquote>
-     *
-     * @param cd {@code CompositeData} representing a {@code VMOption}
-     *
-     * @throws IllegalArgumentException if {@code cd} does not
-     *   represent a {@code VMOption} with the attributes described
-     *   above.
-     *
-     * @return a {@code VMOption} object represented by {@code cd}
-     *         if {@code cd} is not {@code null};
-     *         {@code null} otherwise.
-     */
-    public static VMOption from(CompositeData cd) {
-        if (cd == null) {
-            return null;
-        }
-
-        if (cd instanceof VMOptionCompositeData) {
-            return ((VMOptionCompositeData) cd).getVMOption();
-        } else {
-            return new VMOption(cd);
-        }
-
-    }
-
-
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-package com.sun.management.internal;
-
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javax.management.DynamicMBean;
-import javax.management.ObjectName;
-import sun.management.ManagementFactoryHelper;
-import sun.management.spi.PlatformMBeanProvider;
-
-public final class PlatformMBeanProviderImpl extends PlatformMBeanProvider {
-    private final List<PlatformComponent<?>> mxbeanList;
-
-    public PlatformMBeanProviderImpl() {
-        mxbeanList = Collections.unmodifiableList(init());
-    }
-
-    @Override
-    public List<PlatformComponent<?>> getPlatformComponentList() {
-        return mxbeanList;
-    }
-
-    private List<PlatformComponent<?>> init() {
-        ArrayList<PlatformComponent<?>> initMBeanList = new ArrayList<>();
-        /**
-         * Garbage Collector in the Java virtual machine.
-         */
-        initMBeanList.add(new PlatformComponent<java.lang.management.MemoryManagerMXBean>() {
-            private final Set<String> garbageCollectorMXBeanInterfaceNames
-                    = Collections.unmodifiableSet(
-                            Stream.of("java.lang.management.MemoryManagerMXBean",
-                                    "java.lang.management.GarbageCollectorMXBean",
-                                    "com.sun.management.GarbageCollectorMXBean")
-                            .collect(Collectors.toSet()));
-
-            @Override
-            public Set<Class<? extends java.lang.management.MemoryManagerMXBean>> mbeanInterfaces() {
-                return Stream.of(java.lang.management.MemoryManagerMXBean.class,
-                        java.lang.management.GarbageCollectorMXBean.class,
-                        com.sun.management.GarbageCollectorMXBean.class)
-                        .collect(Collectors.toSet());
-            }
-
-            @Override
-            public Set<String> mbeanInterfaceNames() {
-                return garbageCollectorMXBeanInterfaceNames;
-            }
-
-            @Override
-            public String getObjectNamePattern() {
-                return ManagementFactory.GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",name=*";
-            }
-
-            @Override
-            public boolean isSingleton() {
-                return false; // zero or more instances
-            }
-
-            @Override
-            public Map<String, java.lang.management.MemoryManagerMXBean> nameToMBeanMap() {
-                List<java.lang.management.GarbageCollectorMXBean> list
-                        = ManagementFactoryHelper.getGarbageCollectorMXBeans();;
-                Map<String, java.lang.management.MemoryManagerMXBean> map;
-                if (list.isEmpty()) {
-                    map = Collections.<String, java.lang.management.MemoryManagerMXBean>emptyMap();
-                } else {
-                    map = new HashMap<>(list.size());
-                    for (java.lang.management.MemoryManagerMXBean gcm : list) {
-                        map.put(gcm.getObjectName().getCanonicalName(),
-                                gcm);
-                    }
-                }
-                return map;
-            }
-        });
-
-        /**
-         * OperatingSystemMXBean
-         */
-        initMBeanList.add(new PlatformComponent<java.lang.management.OperatingSystemMXBean>() {
-            private final Set<String> operatingSystemMXBeanInterfaceNames
-                    = Collections.unmodifiableSet(
-                            Stream.of("java.lang.management.OperatingSystemMXBean",
-                                    "com.sun.management.OperatingSystemMXBean",
-                                    "com.sun.management.UnixOperatingSystemMXBean")
-                            .collect(Collectors.toSet()));
-
-            @Override
-            public Set<Class<? extends java.lang.management.OperatingSystemMXBean>> mbeanInterfaces() {
-                return Stream.of(java.lang.management.OperatingSystemMXBean.class,
-                        com.sun.management.OperatingSystemMXBean.class,
-                        com.sun.management.UnixOperatingSystemMXBean.class)
-                        .collect(Collectors.toSet());
-            }
-
-            @Override
-            public Set<String> mbeanInterfaceNames() {
-                return operatingSystemMXBeanInterfaceNames;
-            }
-
-            @Override
-            public String getObjectNamePattern() {
-                return ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME;
-            }
-
-            @Override
-            public Map<String, java.lang.management.OperatingSystemMXBean> nameToMBeanMap() {
-                return Collections.<String, java.lang.management.OperatingSystemMXBean>singletonMap(
-                        ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME,
-                        ManagementFactoryHelper.getOperatingSystemMXBean());
-            }
-        });
-
-        /**
-         * Diagnostic support for the HotSpot Virtual Machine.
-         */
-        initMBeanList.add(new PlatformComponent<com.sun.management.HotSpotDiagnosticMXBean>() {
-            private final Set<String> hotSpotDiagnosticMXBeanInterfaceNames =
-                    Collections.unmodifiableSet(Collections.<String>singleton("com.sun.management.HotSpotDiagnosticMXBean"));
-
-            @Override
-            public Set<Class<? extends com.sun.management.HotSpotDiagnosticMXBean>> mbeanInterfaces() {
-                return Collections.singleton(com.sun.management.HotSpotDiagnosticMXBean.class);
-            }
-
-            @Override
-            public Set<String> mbeanInterfaceNames() {
-                return hotSpotDiagnosticMXBeanInterfaceNames;
-            }
-
-            @Override
-            public String getObjectNamePattern() {
-                return "com.sun.management:type=HotSpotDiagnostic";
-            }
-
-            @Override
-            public Map<String, com.sun.management.HotSpotDiagnosticMXBean> nameToMBeanMap() {
-                return Collections.<String, com.sun.management.HotSpotDiagnosticMXBean>singletonMap(
-                        "com.sun.management:type=HotSpotDiagnostic",
-                        ManagementFactoryHelper.getDiagnosticMXBean());
-            }
-        });
-
-        /**
-         * DynamicMBean
-         */
-        HashMap<ObjectName, DynamicMBean> dynmbeans
-                = ManagementFactoryHelper.getPlatformDynamicMBeans();
-        final Set<String> dynamicMBeanInterfaceNames =
-            Collections.unmodifiableSet(Collections.<String>singleton("javax.management.DynamicMBean"));
-        for (Map.Entry<ObjectName, DynamicMBean> e : dynmbeans.entrySet()) {
-            initMBeanList.add(new PlatformComponent<DynamicMBean>() {
-                @Override
-                public Set<String> mbeanInterfaceNames() {
-                    return dynamicMBeanInterfaceNames;
-                }
-
-                @Override
-                public Set<Class<? extends DynamicMBean>> mbeanInterfaces() {
-                    return Collections.emptySet(); // DynamicMBean cannot be used to find an MBean by ManagementFactory
-                }
-
-                @Override
-                public String getObjectNamePattern() {
-                    return e.getKey().getCanonicalName();
-                }
-
-                @Override
-                public Map<String, DynamicMBean> nameToMBeanMap() {
-                    return Collections.<String, DynamicMBean>singletonMap(
-                            e.getKey().getCanonicalName(),
-                            e.getValue());
-                }
-            });
-        }
-        initMBeanList.trimToSize();
-        return initMBeanList;
-    }
-}
--- a/jdk/src/java.management/share/classes/com/sun/management/package-info.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2004, 2013, 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.
- */
-
-/**
- * This package contains Oracle Corporation's platform extension to
- * the implementation of the
- * <a href="{@docRoot}/../../../../api/java/lang/management/package-summary.html">
- * java.lang.management</a> API and also defines the management
- * interface for some other components for the platform.
- *
- * <p>
- * All platform MBeans are registered in the <em>platform MBeanServer</em>
- * which can be obtained via the
- * <a href="{@docRoot}/../../../../api/java/lang/management/ManagementFactory.html#getPlatformMBeanServer()">
- * java.lang.management.ManagementFactory.getPlatformMBeanServer</a>
- *
- * @author  Mandy Chung
- * @since   1.5
- */
-
-@jdk.Exported
-package com.sun.management;
--- a/jdk/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java	Thu May 07 20:50:07 2015 -0700
@@ -33,7 +33,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.management.DynamicMBean;
 import javax.management.ObjectName;
 import sun.management.ManagementFactoryHelper;
 import sun.management.spi.PlatformMBeanProvider;
@@ -162,8 +161,7 @@
             @Override
             public Set<Class<? extends MemoryManagerMXBean>> mbeanInterfaces() {
                 return Stream.of(MemoryManagerMXBean.class,
-                        GarbageCollectorMXBean.class,
-                        com.sun.management.GarbageCollectorMXBean.class).collect(Collectors.toSet());
+                        GarbageCollectorMXBean.class).collect(Collectors.toSet());
             }
 
             @Override
@@ -464,39 +462,6 @@
 
         });
 
-        /**
-         * DynamicMBean
-         */
-        HashMap<ObjectName, DynamicMBean> dynmbeans
-                = ManagementFactoryHelper.getPlatformDynamicMBeans();
-        final Set<String> dynamicMBeanInterfaceNames =
-            Collections.unmodifiableSet(Collections.singleton("javax.management.DynamicMBean"));
-        for (Map.Entry<ObjectName, DynamicMBean> e : dynmbeans.entrySet()) {
-            initMBeanList.add(new PlatformComponent<DynamicMBean>() {
-                @Override
-                public Set<Class<? extends DynamicMBean>> mbeanInterfaces() {
-                    return Collections.emptySet();
-                }
-
-                @Override
-                public Set<String> mbeanInterfaceNames() {
-                    return dynamicMBeanInterfaceNames;
-                }
-
-                @Override
-                public String getObjectNamePattern() {
-                    return e.getKey().getCanonicalName();
-                }
-
-                @Override
-                public Map<String, DynamicMBean> nameToMBeanMap() {
-                    return Collections.<String, DynamicMBean>singletonMap(
-                            e.getKey().getCanonicalName(),
-                            e.getValue());
-                }
-            });
-        }
-
         initMBeanList.trimToSize();
         return initMBeanList;
     }
--- a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java	Thu May 07 20:50:07 2015 -0700
@@ -582,7 +582,7 @@
         final Class<?> cls = mxbeanInterface;
         ClassLoader loader =
             AccessController.doPrivileged(
-                    (PrivilegedAction<ClassLoader>) () -> cls.getClassLoader());
+                (PrivilegedAction<ClassLoader>) () -> cls.getClassLoader());
         if (!sun.misc.VM.isSystemDomainLoader(loader)) {
             throw new IllegalArgumentException(mxbeanName +
                 " is not a platform MXBean");
@@ -883,7 +883,7 @@
                      all.add(new DefaultPlatformMBeanProvider());
                      return all;
                 }, null, new FilePermission("<<ALL FILES>>", "read"),
-                         new RuntimePermission("sun.management.spi.PlatformMBeanProvider"));
+                         new RuntimePermission("sun.management.spi.PlatformMBeanProvider.subclass"));
 
             // load all platform components into a map
             componentMap = providers.stream()
@@ -970,4 +970,11 @@
             return singleton;
         }
     }
+
+    static {
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            System.loadLibrary("management");
+            return null;
+        });
+    }
 }
--- a/jdk/src/java.management/share/classes/sun/management/Agent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/Agent.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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,6 +34,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
+import java.net.MalformedURLException;
 import java.net.UnknownHostException;
 import java.text.MessageFormat;
 import java.util.MissingResourceException;
@@ -55,6 +56,125 @@
  * system class loader. Also jmx framework could be started by jcmd
  */
 public class Agent {
+    /**
+     * Agent status collector strategy class
+     */
+    private static abstract class StatusCollector {
+        final protected StringBuilder sb = new StringBuilder();
+        final public String collect() {
+            Properties agentProps = VMSupport.getAgentProperties();
+            String localConnAddr = (String)agentProps.get(LOCAL_CONNECTOR_ADDRESS_PROP);
+            if (localConnAddr != null || jmxServer != null) {
+                addAgentStatus(true);
+                appendConnections(localConnAddr);
+            } else {
+                addAgentStatus(false);
+            }
+            return sb.toString();
+        }
+
+        private void appendConnections(String localConnAddr) {
+            appendConnectionsHeader();
+            if (localConnAddr != null) {
+                try {
+                    JMXServiceURL u = new JMXServiceURL(localConnAddr);
+                    addConnection(false, u);
+                } catch (MalformedURLException e) {
+                    // will never happen
+                }
+
+            }
+            if (jmxServer != null) {
+                addConnection(true, jmxServer.getAddress());
+            }
+            appendConnectionsFooter();
+        }
+
+        private void addConnection(boolean remote, JMXServiceURL u) {
+            appendConnectionHeader(remote);
+            addConnectionDetails(u);
+            if (remote) {
+                addConfigProperties();
+            }
+            appendConnectionFooter(remote);
+        }
+
+        private void addConfigProperties() {
+            appendConfigPropsHeader();
+            boolean[] first = new boolean[] {true};
+            configProps.entrySet().stream().forEach((e) -> {
+                String key = (String)e.getKey();
+                if (key.startsWith("com.sun.management.")) {
+                    addConfigProp(key, e.getValue(), first[0]);
+                    first[0] = false;
+                }
+            });
+            appendConfigPropsFooter();
+        }
+
+        abstract protected void addAgentStatus(boolean enabled);
+        abstract protected void appendConnectionsHeader();
+        abstract protected void appendConnectionsFooter();
+        abstract protected void addConnectionDetails(JMXServiceURL u);
+        abstract protected void appendConnectionHeader(boolean remote);
+        abstract protected void appendConnectionFooter(boolean remote);
+        abstract protected void appendConfigPropsHeader();
+        abstract protected void appendConfigPropsFooter();
+        abstract protected void addConfigProp(String key, Object value, boolean first);
+    }
+
+    /**
+     * Free-text status collector strategy implementation
+     */
+    final private static class TextStatusCollector extends StatusCollector {
+
+        @Override
+        protected void addAgentStatus(boolean enabled) {
+            sb.append("Agent: ").append(enabled ? "enabled" : "disabled").append('\n');
+        }
+
+        @Override
+        protected void appendConnectionsHeader() {
+            sb.append('\n');
+        }
+
+        @Override
+        protected void addConnectionDetails(JMXServiceURL u) {
+            sb.append("Protocol       : ").append(u.getProtocol()).append('\n')
+              .append("Host           : ").append(u.getHost()).append('\n')
+              .append("URL            : ").append(u).append('\n');
+        }
+
+        @Override
+        protected void appendConnectionHeader(boolean remote) {
+            sb.append("Connection Type: ").append(remote ? "remote" : "local").append('\n');
+        }
+
+        @Override
+        protected void appendConfigPropsHeader() {
+            sb.append("Properties     :\n");
+        }
+
+        @Override
+        protected void addConfigProp(String key, Object value, boolean first) {
+            if (!first) {
+                sb.append('\n');
+            }
+            sb.append("  ").append(key).append(" = ").append(value);
+        }
+
+        @Override
+        protected void appendConnectionsFooter() {}
+
+        @Override
+        protected void appendConnectionFooter(boolean remote) {
+            sb.append('\n');
+        }
+
+        @Override
+        protected void appendConfigPropsFooter() {}
+    }
+
     // management properties
 
     private static Properties mgmtProps;
@@ -81,6 +201,8 @@
 
     // The only active agent allowed
     private static JMXConnectorServer jmxServer = null;
+    // The properties used to configure the server
+    private static Properties configProps = null;
 
     // Parse string com.sun.management.prop=xxx,com.sun.management.prop=yyyy
     // and return property set if args is null or empty
@@ -161,7 +283,7 @@
 
         try {
             Properties argProps = parseString(args);
-            Properties configProps = new Properties();
+            configProps = new Properties();
 
             // Load the management properties from the config file
             // if config file is not specified readConfiguration implicitly
@@ -228,9 +350,14 @@
             // Don't cause any errors.
             jmxServer.stop();
             jmxServer = null;
+            configProps = null;
         }
     }
 
+    private static synchronized String getManagementAgentStatus() throws Exception {
+        return new TextStatusCollector().collect();
+    }
+
     private static void startAgent(Properties props) throws Exception {
         String snmpPort = props.getProperty(SNMP_PORT);
         String jmxremote = props.getProperty(JMXREMOTE);
--- a/jdk/src/java.management/share/classes/sun/management/DiagnosticCommandArgumentInfo.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package sun.management;
-
-/**
- * Diagnostic Command Argument information. It contains the description
- * of one parameter of the diagnostic command. A parameter can either be an
- * option or an argument. Options are identified by the option name while
- * arguments are identified by their position in the command line. The generic
- * syntax of a diagnostic command is:
- *  <blockquote>
- *    &lt;command name&gt; [&lt;option&gt;=&lt;value&gt;] [&lt;argument_value&gt;]
- * </blockquote>
- * Example:
- * <blockquote>
- * command_name option1=value1 option2=value argumentA argumentB argumentC
- * </blockquote>
- * In this command line, the diagnostic command receives five parameters, two
- * options named {@code option1} and {@code option2}, and three arguments.
- * argumentA's position is 0, argumentB's position is 1 and argumentC's
- * position is 2.
- *
- * @since 1.8
- */
-
-class DiagnosticCommandArgumentInfo {
-    private final String name;
-    private final String description;
-    private final String type;
-    private final String defaultValue;
-    private final boolean mandatory;
-    private final boolean option;
-    private final boolean multiple;
-    private final int position;
-
-    /**
-     * Returns the argument name.
-     *
-     * @return the argument name
-     */
-    String getName() {
-        return name;
-    }
-
-   /**
-     * Returns the argument description.
-     *
-     * @return the argument description
-     */
-    String getDescription() {
-        return description;
-    }
-
-    /**
-     * Returns the argument type.
-     *
-     * @return the argument type
-     */
-    String getType() {
-        return type;
-    }
-
-    /**
-     * Returns the default value as a String if a default value
-     * is defined, null otherwise.
-     *
-     * @return the default value as a String if a default value
-     * is defined, null otherwise.
-     */
-    String getDefault() {
-        return defaultValue;
-    }
-
-    /**
-     * Returns {@code true} if the argument is mandatory,
-     *         {@code false} otherwise.
-     *
-     * @return {@code true} if the argument is mandatory,
-     *         {@code false} otherwise
-     */
-    boolean isMandatory() {
-        return mandatory;
-    }
-
-    /**
-     * Returns {@code true} if the argument is an option,
-     *         {@code false} otherwise. Options have to be specified using the
-     *         &lt;key&gt;=&lt;value&gt; syntax on the command line, while other
-     *         arguments are specified with a single &lt;value&gt; field and are
-     *         identified by their position on command line.
-     *
-     * @return {@code true} if the argument is an option,
-     *         {@code false} otherwise
-     */
-    boolean isOption() {
-        return option;
-    }
-
-    /**
-     * Returns {@code true} if the argument can be specified multiple times,
-     *         {@code false} otherwise.
-     *
-     * @return {@code true} if the argument can be specified multiple times,
-     *         {@code false} otherwise
-     */
-    boolean isMultiple() {
-        return multiple;
-    }
-
-    /**
-     * Returns the expected position of this argument if it is not an option,
-     *         -1 otherwise. Argument position if defined from left to right,
-     *         starting at zero and ignoring the diagnostic command name and
-     *         options.
-     *
-     * @return the expected position of this argument if it is not an option,
-     *         -1 otherwise.
-     */
-    int getPosition() {
-        return position;
-    }
-
-    DiagnosticCommandArgumentInfo(String name, String description,
-                                         String type, String defaultValue,
-                                         boolean mandatory, boolean option,
-                                         boolean multiple, int position) {
-        this.name = name;
-        this.description = description;
-        this.type = type;
-        this.defaultValue = defaultValue;
-        this.mandatory = mandatory;
-        this.option = option;
-        this.multiple = multiple;
-        this.position = position;
-    }
-}
--- a/jdk/src/java.management/share/classes/sun/management/DiagnosticCommandImpl.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,380 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, 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.
- */
-
-package sun.management;
-
-import com.sun.management.DiagnosticCommandMBean;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.security.Permission;
-import java.util.*;
-import javax.management.*;
-
-/**
- * Implementation class for the diagnostic commands subsystem.
- *
- * @since 1.8
- */
-class DiagnosticCommandImpl extends NotificationEmitterSupport
-    implements DiagnosticCommandMBean {
-
-    private final VMManagement jvm;
-    private volatile Map<String, Wrapper> wrappers = null;
-    private static final String strClassName = "".getClass().getName();
-    private static final String strArrayClassName = String[].class.getName();
-    private final boolean isSupported;
-
-    @Override
-    public Object getAttribute(String attribute) throws AttributeNotFoundException,
-        MBeanException, ReflectionException {
-        throw new AttributeNotFoundException(attribute);
-    }
-
-    @Override
-    public void setAttribute(Attribute attribute) throws AttributeNotFoundException,
-        InvalidAttributeValueException, MBeanException, ReflectionException {
-        throw new AttributeNotFoundException(attribute.getName());
-    }
-
-    @Override
-    public AttributeList getAttributes(String[] attributes) {
-        return new AttributeList();
-    }
-
-    @Override
-    public AttributeList setAttributes(AttributeList attributes) {
-        return new AttributeList();
-    }
-
-    private class Wrapper {
-
-        String name;
-        String cmd;
-        DiagnosticCommandInfo info;
-        Permission permission;
-
-        Wrapper(String name, String cmd, DiagnosticCommandInfo info)
-                throws InstantiationException {
-            this.name = name;
-            this.cmd = cmd;
-            this.info = info;
-            this.permission = null;
-            Exception cause = null;
-            if (info.getPermissionClass() != null) {
-                try {
-                    Class<?> c = Class.forName(info.getPermissionClass());
-                    if (info.getPermissionAction() == null) {
-                        try {
-                            Constructor<?> constructor = c.getConstructor(String.class);
-                            permission = (Permission) constructor.newInstance(info.getPermissionName());
-
-                        } catch (InstantiationException | IllegalAccessException
-                                | IllegalArgumentException | InvocationTargetException
-                                | NoSuchMethodException | SecurityException ex) {
-                            cause = ex;
-                        }
-                    }
-                    if (permission == null) {
-                        try {
-                            Constructor<?> constructor = c.getConstructor(String.class, String.class);
-                            permission = (Permission) constructor.newInstance(
-                                    info.getPermissionName(),
-                                    info.getPermissionAction());
-                        } catch (InstantiationException | IllegalAccessException
-                                | IllegalArgumentException | InvocationTargetException
-                                | NoSuchMethodException | SecurityException ex) {
-                            cause = ex;
-                        }
-                    }
-                } catch (ClassNotFoundException ex) { }
-                if (permission == null) {
-                    InstantiationException iex =
-                            new InstantiationException("Unable to instantiate required permission");
-                    iex.initCause(cause);
-                }
-            }
-        }
-
-        public String execute(String[] args) {
-            if (permission != null) {
-                SecurityManager sm = System.getSecurityManager();
-                if (sm != null) {
-                    sm.checkPermission(permission);
-                }
-            }
-            if(args == null) {
-                return executeDiagnosticCommand(cmd);
-            } else {
-                StringBuilder sb = new StringBuilder();
-                sb.append(cmd);
-                for(int i=0; i<args.length; i++) {
-                    if(args[i] == null) {
-                        throw new IllegalArgumentException("Invalid null argument");
-                    }
-                    sb.append(" ");
-                    sb.append(args[i]);
-                }
-                return executeDiagnosticCommand(sb.toString());
-            }
-        }
-    }
-
-    DiagnosticCommandImpl(VMManagement jvm) {
-        this.jvm = jvm;
-        isSupported = jvm.isRemoteDiagnosticCommandsSupported();
-    }
-
-    private static class OperationInfoComparator implements Comparator<MBeanOperationInfo> {
-        @Override
-        public int compare(MBeanOperationInfo o1, MBeanOperationInfo o2) {
-            return o1.getName().compareTo(o2.getName());
-        }
-    }
-
-    @Override
-    public MBeanInfo getMBeanInfo() {
-        SortedSet<MBeanOperationInfo> operations = new TreeSet<>(new OperationInfoComparator());
-        Map<String, Wrapper> wrappersmap;
-        if (!isSupported) {
-            wrappersmap = Collections.emptyMap();
-        } else {
-            try {
-                String[] command = getDiagnosticCommands();
-                DiagnosticCommandInfo[] info = getDiagnosticCommandInfo(command);
-                MBeanParameterInfo stringArgInfo[] = new MBeanParameterInfo[]{
-                    new MBeanParameterInfo("arguments", strArrayClassName,
-                    "Array of Diagnostic Commands Arguments and Options")
-                };
-                wrappersmap = new HashMap<>();
-                for (int i = 0; i < command.length; i++) {
-                    String name = transform(command[i]);
-                    try {
-                        Wrapper w = new Wrapper(name, command[i], info[i]);
-                        wrappersmap.put(name, w);
-                        operations.add(new MBeanOperationInfo(
-                                w.name,
-                                w.info.getDescription(),
-                                (w.info.getArgumentsInfo() == null
-                                    || w.info.getArgumentsInfo().isEmpty())
-                                    ? null : stringArgInfo,
-                                strClassName,
-                                MBeanOperationInfo.ACTION_INFO,
-                                commandDescriptor(w)));
-                    } catch (InstantiationException ex) {
-                        // If for some reasons the creation of a diagnostic command
-                        // wrappers fails, the diagnostic command is just ignored
-                        // and won't appear in the DynamicMBean
-                    }
-                }
-            } catch (IllegalArgumentException | UnsupportedOperationException e) {
-                wrappersmap = Collections.emptyMap();
-            }
-        }
-        wrappers =  Collections.unmodifiableMap(wrappersmap);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("immutableInfo", "false");
-        map.put("interfaceClassName","com.sun.management.DiagnosticCommandMBean");
-        map.put("mxbean", "false");
-        Descriptor desc = new ImmutableDescriptor(map);
-        return new MBeanInfo(
-                this.getClass().getName(),
-                "Diagnostic Commands",
-                null, // attributes
-                null, // constructors
-                operations.toArray(new MBeanOperationInfo[operations.size()]), // operations
-                getNotificationInfo(), // notifications
-                desc);
-    }
-
-    @Override
-    public Object invoke(String actionName, Object[] params, String[] signature)
-            throws MBeanException, ReflectionException {
-        if (!isSupported) {
-            throw new UnsupportedOperationException();
-        }
-        if (wrappers == null) {
-            getMBeanInfo();
-        }
-        Wrapper w = wrappers.get(actionName);
-        if (w != null) {
-            if (w.info.getArgumentsInfo().isEmpty()
-                    && (params == null || params.length == 0)
-                    && (signature == null || signature.length == 0)) {
-                return w.execute(null);
-            } else if((params != null && params.length == 1)
-                    && (signature != null && signature.length == 1
-                    && signature[0] != null
-                    && signature[0].compareTo(strArrayClassName) == 0)) {
-                return w.execute((String[]) params[0]);
-            }
-        }
-        throw new ReflectionException(new NoSuchMethodException(actionName));
-    }
-
-    private static String transform(String name) {
-        StringBuilder sb = new StringBuilder();
-        boolean toLower = true;
-        boolean toUpper = false;
-        for (int i = 0; i < name.length(); i++) {
-            char c = name.charAt(i);
-            if (c == '.' || c == '_') {
-                toLower = false;
-                toUpper = true;
-            } else {
-                if (toUpper) {
-                    toUpper = false;
-                    sb.append(Character.toUpperCase(c));
-                } else if(toLower) {
-                    sb.append(Character.toLowerCase(c));
-                } else {
-                    sb.append(c);
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    private Descriptor commandDescriptor(Wrapper w) throws IllegalArgumentException {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("dcmd.name", w.info.getName());
-        map.put("dcmd.description", w.info.getDescription());
-        map.put("dcmd.vmImpact", w.info.getImpact());
-        map.put("dcmd.permissionClass", w.info.getPermissionClass());
-        map.put("dcmd.permissionName", w.info.getPermissionName());
-        map.put("dcmd.permissionAction", w.info.getPermissionAction());
-        map.put("dcmd.enabled", w.info.isEnabled());
-        StringBuilder sb = new StringBuilder();
-        sb.append("help ");
-        sb.append(w.info.getName());
-        map.put("dcmd.help", executeDiagnosticCommand(sb.toString()));
-        if (w.info.getArgumentsInfo() != null && !w.info.getArgumentsInfo().isEmpty()) {
-            HashMap<String, Object> allargmap = new HashMap<>();
-            for (DiagnosticCommandArgumentInfo arginfo : w.info.getArgumentsInfo()) {
-                HashMap<String, Object> argmap = new HashMap<>();
-                argmap.put("dcmd.arg.name", arginfo.getName());
-                argmap.put("dcmd.arg.type", arginfo.getType());
-                argmap.put("dcmd.arg.description", arginfo.getDescription());
-                argmap.put("dcmd.arg.isMandatory", arginfo.isMandatory());
-                argmap.put("dcmd.arg.isMultiple", arginfo.isMultiple());
-                boolean isOption = arginfo.isOption();
-                argmap.put("dcmd.arg.isOption", isOption);
-                if(!isOption) {
-                    argmap.put("dcmd.arg.position", arginfo.getPosition());
-                } else {
-                    argmap.put("dcmd.arg.position", -1);
-                }
-                allargmap.put(arginfo.getName(), new ImmutableDescriptor(argmap));
-            }
-            map.put("dcmd.arguments", new ImmutableDescriptor(allargmap));
-        }
-        return new ImmutableDescriptor(map);
-    }
-
-    private final static String notifName =
-        "javax.management.Notification";
-
-    private final static String[] diagFramNotifTypes = {
-        "jmx.mbean.info.changed"
-    };
-
-    private MBeanNotificationInfo[] notifInfo = null;
-
-    @Override
-    public MBeanNotificationInfo[] getNotificationInfo() {
-        synchronized (this) {
-            if (notifInfo == null) {
-                 notifInfo = new MBeanNotificationInfo[1];
-                 notifInfo[0] =
-                         new MBeanNotificationInfo(diagFramNotifTypes,
-                                                   notifName,
-                                                   "Diagnostic Framework Notification");
-            }
-        }
-        return notifInfo;
-    }
-
-    private static long seqNumber = 0;
-    private static long getNextSeqNumber() {
-        return ++seqNumber;
-    }
-
-    private void createDiagnosticFrameworkNotification() {
-
-        if (!hasListeners()) {
-            return;
-        }
-        ObjectName on = null;
-        try {
-            on = ObjectName.getInstance(ManagementFactoryHelper.HOTSPOT_DIAGNOSTIC_COMMAND_MBEAN_NAME);
-        } catch (MalformedObjectNameException e) { }
-        Notification notif = new Notification("jmx.mbean.info.changed",
-                                              on,
-                                              getNextSeqNumber());
-        notif.setUserData(getMBeanInfo());
-        sendNotification(notif);
-    }
-
-    @Override
-    public synchronized void addNotificationListener(NotificationListener listener,
-            NotificationFilter filter,
-            Object handback) {
-        boolean before = hasListeners();
-        super.addNotificationListener(listener, filter, handback);
-        boolean after = hasListeners();
-        if (!before && after) {
-            setNotificationEnabled(true);
-        }
-    }
-
-    @Override
-    public synchronized void removeNotificationListener(NotificationListener listener)
-            throws ListenerNotFoundException {
-        boolean before = hasListeners();
-        super.removeNotificationListener(listener);
-        boolean after = hasListeners();
-        if (before && !after) {
-            setNotificationEnabled(false);
-        }
-    }
-
-    @Override
-    public synchronized void removeNotificationListener(NotificationListener listener,
-            NotificationFilter filter,
-            Object handback)
-            throws ListenerNotFoundException {
-        boolean before = hasListeners();
-        super.removeNotificationListener(listener, filter, handback);
-        boolean after = hasListeners();
-        if (before && !after) {
-            setNotificationEnabled(false);
-        }
-    }
-
-    private native void setNotificationEnabled(boolean enabled);
-    private native String[] getDiagnosticCommands();
-    private native DiagnosticCommandInfo[] getDiagnosticCommandInfo(String[] commands);
-    private native String executeDiagnosticCommand(String command);
-
-}
--- a/jdk/src/java.management/share/classes/sun/management/DiagnosticCommandInfo.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package sun.management;
-
-import java.util.List;
-
-/**
- * Diagnostic command information. It contains the description of a
- * diagnostic command.
- *
- * @since 1.8
- */
-
-class DiagnosticCommandInfo {
-    private final String name;
-    private final String description;
-    private final String impact;
-    private final String permissionClass;
-    private final String permissionName;
-    private final String permissionAction;
-    private final boolean enabled;
-    private final List<DiagnosticCommandArgumentInfo> arguments;
-
-    /**
-     * Returns the diagnostic command name.
-     *
-     * @return the diagnostic command name
-     */
-    String getName() {
-        return name;
-    }
-
-   /**
-     * Returns the diagnostic command description.
-     *
-     * @return the diagnostic command description
-     */
-    String getDescription() {
-        return description;
-    }
-
-    /**
-     * Returns the potential impact of the diagnostic command execution
-     *         on the Java virtual machine behavior.
-     *
-     * @return the potential impact of the diagnostic command execution
-     *         on the Java virtual machine behavior
-     */
-    String getImpact() {
-        return impact;
-    }
-
-    /**
-     * Returns the name of the permission class required to be allowed
-     *         to invoke the diagnostic command, or null if no permission
-     *         is required.
-     *
-     * @return the name of the permission class name required to be allowed
-     *         to invoke the diagnostic command, or null if no permission
-     *         is required
-     */
-    String getPermissionClass() {
-        return permissionClass;
-    }
-
-    /**
-     * Returns the permission name required to be allowed to invoke the
-     *         diagnostic command, or null if no permission is required.
-     *
-     * @return the permission name required to be allowed to invoke the
-     *         diagnostic command, or null if no permission is required
-     */
-    String getPermissionName() {
-        return permissionName;
-    }
-
-    /**
-     * Returns the permission action required to be allowed to invoke the
-     *         diagnostic command, or null if no permission is required or
-     *         if the permission has no action specified.
-     *
-     * @return the permission action required to be allowed to invoke the
-     *         diagnostic command, or null if no permission is required or
-     *         if the permission has no action specified
-     */
-    String getPermissionAction() {
-        return permissionAction;
-    }
-
-    /**
-     * Returns {@code true} if the diagnostic command is enabled,
-     *         {@code false} otherwise. The enabled/disabled
-     *         status of a diagnostic command can evolve during
-     *         the lifetime of the Java virtual machine.
-     *
-     * @return {@code true} if the diagnostic command is enabled,
-     *         {@code false} otherwise
-     */
-    boolean isEnabled() {
-        return enabled;
-    }
-
-    /**
-     * Returns the list of the diagnostic command arguments description.
-     * If the diagnostic command has no arguments, it returns an empty list.
-     *
-     * @return a list of the diagnostic command arguments description
-     */
-    List<DiagnosticCommandArgumentInfo> getArgumentsInfo() {
-        return arguments;
-    }
-
-    DiagnosticCommandInfo(String name, String description,
-                                    String impact, String permissionClass,
-                                    String permissionName, String permissionAction,
-                                    boolean enabled,
-                                    List<DiagnosticCommandArgumentInfo> arguments)
-    {
-        this.name = name;
-        this.description = description;
-        this.impact = impact;
-        this.permissionClass = permissionClass;
-        this.permissionName = permissionName;
-        this.permissionAction = permissionAction;
-        this.enabled = enabled;
-        this.arguments = arguments;
-    }
-}
--- a/jdk/src/java.management/share/classes/sun/management/Flag.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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.
- */
-
-package sun.management;
-
-import java.util.*;
-import com.sun.management.VMOption;
-import com.sun.management.VMOption.Origin;
-import java.security.AccessController;
-
-/**
- * Flag class is a helper class for constructing a VMOption.
- * It has the static methods for getting the Flag objects, each
- * corresponds to one VMOption.
- *
- */
-class Flag {
-    private String name;
-    private Object value;
-    private Origin origin;
-    private boolean writeable;
-    private boolean external;
-
-    Flag(String name, Object value, boolean writeable,
-         boolean external, Origin origin) {
-        this.name = name;
-        this.value = value == null ? "" : value ;
-        this.origin = origin;
-        this.writeable = writeable;
-        this.external = external;
-    }
-
-    Object getValue() {
-        return value;
-    }
-
-    boolean isWriteable() {
-        return writeable;
-    }
-
-    boolean isExternal() {
-        return external;
-    }
-
-    VMOption getVMOption() {
-        return new VMOption(name, value.toString(), writeable, origin);
-    }
-
-    static Flag getFlag(String name) {
-        String[] names = new String[1];
-        names[0] = name;
-
-        List<Flag> flags = getFlags(names, 1);
-        if (flags.isEmpty()) {
-            return null;
-        } else {
-            // flags should have only one element
-            return flags.get(0);
-        }
-    }
-
-    static List<Flag> getAllFlags() {
-        int numFlags = getInternalFlagCount();
-
-        // Get all internal flags with names = null
-        return getFlags(null, numFlags);
-    }
-
-    private static List<Flag> getFlags(String[] names, int numFlags) {
-        Flag[] flags = new Flag[numFlags];
-        int count = getFlags(names, flags, numFlags);
-
-        List<Flag> result = new ArrayList<>();
-        for (Flag f : flags) {
-            if (f != null) {
-                result.add(f);
-            }
-        }
-        return result;
-    }
-
-    private static native String[] getAllFlagNames();
-    // getFlags sets each element in the given flags array
-    // with a Flag object only if the name is valid and the
-    // type is supported. The flags array may contain null elements.
-    private static native int getFlags(String[] names, Flag[] flags, int count);
-    private static native int getInternalFlagCount();
-
-    // These set* methods are synchronized on the class object
-    // to avoid multiple threads updating the same flag at the same time.
-    static synchronized native void setLongValue(String name, long value);
-    static synchronized native void setDoubleValue(String name, double value);
-    static synchronized native void setBooleanValue(String name, boolean value);
-    static synchronized native void setStringValue(String name, String value);
-
-    static {
-        AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
-                    System.loadLibrary("management");
-                    return null;
-                }
-            });
-        initialize();
-    }
-    private static native void initialize();
-}
--- a/jdk/src/java.management/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, 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.
- */
-
-package sun.management;
-
-import com.sun.management.GarbageCollectionNotificationInfo;
-import com.sun.management.GcInfo;
-import java.lang.reflect.Method;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.SimpleType;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-
-/**
- * A CompositeData for GarbageCollectionNotificationInfo for the local management support.
- * This class avoids the performance penalty paid to the
- * construction of a CompositeData use in the local case.
- */
-public class GarbageCollectionNotifInfoCompositeData extends LazyCompositeData {
-    private final GarbageCollectionNotificationInfo gcNotifInfo;
-
-    public GarbageCollectionNotifInfoCompositeData(GarbageCollectionNotificationInfo info) {
-        this.gcNotifInfo = info;
-    }
-
-    public GarbageCollectionNotificationInfo getGarbageCollectionNotifInfo() {
-        return gcNotifInfo;
-    }
-
-    public static CompositeData toCompositeData(GarbageCollectionNotificationInfo info) {
-        GarbageCollectionNotifInfoCompositeData gcnicd =
-            new GarbageCollectionNotifInfoCompositeData(info);
-        return gcnicd.getCompositeData();
-    }
-
-    private CompositeType getCompositeTypeByBuilder() {
-        final GcInfoBuilder builder = AccessController.doPrivileged (new PrivilegedAction<GcInfoBuilder>() {
-                public GcInfoBuilder run() {
-                    try {
-                        Class<?> cl = Class.forName("com.sun.management.GcInfo");
-                        Field f = cl.getDeclaredField("builder");
-                        f.setAccessible(true);
-                        return (GcInfoBuilder)f.get(gcNotifInfo.getGcInfo());
-                    } catch(ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
-                        return null;
-                    }
-                }
-            });
-        CompositeType gict = null;
-        synchronized(compositeTypeByBuilder) {
-            gict = compositeTypeByBuilder.get(builder);
-            if(gict == null) {
-                OpenType<?>[] gcNotifInfoItemTypes = new OpenType<?>[] {
-                    SimpleType.STRING,
-                    SimpleType.STRING,
-                    SimpleType.STRING,
-                    builder.getGcInfoCompositeType(),
-                };
-                try {
-                    final String typeName =
-                        "sun.management.GarbageCollectionNotifInfoCompositeType";
-                    gict = new CompositeType(typeName,
-                                             "CompositeType for GC notification info",
-                                             gcNotifInfoItemNames,
-                                             gcNotifInfoItemNames,
-                                             gcNotifInfoItemTypes);
-                    compositeTypeByBuilder.put(builder,gict);
-                } catch (OpenDataException e) {
-                    // shouldn't reach here
-                    throw Util.newException(e);
-                }
-            }
-        }
-        return gict;
-    }
-
-    protected CompositeData getCompositeData() {
-        // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH
-        // gcNotifInfoItemNames!
-        final Object[] gcNotifInfoItemValues;
-        gcNotifInfoItemValues = new Object[] {
-            gcNotifInfo.getGcName(),
-            gcNotifInfo.getGcAction(),
-            gcNotifInfo.getGcCause(),
-            GcInfoCompositeData.toCompositeData(gcNotifInfo.getGcInfo())
-        };
-
-        CompositeType gict = getCompositeTypeByBuilder();
-
-        try {
-            return new CompositeDataSupport(gict,
-                                            gcNotifInfoItemNames,
-                                            gcNotifInfoItemValues);
-        } catch (OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-    }
-
-    //    private static MappedMXBeanType gcInfoMapType;
-    private static final String GC_NAME = "gcName";
-    private static final String GC_ACTION = "gcAction";
-    private static final String GC_CAUSE = "gcCause";
-    private static final String GC_INFO     = "gcInfo";
-    private static final String[] gcNotifInfoItemNames = {
-        GC_NAME,
-        GC_ACTION,
-        GC_CAUSE,
-        GC_INFO
-    };
-    private static HashMap<GcInfoBuilder,CompositeType> compositeTypeByBuilder =
-        new HashMap<>();
-
-    public static String getGcName(CompositeData cd) {
-        String gcname = getString(cd, GC_NAME);
-        if (gcname == null) {
-            throw new IllegalArgumentException("Invalid composite data: " +
-                "Attribute " + GC_NAME + " has null value");
-        }
-        return gcname;
-    }
-
-    public static String getGcAction(CompositeData cd) {
-        String gcaction = getString(cd, GC_ACTION);
-        if (gcaction == null) {
-            throw new IllegalArgumentException("Invalid composite data: " +
-                "Attribute " + GC_ACTION + " has null value");
-        }
-        return gcaction;
-    }
-
-    public static String getGcCause(CompositeData cd) {
-        String gccause = getString(cd, GC_CAUSE);
-        if (gccause == null) {
-            throw new IllegalArgumentException("Invalid composite data: " +
-                "Attribute " + GC_CAUSE + " has null value");
-        }
-        return gccause;
-    }
-
-    public static GcInfo getGcInfo(CompositeData cd) {
-        CompositeData gcInfoData = (CompositeData) cd.get(GC_INFO);
-        return GcInfo.from(gcInfoData);
-    }
-
-    /** Validate if the input CompositeData has the expected
-     * CompositeType (i.e. contain all attributes with expected
-     * names and types).
-     */
-    public static void validateCompositeData(CompositeData cd) {
-        if (cd == null) {
-            throw new NullPointerException("Null CompositeData");
-        }
-
-        if (!isTypeMatched( getBaseGcNotifInfoCompositeType(), cd.getCompositeType())) {
-            throw new IllegalArgumentException(
-                "Unexpected composite type for GarbageCollectionNotificationInfo");
-        }
-    }
-
-    // This is only used for validation.
-    private static CompositeType baseGcNotifInfoCompositeType = null;
-    private static synchronized CompositeType getBaseGcNotifInfoCompositeType() {
-        if (baseGcNotifInfoCompositeType == null) {
-            try {
-                OpenType<?>[] baseGcNotifInfoItemTypes = new OpenType<?>[] {
-                    SimpleType.STRING,
-                    SimpleType.STRING,
-                    SimpleType.STRING,
-                    GcInfoCompositeData.getBaseGcInfoCompositeType()
-                };
-                baseGcNotifInfoCompositeType =
-                    new CompositeType("sun.management.BaseGarbageCollectionNotifInfoCompositeType",
-                                      "CompositeType for Base GarbageCollectionNotificationInfo",
-                                      gcNotifInfoItemNames,
-                                      gcNotifInfoItemNames,
-                                      baseGcNotifInfoItemTypes);
-            } catch (OpenDataException e) {
-                // shouldn't reach here
-                throw Util.newException(e);
-            }
-        }
-        return baseGcNotifInfoCompositeType;
-    }
-
-    private static final long serialVersionUID = -1805123446483771292L;
-}
--- a/jdk/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -25,168 +25,31 @@
 
 package sun.management;
 
-import com.sun.management.GarbageCollectorMXBean;
-import com.sun.management.GarbageCollectionNotificationInfo;
+import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryPoolMXBean;
-import java.lang.management.MemoryUsage;
-
-import com.sun.management.GcInfo;
-import javax.management.openmbean.CompositeData;
-import javax.management.MBeanInfo;
-import javax.management.MBeanAttributeInfo;
 import javax.management.ObjectName;
-import javax.management.MBeanNotificationInfo;
-import javax.management.Notification;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-import javax.management.ListenerNotFoundException;
-
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
 
 /**
  * Implementation class for the garbage collector.
- * Standard and committed hotspot-specific metrics if any.
  *
  * ManagementFactory.getGarbageCollectorMXBeans() returns a list
  * of instances of this class.
  */
-class GarbageCollectorImpl extends MemoryManagerImpl
+public class GarbageCollectorImpl extends MemoryManagerImpl
     implements GarbageCollectorMXBean {
 
-    GarbageCollectorImpl(String name) {
+    protected GarbageCollectorImpl(String name) {
         super(name);
     }
 
+    @Override
     public native long getCollectionCount();
+
+    @Override
     public native long getCollectionTime();
 
-
-    // The memory pools are static and won't be changed.
-    // TODO: If the hotspot implementation begins to have pools
-    // dynamically created and removed, this needs to be modified.
-    private String[] poolNames = null;
-    synchronized String[] getAllPoolNames() {
-        if (poolNames == null) {
-            List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
-            poolNames = new String[pools.size()];
-            int i = 0;
-            for (MemoryPoolMXBean m : pools) {
-                poolNames[i++] = m.getName();
-            }
-        }
-        return poolNames;
-    }
-
-    // Sun JDK extension
-    private GcInfoBuilder gcInfoBuilder;
-
-    private synchronized GcInfoBuilder getGcInfoBuilder() {
-        if(gcInfoBuilder == null) {
-            gcInfoBuilder = new GcInfoBuilder(this, getAllPoolNames());
-        }
-        return gcInfoBuilder;
-    }
-
-    public GcInfo getLastGcInfo() {
-        GcInfo info = getGcInfoBuilder().getLastGcInfo();
-        return info;
-    }
-
-    private final static String notifName =
-        "javax.management.Notification";
-
-    private final static String[] gcNotifTypes = {
-        GarbageCollectionNotificationInfo.GARBAGE_COLLECTION_NOTIFICATION
-    };
-
-    private MBeanNotificationInfo[] notifInfo = null;
-    public MBeanNotificationInfo[] getNotificationInfo() {
-        synchronized (this) {
-            if (notifInfo == null) {
-                 notifInfo = new MBeanNotificationInfo[1];
-                 notifInfo[0] = new MBeanNotificationInfo(gcNotifTypes,
-                                                          notifName,
-                                                          "GC Notification");
-            }
-        }
-        return notifInfo;
-    }
-
-    private static long seqNumber = 0;
-    private static long getNextSeqNumber() {
-        return ++seqNumber;
-    }
-
-    void createGCNotification(long timestamp,
-                              String gcName,
-                              String gcAction,
-                              String gcCause,
-                              GcInfo gcInfo)  {
-
-        if (!hasListeners()) {
-            return;
-        }
-
-        Notification notif = new Notification(GarbageCollectionNotificationInfo.GARBAGE_COLLECTION_NOTIFICATION,
-                                              getObjectName(),
-                                              getNextSeqNumber(),
-                                              timestamp,
-                                              gcName);
-        GarbageCollectionNotificationInfo info =
-            new GarbageCollectionNotificationInfo(gcName,
-                                                  gcAction,
-                                                  gcCause,
-                                                  gcInfo);
-
-        CompositeData cd =
-            GarbageCollectionNotifInfoCompositeData.toCompositeData(info);
-        notif.setUserData(cd);
-        sendNotification(notif);
-    }
-
-    public synchronized void addNotificationListener(NotificationListener listener,
-                                                     NotificationFilter filter,
-                                                     Object handback)
-    {
-        boolean before = hasListeners();
-        super.addNotificationListener(listener, filter, handback);
-        boolean after = hasListeners();
-        if (!before && after) {
-            setNotificationEnabled(this, true);
-        }
-    }
-
-    public synchronized void removeNotificationListener(NotificationListener listener)
-        throws ListenerNotFoundException {
-        boolean before = hasListeners();
-        super.removeNotificationListener(listener);
-        boolean after = hasListeners();
-        if (before && !after) {
-            setNotificationEnabled(this,false);
-        }
-    }
-
-    public synchronized void removeNotificationListener(NotificationListener listener,
-                                                        NotificationFilter filter,
-                                                        Object handback)
-            throws ListenerNotFoundException
-    {
-        boolean before = hasListeners();
-        super.removeNotificationListener(listener,filter,handback);
-        boolean after = hasListeners();
-        if (before && !after) {
-            setNotificationEnabled(this,false);
-        }
-    }
-
+    @Override
     public ObjectName getObjectName() {
         return Util.newObjectName(ManagementFactory.GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE, getName());
     }
-
-    native void setNotificationEnabled(GarbageCollectorMXBean gc,
-                                       boolean enabled);
-
 }
--- a/jdk/src/java.management/share/classes/sun/management/GcInfoBuilder.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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.
- */
-package sun.management;
-
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.MemoryUsage;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.TabularType;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.OpenDataException;
-import com.sun.management.GcInfo;
-
-/**
- * Helper class to build composite data.
- */
-public class GcInfoBuilder {
-    private final GarbageCollectorMXBean gc;
-    private final String[] poolNames;
-    private String[] allItemNames;
-
-    // GC-specific composite type:
-    // Each GarbageCollectorMXBean may have different GC-specific attributes
-    // the CompositeType for the GcInfo could be different.
-    private CompositeType gcInfoCompositeType;
-
-    // GC-specific items
-    private final int gcExtItemCount;
-    private final String[] gcExtItemNames;
-    private final String[] gcExtItemDescs;
-    private final char[] gcExtItemTypes;
-
-    GcInfoBuilder(GarbageCollectorMXBean gc, String[] poolNames) {
-        this.gc = gc;
-        this.poolNames = poolNames;
-        this.gcExtItemCount = getNumGcExtAttributes(gc);
-        this.gcExtItemNames = new String[gcExtItemCount];
-        this.gcExtItemDescs = new String[gcExtItemCount];
-        this.gcExtItemTypes = new char[gcExtItemCount];
-
-        // Fill the information about extension attributes
-        fillGcAttributeInfo(gc, gcExtItemCount, gcExtItemNames,
-                            gcExtItemTypes, gcExtItemDescs);
-
-        // lazily build the CompositeType for the GcInfo
-        // including the GC-specific extension attributes
-        this.gcInfoCompositeType = null;
-    }
-
-    GcInfo getLastGcInfo() {
-        MemoryUsage[] usageBeforeGC = new MemoryUsage[poolNames.length];
-        MemoryUsage[] usageAfterGC = new MemoryUsage[poolNames.length];
-        Object[] values = new Object[gcExtItemCount];
-
-        return getLastGcInfo0(gc, gcExtItemCount, values, gcExtItemTypes,
-                              usageBeforeGC, usageAfterGC);
-    }
-
-    public String[] getPoolNames() {
-        return poolNames;
-    }
-
-    int getGcExtItemCount() {
-        return gcExtItemCount;
-    }
-
-    // Returns the CompositeType for the GcInfo including
-    // the extension attributes
-    synchronized CompositeType getGcInfoCompositeType() {
-        if (gcInfoCompositeType != null)
-            return gcInfoCompositeType;
-
-        // First, fill with the attributes in the GcInfo
-        String[] gcInfoItemNames = GcInfoCompositeData.getBaseGcInfoItemNames();
-        OpenType<?>[] gcInfoItemTypes = GcInfoCompositeData.getBaseGcInfoItemTypes();
-        int numGcInfoItems = gcInfoItemNames.length;
-
-        int itemCount = numGcInfoItems + gcExtItemCount;
-        allItemNames = new String[itemCount];
-        String[] allItemDescs = new String[itemCount];
-        OpenType<?>[] allItemTypes = new OpenType<?>[itemCount];
-
-        System.arraycopy(gcInfoItemNames, 0, allItemNames, 0, numGcInfoItems);
-        System.arraycopy(gcInfoItemNames, 0, allItemDescs, 0, numGcInfoItems);
-        System.arraycopy(gcInfoItemTypes, 0, allItemTypes, 0, numGcInfoItems);
-
-        // Then fill with the extension GC-specific attributes, if any.
-        if (gcExtItemCount > 0) {
-            fillGcAttributeInfo(gc, gcExtItemCount, gcExtItemNames,
-                                gcExtItemTypes, gcExtItemDescs);
-            System.arraycopy(gcExtItemNames, 0, allItemNames,
-                             numGcInfoItems, gcExtItemCount);
-            System.arraycopy(gcExtItemDescs, 0, allItemDescs,
-                             numGcInfoItems, gcExtItemCount);
-            for (int i = numGcInfoItems, j = 0; j < gcExtItemCount; i++, j++) {
-                switch (gcExtItemTypes[j]) {
-                    case 'Z':
-                        allItemTypes[i] = SimpleType.BOOLEAN;
-                        break;
-                    case 'B':
-                        allItemTypes[i] = SimpleType.BYTE;
-                        break;
-                    case 'C':
-                        allItemTypes[i] = SimpleType.CHARACTER;
-                        break;
-                    case 'S':
-                        allItemTypes[i] = SimpleType.SHORT;
-                        break;
-                    case 'I':
-                        allItemTypes[i] = SimpleType.INTEGER;
-                        break;
-                    case 'J':
-                        allItemTypes[i] = SimpleType.LONG;
-                        break;
-                    case 'F':
-                        allItemTypes[i] = SimpleType.FLOAT;
-                        break;
-                    case 'D':
-                        allItemTypes[i] = SimpleType.DOUBLE;
-                        break;
-                    default:
-                        throw new AssertionError(
-                            "Unsupported type [" + gcExtItemTypes[i] + "]");
-                }
-            }
-        }
-
-        CompositeType gict = null;
-        try {
-            final String typeName =
-                "sun.management." + gc.getName() + ".GcInfoCompositeType";
-
-            gict = new CompositeType(typeName,
-                                     "CompositeType for GC info for " +
-                                         gc.getName(),
-                                     allItemNames,
-                                     allItemDescs,
-                                     allItemTypes);
-        } catch (OpenDataException e) {
-            // shouldn't reach here
-            throw Util.newException(e);
-        }
-        gcInfoCompositeType = gict;
-
-        return gcInfoCompositeType;
-    }
-
-    synchronized String[] getItemNames() {
-        if (allItemNames == null) {
-            // initialize when forming the composite type
-            getGcInfoCompositeType();
-        }
-        return allItemNames;
-    }
-
-    // Retrieve information about extension attributes
-    private native int getNumGcExtAttributes(GarbageCollectorMXBean gc);
-    private native void fillGcAttributeInfo(GarbageCollectorMXBean gc,
-                                            int numAttributes,
-                                            String[] attributeNames,
-                                            char[] types,
-                                            String[] descriptions);
-
-    /**
-     * Returns the last GcInfo
-     *
-     * @param gc GarbageCollectorMXBean that the gc info is associated with.
-     * @param numExtAtts number of extension attributes
-     * @param extAttValues Values of extension attributes to be filled.
-     * @param before Memory usage before GC to be filled.
-     * @param after Memory usage after GC to be filled.
-     */
-    private native GcInfo getLastGcInfo0(GarbageCollectorMXBean gc,
-                                         int numExtAtts,
-                                         Object[] extAttValues,
-                                         char[] extAttTypes,
-                                         MemoryUsage[] before,
-                                         MemoryUsage[] after);
-}
--- a/jdk/src/java.management/share/classes/sun/management/GcInfoCompositeData.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2004, 2014, 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.
- */
-
-package sun.management;
-
-import java.lang.management.MemoryUsage;
-import java.lang.reflect.Method;
-import java.lang.reflect.Field;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Collections;
-import java.io.InvalidObjectException;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.OpenDataException;
-import com.sun.management.GcInfo;
-import com.sun.management.GarbageCollectionNotificationInfo;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * A CompositeData for GcInfo for the local management support.
- * This class avoids the performance penalty paid to the
- * construction of a CompositeData use in the local case.
- */
-public class GcInfoCompositeData extends LazyCompositeData {
-    private final GcInfo info;
-    private final GcInfoBuilder builder;
-    private final Object[] gcExtItemValues;
-
-    public GcInfoCompositeData(GcInfo info,
-                        GcInfoBuilder builder,
-                        Object[] gcExtItemValues) {
-        this.info = info;
-        this.builder = builder;
-        this.gcExtItemValues = gcExtItemValues;
-    }
-
-    public GcInfo getGcInfo() {
-        return info;
-    }
-
-    public static CompositeData toCompositeData(final GcInfo info) {
-        final GcInfoBuilder builder = AccessController.doPrivileged (new PrivilegedAction<GcInfoBuilder>() {
-                        public GcInfoBuilder run() {
-                            try {
-                                Class<?> cl = Class.forName("com.sun.management.GcInfo");
-                                Field f = cl.getDeclaredField("builder");
-                                f.setAccessible(true);
-                                return (GcInfoBuilder)f.get(info);
-                            } catch(ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
-                                return null;
-                            }
-                        }
-                    });
-        final Object[] extAttr = AccessController.doPrivileged (new PrivilegedAction<Object[]>() {
-                        public Object[] run() {
-                            try {
-                                Class<?> cl = Class.forName("com.sun.management.GcInfo");
-                                Field f = cl.getDeclaredField("extAttributes");
-                                f.setAccessible(true);
-                                return (Object[])f.get(info);
-                            } catch(ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
-                                return null;
-                            }
-                        }
-                    });
-        GcInfoCompositeData gcicd =
-            new GcInfoCompositeData(info,builder,extAttr);
-        return gcicd.getCompositeData();
-    }
-
-    protected CompositeData getCompositeData() {
-        // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH
-        // baseGcInfoItemNames!
-        final Object[] baseGcInfoItemValues;
-
-        try {
-            baseGcInfoItemValues = new Object[] {
-                info.getId(),
-                info.getStartTime(),
-                info.getEndTime(),
-                info.getDuration(),
-                memoryUsageMapType.toOpenTypeData(info.getMemoryUsageBeforeGc()),
-                memoryUsageMapType.toOpenTypeData(info.getMemoryUsageAfterGc()),
-            };
-        } catch (OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-
-        // Get the item values for the extension attributes
-        final int gcExtItemCount = builder.getGcExtItemCount();
-        if (gcExtItemCount == 0 &&
-            gcExtItemValues != null && gcExtItemValues.length != 0) {
-            throw new AssertionError("Unexpected Gc Extension Item Values");
-        }
-
-        if (gcExtItemCount > 0 && (gcExtItemValues == null ||
-             gcExtItemCount != gcExtItemValues.length)) {
-            throw new AssertionError("Unmatched Gc Extension Item Values");
-        }
-
-        Object[] values = new Object[baseGcInfoItemValues.length +
-                                     gcExtItemCount];
-        System.arraycopy(baseGcInfoItemValues, 0, values, 0,
-                         baseGcInfoItemValues.length);
-
-        if (gcExtItemCount > 0) {
-            System.arraycopy(gcExtItemValues, 0, values,
-                             baseGcInfoItemValues.length, gcExtItemCount);
-        }
-
-        try {
-            return new CompositeDataSupport(builder.getGcInfoCompositeType(),
-                                            builder.getItemNames(),
-                                            values);
-        } catch (OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-    }
-
-    private static final String ID                     = "id";
-    private static final String START_TIME             = "startTime";
-    private static final String END_TIME               = "endTime";
-    private static final String DURATION               = "duration";
-    private static final String MEMORY_USAGE_BEFORE_GC = "memoryUsageBeforeGc";
-    private static final String MEMORY_USAGE_AFTER_GC  = "memoryUsageAfterGc";
-
-    private static final String[] baseGcInfoItemNames = {
-        ID,
-        START_TIME,
-        END_TIME,
-        DURATION,
-        MEMORY_USAGE_BEFORE_GC,
-        MEMORY_USAGE_AFTER_GC,
-    };
-
-
-    private static MappedMXBeanType memoryUsageMapType;
-    static {
-        try {
-            Method m = GcInfo.class.getMethod("getMemoryUsageBeforeGc");
-            memoryUsageMapType =
-                MappedMXBeanType.getMappedType(m.getGenericReturnType());
-        } catch (NoSuchMethodException | OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-    }
-
-    static String[] getBaseGcInfoItemNames() {
-        return baseGcInfoItemNames;
-    }
-
-    private static OpenType<?>[] baseGcInfoItemTypes = null;
-    static synchronized OpenType<?>[] getBaseGcInfoItemTypes() {
-        if (baseGcInfoItemTypes == null) {
-            OpenType<?> memoryUsageOpenType = memoryUsageMapType.getOpenType();
-            baseGcInfoItemTypes = new OpenType<?>[] {
-                SimpleType.LONG,
-                SimpleType.LONG,
-                SimpleType.LONG,
-                SimpleType.LONG,
-
-                memoryUsageOpenType,
-                memoryUsageOpenType,
-            };
-        }
-        return baseGcInfoItemTypes;
-    }
-
-    public static long getId(CompositeData cd) {
-        return getLong(cd, ID);
-    }
-    public static long getStartTime(CompositeData cd) {
-        return getLong(cd, START_TIME);
-    }
-    public static long getEndTime(CompositeData cd) {
-        return getLong(cd, END_TIME);
-    }
-
-    public static Map<String, MemoryUsage>
-            getMemoryUsageBeforeGc(CompositeData cd) {
-        try {
-            TabularData td = (TabularData) cd.get(MEMORY_USAGE_BEFORE_GC);
-            return cast(memoryUsageMapType.toJavaTypeData(td));
-        } catch (InvalidObjectException | OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Map<String, MemoryUsage> cast(Object x) {
-        return (Map<String, MemoryUsage>) x;
-    }
-    public static Map<String, MemoryUsage>
-            getMemoryUsageAfterGc(CompositeData cd) {
-        try {
-            TabularData td = (TabularData) cd.get(MEMORY_USAGE_AFTER_GC);
-            //return (Map<String,MemoryUsage>)
-            return cast(memoryUsageMapType.toJavaTypeData(td));
-        } catch (InvalidObjectException | OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-    }
-
-    /**
-     * Returns true if the input CompositeData has the expected
-     * CompositeType (i.e. contain all attributes with expected
-     * names and types).  Otherwise, return false.
-     */
-    public static void validateCompositeData(CompositeData cd) {
-        if (cd == null) {
-            throw new NullPointerException("Null CompositeData");
-        }
-
-        if (!isTypeMatched(getBaseGcInfoCompositeType(),
-                           cd.getCompositeType())) {
-           throw new IllegalArgumentException(
-                "Unexpected composite type for GcInfo");
-        }
-    }
-
-    // This is only used for validation.
-    private static CompositeType baseGcInfoCompositeType = null;
-    static synchronized CompositeType getBaseGcInfoCompositeType() {
-        if (baseGcInfoCompositeType == null) {
-            try {
-                baseGcInfoCompositeType =
-                    new CompositeType("sun.management.BaseGcInfoCompositeType",
-                                      "CompositeType for Base GcInfo",
-                                      getBaseGcInfoItemNames(),
-                                      getBaseGcInfoItemNames(),
-                                      getBaseGcInfoItemTypes());
-            } catch (OpenDataException e) {
-                // shouldn't reach here
-                throw Util.newException(e);
-            }
-        }
-        return baseGcInfoCompositeType;
-    }
-
-    private static final long serialVersionUID = -5716428894085882742L;
-}
--- a/jdk/src/java.management/share/classes/sun/management/HotSpotDiagnostic.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2005, 2014, 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.
- */
-
-package sun.management;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.management.ObjectName;
-
-import com.sun.management.HotSpotDiagnosticMXBean;
-import com.sun.management.VMOption;
-
-/**
- * Implementation of the diagnostic MBean for Hotspot VM.
- */
-public class HotSpotDiagnostic implements HotSpotDiagnosticMXBean {
-    public HotSpotDiagnostic() {
-    }
-
-    @Override
-    public void dumpHeap(String outputFile, boolean live) throws IOException {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkWrite(outputFile);
-            Util.checkControlAccess();
-        }
-
-        dumpHeap0(outputFile, live);
-    }
-
-    private native void dumpHeap0(String outputFile, boolean live) throws IOException;
-
-    @Override
-    public List<VMOption> getDiagnosticOptions() {
-        List<Flag> allFlags = Flag.getAllFlags();
-        List<VMOption> result = new ArrayList<>();
-        for (Flag flag : allFlags) {
-            if (flag.isWriteable() && flag.isExternal()) {
-                result.add(flag.getVMOption());
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public VMOption getVMOption(String name) {
-        if (name == null) {
-            throw new NullPointerException("name cannot be null");
-        }
-
-        Flag f = Flag.getFlag(name);
-        if (f == null) {
-            throw new IllegalArgumentException("VM option \"" +
-                name + "\" does not exist");
-        }
-        return f.getVMOption();
-    }
-
-    @Override
-    public void setVMOption(String name, String value) {
-        if (name == null) {
-            throw new NullPointerException("name cannot be null");
-        }
-        if (value == null) {
-            throw new NullPointerException("value cannot be null");
-        }
-
-        Util.checkControlAccess();
-        Flag flag = Flag.getFlag(name);
-        if (flag == null) {
-            throw new IllegalArgumentException("VM option \"" +
-                name + "\" does not exist");
-        }
-        if (!flag.isWriteable()){
-            throw new IllegalArgumentException("VM Option \"" +
-                name + "\" is not writeable");
-        }
-
-        // Check the type of the value
-        Object v = flag.getValue();
-        if (v instanceof Long) {
-            try {
-                long l = Long.parseLong(value);
-                Flag.setLongValue(name, l);
-            } catch (NumberFormatException e) {
-                throw new IllegalArgumentException("Invalid value:" +
-                        " VM Option \"" + name + "\"" +
-                        " expects numeric value", e);
-            }
-        } else if (v instanceof Double) {
-            try {
-                double d = Double.parseDouble(value);
-                Flag.setDoubleValue(name, d);
-            } catch (NumberFormatException e) {
-                throw new IllegalArgumentException("Invalid value:" +
-                        " VM Option \"" + name + "\"" +
-                        " expects numeric value", e);
-            }
-        } else if (v instanceof Boolean) {
-            if (!value.equalsIgnoreCase("true") &&
-                !value.equalsIgnoreCase("false")) {
-                throw new IllegalArgumentException("Invalid value:" +
-                    " VM Option \"" + name + "\"" +
-                    " expects \"true\" or \"false\".");
-            }
-            Flag.setBooleanValue(name, Boolean.parseBoolean(value));
-        } else if (v instanceof String) {
-            Flag.setStringValue(name, value);
-        } else {
-            throw new IllegalArgumentException("VM Option \"" +
-                name + "\" is of an unsupported type: " +
-                v.getClass().getName());
-        }
-    }
-
-    @Override
-    public ObjectName getObjectName() {
-        return Util.newObjectName("com.sun.management:type=HotSpotDiagnostic");
-    }
-}
--- a/jdk/src/java.management/share/classes/sun/management/LazyCompositeData.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/LazyCompositeData.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -115,28 +115,28 @@
     protected abstract CompositeData getCompositeData();
 
     // Helper methods
-    static String getString(CompositeData cd, String itemName) {
+    public static String getString(CompositeData cd, String itemName) {
         if (cd == null)
             throw new IllegalArgumentException("Null CompositeData");
 
         return (String) cd.get(itemName);
     }
 
-    static boolean getBoolean(CompositeData cd, String itemName) {
+    public static boolean getBoolean(CompositeData cd, String itemName) {
         if (cd == null)
             throw new IllegalArgumentException("Null CompositeData");
 
         return ((Boolean) cd.get(itemName)).booleanValue();
     }
 
-    static long getLong(CompositeData cd, String itemName) {
+    public static long getLong(CompositeData cd, String itemName) {
         if (cd == null)
             throw new IllegalArgumentException("Null CompositeData");
 
         return ((Long) cd.get(itemName)).longValue();
     }
 
-    static int getInt(CompositeData cd, String itemName) {
+    public static int getInt(CompositeData cd, String itemName) {
         if (cd == null)
             throw new IllegalArgumentException("Null CompositeData");
 
--- a/jdk/src/java.management/share/classes/sun/management/ManagementFactory.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package sun.management;
-
-import java.lang.management.MemoryManagerMXBean;
-import java.lang.management.MemoryPoolMXBean;
-import java.lang.management.GarbageCollectorMXBean;
-
-/**
- * ManagementFactory class provides the methods that the HotSpot VM
- * will invoke. So the class and method names cannot be renamed.
- */
-class ManagementFactory {
-    private ManagementFactory() {};
-
-    // Invoked by the VM
-    private static MemoryPoolMXBean createMemoryPool
-        (String name, boolean isHeap, long uThreshold, long gcThreshold) {
-        return new MemoryPoolImpl(name, isHeap, uThreshold, gcThreshold);
-    }
-
-    private static MemoryManagerMXBean createMemoryManager(String name) {
-        return new MemoryManagerImpl(name);
-    }
-
-    private static GarbageCollectorMXBean
-        createGarbageCollector(String name, String type) {
-
-        // ignore type parameter which is for future extension
-        return new GarbageCollectorImpl(name);
-    }
-}
--- a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,8 +26,6 @@
 package sun.management;
 
 import java.lang.management.*;
-
-import javax.management.DynamicMBean;
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;
@@ -38,30 +36,35 @@
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-
 import sun.util.logging.LoggingSupport;
-
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import com.sun.management.DiagnosticCommandMBean;
-import com.sun.management.HotSpotDiagnosticMXBean;
 
 /**
  * ManagementFactoryHelper provides static factory methods to create
  * instances of the management interface.
  */
 public class ManagementFactoryHelper {
+    static {
+        // make sure that the management lib is loaded within
+        // java.lang.management.ManagementFactory
+        sun.misc.Unsafe.getUnsafe().ensureClassInitialized(ManagementFactory.class);
+    }
+
+    private static final VMManagement jvm = new VMManagementImpl();
+
     private ManagementFactoryHelper() {};
 
-    private static VMManagement jvm;
+    public static VMManagement getVMManagement() {
+        return jvm;
+    }
 
     private static ClassLoadingImpl    classMBean = null;
     private static MemoryImpl          memoryMBean = null;
     private static ThreadImpl          threadMBean = null;
     private static RuntimeImpl         runtimeMBean = null;
     private static CompilationImpl     compileMBean = null;
-    private static OperatingSystemImpl osMBean = null;
+    private static BaseOperatingSystemImpl osMBean = null;
 
     public static synchronized ClassLoadingMXBean getClassLoadingMXBean() {
         if (classMBean == null) {
@@ -100,7 +103,7 @@
 
     public static synchronized OperatingSystemMXBean getOperatingSystemMXBean() {
         if (osMBean == null) {
-            osMBean = new OperatingSystemImpl(jvm);
+            osMBean = new BaseOperatingSystemImpl(jvm);
         }
         return osMBean;
     }
@@ -123,7 +126,7 @@
         return result;
     }
 
-    public static List<GarbageCollectorMXBean> getGarbageCollectorMXBeans() {
+     public static List<GarbageCollectorMXBean> getGarbageCollectorMXBeans() {
         MemoryManagerMXBean[]  mgrs = MemoryImpl.getMemoryManagers();
         List<GarbageCollectorMXBean> result = new ArrayList<>(mgrs.length);
         for (MemoryManagerMXBean m : mgrs) {
@@ -257,20 +260,11 @@
         };
     }
 
-    private static HotSpotDiagnostic hsDiagMBean = null;
     private static HotspotRuntime hsRuntimeMBean = null;
     private static HotspotClassLoading hsClassMBean = null;
     private static HotspotThread hsThreadMBean = null;
     private static HotspotCompilation hsCompileMBean = null;
     private static HotspotMemory hsMemoryMBean = null;
-    private static DiagnosticCommandImpl hsDiagCommandMBean = null;
-
-    public static synchronized HotSpotDiagnosticMXBean getDiagnosticMXBean() {
-        if (hsDiagMBean == null) {
-            hsDiagMBean = new HotSpotDiagnostic();
-        }
-        return hsDiagMBean;
-    }
 
     /**
      * This method is for testing only.
@@ -312,14 +306,6 @@
         return hsMemoryMBean;
     }
 
-    public static synchronized DiagnosticCommandMBean getDiagnosticCommandMBean() {
-        // Remote Diagnostic Commands may not be supported
-        if (hsDiagCommandMBean == null && jvm.isRemoteDiagnosticCommandsSupported()) {
-            hsDiagCommandMBean = new DiagnosticCommandImpl(jvm);
-        }
-        return hsDiagCommandMBean;
-    }
-
     /**
      * This method is for testing only.
      */
@@ -374,18 +360,6 @@
     private final static String HOTSPOT_THREAD_MBEAN_NAME =
         "sun.management:type=HotspotThreading";
 
-    final static String HOTSPOT_DIAGNOSTIC_COMMAND_MBEAN_NAME =
-        "com.sun.management:type=DiagnosticCommand";
-
-    public static HashMap<ObjectName, DynamicMBean> getPlatformDynamicMBeans() {
-        HashMap<ObjectName, DynamicMBean> map = new HashMap<>();
-        DiagnosticCommandMBean diagMBean = getDiagnosticCommandMBean();
-        if (diagMBean != null) {
-            map.put(Util.newObjectName(HOTSPOT_DIAGNOSTIC_COMMAND_MBEAN_NAME), diagMBean);
-        }
-        return map;
-    }
-
     static void registerInternalMBeans(MBeanServer mbs) {
         // register all internal MBeans if not registered
         // No exception is thrown if a MBean with that object name
@@ -441,17 +415,6 @@
         }
     }
 
-    static {
-        AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
-                    System.loadLibrary("management");
-                    return null;
-                }
-            });
-        jvm = new VMManagementImpl();
-    }
-
     public static boolean isThreadSuspended(int state) {
         return ((state & JMM_THREAD_STATE_FLAG_SUSPENDED) != 0);
     }
@@ -471,4 +434,20 @@
     private static final int JMM_THREAD_STATE_FLAG_SUSPENDED = 0x00100000;
     private static final int JMM_THREAD_STATE_FLAG_NATIVE = 0x00400000;
 
+    // Invoked by the VM
+    private static MemoryPoolMXBean createMemoryPool
+        (String name, boolean isHeap, long uThreshold, long gcThreshold) {
+        return new MemoryPoolImpl(name, isHeap, uThreshold, gcThreshold);
+    }
+
+    private static MemoryManagerMXBean createMemoryManager(String name) {
+        return new MemoryManagerImpl(name);
+    }
+
+    private static GarbageCollectorMXBean
+        createGarbageCollector(String name, String type) {
+
+        // ignore type parameter which is for future extension
+        return new GarbageCollectorImpl(name);
+    }
 }
--- a/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -38,10 +38,8 @@
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import javax.management.*;
 import javax.management.openmbean.*;
 import static javax.management.openmbean.SimpleType.*;
-import com.sun.management.VMOption;
 
 /**
  * A mapped mxbean type maps a Java type to an open type.
@@ -113,7 +111,7 @@
         return mt;
     }
 
-    static synchronized MappedMXBeanType getMappedType(Type t)
+    public static synchronized MappedMXBeanType getMappedType(Type t)
             throws OpenDataException {
         MappedMXBeanType mt = convertedTypes.get(t);
         if (mt == null) {
@@ -152,7 +150,7 @@
     }
 
     // Return the mapped open type
-    OpenType<?> getOpenType() {
+    public OpenType<?> getOpenType() {
         return openType;
     }
 
@@ -177,10 +175,10 @@
     // return name of the class or the generic type
     abstract String getName();
 
-    abstract Object toOpenTypeData(Object javaTypeData)
+    public abstract Object toOpenTypeData(Object javaTypeData)
         throws OpenDataException;
 
-    abstract Object toJavaTypeData(Object openTypeData)
+    public abstract Object toJavaTypeData(Object openTypeData)
         throws OpenDataException, InvalidObjectException;
 
     // Basic Types - Classes that do not require data conversion
@@ -208,11 +206,11 @@
             return basicType.getName();
         }
 
-        Object toOpenTypeData(Object data) throws OpenDataException {
+        public Object toOpenTypeData(Object data) throws OpenDataException {
             return data;
         }
 
-        Object toJavaTypeData(Object data)
+        public Object toJavaTypeData(Object data)
             throws OpenDataException, InvalidObjectException {
 
             return data;
@@ -243,11 +241,11 @@
             return enumClass.getName();
         }
 
-        Object toOpenTypeData(Object data) throws OpenDataException {
+        public Object toOpenTypeData(Object data) throws OpenDataException {
             return ((Enum) data).name();
         }
 
-        Object toJavaTypeData(Object data)
+        public Object toJavaTypeData(Object data)
             throws OpenDataException, InvalidObjectException {
 
             try {
@@ -315,7 +313,7 @@
             return arrayClass.getName();
         }
 
-        Object toOpenTypeData(Object data) throws OpenDataException {
+        public Object toOpenTypeData(Object data) throws OpenDataException {
             // If the base element type is a basic type
             // return the data as no conversion is needed.
             // Primitive types are not converted to wrappers.
@@ -340,7 +338,7 @@
         }
 
 
-        Object toJavaTypeData(Object data)
+        public Object toJavaTypeData(Object data)
             throws OpenDataException, InvalidObjectException {
 
             // If the base element type is a basic type
@@ -457,7 +455,7 @@
             return typeName;
         }
 
-        Object toOpenTypeData(Object data) throws OpenDataException {
+        public Object toOpenTypeData(Object data) throws OpenDataException {
             final List<Object> list = (List<Object>) data;
 
             final Object[] openArray = (Object[])
@@ -470,7 +468,7 @@
             return openArray;
         }
 
-        Object toJavaTypeData(Object data)
+        public Object toJavaTypeData(Object data)
             throws OpenDataException, InvalidObjectException {
 
             final Object[] openArray = (Object[]) data;
@@ -538,7 +536,7 @@
             return typeName;
         }
 
-        Object toOpenTypeData(Object data) throws OpenDataException {
+        public Object toOpenTypeData(Object data) throws OpenDataException {
             final Map<Object,Object> map = (Map<Object,Object>) data;
             final TabularType tabularType = (TabularType) openType;
             final TabularData table = new TabularDataSupport(tabularType);
@@ -556,7 +554,7 @@
             return table;
         }
 
-        Object toJavaTypeData(Object data)
+        public Object toJavaTypeData(Object data)
             throws OpenDataException, InvalidObjectException {
 
             final TabularData td = (TabularData) data;
@@ -605,8 +603,9 @@
     //
     static class CompositeDataMXBeanType extends MappedMXBeanType {
         final Class<?> javaClass;
-        final boolean isCompositeData;
+        boolean isCompositeData = false;
         Method fromMethod = null;
+        Method toMethod = null;
 
         CompositeDataMXBeanType(Class<?> c) throws OpenDataException {
             this.javaClass = c;
@@ -624,6 +623,26 @@
                 // that has no from method to be embeded in another class.
             }
 
+            // check if a static "toCompositeData" method exists
+            try {
+                toMethod = AccessController.doPrivileged(new PrivilegedExceptionAction<Method>() {
+                    public Method run() throws NoSuchMethodException {
+                        Method m = javaClass.getDeclaredMethod("toCompositeData", javaClass);
+                        if (m != null
+                                && CompositeData.class.isAssignableFrom(m.getReturnType())
+                                && Modifier.isStatic(m.getModifiers())) {
+                            m.setAccessible(true);
+                            return m;
+                        } else {
+                            return null;
+                        }
+                    }
+                });
+            } catch (PrivilegedActionException e) {
+                // ignore NoSuchMethodException since we allow classes
+                // that has no from method to be embeded in another class.
+            }
+
             if (COMPOSITE_DATA_CLASS.isAssignableFrom(c)) {
                 // c implements CompositeData - set openType to null
                 // defer generating the CompositeType
@@ -636,16 +655,16 @@
                 // Make a CompositeData containing all the getters
                 final Method[] methods =
                     AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
-                        public Method[] run() {
-                            return javaClass.getMethods();
-                        }
-                    });
+                            public Method[] run() {
+                                return javaClass.getMethods();
+                            }
+                        });
                 final List<String> names = new ArrayList<>();
                 final List<OpenType<?>> types = new ArrayList<>();
 
                 /* Select public methods that look like "T getX()" or "boolean
-                   isX()", where T is not void and X is not the empty
-                   string.  Exclude "Class getClass()" inherited from Object.  */
+                 isX()", where T is not void and X is not the empty
+                 string.  Exclude "Class getClass()" inherited from Object.  */
                 for (int i = 0; i < methods.length; i++) {
                     final Method method = methods[i];
                     final String name = method.getName();
@@ -676,10 +695,10 @@
 
                 final String[] nameArray = names.toArray(new String[0]);
                 openType = new CompositeType(c.getName(),
-                                             c.getName(),
-                                             nameArray, // field names
-                                             nameArray, // field descriptions
-                                             types.toArray(new OpenType<?>[0]));
+                        c.getName(),
+                        nameArray, // field names
+                        nameArray, // field descriptions
+                        types.toArray(new OpenType<?>[0]));
             }
         }
 
@@ -691,7 +710,23 @@
             return javaClass.getName();
         }
 
-        Object toOpenTypeData(Object data) throws OpenDataException {
+        public Object toOpenTypeData(Object data) throws OpenDataException {
+            if (toMethod != null) {
+                try {
+                    return toMethod.invoke(null, data);
+                } catch (IllegalAccessException e) {
+                    // should never reach here
+                    throw new AssertionError(e);
+                } catch (InvocationTargetException e) {
+                    final OpenDataException ode
+                            = new OpenDataException("Failed to invoke "
+                                    + toMethod.getName() + " to convert " + javaClass.getName()
+                                    + " to CompositeData");
+                    ode.initCause(e);
+                    throw ode;
+                }
+            }
+
             if (data instanceof MemoryUsage) {
                 return MemoryUsageCompositeData.toCompositeData((MemoryUsage) data);
             }
@@ -712,10 +747,6 @@
                     toCompositeData((MemoryNotificationInfo) data);
             }
 
-            if (data instanceof VMOption) {
-                return VMOptionCompositeData.toCompositeData((VMOption) data);
-            }
-
             if (isCompositeData) {
                 // Classes that implement CompositeData
                 //
@@ -732,7 +763,7 @@
                 " is not supported for platform MXBeans");
         }
 
-        Object toJavaTypeData(Object data)
+        public Object toJavaTypeData(Object data)
             throws OpenDataException, InvalidObjectException {
 
             if (fromMethod == null) {
--- a/jdk/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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,13 +34,12 @@
 
 import java.util.List;
 import java.util.ArrayList;
-import java.util.ListIterator;
 import java.util.Collections;
 
 /**
  * Abstract helper class for notification emitter support.
  */
-abstract class NotificationEmitterSupport implements NotificationEmitter {
+public abstract class NotificationEmitterSupport implements NotificationEmitter {
 
     protected NotificationEmitterSupport() {
     }
@@ -135,7 +134,7 @@
         }
     }
 
-    void sendNotification(Notification notification) {
+    public void sendNotification(Notification notification) {
 
         if (notification == null) {
             return;
@@ -162,7 +161,7 @@
         }
     }
 
-    boolean hasListeners() {
+    public boolean hasListeners() {
         synchronized (listenerLock) {
             return !listenerList.isEmpty();
         }
--- a/jdk/src/java.management/share/classes/sun/management/ThreadImpl.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/ThreadImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,20 +26,18 @@
 package sun.management;
 
 import java.lang.management.ManagementFactory;
-
 import java.lang.management.ThreadInfo;
-
+import java.lang.management.ThreadMXBean;
 import javax.management.ObjectName;
 
 /**
- * Implementation class for the thread subsystem.
- * Standard and committed hotspot-specific metrics if any.
- *
- * ManagementFactory.getThreadMXBean() returns an instance
- * of this class.
+ * Implementation for java.lang.management.ThreadMXBean as well as providing the
+ * supporting method for com.sun.management.ThreadMXBean.
+ * The supporting method for com.sun.management.ThreadMXBean can be moved to
+ * jdk.management in the future.
  */
-class ThreadImpl implements com.sun.management.ThreadMXBean {
 
+public class ThreadImpl implements ThreadMXBean {
     private final VMManagement jvm;
 
     // default for thread contention monitoring is disabled.
@@ -50,32 +48,38 @@
     /**
      * Constructor of ThreadImpl class.
      */
-    ThreadImpl(VMManagement vm) {
+    protected ThreadImpl(VMManagement vm) {
         this.jvm = vm;
         this.cpuTimeEnabled = jvm.isThreadCpuTimeEnabled();
         this.allocatedMemoryEnabled = jvm.isThreadAllocatedMemoryEnabled();
     }
 
+    @Override
     public int getThreadCount() {
         return jvm.getLiveThreadCount();
     }
 
+    @Override
     public int getPeakThreadCount() {
         return jvm.getPeakThreadCount();
     }
 
+    @Override
     public long getTotalStartedThreadCount() {
         return jvm.getTotalThreadCount();
     }
 
+    @Override
     public int getDaemonThreadCount() {
         return jvm.getDaemonThreadCount();
     }
 
+    @Override
     public boolean isThreadContentionMonitoringSupported() {
         return jvm.isThreadContentionMonitoringSupported();
     }
 
+    @Override
     public synchronized boolean isThreadContentionMonitoringEnabled() {
        if (!isThreadContentionMonitoringSupported()) {
             throw new UnsupportedOperationException(
@@ -84,18 +88,21 @@
         return contentionMonitoringEnabled;
     }
 
+    @Override
     public boolean isThreadCpuTimeSupported() {
         return jvm.isOtherThreadCpuTimeSupported();
     }
 
+    @Override
     public boolean isCurrentThreadCpuTimeSupported() {
         return jvm.isCurrentThreadCpuTimeSupported();
     }
 
-    public boolean isThreadAllocatedMemorySupported() {
+    protected boolean isThreadAllocatedMemorySupported() {
         return jvm.isThreadAllocatedMemorySupported();
     }
 
+    @Override
     public boolean isThreadCpuTimeEnabled() {
         if (!isThreadCpuTimeSupported() &&
             !isCurrentThreadCpuTimeSupported()) {
@@ -105,7 +112,7 @@
         return cpuTimeEnabled;
     }
 
-    public boolean isThreadAllocatedMemoryEnabled() {
+    protected boolean isThreadAllocatedMemoryEnabled() {
         if (!isThreadAllocatedMemorySupported()) {
             throw new UnsupportedOperationException(
                 "Thread allocated memory measurement is not supported");
@@ -113,6 +120,7 @@
         return allocatedMemoryEnabled;
     }
 
+    @Override
     public long[] getAllThreadIds() {
         Util.checkMonitorAccess();
 
@@ -126,6 +134,7 @@
         return ids;
     }
 
+    @Override
     public ThreadInfo getThreadInfo(long id) {
         long[] ids = new long[1];
         ids[0] = id;
@@ -133,6 +142,7 @@
         return infos[0];
     }
 
+    @Override
     public ThreadInfo getThreadInfo(long id, int maxDepth) {
         long[] ids = new long[1];
         ids[0] = id;
@@ -140,6 +150,7 @@
         return infos[0];
     }
 
+    @Override
     public ThreadInfo[] getThreadInfo(long[] ids) {
         return getThreadInfo(ids, 0);
     }
@@ -157,6 +168,7 @@
         }
     }
 
+    @Override
     public ThreadInfo[] getThreadInfo(long[] ids, int maxDepth) {
         verifyThreadIds(ids);
 
@@ -165,6 +177,10 @@
                 "Invalid maxDepth parameter: " + maxDepth);
         }
 
+        // ids has been verified to be non-null
+        // an empty array of ids should return an empty array of ThreadInfos
+        if (ids.length == 0) return new ThreadInfo[0];
+
         Util.checkMonitorAccess();
 
         ThreadInfo[] infos = new ThreadInfo[ids.length]; // nulls
@@ -176,6 +192,7 @@
         return infos;
     }
 
+    @Override
     public void setThreadContentionMonitoringEnabled(boolean enable) {
         if (!isThreadContentionMonitoringSupported()) {
             throw new UnsupportedOperationException(
@@ -209,6 +226,7 @@
         return isThreadCpuTimeEnabled();
     }
 
+    @Override
     public long getCurrentThreadCpuTime() {
         if (verifyCurrentThreadCpuTime()) {
             return getThreadTotalCpuTime0(0);
@@ -216,6 +234,7 @@
         return -1;
     }
 
+    @Override
     public long getThreadCpuTime(long id) {
         long[] ids = new long[1];
         ids[0] = id;
@@ -247,7 +266,7 @@
         return isThreadCpuTimeEnabled();
     }
 
-    public long[] getThreadCpuTime(long[] ids) {
+    protected long[] getThreadCpuTime(long[] ids) {
         boolean verified = verifyThreadCpuTime(ids);
 
         int length = ids.length;
@@ -268,6 +287,7 @@
         return times;
     }
 
+    @Override
     public long getCurrentThreadUserTime() {
         if (verifyCurrentThreadCpuTime()) {
             return getThreadUserCpuTime0(0);
@@ -275,6 +295,7 @@
         return -1;
     }
 
+    @Override
     public long getThreadUserTime(long id) {
         long[] ids = new long[1];
         ids[0] = id;
@@ -282,7 +303,7 @@
         return times[0];
     }
 
-    public long[] getThreadUserTime(long[] ids) {
+    protected long[] getThreadUserTime(long[] ids) {
         boolean verified = verifyThreadCpuTime(ids);
 
         int length = ids.length;
@@ -303,6 +324,7 @@
         return times;
     }
 
+    @Override
     public void setThreadCpuTimeEnabled(boolean enable) {
         if (!isThreadCpuTimeSupported() &&
             !isCurrentThreadCpuTimeSupported()) {
@@ -320,7 +342,7 @@
         }
     }
 
-    public long getThreadAllocatedBytes(long id) {
+    protected long getThreadAllocatedBytes(long id) {
         long[] ids = new long[1];
         ids[0] = id;
         final long[] sizes = getThreadAllocatedBytes(ids);
@@ -339,7 +361,7 @@
         return isThreadAllocatedMemoryEnabled();
     }
 
-    public long[] getThreadAllocatedBytes(long[] ids) {
+    protected long[] getThreadAllocatedBytes(long[] ids) {
         boolean verified = verifyThreadAllocatedMemory(ids);
 
         long[] sizes = new long[ids.length];
@@ -351,7 +373,7 @@
         return sizes;
     }
 
-    public void setThreadAllocatedMemoryEnabled(boolean enable) {
+    protected void setThreadAllocatedMemoryEnabled(boolean enable) {
         if (!isThreadAllocatedMemorySupported()) {
             throw new UnsupportedOperationException(
                 "Thread allocated memory measurement is not supported.");
@@ -367,6 +389,7 @@
         }
     }
 
+    @Override
     public long[] findMonitorDeadlockedThreads() {
         Util.checkMonitorAccess();
 
@@ -383,6 +406,7 @@
         return ids;
     }
 
+    @Override
     public long[] findDeadlockedThreads() {
         if (!isSynchronizerUsageSupported()) {
             throw new UnsupportedOperationException(
@@ -404,15 +428,18 @@
         return ids;
     }
 
+    @Override
     public void resetPeakThreadCount() {
         Util.checkControlAccess();
         resetPeakThreadCount0();
     }
 
+    @Override
     public boolean isObjectMonitorUsageSupported() {
         return jvm.isObjectMonitorUsageSupported();
     }
 
+    @Override
     public boolean isSynchronizerUsageSupported() {
         return jvm.isSynchronizerUsageSupported();
     }
@@ -432,14 +459,20 @@
         Util.checkMonitorAccess();
     }
 
+    @Override
     public ThreadInfo[] getThreadInfo(long[] ids,
                                       boolean lockedMonitors,
                                       boolean lockedSynchronizers) {
         verifyThreadIds(ids);
+        // ids has been verified to be non-null
+        // an empty array of ids should return an empty array of ThreadInfos
+        if (ids.length == 0) return new ThreadInfo[0];
+
         verifyDumpThreads(lockedMonitors, lockedSynchronizers);
         return dumpThreads0(ids, lockedMonitors, lockedSynchronizers);
     }
 
+    @Override
     public ThreadInfo[] dumpAllThreads(boolean lockedMonitors,
                                        boolean lockedSynchronizers) {
         verifyDumpThreads(lockedMonitors, lockedSynchronizers);
@@ -469,6 +502,7 @@
     // tid == 0 to reset contention times for all threads
     private static native void resetContentionTimes0(long tid);
 
+    @Override
     public ObjectName getObjectName() {
         return Util.newObjectName(ManagementFactory.THREAD_MXBEAN_NAME);
     }
--- a/jdk/src/java.management/share/classes/sun/management/Util.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/Util.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -81,7 +81,7 @@
     static void checkMonitorAccess() throws SecurityException {
         checkAccess(monitorPermission);
     }
-    static void checkControlAccess() throws SecurityException {
+    public static void checkControlAccess() throws SecurityException {
         checkAccess(controlPermission);
     }
 }
--- a/jdk/src/java.management/share/classes/sun/management/VMOptionCompositeData.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2005, 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.
- */
-
-package sun.management;
-
-import com.sun.management.VMOption;
-import com.sun.management.VMOption.Origin;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.OpenDataException;
-
-/**
- * A CompositeData for VMOption for the local management support.
- * This class avoids the performance penalty paid to the
- * construction of a CompositeData use in the local case.
- */
-public class VMOptionCompositeData extends LazyCompositeData {
-    private final VMOption option;
-
-    private VMOptionCompositeData(VMOption option) {
-        this.option = option;
-    }
-
-    public VMOption getVMOption() {
-        return option;
-    }
-
-    public static CompositeData toCompositeData(VMOption option) {
-        VMOptionCompositeData vcd = new VMOptionCompositeData(option);
-        return vcd.getCompositeData();
-    }
-
-    protected CompositeData getCompositeData() {
-        // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH
-        // vmOptionItemNames!
-        final Object[] vmOptionItemValues = {
-            option.getName(),
-            option.getValue(),
-            option.isWriteable(),
-            option.getOrigin().toString(),
-        };
-
-        try {
-            return new CompositeDataSupport(vmOptionCompositeType,
-                                            vmOptionItemNames,
-                                            vmOptionItemValues);
-        } catch (OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-    }
-
-    private static final CompositeType vmOptionCompositeType;
-    static {
-        try {
-            vmOptionCompositeType = (CompositeType)
-                MappedMXBeanType.toOpenType(VMOption.class);
-        } catch (OpenDataException e) {
-            // Should never reach here
-            throw new AssertionError(e);
-        }
-    }
-
-    static CompositeType getVMOptionCompositeType() {
-        return vmOptionCompositeType;
-    }
-
-    private static final String NAME      = "name";
-    private static final String VALUE     = "value";
-    private static final String WRITEABLE = "writeable";
-    private static final String ORIGIN    = "origin";
-
-    private static final String[] vmOptionItemNames = {
-        NAME,
-        VALUE,
-        WRITEABLE,
-        ORIGIN,
-    };
-
-    public static String getName(CompositeData cd) {
-        return getString(cd, NAME);
-    }
-    public static String getValue(CompositeData cd) {
-        return getString(cd, VALUE);
-    }
-    public static Origin getOrigin(CompositeData cd) {
-        String o = getString(cd, ORIGIN);
-        return Enum.valueOf(Origin.class, o);
-    }
-    public static boolean isWriteable(CompositeData cd) {
-        return getBoolean(cd, WRITEABLE);
-    }
-
-    /** Validate if the input CompositeData has the expected
-     * CompositeType (i.e. contain all attributes with expected
-     * names and types).
-     */
-    public static void validateCompositeData(CompositeData cd) {
-        if (cd == null) {
-            throw new NullPointerException("Null CompositeData");
-        }
-
-        if (!isTypeMatched(vmOptionCompositeType, cd.getCompositeType())) {
-            throw new IllegalArgumentException(
-                "Unexpected composite type for VMOption");
-        }
-    }
-
-    private static final long serialVersionUID = -2395573975093578470L;
-}
--- a/jdk/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java	Thu May 07 20:50:07 2015 -0700
@@ -205,7 +205,7 @@
      * Instantiates a new PlatformMBeanProvider.
      *
      * @throws SecurityException if the subclass (and calling code) does not
-     *    have {@code RuntimePermission("sun.management.spi.PlatformMBeanProvider", "subclass")}
+     *    have {@code RuntimePermission("sun.management.spi.PlatformMBeanProvider.subclass")}
      */
     protected PlatformMBeanProvider () {
         this(checkSubclassPermission());
@@ -226,7 +226,7 @@
     private static Void checkSubclassPermission() {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
-            sm.checkPermission(new RuntimePermission(PlatformMBeanProvider.class.getName(), "subclass"));
+            sm.checkPermission(new RuntimePermission(PlatformMBeanProvider.class.getName()+".subclass"));
         }
         return null;
     }
--- a/jdk/src/java.management/share/native/libmanagement/DiagnosticCommandImpl.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-#include <stdlib.h>
-#include <jni.h>
-#include "management.h"
-#include "sun_management_DiagnosticCommandImpl.h"
-
-JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled
-(JNIEnv *env, jobject dummy, jboolean enabled) {
-    if (jmm_version <= JMM_VERSION_1_2_2) {
-        JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
-                        "JMX interface to diagnostic framework notifications is not supported by this VM");
-        return;
-    }
-    jmm_interface->SetDiagnosticFrameworkNotificationEnabled(env, enabled);
-}
-
-JNIEXPORT jobjectArray JNICALL
-Java_sun_management_DiagnosticCommandImpl_getDiagnosticCommands
-  (JNIEnv *env, jobject dummy)
-{
-  return jmm_interface->GetDiagnosticCommands(env);
-}
-
-jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
-                                              int num_arg) {
-  int i;
-  jobject obj;
-  jobjectArray result;
-  dcmdArgInfo* dcmd_arg_info_array;
-  jclass dcmdArgInfoCls;
-  jclass arraysCls;
-  jmethodID mid;
-  jobject resultList;
-
-  dcmd_arg_info_array = (dcmdArgInfo*) malloc(num_arg * sizeof(dcmdArgInfo));
-  /* According to ISO C it is perfectly legal for malloc to return zero if called with a zero argument */
-  if (dcmd_arg_info_array == NULL && num_arg != 0) {
-    return NULL;
-  }
-  jmm_interface->GetDiagnosticCommandArgumentsInfo(env, command,
-                                                   dcmd_arg_info_array);
-  dcmdArgInfoCls = (*env)->FindClass(env,
-                                     "sun/management/DiagnosticCommandArgumentInfo");
-  if ((*env)->ExceptionCheck(env)) {
-    free(dcmd_arg_info_array);
-    return NULL;
-  }
-
-  result = (*env)->NewObjectArray(env, num_arg, dcmdArgInfoCls, NULL);
-  if (result == NULL) {
-    free(dcmd_arg_info_array);
-    return NULL;
-  }
-  for (i=0; i<num_arg; i++) {
-    obj = JNU_NewObjectByName(env,
-                              "sun/management/DiagnosticCommandArgumentInfo",
-                              "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZI)V",
-                              (*env)->NewStringUTF(env,dcmd_arg_info_array[i].name),
-                              (*env)->NewStringUTF(env,dcmd_arg_info_array[i].description),
-                              (*env)->NewStringUTF(env,dcmd_arg_info_array[i].type),
-                              dcmd_arg_info_array[i].default_string == NULL ? NULL:
-                              (*env)->NewStringUTF(env, dcmd_arg_info_array[i].default_string),
-                              dcmd_arg_info_array[i].mandatory,
-                              dcmd_arg_info_array[i].option,
-                              dcmd_arg_info_array[i].multiple,
-                              dcmd_arg_info_array[i].position);
-    if (obj == NULL) {
-      free(dcmd_arg_info_array);
-      return NULL;
-    }
-    (*env)->SetObjectArrayElement(env, result, i, obj);
-  }
-  free(dcmd_arg_info_array);
-  arraysCls = (*env)->FindClass(env, "java/util/Arrays");
-  if ((*env)->ExceptionCheck(env)) {
-    return NULL;
-  }
-  mid = (*env)->GetStaticMethodID(env, arraysCls,
-                                  "asList", "([Ljava/lang/Object;)Ljava/util/List;");
-  resultList = (*env)->CallStaticObjectMethod(env, arraysCls, mid, result);
-  if ((*env)->ExceptionCheck(env)) {
-    // Make sure we return NULL in case of OOM inside Java
-    return NULL;
-  }
-  return resultList;
-}
-
-/* Throws IllegalArgumentException if at least one of the diagnostic command
- * passed in argument is not supported by the JVM
- */
-JNIEXPORT jobjectArray JNICALL
-Java_sun_management_DiagnosticCommandImpl_getDiagnosticCommandInfo
-(JNIEnv *env, jobject dummy, jobjectArray commands)
-{
-  int i;
-  jclass dcmdInfoCls;
-  jobject result;
-  jobjectArray args;
-  jobject obj;
-  jmmOptionalSupport mos;
-  jint ret = jmm_interface->GetOptionalSupport(env, &mos);
-  jsize num_commands;
-  dcmdInfo* dcmd_info_array;
-
-  if (commands == NULL) {
-      JNU_ThrowNullPointerException(env, "Invalid String Array");
-      return NULL;
-  }
-  num_commands = (*env)->GetArrayLength(env, commands);
-  dcmdInfoCls = (*env)->FindClass(env,
-                                  "sun/management/DiagnosticCommandInfo");
-  if ((*env)->ExceptionCheck(env)) {
-    return NULL;
-  }
-
-  result = (*env)->NewObjectArray(env, num_commands, dcmdInfoCls, NULL);
-  if (result == NULL) {
-      JNU_ThrowOutOfMemoryError(env, 0);
-      return NULL;
-  }
-  if (num_commands == 0) {
-      /* Handle the 'zero commands' case specially to avoid calling 'malloc()' */
-      /* with a zero argument because that may legally return a NULL pointer.  */
-      return result;
-  }
-  dcmd_info_array = (dcmdInfo*) malloc(num_commands * sizeof(dcmdInfo));
-  if (dcmd_info_array == NULL) {
-      JNU_ThrowOutOfMemoryError(env, NULL);
-      return NULL;
-  }
-  jmm_interface->GetDiagnosticCommandInfo(env, commands, dcmd_info_array);
-  for (i=0; i<num_commands; i++) {
-      args = getDiagnosticCommandArgumentInfoArray(env,
-                                                   (*env)->GetObjectArrayElement(env,commands,i),
-                                                   dcmd_info_array[i].num_arguments);
-      if (args == NULL) {
-          free(dcmd_info_array);
-          JNU_ThrowOutOfMemoryError(env, 0);
-          return NULL;
-      }
-      obj = JNU_NewObjectByName(env,
-                                "sun/management/DiagnosticCommandInfo",
-                                "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V",
-                                (*env)->NewStringUTF(env,dcmd_info_array[i].name),
-                                (*env)->NewStringUTF(env,dcmd_info_array[i].description),
-                                (*env)->NewStringUTF(env,dcmd_info_array[i].impact),
-                                dcmd_info_array[i].permission_class==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_class),
-                                dcmd_info_array[i].permission_name==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_name),
-                                dcmd_info_array[i].permission_action==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_action),
-                                dcmd_info_array[i].enabled,
-                                args);
-      if (obj == NULL) {
-          free(dcmd_info_array);
-          JNU_ThrowOutOfMemoryError(env, 0);
-          return NULL;
-      }
-      (*env)->SetObjectArrayElement(env, result, i, obj);
-  }
-  free(dcmd_info_array);
-  return result;
-}
-
-/* Throws IllegalArgumentException if the diagnostic command
- * passed in argument is not supported by the JVM
- */
-JNIEXPORT jstring JNICALL
-Java_sun_management_DiagnosticCommandImpl_executeDiagnosticCommand
-(JNIEnv *env, jobject dummy, jstring command) {
-  return jmm_interface->ExecuteDiagnosticCommand(env, command);
-}
--- a/jdk/src/java.management/share/native/libmanagement/Flag.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <jni.h>
-#include "management.h"
-#include "sun_management_Flag.h"
-
-static jobject default_origin = NULL;
-static jobject vm_creation_origin = NULL;
-static jobject mgmt_origin = NULL;
-static jobject envvar_origin = NULL;
-static jobject config_file_origin = NULL;
-static jobject ergo_origin = NULL;
-static jobject attach_origin = NULL;
-static jobject other_origin = NULL;
-
-JNIEXPORT jint JNICALL
-Java_sun_management_Flag_getInternalFlagCount
-  (JNIEnv *env, jclass cls)
-{
-    jlong count = jmm_interface->GetLongAttribute(env, NULL,
-                                                  JMM_VM_GLOBAL_COUNT);
-    return (jint) count;
-}
-
-JNIEXPORT jobjectArray JNICALL
-  Java_sun_management_Flag_getAllFlagNames
-(JNIEnv *env, jclass cls)
-{
-  return jmm_interface->GetVMGlobalNames(env);
-}
-
-static jobject find_origin_constant(JNIEnv* env, const char* enum_name) {
-    jvalue field;
-    field = JNU_GetStaticFieldByName(env,
-                                     NULL,
-                                     "com/sun/management/VMOption$Origin",
-                                     enum_name,
-                                     "Lcom/sun/management/VMOption$Origin;");
-    return (*env)->NewGlobalRef(env, field.l);
-}
-
-JNIEXPORT void JNICALL
-Java_sun_management_Flag_initialize
-  (JNIEnv *env, jclass cls)
-{
-    default_origin = find_origin_constant(env, "DEFAULT");
-    vm_creation_origin = find_origin_constant(env, "VM_CREATION");
-    mgmt_origin = find_origin_constant(env, "MANAGEMENT");
-    envvar_origin = find_origin_constant(env, "ENVIRON_VAR");
-    config_file_origin = find_origin_constant(env, "CONFIG_FILE");
-    ergo_origin = find_origin_constant(env, "ERGONOMIC");
-    attach_origin = find_origin_constant(env, "ATTACH_ON_DEMAND");
-    other_origin = find_origin_constant(env, "OTHER");
-}
-
-JNIEXPORT jint JNICALL
-Java_sun_management_Flag_getFlags
-  (JNIEnv *env, jclass cls, jobjectArray names, jobjectArray flags, jint count)
-{
-    jint num_flags, i, index;
-    jmmVMGlobal* globals;
-    size_t gsize;
-    const char* class_name = "sun/management/Flag";
-    const char* signature = "(Ljava/lang/String;Ljava/lang/Object;ZZLcom/sun/management/VMOption$Origin;)V";
-    jobject origin;
-    jobject valueObj;
-    jobject flag;
-
-    if (flags == NULL) {
-        JNU_ThrowNullPointerException(env, 0);
-        return 0;
-    }
-
-    if (count <= 0) {
-        JNU_ThrowIllegalArgumentException(env, 0);
-        return 0;
-    }
-
-    gsize = (size_t)count * sizeof(jmmVMGlobal);
-    globals = (jmmVMGlobal*) malloc(gsize);
-    if (globals == NULL) {
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return 0;
-    }
-
-    memset(globals, 0, gsize);
-    num_flags = jmm_interface->GetVMGlobals(env, names, globals, count);
-    if (num_flags == 0) {
-        free(globals);
-        return 0;
-    }
-
-    index = 0;
-    for (i = 0; i < count; i++) {
-        if (globals[i].name == NULL) {
-            continue;
-        }
-        switch (globals[i].type) {
-        case JMM_VMGLOBAL_TYPE_JBOOLEAN:
-            valueObj = JNU_NewObjectByName(env, "java/lang/Boolean", "(Z)V",
-                                           globals[i].value.z);
-            break;
-        case JMM_VMGLOBAL_TYPE_JSTRING:
-            valueObj = globals[i].value.l;
-            break;
-        case JMM_VMGLOBAL_TYPE_JLONG:
-            valueObj = JNU_NewObjectByName(env, "java/lang/Long", "(J)V",
-                                           globals[i].value.j);
-            break;
-        case JMM_VMGLOBAL_TYPE_JDOUBLE:
-            valueObj = JNU_NewObjectByName(env, "java/lang/Double", "(D)V",
-                                           globals[i].value.d);
-            break;
-        default:
-            // ignore unsupported type
-            continue;
-        }
-        switch (globals[i].origin) {
-        case JMM_VMGLOBAL_ORIGIN_DEFAULT:
-            origin = default_origin;
-            break;
-        case JMM_VMGLOBAL_ORIGIN_COMMAND_LINE:
-            origin = vm_creation_origin;
-            break;
-        case JMM_VMGLOBAL_ORIGIN_MANAGEMENT:
-            origin = mgmt_origin;
-            break;
-        case JMM_VMGLOBAL_ORIGIN_ENVIRON_VAR:
-            origin = envvar_origin;
-            break;
-        case JMM_VMGLOBAL_ORIGIN_CONFIG_FILE:
-            origin = config_file_origin;
-            break;
-        case JMM_VMGLOBAL_ORIGIN_ERGONOMIC:
-            origin = ergo_origin;
-            break;
-        case JMM_VMGLOBAL_ORIGIN_ATTACH_ON_DEMAND:
-            origin = attach_origin;
-            break;
-        case JMM_VMGLOBAL_ORIGIN_OTHER:
-            origin = other_origin;
-            break;
-        default:
-            // unknown origin
-            origin = other_origin;
-            break;
-        }
-        flag = JNU_NewObjectByName(env, class_name, signature, globals[i].name,
-                                   valueObj, globals[i].writeable,
-                                   globals[i].external, origin);
-        if (flag == NULL) {
-            free(globals);
-            JNU_ThrowOutOfMemoryError(env, 0);
-            return 0;
-        }
-        (*env)->SetObjectArrayElement(env, flags, index, flag);
-        index++;
-    }
-
-    if (index != num_flags) {
-        JNU_ThrowInternalError(env, "Number of Flag objects created unmatched");
-        free(globals);
-        return 0;
-    }
-
-    free(globals);
-
-    /* return the number of Flag objects created */
-    return num_flags;
-}
-
-JNIEXPORT void JNICALL
-Java_sun_management_Flag_setLongValue
-  (JNIEnv *env, jclass cls, jstring name, jlong value)
-{
-   jvalue v;
-   v.j = value;
-
-   jmm_interface->SetVMGlobal(env, name, v);
-}
-
-JNIEXPORT void JNICALL
-Java_sun_management_Flag_setDoubleValue
-  (JNIEnv *env, jclass cls, jstring name, jdouble value)
-{
-   jvalue v;
-   v.d = value;
-
-   jmm_interface->SetVMGlobal(env, name, v);
-}
-
-JNIEXPORT void JNICALL
-Java_sun_management_Flag_setBooleanValue
-  (JNIEnv *env, jclass cls, jstring name, jboolean value)
-{
-   jvalue v;
-   v.z = value;
-
-   jmm_interface->SetVMGlobal(env, name, v);
-}
-
-JNIEXPORT void JNICALL
-Java_sun_management_Flag_setStringValue
-  (JNIEnv *env, jclass cls, jstring name, jstring value)
-{
-   jvalue v;
-   v.l = value;
-
-   jmm_interface->SetVMGlobal(env, name, v);
-}
--- a/jdk/src/java.management/share/native/libmanagement/GarbageCollectorImpl.c	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.management/share/native/libmanagement/GarbageCollectorImpl.c	Thu May 07 20:50:07 2015 -0700
@@ -36,17 +36,3 @@
   (JNIEnv *env, jobject mgr) {
     return jmm_interface->GetLongAttribute(env, mgr, JMM_GC_TIME_MS);
 }
-
-
-JNIEXPORT void JNICALL Java_sun_management_GarbageCollectorImpl_setNotificationEnabled
-(JNIEnv *env, jobject dummy, jobject gc,jboolean enabled) {
-
-    if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
-        return;
-    }
-    if((jmm_version > JMM_VERSION_1_2)
-       || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=1))) {
-      jmm_interface->SetGCNotificationEnabled(env, gc, enabled);
-    }
-}
--- a/jdk/src/java.management/share/native/libmanagement/GcInfoBuilder.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <jni.h>
-#include "management.h"
-#include "sun_management_GcInfoBuilder.h"
-
-JNIEXPORT jint JNICALL Java_sun_management_GcInfoBuilder_getNumGcExtAttributes
-  (JNIEnv *env, jobject dummy, jobject gc) {
-    jlong value;
-
-    if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
-        return 0;
-    }
-    value = jmm_interface->GetLongAttribute(env, gc,
-                                            JMM_GC_EXT_ATTRIBUTE_INFO_SIZE);
-    return (jint) value;
-}
-
-JNIEXPORT void JNICALL Java_sun_management_GcInfoBuilder_fillGcAttributeInfo
-  (JNIEnv *env, jobject dummy, jobject gc,
-   jint num_attributes, jobjectArray attributeNames,
-   jcharArray types, jobjectArray descriptions) {
-
-    jmmExtAttributeInfo* ext_att_info;
-    jchar* nativeTypes;
-    jstring attName = NULL;
-    jstring desc = NULL;
-    jint ret = 0;
-    jint i;
-
-    if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
-        return;
-    }
-
-    if (num_attributes <= 0) {
-        JNU_ThrowIllegalArgumentException(env, "Invalid num_attributes");
-        return;
-    }
-
-    ext_att_info = (jmmExtAttributeInfo*) malloc((size_t)num_attributes *
-                                                 sizeof(jmmExtAttributeInfo));
-    if (ext_att_info == NULL) {
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return;
-    }
-    ret = jmm_interface->GetGCExtAttributeInfo(env, gc,
-                                               ext_att_info, num_attributes);
-    if (ret != num_attributes) {
-        JNU_ThrowInternalError(env, "Unexpected num_attributes");
-        free(ext_att_info);
-        return;
-    }
-
-    nativeTypes = (jchar*) malloc((size_t)num_attributes * sizeof(jchar));
-    if (nativeTypes == NULL) {
-        free(ext_att_info);
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return;
-    }
-    for (i = 0; i < num_attributes; i++) {
-        nativeTypes[i] = ext_att_info[i].type;
-        attName = (*env)->NewStringUTF(env, ext_att_info[i].name);
-        desc = (*env)->NewStringUTF(env, ext_att_info[i].description);
-        (*env)->SetObjectArrayElement(env, attributeNames, i, attName);
-        (*env)->SetObjectArrayElement(env, descriptions, i, desc);
-    }
-    (*env)->SetCharArrayRegion(env, types, 0, num_attributes, nativeTypes);
-
-    if (ext_att_info != NULL) {
-        free(ext_att_info);
-    }
-    if (nativeTypes != NULL) {
-        free(nativeTypes);
-    }
-}
-
-static void setLongValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                      jsize index, jlong value) {
-    static const char* class_name = "java/lang/Long";
-    static const char* signature = "(J)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-static void setBooleanValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                         jsize index, jboolean value) {
-    static const char* class_name = "java/lang/Boolean";
-    static const char* signature = "(Z)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-static void setByteValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                      jsize index, jbyte value) {
-    static const char* class_name = "java/lang/Byte";
-    static const char* signature = "(B)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-static void setIntValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                     jsize index, jint value) {
-    static const char* class_name = "java/lang/Integer";
-    static const char* signature = "(I)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-static void setShortValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                       jsize index, jshort value) {
-    static const char* class_name = "java/lang/Short";
-    static const char* signature = "(S)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-static void setDoubleValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                        jsize index, jdouble value) {
-    static const char* class_name = "java/lang/Double";
-    static const char* signature = "(D)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-static void setFloatValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                       jsize index, jfloat value) {
-    static const char* class_name = "java/lang/Float";
-    static const char* signature = "(D)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-static void setCharValueAtObjectArray(JNIEnv *env, jobjectArray array,
-                                      jsize index, jchar value) {
-    static const char* class_name = "java/lang/Character";
-    static const char* signature = "(C)V";
-    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
-
-    (*env)->SetObjectArrayElement(env, array, index, obj);
-}
-
-JNIEXPORT jobject JNICALL Java_sun_management_GcInfoBuilder_getLastGcInfo0
-  (JNIEnv *env, jobject builder, jobject gc,
-   jint ext_att_count, jobjectArray ext_att_values, jcharArray ext_att_types,
-   jobjectArray usageBeforeGC, jobjectArray usageAfterGC) {
-
-    jmmGCStat   gc_stat;
-    jchar*      nativeTypes;
-    jsize       i;
-    jvalue      v;
-
-    if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
-        return 0;
-    }
-
-    if (ext_att_count <= 0) {
-        JNU_ThrowIllegalArgumentException(env, "Invalid ext_att_count");
-        return 0;
-    }
-
-    gc_stat.usage_before_gc = usageBeforeGC;
-    gc_stat.usage_after_gc = usageAfterGC;
-    gc_stat.gc_ext_attribute_values_size = ext_att_count;
-    if (ext_att_count > 0) {
-        gc_stat.gc_ext_attribute_values = (jvalue*) malloc((size_t)ext_att_count *
-                                                           sizeof(jvalue));
-        if (gc_stat.gc_ext_attribute_values == NULL) {
-            JNU_ThrowOutOfMemoryError(env, 0);
-            return 0;
-        }
-    } else {
-        gc_stat.gc_ext_attribute_values = NULL;
-    }
-
-
-    jmm_interface->GetLastGCStat(env, gc, &gc_stat);
-    if (gc_stat.gc_index == 0) {
-        if (gc_stat.gc_ext_attribute_values != NULL) {
-            free(gc_stat.gc_ext_attribute_values);
-        }
-        return 0;
-    }
-
-    // convert the ext_att_types to native types
-    nativeTypes = (jchar*) malloc((size_t)ext_att_count * sizeof(jchar));
-    if (nativeTypes == NULL) {
-        if (gc_stat.gc_ext_attribute_values != NULL) {
-            free(gc_stat.gc_ext_attribute_values);
-        }
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return 0;
-    }
-    (*env)->GetCharArrayRegion(env, ext_att_types, 0, ext_att_count, nativeTypes);
-    for (i = 0; i < ext_att_count; i++) {
-       v = gc_stat.gc_ext_attribute_values[i];
-       switch (nativeTypes[i]) {
-            case 'Z':
-                setBooleanValueAtObjectArray(env, ext_att_values, i, v.z);
-                break;
-            case 'B':
-                setByteValueAtObjectArray(env, ext_att_values, i, v.b);
-                break;
-            case 'C':
-                setCharValueAtObjectArray(env, ext_att_values, i, v.c);
-                break;
-            case 'S':
-                setShortValueAtObjectArray(env, ext_att_values, i, v.s);
-                break;
-            case 'I':
-                setIntValueAtObjectArray(env, ext_att_values, i, v.i);
-                break;
-            case 'J':
-                setLongValueAtObjectArray(env, ext_att_values, i, v.j);
-                break;
-            case 'F':
-                setFloatValueAtObjectArray(env, ext_att_values, i, v.f);
-                break;
-            case 'D':
-                setDoubleValueAtObjectArray(env, ext_att_values, i, v.d);
-                break;
-            default:
-                if (gc_stat.gc_ext_attribute_values != NULL) {
-                    free(gc_stat.gc_ext_attribute_values);
-                }
-                if (nativeTypes != NULL) {
-                    free(nativeTypes);
-                }
-                JNU_ThrowInternalError(env, "Unsupported attribute type");
-                return 0;
-       }
-    }
-    if (gc_stat.gc_ext_attribute_values != NULL) {
-        free(gc_stat.gc_ext_attribute_values);
-    }
-    if (nativeTypes != NULL) {
-        free(nativeTypes);
-    }
-
-    return JNU_NewObjectByName(env,
-       "com/sun/management/GcInfo",
-       "(Lsun/management/GcInfoBuilder;JJJ[Ljava/lang/management/MemoryUsage;[Ljava/lang/management/MemoryUsage;[Ljava/lang/Object;)V",
-       builder,
-       gc_stat.gc_index,
-       gc_stat.start_time,
-       gc_stat.end_time,
-       usageBeforeGC,
-       usageAfterGC,
-       ext_att_values);
-}
--- a/jdk/src/java.management/share/native/libmanagement/HotSpotDiagnostic.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, 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.
- */
-
-#include <jni.h>
-#include "jvm.h"
-#include "management.h"
-#include "sun_management_HotSpotDiagnostic.h"
-
-JNIEXPORT void JNICALL
-Java_sun_management_HotSpotDiagnostic_dumpHeap0
-  (JNIEnv *env, jobject dummy, jstring outputfile, jboolean live)
-{
-    jmm_interface->DumpHeap0(env, outputfile, live);
-}
--- a/jdk/src/java.management/unix/classes/sun/management/OperatingSystemImpl.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-package sun.management;
-
-/**
- * Implementation class for the operating system.
- * Standard and committed hotspot-specific metrics if any.
- *
- * ManagementFactory.getOperatingSystemMXBean() returns an instance
- * of this class.
- */
-class OperatingSystemImpl extends BaseOperatingSystemImpl
-    implements com.sun.management.UnixOperatingSystemMXBean {
-
-    OperatingSystemImpl(VMManagement vm) {
-        super(vm);
-    }
-
-    public long getCommittedVirtualMemorySize() {
-        return getCommittedVirtualMemorySize0();
-    }
-
-    public long getTotalSwapSpaceSize() {
-        return getTotalSwapSpaceSize0();
-    }
-
-    public long getFreeSwapSpaceSize() {
-        return getFreeSwapSpaceSize0();
-    }
-
-    public long getProcessCpuTime() {
-        return getProcessCpuTime0();
-    }
-
-    public long getFreePhysicalMemorySize() {
-        return getFreePhysicalMemorySize0();
-    }
-
-    public long getTotalPhysicalMemorySize() {
-        return getTotalPhysicalMemorySize0();
-    }
-
-    public long getOpenFileDescriptorCount() {
-        return getOpenFileDescriptorCount0();
-    }
-
-    public long getMaxFileDescriptorCount() {
-        return getMaxFileDescriptorCount0();
-    }
-
-    public double getSystemCpuLoad() {
-        return getSystemCpuLoad0();
-    }
-
-    public double getProcessCpuLoad() {
-        return getProcessCpuLoad0();
-    }
-
-    /* native methods */
-    private native long getCommittedVirtualMemorySize0();
-    private native long getFreePhysicalMemorySize0();
-    private native long getFreeSwapSpaceSize0();
-    private native long getMaxFileDescriptorCount0();
-    private native long getOpenFileDescriptorCount0();
-    private native long getProcessCpuTime0();
-    private native double getProcessCpuLoad0();
-    private native double getSystemCpuLoad0();
-    private native long getTotalPhysicalMemorySize0();
-    private native long getTotalSwapSpaceSize0();
-
-    static {
-        initialize0();
-    }
-
-    private static native void initialize0();
-}
--- a/jdk/src/java.management/unix/native/libmanagement/LinuxOperatingSystem.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <pthread.h>
-#include <inttypes.h>
-#include "sun_management_OperatingSystemImpl.h"
-
-struct ticks {
-    uint64_t  used;
-    uint64_t  usedKernel;
-    uint64_t  total;
-};
-
-typedef struct ticks ticks;
-
-typedef enum {
-    CPU_LOAD_VM_ONLY,
-    CPU_LOAD_GLOBAL,
-} CpuLoadTarget;
-
-static struct perfbuf {
-    int   nProcs;
-    ticks jvmTicks;
-    ticks cpuTicks;
-    ticks *cpus;
-} counters;
-
-#define DEC_64 "%"SCNd64
-
-static void next_line(FILE *f) {
-    while (fgetc(f) != '\n');
-}
-
-/**
- * Return the total number of ticks since the system was booted.
- * If the usedTicks parameter is not NULL, it will be filled with
- * the number of ticks spent on actual processes (user, system or
- * nice processes) since system boot. Note that this is the total number
- * of "executed" ticks on _all_ CPU:s, that is on a n-way system it is
- * n times the number of ticks that has passed in clock time.
- *
- * Returns a negative value if the reading of the ticks failed.
- */
-static int get_totalticks(int which, ticks *pticks) {
-    FILE         *fh;
-    uint64_t        userTicks, niceTicks, systemTicks, idleTicks;
-    int             n;
-
-    if((fh = fopen("/proc/stat", "r")) == NULL) {
-        return -1;
-    }
-
-    n = fscanf(fh, "cpu " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64,
-           &userTicks, &niceTicks, &systemTicks, &idleTicks);
-
-    // Move to next line
-    next_line(fh);
-
-    //find the line for requested cpu faster to just iterate linefeeds?
-    if (which != -1) {
-        int i;
-        for (i = 0; i < which; i++) {
-            if (fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, &userTicks, &niceTicks, &systemTicks, &idleTicks) != 4) {
-                fclose(fh);
-                return -2;
-            }
-            next_line(fh);
-        }
-        n = fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64 "\n",
-           &userTicks, &niceTicks, &systemTicks, &idleTicks);
-    }
-
-    fclose(fh);
-    if (n != 4) {
-        return -2;
-    }
-
-    pticks->used       = userTicks + niceTicks;
-    pticks->usedKernel = systemTicks;
-    pticks->total      = userTicks + niceTicks + systemTicks + idleTicks;
-
-    return 0;
-}
-
-static int vread_statdata(const char *procfile, const char *fmt, va_list args) {
-    FILE    *f;
-    int     n;
-    char     buf[2048];
-
-    if ((f = fopen(procfile, "r")) == NULL) {
-        return -1;
-    }
-
-    if ((n = fread(buf, 1, sizeof(buf), f)) != -1) {
-    char *tmp;
-
-    buf[n-1] = '\0';
-    /** skip through pid and exec name. the exec name _could be wacky_ (renamed) and
-     *  make scanf go mupp.
-     */
-    if ((tmp = strrchr(buf, ')')) != NULL) {
-        // skip the ')' and the following space but check that the buffer is long enough
-        tmp += 2;
-        if (tmp < buf + n) {
-        n = vsscanf(tmp, fmt, args);
-        }
-    }
-    }
-
-    fclose(f);
-
-    return n;
-}
-
-static int read_statdata(const char *procfile, const char *fmt, ...) {
-    int       n;
-    va_list args;
-
-    va_start(args, fmt);
-    n = vread_statdata(procfile, fmt, args);
-    va_end(args);
-    return n;
-}
-
-/** read user and system ticks from a named procfile, assumed to be in 'stat' format then. */
-static int read_ticks(const char *procfile, uint64_t *userTicks, uint64_t *systemTicks) {
-    return read_statdata(procfile, "%*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "DEC_64" "DEC_64,
-             userTicks, systemTicks
-             );
-}
-
-/**
- * Return the number of ticks spent in any of the processes belonging
- * to the JVM on any CPU.
- */
-static int get_jvmticks(ticks *pticks) {
-    uint64_t userTicks;
-    uint64_t systemTicks;
-
-    if (read_ticks("/proc/self/stat", &userTicks, &systemTicks) < 0) {
-        return -1;
-    }
-
-    // get the total
-    if (get_totalticks(-1, pticks) < 0) {
-        return -1;
-    }
-
-    pticks->used       = userTicks;
-    pticks->usedKernel = systemTicks;
-
-    return 0;
-}
-
-/**
- * This method must be called first, before any data can be gathererd.
- */
-int perfInit() {
-    static int initialized=1;
-
-    if (!initialized) {
-        int  i;
-
-        int n = sysconf(_SC_NPROCESSORS_ONLN);
-        if (n <= 0) {
-            n = 1;
-        }
-
-        counters.cpus = calloc(n,sizeof(ticks));
-        if (counters.cpus != NULL)  {
-            // For the CPU load
-            get_totalticks(-1, &counters.cpuTicks);
-
-            for (i = 0; i < n; i++) {
-                get_totalticks(i, &counters.cpus[i]);
-            }
-            // For JVM load
-            get_jvmticks(&counters.jvmTicks);
-            initialized = 1;
-        }
-    }
-
-    return initialized ? 0 : -1;
-}
-
-#define MAX(a,b) (a>b?a:b)
-#define MIN(a,b) (a<b?a:b)
-
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-
-/**
- * Return the load of the CPU as a double. 1.0 means the CPU process uses all
- * available time for user or system processes, 0.0 means the CPU uses all time
- * being idle.
- *
- * Returns a negative value if there is a problem in determining the CPU load.
- */
-
-static double get_cpuload_internal(int which, double *pkernelLoad, CpuLoadTarget target) {
-    uint64_t udiff, kdiff, tdiff;
-    ticks *pticks, tmp;
-    double user_load = -1.0;
-    int failed = 0;
-
-    *pkernelLoad = 0.0;
-
-    pthread_mutex_lock(&lock);
-
-    if(perfInit() == 0) {
-
-        if (target == CPU_LOAD_VM_ONLY) {
-            pticks = &counters.jvmTicks;
-        } else if (which == -1) {
-            pticks = &counters.cpuTicks;
-        } else {
-            pticks = &counters.cpus[which];
-        }
-
-        tmp = *pticks;
-
-        if (target == CPU_LOAD_VM_ONLY) {
-            if (get_jvmticks(pticks) != 0) {
-                failed = 1;
-            }
-        } else if (get_totalticks(which, pticks) < 0) {
-            failed = 1;
-        }
-
-        if(!failed) {
-            // seems like we sometimes end up with less kernel ticks when
-            // reading /proc/self/stat a second time, timing issue between cpus?
-            if (pticks->usedKernel < tmp.usedKernel) {
-                kdiff = 0;
-            } else {
-                kdiff = pticks->usedKernel - tmp.usedKernel;
-            }
-            tdiff = pticks->total - tmp.total;
-            udiff = pticks->used - tmp.used;
-
-            if (tdiff == 0) {
-                user_load = 0;
-            } else {
-                if (tdiff < (udiff + kdiff)) {
-                    tdiff = udiff + kdiff;
-                }
-                *pkernelLoad = (kdiff / (double)tdiff);
-                // BUG9044876, normalize return values to sane values
-                *pkernelLoad = MAX(*pkernelLoad, 0.0);
-                *pkernelLoad = MIN(*pkernelLoad, 1.0);
-
-                user_load = (udiff / (double)tdiff);
-                user_load = MAX(user_load, 0.0);
-                user_load = MIN(user_load, 1.0);
-            }
-        }
-    }
-    pthread_mutex_unlock(&lock);
-    return user_load;
-}
-
-double get_cpu_load(int which) {
-    double u, s;
-    u = get_cpuload_internal(which, &s, CPU_LOAD_GLOBAL);
-    if (u < 0) {
-        return -1.0;
-    }
-    // Cap total systemload to 1.0
-    return MIN((u + s), 1.0);
-}
-
-double get_process_load() {
-    double u, s;
-    u = get_cpuload_internal(-1, &s, CPU_LOAD_VM_ONLY);
-    if (u < 0) {
-        return -1.0;
-    }
-    return u + s;
-}
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    if(perfInit() == 0) {
-        return get_cpu_load(-1);
-    } else {
-        return -1.0;
-    }
-}
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    if(perfInit() == 0) {
-        return get_process_load();
-    } else {
-        return -1.0;
-    }
-}
--- a/jdk/src/java.management/unix/native/libmanagement/MacosxOperatingSystem.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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.
- */
-
-#include "sun_management_OperatingSystemImpl.h"
-
-#include <sys/time.h>
-#include <mach/mach.h>
-#include <mach/task_info.h>
-
-#include "jvm.h"
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    // This code is influenced by the darwin top source
-
-    kern_return_t kr;
-    mach_msg_type_number_t count;
-    host_cpu_load_info_data_t load;
-
-    static jlong last_used  = 0;
-    static jlong last_total = 0;
-
-    count = HOST_CPU_LOAD_INFO_COUNT;
-    kr = host_statistics(mach_host_self(), HOST_CPU_LOAD_INFO, (host_info_t)&load, &count);
-    if (kr != KERN_SUCCESS) {
-        return -1;
-    }
-
-    jlong used  = load.cpu_ticks[CPU_STATE_USER] + load.cpu_ticks[CPU_STATE_NICE] + load.cpu_ticks[CPU_STATE_SYSTEM];
-    jlong total = used + load.cpu_ticks[CPU_STATE_IDLE];
-
-    if (last_used == 0 || last_total == 0) {
-        // First call, just set the last values
-        last_used  = used;
-        last_total = total;
-        // return 0 since we have no data, not -1 which indicates error
-        return 0;
-    }
-
-    jlong used_delta  = used - last_used;
-    jlong total_delta = total - last_total;
-
-    jdouble cpu = (jdouble) used_delta / total_delta;
-
-    last_used  = used;
-    last_total = total;
-
-    return cpu;
-}
-
-
-#define TIME_VALUE_TO_TIMEVAL(a, r) do {  \
-     (r)->tv_sec = (a)->seconds;          \
-     (r)->tv_usec = (a)->microseconds;    \
-} while (0)
-
-
-#define TIME_VALUE_TO_MICROSECONDS(TV) \
-     ((TV).tv_sec * 1000 * 1000 + (TV).tv_usec)
-
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    // This code is influenced by the darwin top source
-
-    struct task_basic_info_64 task_info_data;
-    struct task_thread_times_info thread_info_data;
-    struct timeval user_timeval, system_timeval, task_timeval;
-    struct timeval now;
-    mach_port_t task = mach_task_self();
-    kern_return_t kr;
-
-    static jlong last_task_time = 0;
-    static jlong last_time      = 0;
-
-    mach_msg_type_number_t thread_info_count = TASK_THREAD_TIMES_INFO_COUNT;
-    kr = task_info(task,
-            TASK_THREAD_TIMES_INFO,
-            (task_info_t)&thread_info_data,
-            &thread_info_count);
-    if (kr != KERN_SUCCESS) {
-        // Most likely cause: |task| is a zombie.
-        return -1;
-    }
-
-    mach_msg_type_number_t count = TASK_BASIC_INFO_64_COUNT;
-    kr = task_info(task,
-            TASK_BASIC_INFO_64,
-            (task_info_t)&task_info_data,
-            &count);
-    if (kr != KERN_SUCCESS) {
-        // Most likely cause: |task| is a zombie.
-        return -1;
-    }
-
-    /* Set total_time. */
-    // thread info contains live time...
-    TIME_VALUE_TO_TIMEVAL(&thread_info_data.user_time, &user_timeval);
-    TIME_VALUE_TO_TIMEVAL(&thread_info_data.system_time, &system_timeval);
-    timeradd(&user_timeval, &system_timeval, &task_timeval);
-
-    // ... task info contains terminated time.
-    TIME_VALUE_TO_TIMEVAL(&task_info_data.user_time, &user_timeval);
-    TIME_VALUE_TO_TIMEVAL(&task_info_data.system_time, &system_timeval);
-    timeradd(&user_timeval, &task_timeval, &task_timeval);
-    timeradd(&system_timeval, &task_timeval, &task_timeval);
-
-    if (gettimeofday(&now, NULL) < 0) {
-       return -1;
-    }
-    jint ncpus      = JVM_ActiveProcessorCount();
-    jlong time      = TIME_VALUE_TO_MICROSECONDS(now) * ncpus;
-    jlong task_time = TIME_VALUE_TO_MICROSECONDS(task_timeval);
-
-    if ((last_task_time == 0) || (last_time == 0)) {
-        // First call, just set the last values.
-        last_task_time = task_time;
-        last_time      = time;
-        // return 0 since we have no data, not -1 which indicates error
-        return 0;
-    }
-
-    jlong task_time_delta = task_time - last_task_time;
-    jlong time_delta      = time - last_time;
-    if (time_delta == 0) {
-        return -1;
-    }
-
-    jdouble cpu = (jdouble) task_time_delta / time_delta;
-
-    last_task_time = task_time;
-    last_time      = time;
-
-    return cpu;
- }
--- a/jdk/src/java.management/unix/native/libmanagement/OperatingSystemImpl.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jlong.h"
-#include "jvm.h"
-#include "management.h"
-#include "sun_management_OperatingSystemImpl.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#if defined(_ALLBSD_SOURCE)
-#include <sys/sysctl.h>
-#ifdef __APPLE__
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <mach/mach.h>
-#include <sys/proc_info.h>
-#include <libproc.h>
-#endif
-#elif !defined(_AIX)
-#include <sys/swap.h>
-#endif
-#include <sys/resource.h>
-#include <sys/times.h>
-#ifndef _ALLBSD_SOURCE
-#include <sys/sysinfo.h>
-#endif
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#if defined(_AIX)
-#include <libperfstat.h>
-#endif
-
-static jlong page_size = 0;
-
-#if defined(_ALLBSD_SOURCE) || defined(_AIX)
-#define MB      (1024UL * 1024UL)
-#else
-
-/* This gets us the new structured proc interfaces of 5.6 & later */
-/* - see comment in <sys/procfs.h> */
-#define _STRUCTURED_PROC 1
-#include <sys/procfs.h>
-
-#endif /* _ALLBSD_SOURCE */
-
-static struct dirent* read_dir(DIR* dirp, struct dirent* entry) {
-#ifdef __solaris__
-    struct dirent* dbuf = readdir(dirp);
-    return dbuf;
-#else /* __linux__ || _ALLBSD_SOURCE */
-    struct dirent* p;
-    if (readdir_r(dirp, entry, &p) == 0) {
-        return p;
-    } else {
-        return NULL;
-    }
-#endif
-}
-
-// true = get available swap in bytes
-// false = get total swap in bytes
-static jlong get_total_or_available_swap_space_size(JNIEnv* env, jboolean available) {
-#ifdef __solaris__
-    long total, avail;
-    int nswap, i, count;
-    swaptbl_t *stbl;
-    char *strtab;
-
-    // First get the number of swap resource entries
-    if ((nswap = swapctl(SC_GETNSWP, NULL)) == -1) {
-        throw_internal_error(env, "swapctl failed to get nswap");
-        return -1;
-    }
-    if (nswap == 0) {
-        return 0;
-    }
-
-    // Allocate storage for resource entries
-    stbl = (swaptbl_t*) malloc(nswap * sizeof(swapent_t) +
-                               sizeof(struct swaptable));
-    if (stbl == NULL) {
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return -1;
-    }
-
-    // Allocate storage for the table
-    strtab = (char*) malloc((nswap + 1) * MAXPATHLEN);
-    if (strtab == NULL) {
-        free(stbl);
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return -1;
-    }
-
-    for (i = 0; i < (nswap + 1); i++) {
-      stbl->swt_ent[i].ste_path = strtab + (i * MAXPATHLEN);
-    }
-    stbl->swt_n = nswap + 1;
-
-    // Get the entries
-    if ((count = swapctl(SC_LIST, stbl)) < 0) {
-        free(stbl);
-        free(strtab);
-        throw_internal_error(env, "swapctl failed to get swap list");
-        return -1;
-    }
-
-    // Sum the entries to get total and free swap
-    total = 0;
-    avail = 0;
-    for (i = 0; i < count; i++) {
-      total += stbl->swt_ent[i].ste_pages;
-      avail += stbl->swt_ent[i].ste_free;
-    }
-
-    free(stbl);
-    free(strtab);
-    return available ? ((jlong)avail * page_size) :
-                       ((jlong)total * page_size);
-#elif defined(__linux__)
-    int ret;
-    FILE *fp;
-    jlong total = 0, avail = 0;
-
-    struct sysinfo si;
-    ret = sysinfo(&si);
-    if (ret != 0) {
-        throw_internal_error(env, "sysinfo failed to get swap size");
-    }
-    total = (jlong)si.totalswap * si.mem_unit;
-    avail = (jlong)si.freeswap * si.mem_unit;
-
-    return available ? avail : total;
-#elif defined(__APPLE__)
-    struct xsw_usage vmusage;
-    size_t size = sizeof(vmusage);
-    if (sysctlbyname("vm.swapusage", &vmusage, &size, NULL, 0) != 0) {
-        throw_internal_error(env, "sysctlbyname failed");
-    }
-    return available ? (jlong)vmusage.xsu_avail : (jlong)vmusage.xsu_total;
-#else /* _ALLBSD_SOURCE */
-    /*
-     * XXXBSD: there's no way available to get swap info in
-     *         FreeBSD.  Usage of libkvm is not an option here
-     */
-    // throw_internal_error(env, "Unimplemented in FreeBSD");
-    return (0);
-#endif
-}
-
-JNIEXPORT void JNICALL
-Java_sun_management_OperatingSystemImpl_initialize0
-  (JNIEnv *env, jclass cls)
-{
-    page_size = sysconf(_SC_PAGESIZE);
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize0
-  (JNIEnv *env, jobject mbean)
-{
-#ifdef __solaris__
-    psinfo_t psinfo;
-    ssize_t result;
-    size_t remaining;
-    char* addr;
-    int fd;
-
-    fd = open64("/proc/self/psinfo", O_RDONLY, 0);
-    if (fd < 0) {
-        throw_internal_error(env, "Unable to open /proc/self/psinfo");
-        return -1;
-    }
-
-    addr = (char *)&psinfo;
-    for (remaining = sizeof(psinfo_t); remaining > 0;) {
-        result = read(fd, addr, remaining);
-        if (result < 0) {
-            if (errno != EINTR) {
-                close(fd);
-                throw_internal_error(env, "Unable to read /proc/self/psinfo");
-                return -1;
-            }
-        } else {
-            remaining -= result;
-            addr += result;
-        }
-    }
-
-    close(fd);
-    return (jlong) psinfo.pr_size * 1024;
-#elif defined(__linux__)
-    FILE *fp;
-    unsigned long vsize = 0;
-
-    if ((fp = fopen("/proc/self/stat", "r")) == NULL) {
-        throw_internal_error(env, "Unable to open /proc/self/stat");
-        return -1;
-    }
-
-    // Ignore everything except the vsize entry
-    if (fscanf(fp, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %*d %*d %*d %*d %*d %*d %*u %*u %*d %lu %*[^\n]\n", &vsize) == EOF) {
-        throw_internal_error(env, "Unable to get virtual memory usage");
-        fclose(fp);
-        return -1;
-    }
-
-    fclose(fp);
-    return (jlong)vsize;
-#elif defined(__APPLE__)
-    struct task_basic_info t_info;
-    mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT;
-
-    kern_return_t res = task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&t_info, &t_info_count);
-    if (res != KERN_SUCCESS) {
-        throw_internal_error(env, "task_info failed");
-    }
-    return t_info.virtual_size;
-#else /* _ALLBSD_SOURCE */
-    /*
-     * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
-     */
-    // throw_internal_error(env, "Unimplemented in FreeBSD");
-    return (64 * MB);
-#endif
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getTotalSwapSpaceSize0
-  (JNIEnv *env, jobject mbean)
-{
-    return get_total_or_available_swap_space_size(env, JNI_FALSE);
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getFreeSwapSpaceSize0
-  (JNIEnv *env, jobject mbean)
-{
-    return get_total_or_available_swap_space_size(env, JNI_TRUE);
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuTime0
-  (JNIEnv *env, jobject mbean)
-{
-#ifdef __APPLE__
-    struct rusage usage;
-    if (getrusage(RUSAGE_SELF, &usage) != 0) {
-        throw_internal_error(env, "getrusage failed");
-        return -1;
-    }
-    jlong microsecs =
-        usage.ru_utime.tv_sec * 1000 * 1000 + usage.ru_utime.tv_usec +
-        usage.ru_stime.tv_sec * 1000 * 1000 + usage.ru_stime.tv_usec;
-    return microsecs * 1000;
-#else
-    jlong clk_tck, ns_per_clock_tick;
-    jlong cpu_time_ns;
-    struct tms time;
-
-    /*
-     * BSDNOTE: FreeBSD implements _SC_CLK_TCK since FreeBSD 5, so
-     *          add a magic to handle it
-     */
-#if defined(__solaris__) || defined(_SC_CLK_TCK)
-    clk_tck = (jlong) sysconf(_SC_CLK_TCK);
-#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
-    clk_tck = 100;
-#endif
-    if (clk_tck == -1) {
-        throw_internal_error(env,
-                             "sysconf failed - not able to get clock tick");
-        return -1;
-    }
-
-    times(&time);
-    ns_per_clock_tick = (jlong) 1000 * 1000 * 1000 / (jlong) clk_tck;
-    cpu_time_ns = ((jlong)time.tms_utime + (jlong) time.tms_stime) *
-                      ns_per_clock_tick;
-    return cpu_time_ns;
-#endif
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getFreePhysicalMemorySize0
-  (JNIEnv *env, jobject mbean)
-{
-#ifdef __APPLE__
-    mach_msg_type_number_t count;
-    vm_statistics_data_t vm_stats;
-    kern_return_t res;
-
-    count = HOST_VM_INFO_COUNT;
-    res = host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)&vm_stats, &count);
-    if (res != KERN_SUCCESS) {
-        throw_internal_error(env, "host_statistics failed");
-        return -1;
-    }
-    return (jlong)vm_stats.free_count * page_size;
-#elif defined(_ALLBSD_SOURCE)
-    /*
-     * XXBSDL no way to do it in FreeBSD
-     */
-    // throw_internal_error(env, "unimplemented in FreeBSD")
-    return (128 * MB);
-#elif defined(_AIX)
-    perfstat_memory_total_t memory_info;
-    if (-1 != perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1)) {
-        return (jlong)(memory_info.real_free * 4L * 1024L);
-    }
-    return -1;
-#else // solaris / linux
-    jlong num_avail_physical_pages = sysconf(_SC_AVPHYS_PAGES);
-    return (num_avail_physical_pages * page_size);
-#endif
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getTotalPhysicalMemorySize0
-  (JNIEnv *env, jobject mbean)
-{
-#ifdef _ALLBSD_SOURCE
-    jlong result = 0;
-    int mib[2];
-    size_t rlen;
-
-    mib[0] = CTL_HW;
-    mib[1] = HW_MEMSIZE;
-    rlen = sizeof(result);
-    if (sysctl(mib, 2, &result, &rlen, NULL, 0) != 0) {
-        throw_internal_error(env, "sysctl failed");
-        return -1;
-    }
-    return result;
-#elif defined(_AIX)
-    perfstat_memory_total_t memory_info;
-    if (-1 != perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1)) {
-        return (jlong)(memory_info.real_total * 4L * 1024L);
-    }
-    return -1;
-#else // solaris / linux
-    jlong num_physical_pages = sysconf(_SC_PHYS_PAGES);
-    return (num_physical_pages * page_size);
-#endif
-}
-
-
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount0
-  (JNIEnv *env, jobject mbean)
-{
-#ifdef __APPLE__
-    // This code is influenced by the darwin lsof source
-    pid_t my_pid;
-    struct proc_bsdinfo bsdinfo;
-    struct proc_fdinfo *fds;
-    int nfiles;
-    kern_return_t kres;
-    int res;
-    size_t fds_size;
-
-    kres = pid_for_task(mach_task_self(), &my_pid);
-    if (kres != KERN_SUCCESS) {
-        throw_internal_error(env, "pid_for_task failed");
-        return -1;
-    }
-
-    // get the maximum number of file descriptors
-    res = proc_pidinfo(my_pid, PROC_PIDTBSDINFO, 0, &bsdinfo, PROC_PIDTBSDINFO_SIZE);
-    if (res <= 0) {
-        throw_internal_error(env, "proc_pidinfo with PROC_PIDTBSDINFO failed");
-        return -1;
-    }
-
-    // allocate memory to hold the fd information (we don't acutally use this information
-    // but need it to get the number of open files)
-    fds_size = bsdinfo.pbi_nfiles * sizeof(struct proc_fdinfo);
-    fds = malloc(fds_size);
-    if (fds == NULL) {
-        JNU_ThrowOutOfMemoryError(env, "could not allocate space for file descriptors");
-        return -1;
-    }
-
-    // get the list of open files - the return value is the number of bytes
-    // proc_pidinfo filled in
-    res = proc_pidinfo(my_pid, PROC_PIDLISTFDS, 0, fds, fds_size);
-    if (res <= 0) {
-        free(fds);
-        throw_internal_error(env, "proc_pidinfo failed for PROC_PIDLISTFDS");
-        return -1;
-    }
-    nfiles = res / sizeof(struct proc_fdinfo);
-    free(fds);
-
-    return nfiles;
-#elif defined(_ALLBSD_SOURCE)
-    /*
-     * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
-     */
-    // throw_internal_error(env, "Unimplemented in FreeBSD");
-    return (100);
-#else /* solaris/linux */
-    DIR *dirp;
-    struct dirent dbuf;
-    struct dirent* dentp;
-    jlong fds = 0;
-
-#if defined(_AIX)
-/* AIX does not understand '/proc/self' - it requires the real process ID */
-#define FD_DIR aix_fd_dir
-    char aix_fd_dir[32];     /* the pid has at most 19 digits */
-    snprintf(aix_fd_dir, 32, "/proc/%d/fd", getpid());
-#else
-#define FD_DIR "/proc/self/fd"
-#endif
-
-    dirp = opendir(FD_DIR);
-    if (dirp == NULL) {
-        throw_internal_error(env, "Unable to open directory /proc/self/fd");
-        return -1;
-    }
-
-    // iterate through directory entries, skipping '.' and '..'
-    // each entry represents an open file descriptor.
-    while ((dentp = read_dir(dirp, &dbuf)) != NULL) {
-        if (isdigit(dentp->d_name[0])) {
-            fds++;
-        }
-    }
-
-    closedir(dirp);
-    // subtract by 1 which was the fd open for this implementation
-    return (fds - 1);
-#endif
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getMaxFileDescriptorCount0
-  (JNIEnv *env, jobject mbean)
-{
-    struct rlimit rlp;
-
-    if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) {
-        throw_internal_error(env, "getrlimit failed");
-        return -1;
-    }
-    return (jlong) rlp.rlim_cur;
-}
--- a/jdk/src/java.management/unix/native/libmanagement/SolarisOperatingSystem.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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.
- */
-
-#include <fcntl.h>
-#include <kstat.h>
-#include <procfs.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysinfo.h>
-#include <sys/lwp.h>
-#include <pthread.h>
-#include <utmpx.h>
-#include <dlfcn.h>
-#include <sys/loadavg.h>
-#include <jni.h>
-#include "jvm.h"
-#include "sun_management_OperatingSystemImpl.h"
-
-typedef struct {
-    kstat_t *kstat;
-    uint64_t  last_idle;
-    uint64_t  last_total;
-    double  last_ratio;
-} cpuload_t;
-
-static cpuload_t   *cpu_loads = NULL;
-static unsigned int num_cpus;
-static kstat_ctl_t *kstat_ctrl = NULL;
-
-static void map_cpu_kstat_counters() {
-    kstat_t     *kstat;
-    int          i;
-
-    // Get number of CPU(s)
-    if ((num_cpus = sysconf(_SC_NPROCESSORS_ONLN)) == -1) {
-        num_cpus = 1;
-    }
-
-    // Data structure for saving CPU load
-    if ((cpu_loads = calloc(num_cpus,sizeof(cpuload_t))) == NULL) {
-        return;
-    }
-
-    // Get kstat cpu_stat counters for every CPU
-    // (loop over kstat to find our cpu_stat(s)
-    i = 0;
-    for (kstat = kstat_ctrl->kc_chain; kstat != NULL; kstat = kstat->ks_next) {
-        if (strncmp(kstat->ks_module, "cpu_stat", 8) == 0) {
-
-            if (kstat_read(kstat_ctrl, kstat, NULL) == -1) {
-            // Failed to initialize kstat for this CPU so ignore it
-            continue;
-            }
-
-            if (i == num_cpus) {
-            // Found more cpu_stats than reported CPUs
-            break;
-            }
-
-            cpu_loads[i++].kstat = kstat;
-        }
-    }
-}
-
-static int init_cpu_kstat_counters() {
-    static int initialized = 0;
-
-    // Concurrence in this method is prevented by the lock in
-    // the calling method get_cpu_load();
-    if(!initialized) {
-        if ((kstat_ctrl = kstat_open()) != NULL) {
-            map_cpu_kstat_counters();
-            initialized = 1;
-        }
-    }
-    return initialized ? 0 : -1;
-}
-
-static void update_cpu_kstat_counters() {
-    if(kstat_chain_update(kstat_ctrl) != 0) {
-        free(cpu_loads);
-        map_cpu_kstat_counters();
-    }
-}
-
-int read_cpustat(cpuload_t *load, cpu_stat_t *cpu_stat) {
-    if (load->kstat == NULL) {
-        // no handle.
-        return -1;
-    }
-    if (kstat_read(kstat_ctrl, load->kstat, cpu_stat) == -1) {
-        //  disabling for now, a kstat chain update is likely to happen next time
-        load->kstat = NULL;
-        return -1;
-    }
-    return 0;
-}
-
-double get_single_cpu_load(unsigned int n) {
-    cpuload_t  *load;
-    cpu_stat_t  cpu_stat;
-    uint_t     *usage;
-    uint64_t          c_idle;
-    uint64_t          c_total;
-    uint64_t          d_idle;
-    uint64_t          d_total;
-    int           i;
-
-    if (n >= num_cpus) {
-        return -1.0;
-    }
-
-    load = &cpu_loads[n];
-    if (read_cpustat(load, &cpu_stat) < 0) {
-        return -1.0;
-    }
-
-    usage   = cpu_stat.cpu_sysinfo.cpu;
-    c_idle  = usage[CPU_IDLE];
-
-    for (c_total = 0, i = 0; i < CPU_STATES; i++) {
-        c_total += usage[i];
-    }
-
-    // Calculate diff against previous snapshot
-    d_idle  = c_idle - load->last_idle;
-    d_total = c_total - load->last_total;
-
-    /** update if weve moved */
-    if (d_total > 0) {
-        // Save current values for next time around
-        load->last_idle  = c_idle;
-        load->last_total = c_total;
-        load->last_ratio = (double) (d_total - d_idle) / d_total;
-    }
-
-    return load->last_ratio;
-}
-
-int get_info(const char *path, void *info, size_t s, off_t o) {
-    int fd;
-    int ret = 0;
-    if ((fd = open(path, O_RDONLY)) < 0) {
-        return -1;
-    }
-    if (pread(fd, info, s, o) != s) {
-        ret = -1;
-    }
-    close(fd);
-    return ret;
-}
-
-#define MIN(a, b)           ((a < b) ? a : b)
-
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-
-/**
- * Return the cpu load (0-1) for proc number 'which' (or average all if which == -1)
- */
-double  get_cpu_load(int which) {
-    double load =.0;
-
-    pthread_mutex_lock(&lock);
-    if(init_cpu_kstat_counters()==0) {
-
-        update_cpu_kstat_counters();
-
-        if (which == -1) {
-            unsigned int i;
-            double       t;
-
-            for (t = .0, i = 0; i < num_cpus; i++) {
-                t += get_single_cpu_load(i);
-            }
-
-            // Cap total systemload to 1.0
-            load = MIN((t / num_cpus), 1.0);
-        } else {
-            load = MIN(get_single_cpu_load(which), 1.0);
-        }
-    } else {
-        load = -1.0;
-    }
-    pthread_mutex_unlock(&lock);
-
-    return load;
-}
-
-/**
- * Return the cpu load (0-1) for the current process (i.e the JVM)
- * or -1.0 if the get_info() call failed
- */
-double get_process_load(void) {
-    psinfo_t info;
-
-    // Get the percentage of "recent cpu usage" from all the lwp:s in the JVM:s
-    // process. This is returned as a value between 0.0 and 1.0 multiplied by 0x8000.
-    if (get_info("/proc/self/psinfo",&info.pr_pctcpu, sizeof(info.pr_pctcpu), offsetof(psinfo_t, pr_pctcpu)) == 0) {
-        return (double) info.pr_pctcpu / 0x8000;
-    }
-    return -1.0;
-}
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    return get_cpu_load(-1);
-}
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    return get_process_load();
-}
-
--- a/jdk/src/java.management/windows/classes/sun/management/OperatingSystemImpl.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-package sun.management;
-
-import com.sun.management.OperatingSystemMXBean;
-
-/**
- * Implementation class for the operating system.
- * Standard and committed hotspot-specific metrics if any.
- *
- * ManagementFactory.getOperatingSystemMXBean() returns an instance
- * of this class.
- */
-class OperatingSystemImpl extends BaseOperatingSystemImpl
-    implements OperatingSystemMXBean {
-
-    // psapiLock is a lock to make sure only one thread loading
-    // PSAPI DLL.
-    private static Object psapiLock = new Object();
-
-    OperatingSystemImpl(VMManagement vm) {
-        super(vm);
-    }
-
-    public long getCommittedVirtualMemorySize() {
-        synchronized (psapiLock) {
-            return getCommittedVirtualMemorySize0();
-        }
-    }
-
-    public long getTotalSwapSpaceSize() {
-        return getTotalSwapSpaceSize0();
-    }
-
-    public long getFreeSwapSpaceSize() {
-        return getFreeSwapSpaceSize0();
-    }
-
-    public long getProcessCpuTime() {
-        return getProcessCpuTime0();
-    }
-
-    public long getFreePhysicalMemorySize() {
-        return getFreePhysicalMemorySize0();
-    }
-
-    public long getTotalPhysicalMemorySize() {
-        return getTotalPhysicalMemorySize0();
-    }
-
-    public double getSystemCpuLoad() {
-        return getSystemCpuLoad0();
-    }
-
-    public double getProcessCpuLoad() {
-        return getProcessCpuLoad0();
-    }
-
-    /* native methods */
-    private native long getCommittedVirtualMemorySize0();
-    private native long getFreePhysicalMemorySize0();
-    private native long getFreeSwapSpaceSize0();
-    private native double getProcessCpuLoad0();
-    private native long getProcessCpuTime0();
-    private native double getSystemCpuLoad0();
-    private native long getTotalPhysicalMemorySize0();
-    private native long getTotalSwapSpaceSize0();
-
-    static {
-        initialize0();
-    }
-
-    private static native void initialize0();
-}
--- a/jdk/src/java.management/windows/native/libmanagement/OperatingSystemImpl.c	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1363 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jlong.h"
-#include "jvm.h"
-#include "management.h"
-#include "sun_management_OperatingSystemImpl.h"
-
-#include <psapi.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include <malloc.h>
-#pragma warning (push,0)
-#include <windows.h>
-#pragma warning (pop)
-#include <stdio.h>
-#include <time.h>
-#include <stdint.h>
-#include <assert.h>
-
-/* Disable warnings due to broken header files from Microsoft... */
-#pragma warning(push, 3)
-#include <pdh.h>
-#include <pdhmsg.h>
-#include <process.h>
-#pragma warning(pop)
-
-typedef unsigned __int32 juint;
-typedef unsigned __int64 julong;
-
-static void set_low(jlong* value, jint low) {
-    *value &= (jlong)0xffffffff << 32;
-    *value |= (jlong)(julong)(juint)low;
-}
-
-static void set_high(jlong* value, jint high) {
-    *value &= (jlong)(julong)(juint)0xffffffff;
-    *value |= (jlong)high       << 32;
-}
-
-static jlong jlong_from(jint h, jint l) {
-    jlong result = 0; // initialization to avoid warning
-    set_high(&result, h);
-    set_low(&result,  l);
-    return result;
-}
-
-static HANDLE main_process;
-
-static void perfInit(void);
-
-JNIEXPORT void JNICALL
-Java_sun_management_OperatingSystemImpl_initialize0
-  (JNIEnv *env, jclass cls)
-{
-    main_process = GetCurrentProcess();
-    perfInit();
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize0
-  (JNIEnv *env, jobject mbean)
-{
-    PROCESS_MEMORY_COUNTERS pmc;
-    if (GetProcessMemoryInfo(main_process, &pmc, sizeof(PROCESS_MEMORY_COUNTERS)) == 0) {
-        return (jlong)-1L;
-    } else {
-        return (jlong) pmc.PagefileUsage;
-    }
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getTotalSwapSpaceSize0
-  (JNIEnv *env, jobject mbean)
-{
-    MEMORYSTATUSEX ms;
-    ms.dwLength = sizeof(ms);
-    GlobalMemoryStatusEx(&ms);
-    return (jlong) ms.ullTotalPageFile;
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getFreeSwapSpaceSize0
-  (JNIEnv *env, jobject mbean)
-{
-    MEMORYSTATUSEX ms;
-    ms.dwLength = sizeof(ms);
-    GlobalMemoryStatusEx(&ms);
-    return (jlong) ms.ullAvailPageFile;
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuTime0
-  (JNIEnv *env, jobject mbean)
-{
-
-    FILETIME process_creation_time, process_exit_time,
-             process_user_time, process_kernel_time;
-
-    // Using static variables declared above
-    // Units are 100-ns intervals.  Convert to ns.
-    GetProcessTimes(main_process, &process_creation_time,
-                    &process_exit_time,
-                    &process_kernel_time, &process_user_time);
-    return (jlong_from(process_user_time.dwHighDateTime,
-                        process_user_time.dwLowDateTime) +
-            jlong_from(process_kernel_time.dwHighDateTime,
-                        process_kernel_time.dwLowDateTime)) * 100;
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getFreePhysicalMemorySize0
-  (JNIEnv *env, jobject mbean)
-{
-    MEMORYSTATUSEX ms;
-    ms.dwLength = sizeof(ms);
-    GlobalMemoryStatusEx(&ms);
-    return (jlong) ms.ullAvailPhys;
-}
-
-JNIEXPORT jlong JNICALL
-Java_sun_management_OperatingSystemImpl_getTotalPhysicalMemorySize0
-  (JNIEnv *env, jobject mbean)
-{
-    MEMORYSTATUSEX ms;
-    ms.dwLength = sizeof(ms);
-    GlobalMemoryStatusEx(&ms);
-    return (jlong) ms.ullTotalPhys;
-}
-
-/* Performance Data Helper API (PDH) support */
-
-typedef PDH_STATUS (WINAPI *PdhAddCounterFunc)(
-                           HQUERY      hQuery,
-                           LPCSTR      szFullCounterPath,
-                           DWORD       dwUserData,
-                           HCOUNTER    *phCounter
-                           );
-typedef PDH_STATUS (WINAPI *PdhOpenQueryFunc)(
-                           LPCWSTR     szDataSource,
-                           DWORD       dwUserData,
-                           HQUERY      *phQuery
-                           );
-typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)(
-                           HQUERY      hQuery
-                           );
-
-typedef PDH_STATUS (WINAPI *PdhEnumObjectItemsFunc)(
-                           LPCTSTR     szDataSource,
-                           LPCTSTR     szMachineName,
-                           LPCTSTR     szObjectName,
-                           LPTSTR      mszCounterList,
-                           LPDWORD     pcchCounterListLength,
-                           LPTSTR      mszInstanceList,
-                           LPDWORD     pcchInstanceListLength,
-                           DWORD       dwDetailLevel,
-                           DWORD       dwFlags
-                           );
-typedef PDH_STATUS (WINAPI *PdhRemoveCounterFunc)(
-                           HCOUNTER   hCounter
-                           );
-typedef PDH_STATUS (WINAPI *PdhLookupPerfNameByIndexFunc)(
-                           LPCSTR     szMachineName,
-                           DWORD      dwNameIndex,
-                           LPSTR      szNameBuffer,
-                           LPDWORD    pcchNameBufferSize
-                           );
-typedef DWORD (WINAPI *PdhCloseQueryFunc)(
-                      HQUERY      hQuery
-                      );
-
-typedef DWORD (WINAPI *PdhGetFormattedCounterValueFunc)(
-                      HCOUNTER                hCounter,
-                      DWORD                   dwFormat,
-                      LPDWORD                 lpdwType,
-                      PPDH_FMT_COUNTERVALUE   pValue
-                      );
-
-static PdhAddCounterFunc PdhAddCounter_i;
-static PdhOpenQueryFunc PdhOpenQuery_i;
-static PdhCloseQueryFunc PdhCloseQuery_i;
-static PdhCollectQueryDataFunc PdhCollectQueryData_i;
-static PdhGetFormattedCounterValueFunc PdhGetFormattedCounterValue_i;
-static PdhEnumObjectItemsFunc PdhEnumObjectItems_i;
-static PdhRemoveCounterFunc PdhRemoveCounter_i;
-static PdhLookupPerfNameByIndexFunc PdhLookupPerfNameByIndex_i;
-
-/*
- * Struct for PDH queries.
- */
-typedef struct {
-    HQUERY      query;
-    uint64_t    lastUpdate; // Last time query was updated (ticks)
-} UpdateQueryS, *UpdateQueryP;
-
-// Min time between query updates (ticks)
-static const int MIN_UPDATE_INTERVAL = 500;
-
-/*
- * Struct for a PDH query with multiple counters.
- */
-typedef struct {
-    UpdateQueryS  query;
-    HCOUNTER*     counters;
-    int           noOfCounters;
-} MultipleCounterQueryS, *MultipleCounterQueryP;
-
-/*
- * Struct for a PDH query with a single counter.
- */
-typedef struct {
-    UpdateQueryS  query;
-    HCOUNTER      counter;
-} SingleCounterQueryS, *SingleCounterQueryP;
-
-
-typedef struct {
-    CRITICAL_SECTION cs;
-    DWORD owningThread;
-    DWORD recursionCount;
-} PdhCriticalSectionS, *PdhCriticalSectionP;
-
-static PdhCriticalSectionS initializationLock;
-
-static void InitializePdhCriticalSection(PdhCriticalSectionP criticalSection) {
-    assert(criticalSection);
-
-    InitializeCriticalSection(&criticalSection->cs);
-    criticalSection->owningThread = 0;
-    criticalSection->recursionCount = 0;
-}
-
-static void EnterPdhCriticalSection(PdhCriticalSectionP criticalSection) {
-    assert(criticalSection);
-
-    EnterCriticalSection(&criticalSection->cs);
-    criticalSection->recursionCount++;
-    if (!criticalSection->owningThread) {
-        criticalSection->owningThread = GetCurrentThreadId();
-    }
-}
-
-static void LeavePdhCriticalSection(PdhCriticalSectionP criticalSection) {
-    assert(criticalSection);
-    assert(GetCurrentThreadId() == criticalSection->owningThread);
-    assert(criticalSection->recursionCount >= 1);
-
-    criticalSection->recursionCount--;
-    if (!criticalSection->recursionCount) {
-        criticalSection->owningThread = 0;
-    }
-    LeaveCriticalSection(&criticalSection->cs);
-}
-
-/*
- * INFO: Using PDH APIs Correctly in a Localized Language (Q287159)
- *   http://support.microsoft.com/default.aspx?scid=kb;EN-US;q287159
- * The index value for the base system counters and objects like processor,
- * process, thread, memory, and so forth are always the same irrespective
- * of the localized version of the operating system or service pack installed.
- * To find the correct index for an object or counter, inspect the registry key/value:
- * [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Perflib\009\Counter]
- */
-static const DWORD PDH_PROCESSOR_IDX = 238;
-static const DWORD PDH_PROCESSOR_TIME_IDX = 6;
-static const DWORD PDH_PROCESS_IDX = 230;
-static const DWORD PDH_ID_PROCESS_IDX = 784;
-
-/* useful pdh fmt's */
-static const char* const OBJECT_COUNTER_FMT = "\\%s\\%s";
-static const size_t OBJECT_COUNTER_FMT_LEN = 2;
-static const char* const OBJECT_WITH_INSTANCES_COUNTER_FMT = "\\%s(%s)\\%s";
-static const size_t OBJECT_WITH_INSTANCES_COUNTER_FMT_LEN = 4;
-static const char* const PROCESS_OBJECT_INSTANCE_COUNTER_FMT = "\\%s(%s#%s)\\%s";
-static const size_t PROCESS_OBJECT_INSTANCE_COUNTER_FMT_LEN = 5;
-
-static const char* pdhProcessImageName = NULL; /* "java" */
-static char* pdhIDProcessCounterFmt = NULL;    /* "\Process(java#%d)\ID Process" */
-
-static int numberOfJavaProcessesAtInitialization = 0;
-
-/*
- * Currently used CPU queries/counters and variables
- */
-static SingleCounterQueryP processTotalCPULoad = NULL;
-static MultipleCounterQueryP multiCounterCPULoad = NULL;
-static double cpuFactor = .0;
-static DWORD  numCpus = 0;
-
-/*
- * Seems WinXP PDH returns PDH_MORE_DATA whenever we send in a NULL buffer.
- * Let's just ignore it, since we make sure we have enough buffer anyway.
- */
-static int
-pdhFail(PDH_STATUS pdhStat) {
-    return pdhStat != ERROR_SUCCESS && pdhStat != PDH_MORE_DATA;
-}
-
-static const char*
-allocateAndCopy(const char* const originalString) {
-    size_t len;
-    char* allocatedString;
-
-    assert(originalString);
-
-    len = strlen(originalString);
-
-    allocatedString = malloc(len + 1);
-
-    if (!allocatedString) {
-        return NULL;
-    }
-
-    strncpy(allocatedString, originalString, len);
-    allocatedString[len] = '\0';
-
-    return allocatedString;
-}
-
-/*
- * Allocates memory into the supplied pointer and
- * fills it with the localized PDH artifact description, if indexed correctly.
- * Caller owns the memory from the point of returning from this function.
- *
- * @param index    the PDH counter index as specified in the registry
- * @param ppBuffer pointer to a char*.
- * @return         0 if successful, negative on failure.
- */
-static int
-lookupNameByIndex(DWORD index, char** ppBuffer) {
-    DWORD size;
-
-    assert(ppBuffer);
-
-    /* determine size needed */
-    if (PdhLookupPerfNameByIndex_i(NULL, index, NULL, &size) != PDH_MORE_DATA) {
-      /* invalid index? */
-      return -1;
-    }
-
-    *ppBuffer = malloc((size_t)size);
-
-    if (!*ppBuffer) {
-        return -1;
-    }
-
-    if (PdhLookupPerfNameByIndex_i(NULL, index, *ppBuffer, &size) != ERROR_SUCCESS) {
-        free(*ppBuffer);
-        *ppBuffer = NULL;
-        return -1;
-    }
-
-    /* windows vista does not null-terminate the string
-     * (although the docs says it will) */
-    (*ppBuffer)[size - 1] = '\0';
-
-    return 0;
-}
-
-/*
-* Construct a fully qualified PDH path
-*
-* @param objectName   a PDH Object string representation (required)
-* @param counterName  a PDH Counter string representation (required)
-* @param imageName    a process image name string, ex. "java" (opt)
-* @param instance     an instance string, ex. "0", "1", ... (opt)
-* @return             the fully qualified PDH path.
-*
-* Caller will own the returned malloc:ed string
-*/
-static const char*
-makeFullCounterPath(const char* const objectName,
-                    const char* const counterName,
-                    const char* const imageName,
-                    const char* const instance) {
-
-    size_t fullCounterPathLen;
-    char* fullCounterPath;
-
-    assert(objectName);
-    assert(counterName);
-
-    fullCounterPathLen = strlen(objectName);
-    fullCounterPathLen += strlen(counterName);
-
-    if (imageName) {
-        /*
-         * For paths using the "Process" Object.
-         *
-         * Examples:
-         * abstract: "\Process(imageName#instance)\Counter"
-         * actual:   "\Process(java#2)\ID Process"
-         */
-        fullCounterPathLen += PROCESS_OBJECT_INSTANCE_COUNTER_FMT_LEN;
-        fullCounterPathLen += strlen(imageName);
-
-        /*
-         * imageName must be passed together with an associated
-         * instance "number" ("0", "1", "2", ...).
-         * This is required in order to create valid "Process" Object paths.
-         *
-         * Examples: "\Process(java#0)", \Process(java#1"), ...
-         */
-        assert(instance);
-
-        fullCounterPathLen += strlen(instance);
-
-        fullCounterPath = malloc(fullCounterPathLen + 1);
-
-        if (!fullCounterPath) {
-            return NULL;
-        }
-
-        _snprintf(fullCounterPath,
-                  fullCounterPathLen,
-                  PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
-                  objectName,
-                  imageName,
-                  instance,
-                  counterName);
-    } else {
-        if (instance) {
-            /*
-             * For paths where the Object has multiple instances.
-             *
-             * Examples:
-             * abstract: "\Object(instance)\Counter"
-             * actual:   "\Processor(0)\% Privileged Time"
-             */
-            fullCounterPathLen += strlen(instance);
-            fullCounterPathLen += OBJECT_WITH_INSTANCES_COUNTER_FMT_LEN;
-        } else {
-            /*
-             * For "normal" paths.
-             *
-             * Examples:
-             * abstract: "\Object\Counter"
-             * actual:   "\Memory\Available Mbytes"
-             */
-            fullCounterPathLen += OBJECT_COUNTER_FMT_LEN;
-        }
-
-        fullCounterPath = malloc(fullCounterPathLen + 1);
-
-        if (!fullCounterPath) {
-            return NULL;
-        }
-
-        if (instance) {
-            _snprintf(fullCounterPath,
-                      fullCounterPathLen,
-                      OBJECT_WITH_INSTANCES_COUNTER_FMT,
-                      objectName,
-                      instance,
-                      counterName);
-        } else {
-            _snprintf(fullCounterPath,
-                      fullCounterPathLen,
-                      OBJECT_COUNTER_FMT,
-                      objectName,
-                      counterName);
-        }
-    }
-
-    fullCounterPath[fullCounterPathLen] = '\0';
-
-    return fullCounterPath;
-}
-
-/*
- * Resolves an index for a PDH artifact to
- * a localized, malloc:ed string representation.
- * Caller will own the returned malloc:ed string.
- *
- * @param pdhArtifactIndex  PDH index
- * @return                  malloc:ed string representation
- *                          of the requested pdh artifact (localized).
- *                          NULL on failure.
- */
-static const char*
-getPdhLocalizedArtifact(DWORD pdhArtifactIndex) {
-    char* pdhLocalizedArtifactString;
-
-    if (lookupNameByIndex(pdhArtifactIndex,
-                          &pdhLocalizedArtifactString) != 0) {
-        return NULL;
-    }
-
-    return pdhLocalizedArtifactString;
-}
-
-static void
-pdhCleanup(HQUERY* const query, HCOUNTER* const counter) {
-    if (counter && *counter) {
-        PdhRemoveCounter_i(*counter);
-        *counter = NULL;
-    }
-    if (query && *query) {
-        PdhCloseQuery_i(*query);
-        *query = NULL;
-    }
-}
-
-static void
-destroySingleCounter(SingleCounterQueryP counterQuery) {
-    if (counterQuery) {
-        pdhCleanup(&counterQuery->query.query, &counterQuery->counter);
-    }
-}
-
-static void
-destroyMultiCounter(MultipleCounterQueryP multiCounterQuery) {
-    int i;
-    if (multiCounterQuery) {
-        if (multiCounterQuery->counters) {
-            for (i = 0; i < multiCounterQuery->noOfCounters; i++) {
-                pdhCleanup(NULL, &multiCounterQuery->counters[i]);
-            }
-            free(multiCounterQuery->counters);
-            multiCounterQuery->counters = NULL;
-        }
-        pdhCleanup(&multiCounterQuery->query.query, NULL);
-    }
-}
-
-static int
-openQuery(HQUERY* const query) {
-    assert(query);
-
-    if (PdhOpenQuery_i(NULL, 0, query) != ERROR_SUCCESS) {
-        return -1;
-    }
-
-    return 0;
-}
-
-static int
-addCounter(HQUERY query,
-           const char* const fullCounterPath,
-           HCOUNTER* const counter) {
-
-    assert(fullCounterPath);
-    assert(counter);
-
-    if (PdhAddCounter_i(query,
-                        fullCounterPath,
-                        0,
-                        counter) != ERROR_SUCCESS) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/*
- * Sets up the supplied SingleCounterQuery to listen for the specified counter.
- *
- * @param counterQuery       the counter query to set up.
- * @param fullCounterPath    the string specifying the full path to the counter.
- * @returns                  0 if successful, negative on failure.
- */
-static int
-initializeSingleCounterQuery(SingleCounterQueryP counterQuery,
-                             const char* const fullCounterPath) {
-    assert(counterQuery);
-    assert(fullCounterPath);
-
-    if (openQuery(&counterQuery->query.query) == 0) {
-        if (addCounter(counterQuery->query.query,
-                       fullCounterPath,
-                       &counterQuery->counter) == 0) {
-            return 0;
-        }
-    }
-
-    return -1;
-}
-
-/*
- * Sets up a SingleCounterQuery
- *
- * param counter             the counter query to set up.
- * param localizedObject     string representing the PDH object to query
- * param localizedCounter    string representing the PDH counter to query
- * param processImageName    if the counter query needs the process image name ("java")
- * param instance            if the counter has instances, this is the instance ("\Processor(0)\")
-                                 where 0 is the instance
- * param firstSampleOnInit   for counters that need two queries to yield their values,
-                                 the first query can be issued just after initialization
- *
- * @returns                   0 if successful, negative on failure.
- */
-static int
-initializeSingleCounter(SingleCounterQueryP const counter,
-                        const char* const localizedObject,
-                        const char* const localizedCounter,
-                        const char* const processImageName,
-                        const char* const instance,
-                        BOOL firstSampleOnInit) {
-    int retValue = -1;
-
-    const char* fullCounterPath = makeFullCounterPath(localizedObject,
-                                                      localizedCounter,
-                                                      processImageName,
-                                                      instance);
-
-    if (fullCounterPath) {
-
-        assert(counter);
-
-        if (initializeSingleCounterQuery(counter, fullCounterPath) == 0) {
-            /*
-             * According to the MSDN documentation, rate counters must be read twice:
-             *
-             * "Obtaining the value of rate counters such as Page faults/sec requires that
-             *  PdhCollectQueryData be called twice, with a specific time interval between
-             *  the two calls, before calling PdhGetFormattedCounterValue. Call Sleep to
-             *  implement the waiting period between the two calls to PdhCollectQueryData."
-             *
-             *  Take the first sample here already to allow for the next (first) "real" sample
-             *  to succeed.
-             */
-            if (firstSampleOnInit) {
-                PdhCollectQueryData_i(counter->query.query);
-            }
-
-            retValue = 0;
-        }
-        free((char*)fullCounterPath);
-    }
-
-    return retValue;
-}
-
-static void
-perfInit(void) {
-    InitializePdhCriticalSection(&initializationLock);
-}
-
-static int
-getProcessID() {
-    static int myPid = 0;
-    if (0 == myPid) {
-        myPid = _getpid();
-    }
-    return myPid;
-}
-
-/*
- * Working against the Process object and it's related counters is inherently problematic
- * when using the PDH API:
- *
- * For PDH, a process is not primarily identified by it's process id,
- * but with a sequential number, for example \Process(java#0), \Process(java#1), ....
- * The really bad part is that this list is reset as soon as one process exits:
- * If \Process(java#1) exits, \Process(java#3) now becomes \Process(java#2) etc.
- *
- * The PDH query api requires a process identifier to be submitted when registering
- * a query, but as soon as the list resets, the query is invalidated (since the name
- * changed).
- *
- * Solution:
- * The #number identifier for a Process query can only decrease after process creation.
- *
- * Therefore we create an array of counter queries for all process object instances
- * up to and including ourselves:
- *
- * Ex. we come in as third process instance (java#2), we then create and register
- * queries for the following Process object instances:
- * java#0, java#1, java#2
- *
- * currentQueryIndexForProcess() keeps track of the current "correct" query
- * (in order to keep this index valid when the list resets from underneath,
- * ensure to call getCurrentQueryIndexForProcess() before every query involving
- * Process object instance data).
- */
-static int
-currentQueryIndexForProcess(void) {
-    HQUERY tmpQuery = NULL;
-    HCOUNTER handleCounter = NULL;
-    int retValue = -1;
-
-    assert(pdhProcessImageName);
-    assert(pdhIDProcessCounterFmt);
-
-    if (openQuery(&tmpQuery) == 0) {
-        int index;
-
-        /* iterate over all instance indexes and try to find our own pid */
-        for (index = 0; index < INT_MAX; ++index) {
-            char fullIDProcessCounterPath[MAX_PATH];
-            PDH_FMT_COUNTERVALUE counterValue;
-            PDH_STATUS res;
-
-            _snprintf(fullIDProcessCounterPath,
-                      MAX_PATH,
-                      pdhIDProcessCounterFmt,
-                      index);
-
-            if (addCounter(tmpQuery, fullIDProcessCounterPath, &handleCounter) != 0) {
-                break;
-            }
-
-            res = PdhCollectQueryData_i(tmpQuery);
-
-            if (PDH_INVALID_HANDLE == res || PDH_NO_DATA == res) {
-                break;
-            }
-
-            PdhGetFormattedCounterValue_i(handleCounter,
-                                          PDH_FMT_LONG,
-                                          NULL,
-                                          &counterValue);
-            /*
-             * This check seems to be needed for Win2k SMP boxes, since
-             * they for some reason don't return PDH_NO_DATA for non existing
-             * counters.
-             */
-            if (counterValue.CStatus != PDH_CSTATUS_VALID_DATA) {
-                break;
-            }
-
-            if ((LONG)getProcessID() == counterValue.longValue) {
-                retValue = index;
-                break;
-            }
-        }
-    }
-
-    pdhCleanup(&tmpQuery, &handleCounter);
-
-    return retValue;
-}
-
-/*
- * If successful, returns the #index corresponding to our PID
- * as resolved by the pdh query:
- * "\Process(java#index)\ID Process" (or localized equivalent)
- *
- * This function should be called before attempting to read
- * from any Process related counter(s), and the return value
- * is the index to be used for indexing an array of Process object query's:
- *
- * Example:
- * processTotalCPULoad[currentQueryIndex].query
- *
- * Returns -1 on failure.
- */
-static int
-getCurrentQueryIndexForProcess() {
-    int currentQueryIndex = currentQueryIndexForProcess();
-
-    assert(currentQueryIndex >= 0 &&
-           currentQueryIndex < numberOfJavaProcessesAtInitialization);
-
-    return currentQueryIndex;
-}
-
-/*
- * Returns the PDH string identifying the current process image name.
- * Use this name as a qualifier when getting counters from the PDH Process Object
- * representing your process.
-
- * Example:
- * "\Process(java#0)\Virtual Bytes" - where "java" is the PDH process
- * image name.
- *
- * Please note that the process image name is not necessarily "java",
- * hence the use of GetModuleFileName() to detect the process image name.
- *
- * @return   the process image name to be used when retrieving
- *           PDH counters from the current process. The caller will
-             own the returned malloc:ed string. NULL if failure.
- */
-static const char*
-getPdhProcessImageName() {
-    char moduleName[MAX_PATH];
-    char* processImageName;
-    char* dotPos;
-
-    // Find our module name and use it to extract the image name used by PDH
-    DWORD getmfnReturn = GetModuleFileName(NULL, moduleName, sizeof(moduleName));
-
-    if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-        return NULL;
-    }
-
-    if (getmfnReturn >= MAX_PATH || 0 == getmfnReturn) {
-        return NULL;
-    }
-
-    processImageName = strrchr(moduleName, '\\'); //drop path
-    processImageName++;                           //skip slash
-    dotPos = strrchr(processImageName, '.');      //drop .exe
-    dotPos[0] = '\0';
-
-    return allocateAndCopy(processImageName);
-}
-
-/*
- * Sets up the supplied MultipleCounterQuery to check on the processors via PDH CPU counters.
- * TODO: Refactor and prettify as with the the SingleCounter queries
- * if more MultipleCounterQueries are discovered/needed.
- *
- * @param multiCounterCPULoad  a pointer to a MultipleCounterQueryS, will be filled in with
- *                             the necessary info to check the PDH processor counters.
- * @return                     0 if successful, negative on failure.
- */
-static int
-initializeMultipleCounterForCPUs(MultipleCounterQueryP multiCounterCPULoad) {
-    DWORD cSize = 0;
-    DWORD iSize = 0;
-    DWORD pCount;
-    DWORD index;
-    char* processor = NULL; //'Processor' == PDH_PROCESSOR_IDX
-    char* time = NULL;      //'Time' == PDH_PROCESSOR_TIME_IDX
-    char* instances = NULL;
-    char* tmp;
-    int   retValue = -1;
-    PDH_STATUS pdhStat;
-
-    if (lookupNameByIndex(PDH_PROCESSOR_IDX, &processor) != 0) {
-        goto end;
-    }
-
-    if (lookupNameByIndex(PDH_PROCESSOR_TIME_IDX, &time) != 0) {
-        goto end;
-    }
-
-    //ok, now we have enough to enumerate all processors.
-    pdhStat = PdhEnumObjectItems_i(
-                                   NULL, // reserved
-                                   NULL, // local machine
-                                   processor, // object to enumerate
-                                   NULL, // pass in NULL buffers
-                                   &cSize, // and 0 length to get
-                                   NULL, // required size
-                                   &iSize, // of the buffers in chars
-                                   PERF_DETAIL_WIZARD, // counter detail level
-                                   0);
-
-    if (pdhFail(pdhStat)) {
-        goto end;
-    }
-
-    instances = calloc(iSize, 1);
-
-    if (!instances) {
-        goto end;
-    }
-
-    cSize = 0;
-
-    pdhStat = PdhEnumObjectItems_i(
-                                   NULL, // reserved
-                                   NULL, // local machine
-                                   processor, // object to enumerate
-                                   NULL, // pass in NULL buffers
-                                   &cSize,
-                                   instances, // now allocated to be filled in
-                                   &iSize, // and size is known
-                                   PERF_DETAIL_WIZARD, // counter detail level
-                                   0);
-
-    if (pdhFail(pdhStat)) {
-        goto end;
-    }
-
-    // enumerate the Processor instances ("\Processor(0)", "\Processor(1)", ..., "\Processor(_Total)")
-    for (pCount = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[strlen(tmp)+1], pCount++);
-
-    assert(pCount == numCpus+1);
-
-    //ok, we now have the number of Processor instances - allocate an HCOUNTER for each
-    multiCounterCPULoad->counters = (HCOUNTER*)malloc(pCount * sizeof(HCOUNTER));
-
-    if (!multiCounterCPULoad->counters) {
-        goto end;
-    }
-
-    multiCounterCPULoad->noOfCounters = pCount;
-
-    if (openQuery(&multiCounterCPULoad->query.query) != 0) {
-        goto end;
-    }
-
-    // fetch instance and register its corresponding HCOUNTER with the query
-    for (index = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[strlen(tmp)+1], ++index) {
-        const char* const fullCounterPath = makeFullCounterPath(processor, time, NULL, tmp);
-
-        if (!fullCounterPath) {
-            goto end;
-        }
-
-        retValue = addCounter(multiCounterCPULoad->query.query,
-                              fullCounterPath,
-                              &multiCounterCPULoad->counters[index]);
-
-        free((char*)fullCounterPath);
-
-        if (retValue != 0) {
-            goto end;
-        }
-    }
-
-    // Query once to initialize the counters which require at least two samples
-    // (like the % CPU usage) to calculate correctly.
-    PdhCollectQueryData_i(multiCounterCPULoad->query.query);
-
-  end:
-    if (processor) {
-        free(processor);
-    }
-
-    if (time) {
-        free(time);
-    }
-
-    if (instances) {
-        free(instances);
-    }
-
-    return retValue;
-}
-
-/*
- * Dynamically sets up function pointers to the PDH library.
- *
- * @param h  HMODULE for the PDH library
- * @return   0 on success, negative on failure.
- */
-static int
-bindPdhFunctionPointers(HMODULE h) {
-    assert(h);
-    assert(GetCurrentThreadId() == initializationLock.owningThread);
-
-    /* The 'A' at the end means the ANSI (not the UNICODE) vesions of the methods */
-    PdhAddCounter_i         = (PdhAddCounterFunc)GetProcAddress(h, "PdhAddCounterA");
-    PdhOpenQuery_i         = (PdhOpenQueryFunc)GetProcAddress(h, "PdhOpenQueryA");
-    PdhCloseQuery_i         = (PdhCloseQueryFunc)GetProcAddress(h, "PdhCloseQuery");
-    PdhCollectQueryData_i     = (PdhCollectQueryDataFunc)GetProcAddress(h, "PdhCollectQueryData");
-    PdhGetFormattedCounterValue_i = (PdhGetFormattedCounterValueFunc)GetProcAddress(h, "PdhGetFormattedCounterValue");
-    PdhEnumObjectItems_i         = (PdhEnumObjectItemsFunc)GetProcAddress(h, "PdhEnumObjectItemsA");
-    PdhRemoveCounter_i         = (PdhRemoveCounterFunc)GetProcAddress(h, "PdhRemoveCounter");
-    PdhLookupPerfNameByIndex_i     = (PdhLookupPerfNameByIndexFunc)GetProcAddress(h, "PdhLookupPerfNameByIndexA");
-
-    if (!PdhAddCounter_i || !PdhOpenQuery_i ||
-        !PdhCloseQuery_i || !PdhCollectQueryData_i ||
-        !PdhGetFormattedCounterValue_i || !PdhEnumObjectItems_i ||
-        !PdhRemoveCounter_i || !PdhLookupPerfNameByIndex_i)
-    {
-        return -1;
-    }
-    return 0;
-}
-
-/*
- * Returns the counter value as a double for the specified query.
- * Will collect the query data and update the counter values as necessary.
- *
- * @param query       the query to update (if needed).
- * @param c           the counter to read.
- * @param value       where to store the formatted value.
- * @param format      the format to use (i.e. PDH_FMT_DOUBLE, PDH_FMT_LONG etc)
- * @return            0 if no error
- *                    -1 if PdhCollectQueryData fails
- *                    -2 if PdhGetFormattedCounterValue fails
- */
-static int
-getPerformanceData(UpdateQueryP query, HCOUNTER c, PDH_FMT_COUNTERVALUE* value, DWORD format) {
-    clock_t now = clock();
-
-    /*
-     * Need to limit how often we update the query
-     * to minimize the Heisenberg effect.
-     * (PDH behaves erratically if the counters are
-     * queried too often, especially counters that
-     * store and use values from two consecutive updates,
-     * like cpu load.)
-     */
-    if (now - query->lastUpdate > MIN_UPDATE_INTERVAL) {
-        if (PdhCollectQueryData_i(query->query) != ERROR_SUCCESS) {
-            return -1;
-        }
-        query->lastUpdate = now;
-    }
-
-    if (PdhGetFormattedCounterValue_i(c, format, NULL, value) != ERROR_SUCCESS) {
-        return -2;
-    }
-
-    return 0;
-}
-
-static int
-allocateAndInitializePdhConstants() {
-    const char* pdhLocalizedProcessObject = NULL;
-    const char* pdhLocalizedIDProcessCounter = NULL;
-    size_t pdhIDProcessCounterFmtLen;
-    int currentQueryIndex;
-    int retValue = -1;
-
-    assert(GetCurrentThreadId() == initializationLock.owningThread);
-
-    assert(!pdhProcessImageName);
-    pdhProcessImageName = getPdhProcessImageName();
-    if (!pdhProcessImageName) {
-        goto end;
-    }
-
-    pdhLocalizedProcessObject = getPdhLocalizedArtifact(PDH_PROCESS_IDX);
-    if (!pdhLocalizedProcessObject) {
-        goto end;
-    }
-
-    pdhLocalizedIDProcessCounter = getPdhLocalizedArtifact(PDH_ID_PROCESS_IDX);
-    if (!pdhLocalizedIDProcessCounter) {
-        goto end;
-    }
-
-    assert(!pdhIDProcessCounterFmt);
-
-    pdhIDProcessCounterFmtLen = strlen(pdhProcessImageName);
-    pdhIDProcessCounterFmtLen += strlen(pdhLocalizedProcessObject);
-    pdhIDProcessCounterFmtLen += strlen(pdhLocalizedIDProcessCounter);
-    pdhIDProcessCounterFmtLen += PROCESS_OBJECT_INSTANCE_COUNTER_FMT_LEN;
-    pdhIDProcessCounterFmtLen += 2; // "%d"
-
-    assert(pdhIDProcessCounterFmtLen < MAX_PATH);
-    pdhIDProcessCounterFmt = malloc(pdhIDProcessCounterFmtLen + 1);
-    if (!pdhIDProcessCounterFmt) {
-        goto end;
-    }
-
-    /* "\Process(java#%d)\ID Process" */
-    _snprintf(pdhIDProcessCounterFmt,
-              pdhIDProcessCounterFmtLen,
-              PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
-              pdhLocalizedProcessObject,
-              pdhProcessImageName,
-              "%d",
-              pdhLocalizedIDProcessCounter);
-
-    pdhIDProcessCounterFmt[pdhIDProcessCounterFmtLen] = '\0';
-
-    assert(0 == numberOfJavaProcessesAtInitialization);
-    currentQueryIndex = currentQueryIndexForProcess();
-    if (-1 == currentQueryIndex) {
-        goto end;
-    }
-
-    numberOfJavaProcessesAtInitialization = currentQueryIndex + 1;
-    assert(numberOfJavaProcessesAtInitialization >= 1);
-
-    retValue = 0;
-
-  end:
-
-    if (pdhLocalizedProcessObject) {
-        free((char*)pdhLocalizedProcessObject);
-    }
-
-    if (pdhLocalizedIDProcessCounter) {
-        free((char*)pdhLocalizedIDProcessCounter);
-    }
-
-    return retValue;
-}
-
-static void
-deallocatePdhConstants() {
-    assert(GetCurrentThreadId() == initializationLock.owningThread);
-
-    if (pdhProcessImageName) {
-        free((char*)pdhProcessImageName);
-        pdhProcessImageName = NULL;
-    }
-
-    if (pdhIDProcessCounterFmt) {
-      free(pdhIDProcessCounterFmt);
-      pdhIDProcessCounterFmt = NULL;
-    }
-
-    numberOfJavaProcessesAtInitialization = 0;
-}
-
-static int
-initializeCPUCounters() {
-    SYSTEM_INFO si;
-    char* localizedProcessObject;
-    char* localizedProcessorTimeCounter;
-    int i;
-    int retValue = -1;
-
-    assert(GetCurrentThreadId() == initializationLock.owningThread);
-
-    assert(0 == numCpus);
-    GetSystemInfo(&si);
-    numCpus = si.dwNumberOfProcessors;
-    assert(numCpus >= 1);
-
-    /* Initialize the denominator for the jvm load calculations */
-    assert(.0 == cpuFactor);
-    cpuFactor = numCpus * 100;
-
-    if (lookupNameByIndex(PDH_PROCESS_IDX,
-                          &localizedProcessObject) == 0) {
-
-        if (lookupNameByIndex(PDH_PROCESSOR_TIME_IDX,
-                              &localizedProcessorTimeCounter) == 0) {
-
-            assert(processTotalCPULoad);
-            assert(pdhProcessImageName);
-
-            for (i = 0; i < numberOfJavaProcessesAtInitialization; ++i) {
-                char instanceIndexBuffer[32];
-                retValue = initializeSingleCounter(&processTotalCPULoad[i],
-                                                   localizedProcessObject,
-                                                   localizedProcessorTimeCounter,
-                                                   pdhProcessImageName,
-                                                   itoa(i, instanceIndexBuffer, 10),
-                                                   TRUE);
-                if (retValue != 0) {
-                    break;
-                }
-            }
-            free(localizedProcessorTimeCounter);
-        }
-        free(localizedProcessObject);
-    }
-
-    if (retValue != 0) {
-        return -1;
-    }
-
-    assert(multiCounterCPULoad);
-    return initializeMultipleCounterForCPUs(multiCounterCPULoad);
-}
-
-static void
-deallocateCPUCounters() {
-    int i;
-
-    assert(GetCurrentThreadId() == initializationLock.owningThread);
-
-    if (processTotalCPULoad) {
-        for (i = 0; i < numberOfJavaProcessesAtInitialization; ++i) {
-            destroySingleCounter(&processTotalCPULoad[i]);
-        }
-        free(processTotalCPULoad);
-        processTotalCPULoad = NULL;
-    }
-
-    if (multiCounterCPULoad) {
-        destroyMultiCounter(multiCounterCPULoad);
-        free(multiCounterCPULoad);
-        multiCounterCPULoad = NULL;
-    }
-
-    cpuFactor = .0;
-    numCpus = 0;
-}
-
-static void
-pdhInitErrorHandler(HMODULE h) {
-    assert(GetCurrentThreadId() == initializationLock.owningThread);
-
-    deallocatePdhConstants();
-
-    if (h) {
-        FreeLibrary(h);
-    }
-}
-
-/*
- * Helper to initialize the PDH library, function pointers and constants.
- *
- * @return  0 if successful, negative on failure.
- */
-static int
-pdhInit() {
-    static BOOL initialized = FALSE;
-    int retValue;
-
-    if (initialized) {
-        return 0;
-    }
-
-    retValue = 0;
-
-    EnterPdhCriticalSection(&initializationLock); {
-        if (!initialized) {
-            HMODULE h = NULL;
-            if ((h = LoadLibrary("pdh.dll")) == NULL) {
-                retValue = -1;
-            } else if (bindPdhFunctionPointers(h) < 0) {
-                retValue = -1;
-            } else if (allocateAndInitializePdhConstants() < 0) {
-                retValue = -1;
-            }
-
-            if (0 == retValue) {
-                initialized = TRUE;
-            } else {
-                pdhInitErrorHandler(h);
-            }
-        }
-    } LeavePdhCriticalSection(&initializationLock);
-
-    return retValue;
-}
-
-static int
-allocateCPUCounters() {
-    assert(GetCurrentThreadId() == initializationLock.owningThread);
-    assert(numberOfJavaProcessesAtInitialization >= 1);
-    assert(!processTotalCPULoad);
-    assert(!multiCounterCPULoad);
-
-    /*
-     * Create an array of Process object queries, for each instance
-     * up to and including our own (java#0, java#1, java#2, ...).
-     */
-    processTotalCPULoad = calloc(numberOfJavaProcessesAtInitialization,
-                                 sizeof(SingleCounterQueryS));
-
-    if (!processTotalCPULoad) {
-        return -1;
-    }
-
-    multiCounterCPULoad = calloc(1, sizeof(MultipleCounterQueryS));
-
-    if (!multiCounterCPULoad) {
-        return -1;
-    }
-
-    return 0;
-}
-
-static int
-initializePdhCPUCounters() {
-    static BOOL initialized = FALSE;
-    int retValue;
-
-    if (initialized) {
-        return 0;
-    }
-
-    retValue = 0;
-
-    EnterPdhCriticalSection(&initializationLock); {
-        if (!initialized) {
-            if (pdhInit() < 0) {
-                retValue = -1;
-            }  else if (allocateCPUCounters() < 0) {
-                retValue = -1;
-            } else if (initializeCPUCounters() < 0) {
-                retValue = -1;
-            }
-
-            if (0 == retValue) {
-                initialized = TRUE;
-            } else {
-              deallocateCPUCounters();
-            }
-        }
-    } LeavePdhCriticalSection(&initializationLock);
-
-    return retValue;
-}
-
-static int
-perfCPUInit() {
-    return initializePdhCPUCounters();
-}
-
-static double
-perfGetProcessCPULoad() {
-    PDH_FMT_COUNTERVALUE cv;
-    int currentQueryIndex;
-
-    if (perfCPUInit() < 0) {
-        // warn?
-        return -1.0;
-    }
-
-    currentQueryIndex = getCurrentQueryIndexForProcess();
-
-    if (getPerformanceData(&processTotalCPULoad[currentQueryIndex].query,
-                           processTotalCPULoad[currentQueryIndex].counter,
-                           &cv,
-                           PDH_FMT_DOUBLE | PDH_FMT_NOCAP100) == 0) {
-        double d = cv.doubleValue / cpuFactor;
-        d = min(1, d);
-        d = max(0, d);
-        return d;
-    }
-    return -1.0;
-}
-
-static double
-perfGetCPULoad(int which) {
-    PDH_FMT_COUNTERVALUE cv;
-    HCOUNTER c;
-
-    if (perfCPUInit() < 0) {
-        // warn?
-        return -1.0;
-    }
-
-    if (-1 == which) {
-        c = multiCounterCPULoad->counters[multiCounterCPULoad->noOfCounters - 1];
-    } else {
-        if (which < multiCounterCPULoad->noOfCounters) {
-            c = multiCounterCPULoad->counters[which];
-        } else {
-            return -1.0;
-        }
-    }
-    if (getPerformanceData(&multiCounterCPULoad->query, c, &cv, PDH_FMT_DOUBLE ) == 0) {
-        return cv.doubleValue / 100;
-    }
-    return -1.0;
-}
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    return perfGetCPULoad(-1);
-}
-
-JNIEXPORT jdouble JNICALL
-Java_sun_management_OperatingSystemImpl_getProcessCpuLoad0
-(JNIEnv *env, jobject dummy)
-{
-    return perfGetProcessCPULoad();
-}
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java	Thu May 07 20:50:07 2015 -0700
@@ -59,6 +59,8 @@
                 GSSUtil.createOid("1.2.840.113554.1.2.2");
     public static final Oid GSS_KRB5_MECH_OID2 =
                 GSSUtil.createOid("1.3.5.1.5.2");
+    public static final Oid GSS_KRB5_MECH_OID_MS =
+                GSSUtil.createOid("1.2.840.48018.1.2.2");
 
     public static final Oid GSS_SPNEGO_MECH_OID =
                 GSSUtil.createOid("1.3.6.1.5.5.2");
@@ -101,7 +103,8 @@
 
     public static boolean isKerberosMech(Oid oid) {
         return (GSS_KRB5_MECH_OID.equals(oid) ||
-                GSS_KRB5_MECH_OID2.equals(oid));
+                GSS_KRB5_MECH_OID2.equals(oid) ||
+                GSS_KRB5_MECH_OID_MS.equals(oid));
 
     }
 
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java	Thu May 07 20:50:07 2015 -0700
@@ -538,14 +538,21 @@
                 // get the token for mechanism
                 byte[] accept_token;
 
-                if (mechList[0].equals(mech_wanted)) {
+                if (mechList[0].equals(mech_wanted) ||
+                        (GSSUtil.isKerberosMech(mechList[0]) &&
+                         GSSUtil.isKerberosMech(mech_wanted))) {
                     // get the mechanism token
+                    if (DEBUG && !mech_wanted.equals(mechList[0])) {
+                        System.out.println("SpNegoContext.acceptSecContext: " +
+                                "negotiated mech adjusted to " + mechList[0]);
+                    }
                     byte[] mechToken = initToken.getMechToken();
                     if (mechToken == null) {
                         throw new GSSException(GSSException.FAILURE, -1,
                                 "mechToken is missing");
                     }
                     accept_token = GSS_acceptSecContext(mechToken);
+                    mech_wanted = mechList[0];
                 } else {
                     accept_token = null;
                 }
--- a/jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c	Thu May 07 20:50:07 2015 -0700
@@ -389,7 +389,7 @@
     jobject authTime, renewTillTime, hostAddresses = NULL;
     KERB_EXTERNAL_TICKET *msticket;
     int found = 0;
-    FILETIME Now, EndTime, LocalEndTime;
+    FILETIME Now, EndTime;
 
     int i, netypes;
     jint *etypes = NULL;
@@ -476,8 +476,7 @@
             GetSystemTimeAsFileTime(&Now);
             EndTime.dwLowDateTime = msticket->EndTime.LowPart;
             EndTime.dwHighDateTime = msticket->EndTime.HighPart;
-            FileTimeToLocalFileTime(&EndTime, &LocalEndTime);
-            if (CompareFileTime(&Now, &LocalEndTime) < 0) {
+            if (CompareFileTime(&Now, &EndTime) < 0) {
                 for (i=0; i<netypes; i++) {
                     if (etypes[i] == msticket->SessionKey.KeyType) {
                         found = 1;
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -131,6 +131,15 @@
     }
 
     @Override
+    boolean isAssignableTo(ReferenceType type) {
+        if (type.name().equals("java.lang.Object")) {
+            // interfaces are always assignable to j.l.Object
+            return true;
+        }
+        return super.isAssignableTo(type);
+    }
+
+    @Override
     List<InterfaceType> interfaces() {
         return superinterfaces();
     }
@@ -140,4 +149,4 @@
         // method must be directly in this interface
         return this.equals(method.declaringType());
     }
-}
\ No newline at end of file
+}
--- a/jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/Jstatd.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/Jstatd.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -64,15 +64,9 @@
                 int localport = (port < 0) ? Registry.REGISTRY_PORT : port;
                 registry = LocateRegistry.createRegistry(localport);
                 bind(name, remoteHost);
+            } else {
+                throw e;
             }
-            else {
-                System.out.println("Could not contact registry\n"
-                                   + e.getMessage());
-                e.printStackTrace();
-            }
-        } catch (RemoteException e) {
-            System.err.println("Could not bind " + name + " to RMI Registry");
-            e.printStackTrace();
         }
     }
 
@@ -142,23 +136,28 @@
             RemoteHost stub = (RemoteHost) UnicastRemoteObject.exportObject(
                     remoteHost, 0);
             bind(name.toString(), remoteHost);
+            System.out.println("jstatd started (bound to " + name.toString() + ")");
+            System.out.flush();
         } catch (MalformedURLException e) {
             if (rminame != null) {
                 System.out.println("Bad RMI server name: " + rminame);
             } else {
-                System.out.println("Bad RMI URL: " + name + " : "
-                                   + e.getMessage());
+                System.out.println("Bad RMI URL: " + name);
             }
+            e.printStackTrace(System.out);
             System.exit(1);
         } catch (java.rmi.ConnectException e) {
             // could not attach to or create a registry
-            System.out.println("Could not contact RMI registry\n"
-                               + e.getMessage());
+            System.out.println("Could not contact RMI registry");
+            e.printStackTrace(System.out);
+            System.exit(1);
+        } catch (RemoteException e) {
+            System.out.println("Could not bind " + name + " to RMI Registry");
+            e.printStackTrace(System.out);
             System.exit(1);
         } catch (Exception e) {
-            System.out.println("Could not create remote object\n"
-                               + e.getMessage());
-            e.printStackTrace();
+            System.out.println("Could not create remote object");
+            e.printStackTrace(System.out);
             System.exit(1);
         }
     }
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/TimeZoneNames_de.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/TimeZoneNames_de.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"Golf Normalzeit", "GST",
                                      "Golf Sommerzeit", "GDT",
                                      "Zeitzone f\u00FCr Persischen Golf", "GT"};
-        String HAST[] = new String[] {"Hawaii-Aleutische Normalzeit", "HAST",
-                                      "Hawaii-Aleutische Sommerzeit", "HADT",
-                                      "Zeitzone f\u00FCr Hawaii und Al\u00EButen", "HAT"};
         String HKT[] =  new String[] {"Hongkong Zeit", "HKT",
                                       "Hongkong Sommerzeit", "HKST",
                                       "Hongkong Zeit", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "Paraguay Sommerzeit", "PYST",
                                                "Paraguay Zeit", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"Hora est\u00e1ndar del Golfo", "GST",
                                      "Hora de verano del Golfo", "GDT",
                                      "Hora del Golfo", "GT"};
-        String HAST[] = new String[] {"Hora est\u00e1ndar de Hawaii-Aleutianas", "HAST",
-                                      "Hora de verano de Hawaii-Aleutianas", "HADT",
-                                      "Hora de Hawaii-Aleutian", "HAT"};
         String HKT[] =  new String[] {"Hora de Hong Kong", "HKT",
                                       "Hora de verano de Hong Kong", "HKST",
                                       "Hora de Hong Kong", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "Hora de verano de Paraguay", "PYST",
                                                "Hora de Paraguay", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"Heure normale du Golfe", "GST",
                                      "Heure avanc\u00e9e du Golfe", "GDT",
                                      "Golfe", "GT"} ;
-        String HAST[] = new String[] {"Heure normale d'Hawa\u00ef-Al\u00e9outiennes", "HAST",
-                                      "Heure avanc\u00e9e d'Hawa\u00ef-Al\u00e9outiennes", "HADT",
-                                      "Hawa\u00EF-Iles Al\u00E9outiennes", "HAT"} ;
         String HKT[] =  new String[] {"Heure de Hong Kong", "HKT",
                                       "Heure d'\u00e9t\u00e9 de Hong Kong", "HKST",
                                       "Heure de Hong-Kong", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "Heure d'\u00e9t\u00e9 du Paraguay", "PYST",
                                                "Heure du Paraguay", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/TimeZoneNames_it.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/TimeZoneNames_it.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"Ora solare del golfo", "GST",
                                      "Ora legale del golfo", "GDT",
                                      "Ora del golfo", "GT"};
-        String HAST[] = new String[] {"Ora solare delle Isole Hawaii-Aleutine", "HAST",
-                                      "Ora solare delle Isole Hawaii-Aleutine", "HADT",
-                                      "Ora Hawaii-Aleutine", "HAT"};
         String HKT[] =  new String[] {"Ora di Hong Kong", "HKT",
                                       "Ora estiva di Hong Kong", "HKST",
                                       "Ora di Hong Kong", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "Ora estiva del Paraguay", "PYST",
                                                "Ora del Paraguay", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"\u6e7e\u5cb8\u6a19\u6e96\u6642", "GST",
                                      "\u6e7e\u5cb8\u590f\u6642\u9593", "GDT",
                                      "\u6E7E\u5CB8\u6642\u9593", "GT"};
-        String HAST[] = new String[] {"\u30cf\u30ef\u30a4 - \u30a2\u30ea\u30e5\u30fc\u30b7\u30e3\u30f3\u6a19\u6e96\u6642", "HAST",
-                                      "\u30cf\u30ef\u30a4 - \u30a2\u30ea\u30e5\u30fc\u30b7\u30e3\u30f3\u590f\u6642\u9593", "HADT",
-                                      "\u30CF\u30EF\u30A4\u30FB\u30A2\u30EA\u30E5\u30FC\u30B7\u30E3\u30F3\u6642\u9593", "HAT"};
         String HKT[] =  new String[] {"\u9999\u6e2f\u6642\u9593", "HKT",
                                       "\u9999\u6e2f\u590f\u6642\u9593", "HKST",
                                       "\u9999\u6E2F\u6642\u9593", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "\u30d1\u30e9\u30b0\u30a2\u30a4\u590f\u6642\u9593", "PYST",
                                                "\u30D1\u30E9\u30B0\u30A2\u30A4\u6642\u9593", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"\uac78\ud504\ub9cc \ud45c\uc900\uc2dc", "GST",
                                      "\uac78\ud504\ub9cc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GDT",
                                      "\uAC78\uD504\uB9CC \uD45C\uC900\uC2DC", "GT"};
-        String HAST[] = new String[] {"\ud558\uc640\uc774 \uc54c\ub958\uc0e8 \ud45c\uc900\uc2dc", "HAST",
-                                      "\ud558\uc640\uc774 \uc54c\ub958\uc0e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HADT",
-                                      "\uD558\uC640\uC774-\uC54C\uB8E8\uC0E8 \uD45C\uC900\uC2DC", "HAT"};
         String HKT[] =  new String[] {"\ud64d\ucf69 \uc2dc\uac04", "HKT",
                                       "\ud64d\ucf69 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HKST",
                                       "\uD64D\uCF69 \uD45C\uC900\uC2DC", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "\ud30c\ub77c\uacfc\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PYST",
                                                "\uD30C\uB77C\uACFC\uC774 \uD45C\uC900\uC2DC", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java	Thu May 07 20:50:07 2015 -0700
@@ -150,9 +150,6 @@
         String GST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do golfo", "GST",
                                      "Hor\u00e1rio de luz natural do golfo", "GDT",
                                      "Hor\u00E1rio do Golfo", "GT"};
-        String HAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed-Aleutian", "HAST",
-                                      "Hor\u00e1rio de luz natural do Hava\u00ed-Aleutian", "HADT",
-                                      "Hor\u00E1rio do Hava\u00ED-Aleutas", "HAT"};
         String HKT[] =  new String[] {"Fuso hor\u00e1rio de Hong Kong", "HKT",
                                       "Fuso hor\u00e1rio de ver\u00e3o de Hong Kong", "HKST",
                                       "Hor\u00E1rio de Hong Kong", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "Fuso hor\u00e1rio de ver\u00e3o do Paraguai", "PYST",
                                                "Hor\u00E1rio do Paraguai", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"Gulf-normaltid", "GST",
                                      "Gulf-sommartid", "GDT",
                                      "Golfens tid", "GT"};
-        String HAST[] = new String[] {"Hawaii-Aleuterna, normaltid", "HAST",
-                                      "Hawaii-Aleuterna, sommartid", "HADT",
-                                      "Hawaiiansk-aleutisk tid", "HAT"};
         String HKT[] =  new String[] {"Hong Kong, normaltid", "HKT",
                                       "Hong Kong, sommartid", "HKST",
                                       "Hongkong-tid", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "Paraguay, sommartid", "PYST",
                                                "Paraguayansk tid", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"\u6ce2\u65af\u6e7e\u6807\u51c6\u65f6\u95f4", "GST",
                                      "\u6ce2\u65af\u6e7e\u590f\u4ee4\u65f6", "GDT",
                                      "\u6D77\u6E7E\u65F6\u95F4", "GT"};
-        String HAST[] = new String[] {"\u590f\u5a01\u5937-\u963f\u7559\u7533\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "HAST",
-                                      "\u590f\u5a01\u5937-\u963f\u7559\u7533\u7fa4\u5c9b\u590f\u4ee4\u65f6", "HADT",
-                                      "\u590F\u5A01\u5937-\u963F\u7559\u7533\u65F6\u95F4", "HAT"};
         String HKT[] =  new String[] {"\u9999\u6e2f\u65f6\u95f4", "HKT",
                                       "\u9999\u6e2f\u590f\u4ee4\u65f6", "HKST",
                                       "\u9999\u6E2F\u65F6\u95F4", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "\u5df4\u62c9\u572d\u590f\u4ee4\u65f6", "PYST",
                                                "\u5DF4\u62C9\u572D\u65F6\u95F4", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1024,7 +1021,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java	Thu May 07 20:50:07 2015 -0700
@@ -153,9 +153,6 @@
         String GST[] = new String[] {"\u6ce2\u65af\u7063\u6a19\u6e96\u6642\u9593", "GST",
                                      "\u6ce2\u65af\u7063\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "GDT",
                                      "\u6CE2\u65AF\u7063\u6642\u9593", "GT"};
-        String HAST[] = new String[] {"\u590f\u5a01\u5937-\u963f\u7559\u7533\u7fa4\u5cf6\u6a19\u6e96\u6642\u9593", "HAST",
-                                      "\u590f\u5a01\u5937-\u963f\u7559\u7533\u7fa4\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "HADT",
-                                      "\u590F\u5A01\u5937-\u963F\u7559\u7533\u6642\u9593", "HAT"};
         String HKT[] =  new String[] {"\u9999\u6e2f\u6642\u9593", "HKT",
                                       "\u9999\u6e2f\u590f\u4ee4\u6642\u9593", "HKST",
                                       "\u9999\u6E2F\u6642\u9593", "HKT"};
@@ -372,7 +369,7 @@
             {"Africa/Tripoli", EET},
             {"Africa/Tunis", CET},
             {"Africa/Windhoek", WAT},
-            {"America/Adak", HAST},
+            {"America/Adak", HST},
             {"America/Anguilla", AST},
             {"America/Antigua", AST},
             {"America/Araguaina", BRT},
@@ -394,7 +391,7 @@
                                                "\u5df4\u62c9\u572d\u590f\u4ee4\u6642\u9593", "PYST",
                                                "\u5DF4\u62C9\u572D\u6642\u9593", "PYT"}},
             {"America/Atikokan", EST},
-            {"America/Atka", HAST},
+            {"America/Atka", HST},
             {"America/Bahia", BRT},
             {"America/Bahia_Banderas", CST},
             {"America/Barbados", AST},
@@ -1026,7 +1023,7 @@
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
-            {"US/Aleutian", HAST},
+            {"US/Aleutian", HST},
             {"US/Arizona", MST},
             {"US/Central", CST},
             {"US/Eastern", EST},
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2015 SAP AG. 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.
+ */
+
+/* Empty stubs for now to satisfy the new build process.                 */
+/* Implement and update https://bugs.openjdk.java.net/browse/JDK-8030957 */
+
+#include <jni.h>
+#include "com_sun_management_internal_OperatingSystemImpl.h"
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getSystemCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    return -1.0;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    return -1.0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/linux/native/libmanagement_ext/UnixOperatingSystem.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2011, 2015, 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.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <pthread.h>
+#include <inttypes.h>
+#include "com_sun_management_internal_OperatingSystemImpl.h"
+
+struct ticks {
+    uint64_t  used;
+    uint64_t  usedKernel;
+    uint64_t  total;
+};
+
+typedef struct ticks ticks;
+
+typedef enum {
+    CPU_LOAD_VM_ONLY,
+    CPU_LOAD_GLOBAL,
+} CpuLoadTarget;
+
+static struct perfbuf {
+    int   nProcs;
+    ticks jvmTicks;
+    ticks cpuTicks;
+    ticks *cpus;
+} counters;
+
+#define DEC_64 "%"SCNd64
+
+static void next_line(FILE *f) {
+    while (fgetc(f) != '\n');
+}
+
+/**
+ * Return the total number of ticks since the system was booted.
+ * If the usedTicks parameter is not NULL, it will be filled with
+ * the number of ticks spent on actual processes (user, system or
+ * nice processes) since system boot. Note that this is the total number
+ * of "executed" ticks on _all_ CPU:s, that is on a n-way system it is
+ * n times the number of ticks that has passed in clock time.
+ *
+ * Returns a negative value if the reading of the ticks failed.
+ */
+static int get_totalticks(int which, ticks *pticks) {
+    FILE         *fh;
+    uint64_t        userTicks, niceTicks, systemTicks, idleTicks;
+    int             n;
+
+    if((fh = fopen("/proc/stat", "r")) == NULL) {
+        return -1;
+    }
+
+    n = fscanf(fh, "cpu " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64,
+           &userTicks, &niceTicks, &systemTicks, &idleTicks);
+
+    // Move to next line
+    next_line(fh);
+
+    //find the line for requested cpu faster to just iterate linefeeds?
+    if (which != -1) {
+        int i;
+        for (i = 0; i < which; i++) {
+            if (fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, &userTicks, &niceTicks, &systemTicks, &idleTicks) != 4) {
+                fclose(fh);
+                return -2;
+            }
+            next_line(fh);
+        }
+        n = fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64 "\n",
+           &userTicks, &niceTicks, &systemTicks, &idleTicks);
+    }
+
+    fclose(fh);
+    if (n != 4) {
+        return -2;
+    }
+
+    pticks->used       = userTicks + niceTicks;
+    pticks->usedKernel = systemTicks;
+    pticks->total      = userTicks + niceTicks + systemTicks + idleTicks;
+
+    return 0;
+}
+
+static int vread_statdata(const char *procfile, const char *fmt, va_list args) {
+    FILE    *f;
+    int     n;
+    char     buf[2048];
+
+    if ((f = fopen(procfile, "r")) == NULL) {
+        return -1;
+    }
+
+    if ((n = fread(buf, 1, sizeof(buf), f)) != -1) {
+    char *tmp;
+
+    buf[n-1] = '\0';
+    /** skip through pid and exec name. the exec name _could be wacky_ (renamed) and
+     *  make scanf go mupp.
+     */
+    if ((tmp = strrchr(buf, ')')) != NULL) {
+        // skip the ')' and the following space but check that the buffer is long enough
+        tmp += 2;
+        if (tmp < buf + n) {
+        n = vsscanf(tmp, fmt, args);
+        }
+    }
+    }
+
+    fclose(f);
+
+    return n;
+}
+
+static int read_statdata(const char *procfile, const char *fmt, ...) {
+    int       n;
+    va_list args;
+
+    va_start(args, fmt);
+    n = vread_statdata(procfile, fmt, args);
+    va_end(args);
+    return n;
+}
+
+/** read user and system ticks from a named procfile, assumed to be in 'stat' format then. */
+static int read_ticks(const char *procfile, uint64_t *userTicks, uint64_t *systemTicks) {
+    return read_statdata(procfile, "%*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "DEC_64" "DEC_64,
+             userTicks, systemTicks
+             );
+}
+
+/**
+ * Return the number of ticks spent in any of the processes belonging
+ * to the JVM on any CPU.
+ */
+static int get_jvmticks(ticks *pticks) {
+    uint64_t userTicks;
+    uint64_t systemTicks;
+
+    if (read_ticks("/proc/self/stat", &userTicks, &systemTicks) < 0) {
+        return -1;
+    }
+
+    // get the total
+    if (get_totalticks(-1, pticks) < 0) {
+        return -1;
+    }
+
+    pticks->used       = userTicks;
+    pticks->usedKernel = systemTicks;
+
+    return 0;
+}
+
+/**
+ * This method must be called first, before any data can be gathererd.
+ */
+int perfInit() {
+    static int initialized=1;
+
+    if (!initialized) {
+        int  i;
+
+        int n = sysconf(_SC_NPROCESSORS_ONLN);
+        if (n <= 0) {
+            n = 1;
+        }
+
+        counters.cpus = calloc(n,sizeof(ticks));
+        if (counters.cpus != NULL)  {
+            // For the CPU load
+            get_totalticks(-1, &counters.cpuTicks);
+
+            for (i = 0; i < n; i++) {
+                get_totalticks(i, &counters.cpus[i]);
+            }
+            // For JVM load
+            get_jvmticks(&counters.jvmTicks);
+            initialized = 1;
+        }
+    }
+
+    return initialized ? 0 : -1;
+}
+
+#define MAX(a,b) (a>b?a:b)
+#define MIN(a,b) (a<b?a:b)
+
+static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+
+/**
+ * Return the load of the CPU as a double. 1.0 means the CPU process uses all
+ * available time for user or system processes, 0.0 means the CPU uses all time
+ * being idle.
+ *
+ * Returns a negative value if there is a problem in determining the CPU load.
+ */
+
+static double get_cpuload_internal(int which, double *pkernelLoad, CpuLoadTarget target) {
+    uint64_t udiff, kdiff, tdiff;
+    ticks *pticks, tmp;
+    double user_load = -1.0;
+    int failed = 0;
+
+    *pkernelLoad = 0.0;
+
+    pthread_mutex_lock(&lock);
+
+    if(perfInit() == 0) {
+
+        if (target == CPU_LOAD_VM_ONLY) {
+            pticks = &counters.jvmTicks;
+        } else if (which == -1) {
+            pticks = &counters.cpuTicks;
+        } else {
+            pticks = &counters.cpus[which];
+        }
+
+        tmp = *pticks;
+
+        if (target == CPU_LOAD_VM_ONLY) {
+            if (get_jvmticks(pticks) != 0) {
+                failed = 1;
+            }
+        } else if (get_totalticks(which, pticks) < 0) {
+            failed = 1;
+        }
+
+        if(!failed) {
+            // seems like we sometimes end up with less kernel ticks when
+            // reading /proc/self/stat a second time, timing issue between cpus?
+            if (pticks->usedKernel < tmp.usedKernel) {
+                kdiff = 0;
+            } else {
+                kdiff = pticks->usedKernel - tmp.usedKernel;
+            }
+            tdiff = pticks->total - tmp.total;
+            udiff = pticks->used - tmp.used;
+
+            if (tdiff == 0) {
+                user_load = 0;
+            } else {
+                if (tdiff < (udiff + kdiff)) {
+                    tdiff = udiff + kdiff;
+                }
+                *pkernelLoad = (kdiff / (double)tdiff);
+                // BUG9044876, normalize return values to sane values
+                *pkernelLoad = MAX(*pkernelLoad, 0.0);
+                *pkernelLoad = MIN(*pkernelLoad, 1.0);
+
+                user_load = (udiff / (double)tdiff);
+                user_load = MAX(user_load, 0.0);
+                user_load = MIN(user_load, 1.0);
+            }
+        }
+    }
+    pthread_mutex_unlock(&lock);
+    return user_load;
+}
+
+double get_cpu_load(int which) {
+    double u, s;
+    u = get_cpuload_internal(which, &s, CPU_LOAD_GLOBAL);
+    if (u < 0) {
+        return -1.0;
+    }
+    // Cap total systemload to 1.0
+    return MIN((u + s), 1.0);
+}
+
+double get_process_load() {
+    double u, s;
+    u = get_cpuload_internal(-1, &s, CPU_LOAD_VM_ONLY);
+    if (u < 0) {
+        return -1.0;
+    }
+    return u + s;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getSystemCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    if(perfInit() == 0) {
+        return get_cpu_load(-1);
+    } else {
+        return -1.0;
+    }
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    if(perfInit() == 0) {
+        return get_process_load();
+    } else {
+        return -1.0;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2011, 2015, 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.
+ */
+
+#include "com_sun_management_internal_OperatingSystemImpl.h"
+
+#include <sys/time.h>
+#include <mach/mach.h>
+#include <mach/task_info.h>
+
+#include "jvm.h"
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getSystemCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    // This code is influenced by the darwin top source
+
+    kern_return_t kr;
+    mach_msg_type_number_t count;
+    host_cpu_load_info_data_t load;
+
+    static jlong last_used  = 0;
+    static jlong last_total = 0;
+
+    count = HOST_CPU_LOAD_INFO_COUNT;
+    kr = host_statistics(mach_host_self(), HOST_CPU_LOAD_INFO, (host_info_t)&load, &count);
+    if (kr != KERN_SUCCESS) {
+        return -1;
+    }
+
+    jlong used  = load.cpu_ticks[CPU_STATE_USER] + load.cpu_ticks[CPU_STATE_NICE] + load.cpu_ticks[CPU_STATE_SYSTEM];
+    jlong total = used + load.cpu_ticks[CPU_STATE_IDLE];
+
+    if (last_used == 0 || last_total == 0) {
+        // First call, just set the last values
+        last_used  = used;
+        last_total = total;
+        // return 0 since we have no data, not -1 which indicates error
+        return 0;
+    }
+
+    jlong used_delta  = used - last_used;
+    jlong total_delta = total - last_total;
+
+    jdouble cpu = (jdouble) used_delta / total_delta;
+
+    last_used  = used;
+    last_total = total;
+
+    return cpu;
+}
+
+
+#define TIME_VALUE_TO_TIMEVAL(a, r) do {  \
+     (r)->tv_sec = (a)->seconds;          \
+     (r)->tv_usec = (a)->microseconds;    \
+} while (0)
+
+
+#define TIME_VALUE_TO_MICROSECONDS(TV) \
+     ((TV).tv_sec * 1000 * 1000 + (TV).tv_usec)
+
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    // This code is influenced by the darwin top source
+
+    struct task_basic_info_64 task_info_data;
+    struct task_thread_times_info thread_info_data;
+    struct timeval user_timeval, system_timeval, task_timeval;
+    struct timeval now;
+    mach_port_t task = mach_task_self();
+    kern_return_t kr;
+
+    static jlong last_task_time = 0;
+    static jlong last_time      = 0;
+
+    mach_msg_type_number_t thread_info_count = TASK_THREAD_TIMES_INFO_COUNT;
+    kr = task_info(task,
+            TASK_THREAD_TIMES_INFO,
+            (task_info_t)&thread_info_data,
+            &thread_info_count);
+    if (kr != KERN_SUCCESS) {
+        // Most likely cause: |task| is a zombie.
+        return -1;
+    }
+
+    mach_msg_type_number_t count = TASK_BASIC_INFO_64_COUNT;
+    kr = task_info(task,
+            TASK_BASIC_INFO_64,
+            (task_info_t)&task_info_data,
+            &count);
+    if (kr != KERN_SUCCESS) {
+        // Most likely cause: |task| is a zombie.
+        return -1;
+    }
+
+    /* Set total_time. */
+    // thread info contains live time...
+    TIME_VALUE_TO_TIMEVAL(&thread_info_data.user_time, &user_timeval);
+    TIME_VALUE_TO_TIMEVAL(&thread_info_data.system_time, &system_timeval);
+    timeradd(&user_timeval, &system_timeval, &task_timeval);
+
+    // ... task info contains terminated time.
+    TIME_VALUE_TO_TIMEVAL(&task_info_data.user_time, &user_timeval);
+    TIME_VALUE_TO_TIMEVAL(&task_info_data.system_time, &system_timeval);
+    timeradd(&user_timeval, &task_timeval, &task_timeval);
+    timeradd(&system_timeval, &task_timeval, &task_timeval);
+
+    if (gettimeofday(&now, NULL) < 0) {
+       return -1;
+    }
+    jint ncpus      = JVM_ActiveProcessorCount();
+    jlong time      = TIME_VALUE_TO_MICROSECONDS(now) * ncpus;
+    jlong task_time = TIME_VALUE_TO_MICROSECONDS(task_timeval);
+
+    if ((last_task_time == 0) || (last_time == 0)) {
+        // First call, just set the last values.
+        last_task_time = task_time;
+        last_time      = time;
+        // return 0 since we have no data, not -1 which indicates error
+        return 0;
+    }
+
+    jlong task_time_delta = task_time - last_task_time;
+    jlong time_delta      = time - last_time;
+    if (time_delta == 0) {
+        return -1;
+    }
+
+    jdouble cpu = (jdouble) task_time_delta / time_delta;
+
+    last_task_time = task_time;
+    last_time      = time;
+
+    return cpu;
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/META-INF/services/sun.management.spi.PlatformMBeanProvider	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2015, 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.
+#
+com.sun.management.internal.PlatformMBeanProviderImpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+package com.sun.management;
+
+import java.lang.management.PlatformManagedObject;
+import javax.management.DynamicMBean;
+
+/**
+ * Management interface for the diagnostic commands for the HotSpot Virtual Machine.
+ *
+ * <p>The {@code DiagnosticCommandMBean} is registered to the
+ * {@linkplain java.lang.management.ManagementFactory#getPlatformMBeanServer
+ * platform MBeanServer} as are other platform MBeans.
+ *
+ * <p>The {@link javax.management.ObjectName ObjectName} for uniquely identifying
+ * the diagnostic MBean within an MBeanServer is:
+ * <blockquote>
+ *    {@code com.sun.management:type=DiagnosticCommand}
+ * </blockquote>
+ *
+ * <p>This MBean is a {@link javax.management.DynamicMBean DynamicMBean}
+ * and also a {@link javax.management.NotificationEmitter}.
+ * The {@code DiagnosticCommandMBean} is generated at runtime and is subject to
+ * modifications during the lifetime of the Java virtual machine.
+ *
+ * A <em>diagnostic command</em> is represented as an operation of
+ * the {@code DiagnosticCommandMBean} interface. Each diagnostic command has:
+ * <ul>
+ * <li>the diagnostic command name which is the name being referenced in
+ *     the HotSpot Virtual Machine</li>
+ * <li>the MBean operation name which is the
+ *     {@linkplain javax.management.MBeanOperationInfo#getName() name}
+ *     generated for the diagnostic command operation invocation.
+ *     The MBean operation name is implementation dependent</li>
+ * </ul>
+ *
+ * The recommended way to transform a diagnostic command name into a MBean
+ * operation name is as follows:
+ * <ul>
+ * <li>All characters from the first one to the first dot are set to be
+ *      lower-case characters</li>
+ * <li>Every dot or underline character is removed and the following
+ *   character is set to be an upper-case character</li>
+ * <li>All other characters are copied without modification</li>
+ * </ul>
+ *
+ * <p>The diagnostic command name is always provided with the meta-data on the
+ * operation in a field named {@code dcmd.name} (see below).
+ *
+ * <p>A diagnostic command may or may not support options or arguments.
+ * All the operations return {@code String} and either take
+ * no parameter for operations that do not support any option or argument,
+ * or take a {@code String[]} parameter for operations that support at least
+ * one option or argument.
+ * Each option or argument must be stored in a single String.
+ * Options or arguments split across several String instances are not supported.
+ *
+ * <p>The distinction between options and arguments: options are identified by
+ * the option name while arguments are identified by their position in the
+ * command line. Options and arguments are processed in the order of the array
+ * passed to the invocation method.
+ *
+ * <p>Like any operation of a dynamic MBean, each of these operations is
+ * described by {@link javax.management.MBeanOperationInfo MBeanOperationInfo}
+ * instance. Here's the values returned by this object:
+ * <ul>
+ *  <li>{@link javax.management.MBeanOperationInfo#getName() getName()}
+ *      returns the operation name generated from the diagnostic command name</li>
+ *  <li>{@link javax.management.MBeanOperationInfo#getDescription() getDescription()}
+ *      returns the diagnostic command description
+ *      (the same as the one return in the 'help' command)</li>
+ *  <li>{@link javax.management.MBeanOperationInfo#getImpact() getImpact()}
+ *      returns {@code ACTION_INFO}</li>
+ *  <li>{@link javax.management.MBeanOperationInfo#getReturnType() getReturnType()}
+ *      returns {@code java.lang.String}</li>
+ *  <li>{@link javax.management.MBeanOperationInfo#getDescriptor() getDescriptor()}
+ *      returns a Descriptor instance (see below)</li>
+ * </ul>
+ *
+ * <p>The {@link javax.management.Descriptor Descriptor}
+ * is a collection of fields containing additional
+ * meta-data for a JMX element. A field is a name and an associated value.
+ * The additional meta-data provided for an operation associated with a
+ * diagnostic command are described in the table below:
+ *
+ * <table border="1" cellpadding="5">
+ *   <tr>
+ *     <th>Name</th><th>Type</th><th>Description</th>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.name</td><td>String</td>
+ *     <td>The original diagnostic command name (not the operation name)</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.description</td><td>String</td>
+ *     <td>The diagnostic command description</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.help</td><td>String</td>
+ *     <td>The full help message for this diagnostic command (same output as
+ *          the one produced by the 'help' command)</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.vmImpact</td><td>String</td>
+ *     <td>The impact of the diagnostic command,
+ *      this value is the same as the one printed in the 'impact'
+ *      section of the help message of the diagnostic command, and it
+ *      is different from the getImpact() of the MBeanOperationInfo</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.enabled</td><td>boolean</td>
+ *     <td>True if the diagnostic command is enabled, false otherwise</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.permissionClass</td><td>String</td>
+ *     <td>Some diagnostic command might require a specific permission to be
+ *          executed, in addition to the MBeanPermission to invoke their
+ *          associated MBean operation. This field returns the fully qualified
+ *          name of the permission class or null if no permission is required
+ *   </td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.permissionName</td><td>String</td>
+ *     <td>The fist argument of the permission required to execute this
+ *          diagnostic command or null if no permission is required</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.permissionAction</td><td>String</td>
+ *     <td>The second argument of the permission required to execute this
+ *          diagnostic command or null if the permission constructor has only
+ *          one argument (like the ManagementPermission) or if no permission
+ *          is required</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.arguments</td><td>Descriptor</td>
+ *     <td>A Descriptor instance containing the descriptions of options and
+ *          arguments supported by the diagnostic command (see below)</td>
+ *   </tr>
+ * </table>
+ *
+ * <p>The description of parameters (options or arguments) of a diagnostic
+ * command is provided within a Descriptor instance. In this Descriptor,
+ * each field name is a parameter name, and each field value is itself
+ * a Descriptor instance. The fields provided in this second Descriptor
+ * instance are described in the table below:
+ *
+ * <table border="1" cellpadding="5">
+ *   <tr>
+ *     <th>Name</th><th>Type</th><th>Description</th>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.arg.name</td><td>String</td>
+ *     <td>The name of the parameter</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.arg.type</td><td>String</td>
+ *     <td>The type of the parameter. The returned String is the name of a type
+ *          recognized by the diagnostic command parser. These types are not
+ *          Java types and are implementation dependent.
+ *          </td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.arg.description</td><td>String</td>
+ *     <td>The parameter description</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.arg.isMandatory</td><td>boolean</td>
+ *     <td>True if the parameter is mandatory, false otherwise</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.arg.isOption</td><td>boolean</td>
+ *     <td>True if the parameter is an option, false if it is an argument</td>
+ *   </tr>
+ *   <tr>
+ *     <td>dcmd.arg.isMultiple</td><td>boolean</td>
+ *     <td>True if the parameter can be specified several times, false
+ *          otherwise</td>
+ *   </tr>
+ * </table>
+ *
+ * <p>When the set of diagnostic commands currently supported by the Java
+ * Virtual Machine is modified, the {@code DiagnosticCommandMBean} emits
+ * a {@link javax.management.Notification} with a
+ * {@linkplain javax.management.Notification#getType() type} of
+ * <a href="{@docRoot}/../../../../api/javax/management/MBeanInfo.html#info-changed">
+ * {@code "jmx.mbean.info.changed"}</a> and a
+ * {@linkplain javax.management.Notification#getUserData() userData} that
+ * is the new {@code MBeanInfo}.
+ *
+ * @since 1.8
+ */
+public interface DiagnosticCommandMBean extends DynamicMBean
+{
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2011, 2015, 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.
+ */
+
+package com.sun.management;
+
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataView;
+import javax.management.openmbean.CompositeType;
+import com.sun.management.internal.GarbageCollectionNotifInfoCompositeData;
+
+/**
+ * The information about a garbage collection
+ *
+ * <p>
+ * A garbage collection notification is emitted by {@link GarbageCollectorMXBean}
+ * when the Java virtual machine completes a garbage collection action
+ * The notification emitted will contain the garbage collection notification
+ * information about the status of the memory:
+ * <ul>
+ *   <li>The name of the garbage collector used to perform the collection.</li>
+ *   <li>The action performed by the garbage collector.</li>
+ *   <li>The cause of the garbage collection action.</li>
+ *   <li>A {@link GcInfo} object containing some statistics about the GC cycle
+          (start time, end time) and the memory usage before and after
+          the GC cycle.</li>
+ * </ul>
+ *
+ * <p>
+ * A {@link CompositeData CompositeData} representing
+ * the {@code GarbageCollectionNotificationInfo} object
+ * is stored in the
+ * {@linkplain javax.management.Notification#setUserData userdata}
+ * of a {@linkplain javax.management.Notification notification}.
+ * The {@link #from from} method is provided to convert from
+ * a {@code CompositeData} to a {@code GarbageCollectionNotificationInfo}
+ * object. For example:
+ *
+ * <blockquote><pre>
+ *      Notification notif;
+ *
+ *      // receive the notification emitted by a GarbageCollectorMXBean and set to notif
+ *      ...
+ *
+ *      String notifType = notif.getType();
+ *      if (notifType.equals(GarbageCollectionNotificationInfo.GARBAGE_COLLECTION_NOTIFICATION)) {
+ *          // retrieve the garbage collection notification information
+ *          CompositeData cd = (CompositeData) notif.getUserData();
+ *          GarbageCollectionNotificationInfo info = GarbageCollectionNotificationInfo.from(cd);
+ *          ....
+ *      }
+ * </pre></blockquote>
+ *
+ * <p>
+ * The type of the notification emitted by a {@code GarbageCollectorMXBean} is:
+ * <ul>
+ *   <li>A {@linkplain #GARBAGE_COLLECTION_NOTIFICATION garbage collection notification}.
+ *       <br>Used by every notification emitted by the garbage collector, the details about
+ *             the notification are provided in the {@linkplain #getGcAction action} String
+ *       </li>
+ * </ul>
+ **/
+
+@jdk.Exported
+public class GarbageCollectionNotificationInfo implements  CompositeDataView {
+
+    private final String gcName;
+    private final String gcAction;
+    private final String gcCause;
+    private final GcInfo gcInfo;
+    private final CompositeData cdata;
+
+    /**
+     * Notification type denoting that
+     * the Java virtual machine has completed a garbage collection cycle.
+     * This notification is emitted by a {@link GarbageCollectorMXBean}.
+     * The value of this notification type is
+     * {@code com.sun.management.gc.notification}.
+     */
+    public static final String GARBAGE_COLLECTION_NOTIFICATION =
+        "com.sun.management.gc.notification";
+
+    /**
+     * Constructs a {@code GarbageCollectionNotificationInfo} object.
+     *
+     * @param gcName The name of the garbage collector used to perform the collection
+     * @param gcAction The name of the action performed by the garbage collector
+     * @param gcCause The cause of the garbage collection action
+     * @param gcInfo  a GcInfo object providing statistics about the GC cycle
+     */
+    public GarbageCollectionNotificationInfo(String gcName,
+                                             String gcAction,
+                                             String gcCause,
+                                             GcInfo gcInfo)  {
+        if (gcName == null) {
+            throw new NullPointerException("Null gcName");
+        }
+        if (gcAction == null) {
+            throw new NullPointerException("Null gcAction");
+        }
+        if (gcCause == null) {
+            throw new NullPointerException("Null gcCause");
+        }
+        this.gcName = gcName;
+        this.gcAction = gcAction;
+        this.gcCause = gcCause;
+        this.gcInfo = gcInfo;
+        this.cdata = new GarbageCollectionNotifInfoCompositeData(this);
+    }
+
+    GarbageCollectionNotificationInfo(CompositeData cd) {
+        GarbageCollectionNotifInfoCompositeData.validateCompositeData(cd);
+
+        this.gcName = GarbageCollectionNotifInfoCompositeData.getGcName(cd);
+        this.gcAction = GarbageCollectionNotifInfoCompositeData.getGcAction(cd);
+        this.gcCause = GarbageCollectionNotifInfoCompositeData.getGcCause(cd);
+        this.gcInfo = GarbageCollectionNotifInfoCompositeData.getGcInfo(cd);
+        this.cdata = cd;
+    }
+
+    /**
+     * Returns the name of the garbage collector used to perform the collection
+     *
+     * @return the name of the garbage collector used to perform the collection
+     */
+    public String getGcName() {
+        return gcName;
+    }
+
+    /**
+     * Returns the action performed by the garbage collector
+     *
+     * @return the action performed by the garbage collector
+     */
+    public String getGcAction() {
+        return gcAction;
+    }
+
+    /**
+     * Returns the cause of the garbage collection
+     *
+     * @return the cause of the garbage collection
+     */
+    public String getGcCause() {
+        return gcCause;
+    }
+
+    /**
+     * Returns the GC information related to the last garbage collection
+     *
+     * @return the GC information related to the
+     * last garbage collection
+     */
+    public GcInfo getGcInfo() {
+        return gcInfo;
+    }
+
+    /**
+     * Returns a {@code GarbageCollectionNotificationInfo} object represented by the
+     * given {@code CompositeData}.
+     * The given {@code CompositeData} must contain
+     * the following attributes:
+     * <blockquote>
+     * <table border>
+     * <tr>
+     *   <th align=left>Attribute Name</th>
+     *   <th align=left>Type</th>
+     * </tr>
+     * <tr>
+     *   <td>gcName</td>
+     *   <td>{@code java.lang.String}</td>
+     * </tr>
+     * <tr>
+     *   <td>gcAction</td>
+     *   <td>{@code java.lang.String}</td>
+     * </tr>
+     * <tr>
+     *   <td>gcCause</td>
+     *   <td>{@code java.lang.String}</td>
+     * </tr>
+     * <tr>
+     *   <td>gcInfo</td>
+     *   <td>{@code javax.management.openmbean.CompositeData}</td>
+     * </tr>
+     * </table>
+     * </blockquote>
+     *
+     * @param cd {@code CompositeData} representing a
+     *           {@code GarbageCollectionNotificationInfo}
+     *
+     * @throws IllegalArgumentException if {@code cd} does not
+     *   represent a {@code GarbaageCollectionNotificationInfo} object.
+     *
+     * @return a {@code GarbageCollectionNotificationInfo} object represented
+     *         by {@code cd} if {@code cd} is not {@code null};
+     *         {@code null} otherwise.
+     */
+    public static GarbageCollectionNotificationInfo from(CompositeData cd) {
+        if (cd == null) {
+            return null;
+        }
+
+        if (cd instanceof GarbageCollectionNotifInfoCompositeData) {
+            return ((GarbageCollectionNotifInfoCompositeData) cd).getGarbageCollectionNotifInfo();
+        } else {
+            return new GarbageCollectionNotificationInfo(cd);
+        }
+    }
+
+    public CompositeData toCompositeData(CompositeType ct) {
+        return cdata;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2003, 2013, 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.
+ */
+
+package com.sun.management;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeType;
+
+/**
+ * Platform-specific management interface for a garbage collector
+ * which performs collections in cycles.
+ *
+ * <p> This platform extension is only available to the garbage
+ * collection implementation that supports this extension.
+ *
+ * @author  Mandy Chung
+ * @since   1.5
+ */
+@jdk.Exported
+public interface GarbageCollectorMXBean
+    extends java.lang.management.GarbageCollectorMXBean {
+
+    /**
+     * Returns the GC information about the most recent GC.
+     * This method returns a {@link GcInfo}.
+     * If no GC information is available, <tt>null</tt> is returned.
+     * The collector-specific attributes, if any, can be obtained
+     * via the {@link CompositeData CompositeData} interface.
+     * <p>
+     * <b>MBeanServer access:</b>
+     * The mapped type of <tt>GcInfo</tt> is <tt>CompositeData</tt>
+     * with attributes specified in {@link GcInfo#from GcInfo}.
+     *
+     * @return a <tt>GcInfo</tt> object representing
+     * the most GC information; or <tt>null</tt> if no GC
+     * information available.
+     */
+    public GcInfo getLastGcInfo();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+package com.sun.management;
+
+import java.lang.management.MemoryUsage;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataView;
+import javax.management.openmbean.CompositeType;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import com.sun.management.internal.GcInfoCompositeData;
+import com.sun.management.internal.GcInfoBuilder;
+
+/**
+ * Garbage collection information.  It contains the following
+ * information for one garbage collection as well as GC-specific
+ * attributes:
+ * <blockquote>
+ * <ul>
+ *   <li>Start time</li>
+ *   <li>End time</li>
+ *   <li>Duration</li>
+ *   <li>Memory usage before the collection starts</li>
+ *   <li>Memory usage after the collection ends</li>
+ * </ul>
+ * </blockquote>
+ *
+ * <p>
+ * {@code GcInfo} is a {@link CompositeData CompositeData}
+ * The GC-specific attributes can be obtained via the CompositeData
+ * interface.  This is a historical relic, and other classes should
+ * not copy this pattern.  Use {@link CompositeDataView} instead.
+ *
+ * <h4>MXBean Mapping</h4>
+ * {@code GcInfo} is mapped to a {@link CompositeData CompositeData}
+ * with attributes as specified in the {@link #from from} method.
+ *
+ * @author  Mandy Chung
+ * @since   1.5
+ */
+@jdk.Exported
+public class GcInfo implements CompositeData, CompositeDataView {
+    private final long index;
+    private final long startTime;
+    private final long endTime;
+    private final Map<String, MemoryUsage> usageBeforeGc;
+    private final Map<String, MemoryUsage> usageAfterGc;
+    private final Object[] extAttributes;
+    private final CompositeData cdata;
+    private final GcInfoBuilder builder;
+
+    private GcInfo(GcInfoBuilder builder,
+                   long index, long startTime, long endTime,
+                   MemoryUsage[] muBeforeGc,
+                   MemoryUsage[] muAfterGc,
+                   Object[] extAttributes) {
+        this.builder       = builder;
+        this.index         = index;
+        this.startTime     = startTime;
+        this.endTime       = endTime;
+        String[] poolNames = builder.getPoolNames();
+        this.usageBeforeGc = new HashMap<String, MemoryUsage>(poolNames.length);
+        this.usageAfterGc = new HashMap<String, MemoryUsage>(poolNames.length);
+        for (int i = 0; i < poolNames.length; i++) {
+            this.usageBeforeGc.put(poolNames[i],  muBeforeGc[i]);
+            this.usageAfterGc.put(poolNames[i],  muAfterGc[i]);
+        }
+        this.extAttributes = extAttributes;
+        this.cdata = new GcInfoCompositeData(this, builder, extAttributes);
+    }
+
+    private GcInfo(CompositeData cd) {
+        GcInfoCompositeData.validateCompositeData(cd);
+
+        this.index         = GcInfoCompositeData.getId(cd);
+        this.startTime     = GcInfoCompositeData.getStartTime(cd);
+        this.endTime       = GcInfoCompositeData.getEndTime(cd);
+        this.usageBeforeGc = GcInfoCompositeData.getMemoryUsageBeforeGc(cd);
+        this.usageAfterGc  = GcInfoCompositeData.getMemoryUsageAfterGc(cd);
+        this.extAttributes = null;
+        this.builder       = null;
+        this.cdata         = cd;
+    }
+
+    /**
+     * Returns the identifier of this garbage collection which is
+     * the number of collections that this collector has done.
+     *
+     * @return the identifier of this garbage collection which is
+     * the number of collections that this collector has done.
+     */
+    public long getId() {
+        return index;
+    }
+
+    /**
+     * Returns the start time of this GC in milliseconds
+     * since the Java virtual machine was started.
+     *
+     * @return the start time of this GC.
+     */
+    public long getStartTime() {
+        return startTime;
+    }
+
+    /**
+     * Returns the end time of this GC in milliseconds
+     * since the Java virtual machine was started.
+     *
+     * @return the end time of this GC.
+     */
+    public long getEndTime() {
+        return endTime;
+    }
+
+    /**
+     * Returns the elapsed time of this GC in milliseconds.
+     *
+     * @return the elapsed time of this GC in milliseconds.
+     */
+    public long getDuration() {
+        return endTime - startTime;
+    }
+
+    /**
+     * Returns the memory usage of all memory pools
+     * at the beginning of this GC.
+     * This method returns
+     * a {@code Map} of the name of a memory pool
+     * to the memory usage of the corresponding
+     * memory pool before GC starts.
+     *
+     * @return a {@code Map} of memory pool names to the memory
+     * usage of a memory pool before GC starts.
+     */
+    public Map<String, MemoryUsage> getMemoryUsageBeforeGc() {
+        return Collections.unmodifiableMap(usageBeforeGc);
+    }
+
+    /**
+     * Returns the memory usage of all memory pools
+     * at the end of this GC.
+     * This method returns
+     * a {@code Map} of the name of a memory pool
+     * to the memory usage of the corresponding
+     * memory pool when GC finishes.
+     *
+     * @return a {@code Map} of memory pool names to the memory
+     * usage of a memory pool when GC finishes.
+     */
+    public Map<String, MemoryUsage> getMemoryUsageAfterGc() {
+        return Collections.unmodifiableMap(usageAfterGc);
+    }
+
+   /**
+     * Returns a {@code GcInfo} object represented by the
+     * given {@code CompositeData}. The given
+     * {@code CompositeData} must contain
+     * all the following attributes:
+     *
+     * <blockquote>
+     * <table border>
+     * <tr>
+     *   <th align=left>Attribute Name</th>
+     *   <th align=left>Type</th>
+     * </tr>
+     * <tr>
+     *   <td>index</td>
+     *   <td>{@code java.lang.Long}</td>
+     * </tr>
+     * <tr>
+     *   <td>startTime</td>
+     *   <td>{@code java.lang.Long}</td>
+     * </tr>
+     * <tr>
+     *   <td>endTime</td>
+     *   <td>{@code java.lang.Long}</td>
+     * </tr>
+     * <tr>
+     *   <td>memoryUsageBeforeGc</td>
+     *   <td>{@code javax.management.openmbean.TabularData}</td>
+     * </tr>
+     * <tr>
+     *   <td>memoryUsageAfterGc</td>
+     *   <td>{@code javax.management.openmbean.TabularData}</td>
+     * </tr>
+     * </table>
+     * </blockquote>
+     *
+     * @throws IllegalArgumentException if {@code cd} does not
+     *   represent a {@code GcInfo} object with the attributes
+     *   described above.
+     *
+     * @return a {@code GcInfo} object represented by {@code cd}
+     * if {@code cd} is not {@code null}; {@code null} otherwise.
+     */
+    public static GcInfo from(CompositeData cd) {
+        if (cd == null) {
+            return null;
+        }
+
+        if (cd instanceof GcInfoCompositeData) {
+            return ((GcInfoCompositeData) cd).getGcInfo();
+        } else {
+            return new GcInfo(cd);
+        }
+
+    }
+
+    // Implementation of the CompositeData interface
+    public boolean containsKey(String key) {
+        return cdata.containsKey(key);
+    }
+
+    public boolean containsValue(Object value) {
+        return cdata.containsValue(value);
+    }
+
+    public boolean equals(Object obj) {
+        return cdata.equals(obj);
+    }
+
+    public Object get(String key) {
+        return cdata.get(key);
+    }
+
+    public Object[] getAll(String[] keys) {
+        return cdata.getAll(keys);
+    }
+
+    public CompositeType getCompositeType() {
+        return cdata.getCompositeType();
+    }
+
+    public int hashCode() {
+        return cdata.hashCode();
+    }
+
+    public String toString() {
+        return cdata.toString();
+    }
+
+    public Collection<?> values() {
+        return cdata.values();
+    }
+
+    /**
+     * Return the {@code CompositeData} representation of this
+     * {@code GcInfo}, including any GC-specific attributes.  The
+     * returned value will have at least all the attributes described
+     * in the {@link #from(CompositeData) from} method, plus optionally
+     * other attributes.
+     *
+     * @param ct the {@code CompositeType} that the caller expects.
+     * This parameter is ignored and can be null.
+     *
+     * @return the {@code CompositeData} representation.
+     */
+    public CompositeData toCompositeData(CompositeType ct) {
+        return cdata;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2005, 2014, 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.
+ */
+
+package com.sun.management;
+
+import java.lang.management.PlatformManagedObject;
+
+/**
+ * Diagnostic management interface for the HotSpot Virtual Machine.
+ *
+ * <p>The diagnostic MBean is registered to the platform MBeanServer
+ * as are other platform MBeans.
+ *
+ * <p>The <tt>ObjectName</tt> for uniquely identifying the diagnostic
+ * MXBean within an MBeanServer is:
+ * <blockquote>
+ *    <tt>com.sun.management:type=HotSpotDiagnostic</tt>
+ * </blockquote>
+.*
+ * It can be obtained by calling the
+ * {@link PlatformManagedObject#getObjectName} method.
+ *
+ * All methods throw a {@code NullPointerException} if any input argument is
+ * {@code null} unless it's stated otherwise.
+ *
+ * @see java.lang.management.ManagementFactory#getPlatformMXBeans(Class)
+ */
+@jdk.Exported
+public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
+    /**
+     * Dumps the heap to the <tt>outputFile</tt> file in the same
+     * format as the hprof heap dump.
+     * <p>
+     * If this method is called remotely from another process,
+     * the heap dump output is written to a file named <tt>outputFile</tt>
+     * on the machine where the target VM is running.  If outputFile is
+     * a relative path, it is relative to the working directory where
+     * the target VM was started.
+     *
+     * @param  outputFile the system-dependent filename
+     * @param  live if <tt>true</tt> dump only <i>live</i> objects
+     *         i.e. objects that are reachable from others
+     * @throws IOException if the <tt>outputFile</tt>
+     *                     cannot be created, opened, or written to.
+     * @throws UnsupportedOperationException if this operation is not supported.
+     * @throws NullPointerException if <tt>outputFile</tt> is <tt>null</tt>.
+     * @throws SecurityException
+     *         If a security manager exists and its {@link
+     *         java.lang.SecurityManager#checkWrite(java.lang.String)}
+     *         method denies write access to the named file
+     *         or the caller does not have ManagmentPermission("control").
+     */
+    public void dumpHeap(String outputFile, boolean live) throws java.io.IOException;
+
+    /**
+     * Returns a list of <tt>VMOption</tt> objects for all diagnostic options.
+     * A diagnostic option is a {@link VMOption#isWriteable writeable}
+     * VM option that can be set dynamically mainly for troubleshooting
+     * and diagnosis.
+     *
+     * @return a list of <tt>VMOption</tt> objects for all diagnostic options.
+     */
+    public java.util.List<VMOption> getDiagnosticOptions();
+
+    /**
+     * Returns a <tt>VMOption</tt> object for a VM option of the given
+     * name.
+     *
+     * @return a <tt>VMOption</tt> object for a VM option of the given name.
+     * @throws NullPointerException if name is <tt>null</tt>.
+     * @throws IllegalArgumentException if a VM option of the given name
+     *                                     does not exist.
+     */
+    public VMOption getVMOption(String name);
+
+    /**
+     * Sets a VM option of the given name to the specified value.
+     * The new value will be reflected in a new <tt>VMOption</tt>
+     * object returned by the {@link #getVMOption} method or
+     * the {@link #getDiagnosticOptions} method.  This method does
+     * not change the value of this <tt>VMOption</tt> object.
+     *
+     * @param name Name of a VM option
+     * @param value New value of the VM option to be set
+     *
+     * @throws IllegalArgumentException if the VM option of the given name
+     *                                     does not exist.
+     * @throws IllegalArgumentException if the new value is invalid.
+     * @throws IllegalArgumentException if the VM option is not writable.
+     * @throws NullPointerException if name or value is <tt>null</tt>.
+     *
+     * @throws  java.lang.SecurityException
+     *     if a security manager exists and the caller does not have
+     *     ManagementPermission("control").
+     */
+    public void setVMOption(String name, String value);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2003, 2013, 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.
+ */
+
+package com.sun.management;
+
+/**
+ * Platform-specific management interface for the operating system
+ * on which the Java virtual machine is running.
+ *
+ * <p>
+ * The <tt>OperatingSystemMXBean</tt> object returned by
+ * {@link java.lang.management.ManagementFactory#getOperatingSystemMXBean()}
+ * is an instance of the implementation class of this interface
+ * or {@link UnixOperatingSystemMXBean} interface depending on
+ * its underlying operating system.
+ *
+ * @author  Mandy Chung
+ * @since   1.5
+ */
+@jdk.Exported
+public interface OperatingSystemMXBean extends
+    java.lang.management.OperatingSystemMXBean {
+
+    /**
+     * Returns the amount of virtual memory that is guaranteed to
+     * be available to the running process in bytes,
+     * or <tt>-1</tt> if this operation is not supported.
+     *
+     * @return the amount of virtual memory that is guaranteed to
+     * be available to the running process in bytes,
+     * or <tt>-1</tt> if this operation is not supported.
+     */
+    public long getCommittedVirtualMemorySize();
+
+    /**
+     * Returns the total amount of swap space in bytes.
+     *
+     * @return the total amount of swap space in bytes.
+     */
+    public long getTotalSwapSpaceSize();
+
+    /**
+     * Returns the amount of free swap space in bytes.
+     *
+     * @return the amount of free swap space in bytes.
+     */
+    public long getFreeSwapSpaceSize();
+
+    /**
+     * Returns the CPU time used by the process on which the Java
+     * virtual machine is running in nanoseconds.  The returned value
+     * is of nanoseconds precision but not necessarily nanoseconds
+     * accuracy.  This method returns <tt>-1</tt> if the
+     * the platform does not support this operation.
+     *
+     * @return the CPU time used by the process in nanoseconds,
+     * or <tt>-1</tt> if this operation is not supported.
+     */
+    public long getProcessCpuTime();
+
+    /**
+     * Returns the amount of free physical memory in bytes.
+     *
+     * @return the amount of free physical memory in bytes.
+     */
+    public long getFreePhysicalMemorySize();
+
+    /**
+     * Returns the total amount of physical memory in bytes.
+     *
+     * @return the total amount of physical memory in  bytes.
+     */
+    public long getTotalPhysicalMemorySize();
+
+    /**
+     * Returns the "recent cpu usage" for the whole system. This value is a
+     * double in the [0.0,1.0] interval. A value of 0.0 means that all CPUs
+     * were idle during the recent period of time observed, while a value
+     * of 1.0 means that all CPUs were actively running 100% of the time
+     * during the recent period being observed. All values betweens 0.0 and
+     * 1.0 are possible depending of the activities going on in the system.
+     * If the system recent cpu usage is not available, the method returns a
+     * negative value.
+     *
+     * @return the "recent cpu usage" for the whole system; a negative
+     * value if not available.
+     * @since   1.7
+     */
+    public double getSystemCpuLoad();
+
+    /**
+     * Returns the "recent cpu usage" for the Java Virtual Machine process.
+     * This value is a double in the [0.0,1.0] interval. A value of 0.0 means
+     * that none of the CPUs were running threads from the JVM process during
+     * the recent period of time observed, while a value of 1.0 means that all
+     * CPUs were actively running threads from the JVM 100% of the time
+     * during the recent period being observed. Threads from the JVM include
+     * the application threads as well as the JVM internal threads. All values
+     * betweens 0.0 and 1.0 are possible depending of the activities going on
+     * in the JVM process and the whole system. If the Java Virtual Machine
+     * recent CPU usage is not available, the method returns a negative value.
+     *
+     * @return the "recent cpu usage" for the Java Virtual Machine process;
+     * a negative value if not available.
+     * @since   1.7
+     */
+    public double getProcessCpuLoad();
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2011, 2013, 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.
+ */
+
+package com.sun.management;
+
+import java.util.Map;
+
+/**
+ * Platform-specific management interface for the thread system
+ * of the Java virtual machine.
+ * <p>
+ * This platform extension is only available to a thread
+ * implementation that supports this extension.
+ *
+ * @author  Paul Hohensee
+ * @since   6u25
+ */
+
+@jdk.Exported
+public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
+    /**
+     * Returns the total CPU time for each thread whose ID is
+     * in the input array {@code ids} in nanoseconds.
+     * The returned values are of nanoseconds precision but
+     * not necessarily nanoseconds accuracy.
+     * <p>
+     * This method is equivalent to calling the
+     * {@link ThreadMXBean#getThreadCpuTime(long)}
+     * method for each thread ID in the input array {@code ids} and setting the
+     * returned value in the corresponding element of the returned array.
+     *
+     * @param ids an array of thread IDs.
+     * @return an array of long values, each of which is the amount of CPU
+     * time the thread whose ID is in the corresponding element of the input
+     * array of IDs has used,
+     * if the thread of a specified ID exists, the thread is alive,
+     * and CPU time measurement is enabled;
+     * {@code -1} otherwise.
+     *
+     * @throws NullPointerException if {@code ids} is {@code null}
+     * @throws IllegalArgumentException if any element in the input array
+     *         {@code ids} is {@code <=} {@code 0}.
+     * @throws java.lang.UnsupportedOperationException if the Java
+     *         virtual machine implementation does not support CPU time
+     *         measurement.
+     *
+     * @see ThreadMXBean#getThreadCpuTime(long)
+     * @see #getThreadUserTime
+     * @see ThreadMXBean#isThreadCpuTimeSupported
+     * @see ThreadMXBean#isThreadCpuTimeEnabled
+     * @see ThreadMXBean#setThreadCpuTimeEnabled
+     */
+    public long[] getThreadCpuTime(long[] ids);
+
+    /**
+     * Returns the CPU time that each thread whose ID is in the input array
+     * {@code ids} has executed in user mode in nanoseconds.
+     * The returned values are of nanoseconds precision but
+     * not necessarily nanoseconds accuracy.
+     * <p>
+     * This method is equivalent to calling the
+     * {@link ThreadMXBean#getThreadUserTime(long)}
+     * method for each thread ID in the input array {@code ids} and setting the
+     * returned value in the corresponding element of the returned array.
+     *
+     * @param ids an array of thread IDs.
+     * @return an array of long values, each of which is the amount of user
+     * mode CPU time the thread whose ID is in the corresponding element of
+     * the input array of IDs has used,
+     * if the thread of a specified ID exists, the thread is alive,
+     * and CPU time measurement is enabled;
+     * {@code -1} otherwise.
+     *
+     * @throws NullPointerException if {@code ids} is {@code null}
+     * @throws IllegalArgumentException if any element in the input array
+     *         {@code ids} is {@code <=} {@code 0}.
+     * @throws java.lang.UnsupportedOperationException if the Java
+     *         virtual machine implementation does not support CPU time
+     *         measurement.
+     *
+     * @see ThreadMXBean#getThreadUserTime(long)
+     * @see #getThreadCpuTime
+     * @see ThreadMXBean#isThreadCpuTimeSupported
+     * @see ThreadMXBean#isThreadCpuTimeEnabled
+     * @see ThreadMXBean#setThreadCpuTimeEnabled
+     */
+    public long[] getThreadUserTime(long[] ids);
+
+    /**
+     * Returns an approximation of the total amount of memory, in bytes,
+     * allocated in heap memory for the thread of the specified ID.
+     * The returned value is an approximation because some Java virtual machine
+     * implementations may use object allocation mechanisms that result in a
+     * delay between the time an object is allocated and the time its size is
+     * recorded.
+     * <p>
+     * If the thread of the specified ID is not alive or does not exist,
+     * this method returns {@code -1}. If thread memory allocation measurement
+     * is disabled, this method returns {@code -1}.
+     * A thread is alive if it has been started and has not yet died.
+     * <p>
+     * If thread memory allocation measurement is enabled after the thread has
+     * started, the Java virtual machine implementation may choose any time up
+     * to and including the time that the capability is enabled as the point
+     * where thread memory allocation measurement starts.
+     *
+     * @param id the thread ID of a thread
+     * @return an approximation of the total memory allocated, in bytes, in
+     * heap memory for a thread of the specified ID
+     * if the thread of the specified ID exists, the thread is alive,
+     * and thread memory allocation measurement is enabled;
+     * {@code -1} otherwise.
+     *
+     * @throws IllegalArgumentException if {@code id} {@code <=} {@code 0}.
+     * @throws java.lang.UnsupportedOperationException if the Java virtual
+     *         machine implementation does not support thread memory allocation
+     *         measurement.
+     *
+     * @see #isThreadAllocatedMemorySupported
+     * @see #isThreadAllocatedMemoryEnabled
+     * @see #setThreadAllocatedMemoryEnabled
+     */
+    public long getThreadAllocatedBytes(long id);
+
+    /**
+     * Returns an approximation of the total amount of memory, in bytes,
+     * allocated in heap memory for each thread whose ID is in the input
+     * array {@code ids}.
+     * The returned values are approximations because some Java virtual machine
+     * implementations may use object allocation mechanisms that result in a
+     * delay between the time an object is allocated and the time its size is
+     * recorded.
+     * <p>
+     * This method is equivalent to calling the
+     * {@link #getThreadAllocatedBytes(long)}
+     * method for each thread ID in the input array {@code ids} and setting the
+     * returned value in the corresponding element of the returned array.
+     *
+     * @param ids an array of thread IDs.
+     * @return an array of long values, each of which is an approximation of
+     * the total memory allocated, in bytes, in heap memory for the thread
+     * whose ID is in the corresponding element of the input array of IDs.
+     *
+     * @throws NullPointerException if {@code ids} is {@code null}
+     * @throws IllegalArgumentException if any element in the input array
+     *         {@code ids} is {@code <=} {@code 0}.
+     * @throws java.lang.UnsupportedOperationException if the Java virtual
+     *         machine implementation does not support thread memory allocation
+     *         measurement.
+     *
+     * @see #getThreadAllocatedBytes(long)
+     * @see #isThreadAllocatedMemorySupported
+     * @see #isThreadAllocatedMemoryEnabled
+     * @see #setThreadAllocatedMemoryEnabled
+     */
+    public long[] getThreadAllocatedBytes(long[] ids);
+
+    /**
+     * Tests if the Java virtual machine implementation supports thread memory
+     * allocation measurement.
+     *
+     * @return
+     *   {@code true}
+     *     if the Java virtual machine implementation supports thread memory
+     *     allocation measurement;
+     *   {@code false} otherwise.
+     */
+    public boolean isThreadAllocatedMemorySupported();
+
+    /**
+     * Tests if thread memory allocation measurement is enabled.
+     *
+     * @return {@code true} if thread memory allocation measurement is enabled;
+     *         {@code false} otherwise.
+     *
+     * @throws java.lang.UnsupportedOperationException if the Java virtual
+     *         machine does not support thread memory allocation measurement.
+     *
+     * @see #isThreadAllocatedMemorySupported
+     */
+    public boolean isThreadAllocatedMemoryEnabled();
+
+    /**
+     * Enables or disables thread memory allocation measurement.  The default
+     * is platform dependent.
+     *
+     * @param enable {@code true} to enable;
+     *               {@code false} to disable.
+     *
+     * @throws java.lang.UnsupportedOperationException if the Java virtual
+     *         machine does not support thread memory allocation measurement.
+     *
+     * @throws java.lang.SecurityException if a security manager
+     *         exists and the caller does not have
+     *         ManagementPermission("control").
+     *
+     * @see #isThreadAllocatedMemorySupported
+     */
+    public void setThreadAllocatedMemoryEnabled(boolean enable);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2003, 2013, 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.
+ */
+
+package com.sun.management;
+
+/**
+ * Platform-specific management interface for the Unix
+ * operating system on which the Java virtual machine is running.
+ *
+ * @author  Mandy Chung
+ * @since   1.5
+ */
+@jdk.Exported
+public interface UnixOperatingSystemMXBean extends
+    com.sun.management.OperatingSystemMXBean {
+
+    /**
+     * Returns the number of open file descriptors.
+     *
+     * @return the number of open file descriptors.
+     */
+    public long getOpenFileDescriptorCount();
+
+    /**
+     * Returns the maximum number of file descriptors.
+     *
+     * @return the maximum number of file descriptors.
+     */
+    public long getMaxFileDescriptorCount();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2005, 2015, 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.
+ */
+
+package com.sun.management;
+
+import com.sun.management.internal.VMOptionCompositeData;
+import javax.management.openmbean.CompositeData;
+
+/**
+ * Information about a VM option including its value and
+ * where the value came from which is referred as its
+ * {@link VMOption.Origin <i>origin</i>}.
+ * <p>
+ * Each VM option has a default value.  A VM option can
+ * be set at VM creation time typically as a command line
+ * argument to the launcher or an argument passed to the
+ * VM created using the JNI invocation interface.
+ * In addition, a VM option may be set via an environment
+ * variable or a configuration file. A VM option can also
+ * be set dynamically via a management interface after
+ * the VM was started.
+ *
+ * A {@code VMOption} contains the value of a VM option
+ * and the origin of that value at the time this {@code VMOption}
+ * object was constructed.  The value of the VM option
+ * may be changed after the {@code VMOption} object was constructed,
+ *
+ * @see <a href="{@docRoot}/../../../../technotes/guides/vm/index.html">
+ *         Java Virtual Machine</a>
+ * @author Mandy Chung
+ * @since 1.6
+ */
+@jdk.Exported
+public class VMOption {
+    private String name;
+    private String value;
+    private boolean writeable;
+    private Origin origin;
+
+    /**
+     * Origin of the value of a VM option.  It tells where the
+     * value of a VM option came from.
+     *
+     * @since 1.6
+     */
+    @jdk.Exported
+    public enum Origin {
+        /**
+         * The VM option has not been set and its value
+         * is the default value.
+         */
+        DEFAULT,
+        /**
+         * The VM option was set at VM creation time typically
+         * as a command line argument to the launcher or
+         * an argument passed to the VM created using the
+         * JNI invocation interface.
+         */
+        VM_CREATION,
+        /**
+         * The VM option was set via an environment variable.
+         */
+        ENVIRON_VAR,
+        /**
+         * The VM option was set via a configuration file.
+         */
+        CONFIG_FILE,
+        /**
+         * The VM option was set via the management interface after the VM
+         * was started.
+         */
+        MANAGEMENT,
+        /**
+         * The VM option was set via the VM ergonomic support.
+         */
+        ERGONOMIC,
+        /**
+         * The VM option was set using the attach framework.
+         * @since 1.9
+         */
+        ATTACH_ON_DEMAND,
+        /**
+         * The VM option was set via some other mechanism.
+         */
+        OTHER
+    }
+
+    /**
+     * Constructs a {@code VMOption}.
+     *
+     * @param name Name of a VM option.
+     * @param value Value of a VM option.
+     * @param writeable {@code true} if a VM option can be set dynamically,
+     *                  or {@code false} otherwise.
+     * @param origin where the value of a VM option came from.
+     *
+     * @throws NullPointerException if the name or value is {@code null}
+     */
+    public VMOption(String name, String value, boolean writeable, Origin origin) {
+        this.name = name;
+        this.value = value;
+        this.writeable = writeable;
+        this.origin = origin;
+    }
+
+    /**
+     * Constructs a {@code VMOption} object from a
+     * {@link CompositeData CompositeData}.
+     */
+    private VMOption(CompositeData cd) {
+        // validate the input composite data
+        VMOptionCompositeData.validateCompositeData(cd);
+
+        this.name = VMOptionCompositeData.getName(cd);
+        this.value = VMOptionCompositeData.getValue(cd);
+        this.writeable = VMOptionCompositeData.isWriteable(cd);
+        this.origin = VMOptionCompositeData.getOrigin(cd);
+    }
+
+    /**
+     * Returns the name of this VM option.
+     *
+     * @return the name of this VM option.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the value of this VM option at the time when
+     * this {@code VMOption} was created. The value could have been changed.
+     *
+     * @return the value of the VM option at the time when
+     *         this {@code VMOption} was created.
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Returns the origin of the value of this VM option. That is,
+     * where the value of this VM option came from.
+     *
+     * @return where the value of this VM option came from.
+     */
+    public Origin getOrigin() {
+        return origin;
+    }
+
+    /**
+     * Tests if this VM option is writeable.  If this VM option is writeable,
+     * it can be set by the {@link HotSpotDiagnosticMXBean#setVMOption
+     * HotSpotDiagnosticMXBean.setVMOption} method.
+     *
+     * @return {@code true} if this VM option is writeable; {@code false}
+     * otherwise.
+     */
+    public boolean isWriteable() {
+        return writeable;
+    }
+
+    public String toString() {
+        return "VM option: " + getName() +
+               " value: " + value + " " +
+               " origin: " + origin + " " +
+               (writeable ? "(read-write)" : "(read-only)");
+    }
+
+    /**
+     * Returns a {@code VMOption} object represented by the
+     * given {@code CompositeData}. The given {@code CompositeData}
+     * must contain the following attributes:
+     *
+     * <blockquote>
+     * <table border>
+     * <tr>
+     *   <th align=left>Attribute Name</th>
+     *   <th align=left>Type</th>
+     * </tr>
+     * <tr>
+     *   <td>name</td>
+     *   <td>{@code java.lang.String}</td>
+     * </tr>
+     * <tr>
+     *   <td>value</td>
+     *   <td>{@code java.lang.String}</td>
+     * </tr>
+     * <tr>
+     *   <td>origin</td>
+     *   <td>{@code java.lang.String}</td>
+     * </tr>
+     * <tr>
+     *   <td>writeable</td>
+     *   <td>{@code java.lang.Boolean}</td>
+     * </tr>
+     * </table>
+     * </blockquote>
+     *
+     * @param cd {@code CompositeData} representing a {@code VMOption}
+     *
+     * @throws IllegalArgumentException if {@code cd} does not
+     *   represent a {@code VMOption} with the attributes described
+     *   above.
+     *
+     * @return a {@code VMOption} object represented by {@code cd}
+     *         if {@code cd} is not {@code null};
+     *         {@code null} otherwise.
+     */
+    public static VMOption from(CompositeData cd) {
+        if (cd == null) {
+            return null;
+        }
+
+        if (cd instanceof VMOptionCompositeData) {
+            return ((VMOptionCompositeData) cd).getVMOption();
+        } else {
+            return new VMOption(cd);
+        }
+
+    }
+
+    // for sun.management.MappedMXBeanType
+    static CompositeData toCompositeData(VMOption option) {
+        return VMOptionCompositeData.toCompositeData(option);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2013, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+/**
+ * Diagnostic Command Argument information. It contains the description
+ * of one parameter of the diagnostic command. A parameter can either be an
+ * option or an argument. Options are identified by the option name while
+ * arguments are identified by their position in the command line. The generic
+ * syntax of a diagnostic command is:
+ *  <blockquote>
+ *    &lt;command name&gt; [&lt;option&gt;=&lt;value&gt;] [&lt;argument_value&gt;]
+ * </blockquote>
+ * Example:
+ * <blockquote>
+ * command_name option1=value1 option2=value argumentA argumentB argumentC
+ * </blockquote>
+ * In this command line, the diagnostic command receives five parameters, two
+ * options named {@code option1} and {@code option2}, and three arguments.
+ * argumentA's position is 0, argumentB's position is 1 and argumentC's
+ * position is 2.
+ *
+ * @since 1.8
+ */
+
+class DiagnosticCommandArgumentInfo {
+    private final String name;
+    private final String description;
+    private final String type;
+    private final String defaultValue;
+    private final boolean mandatory;
+    private final boolean option;
+    private final boolean multiple;
+    private final int position;
+
+    /**
+     * Returns the argument name.
+     *
+     * @return the argument name
+     */
+    String getName() {
+        return name;
+    }
+
+   /**
+     * Returns the argument description.
+     *
+     * @return the argument description
+     */
+    String getDescription() {
+        return description;
+    }
+
+    /**
+     * Returns the argument type.
+     *
+     * @return the argument type
+     */
+    String getType() {
+        return type;
+    }
+
+    /**
+     * Returns the default value as a String if a default value
+     * is defined, null otherwise.
+     *
+     * @return the default value as a String if a default value
+     * is defined, null otherwise.
+     */
+    String getDefault() {
+        return defaultValue;
+    }
+
+    /**
+     * Returns {@code true} if the argument is mandatory,
+     *         {@code false} otherwise.
+     *
+     * @return {@code true} if the argument is mandatory,
+     *         {@code false} otherwise
+     */
+    boolean isMandatory() {
+        return mandatory;
+    }
+
+    /**
+     * Returns {@code true} if the argument is an option,
+     *         {@code false} otherwise. Options have to be specified using the
+     *         &lt;key&gt;=&lt;value&gt; syntax on the command line, while other
+     *         arguments are specified with a single &lt;value&gt; field and are
+     *         identified by their position on command line.
+     *
+     * @return {@code true} if the argument is an option,
+     *         {@code false} otherwise
+     */
+    boolean isOption() {
+        return option;
+    }
+
+    /**
+     * Returns {@code true} if the argument can be specified multiple times,
+     *         {@code false} otherwise.
+     *
+     * @return {@code true} if the argument can be specified multiple times,
+     *         {@code false} otherwise
+     */
+    boolean isMultiple() {
+        return multiple;
+    }
+
+    /**
+     * Returns the expected position of this argument if it is not an option,
+     *         -1 otherwise. Argument position if defined from left to right,
+     *         starting at zero and ignoring the diagnostic command name and
+     *         options.
+     *
+     * @return the expected position of this argument if it is not an option,
+     *         -1 otherwise.
+     */
+    int getPosition() {
+        return position;
+    }
+
+    DiagnosticCommandArgumentInfo(String name, String description,
+                                         String type, String defaultValue,
+                                         boolean mandatory, boolean option,
+                                         boolean multiple, int position) {
+        this.name = name;
+        this.description = description;
+        this.type = type;
+        this.defaultValue = defaultValue;
+        this.mandatory = mandatory;
+        this.option = option;
+        this.multiple = multiple;
+        this.position = position;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,411 @@
+/*
+ * Copyright (c) 2013, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import com.sun.management.DiagnosticCommandMBean;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.security.Permission;
+import java.util.*;
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.Descriptor;
+import javax.management.ImmutableDescriptor;
+import javax.management.InvalidAttributeValueException;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
+import javax.management.MalformedObjectNameException;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import sun.management.ManagementFactoryHelper;
+import sun.management.NotificationEmitterSupport;
+import sun.management.VMManagement;
+
+/**
+ * Implementation class for the diagnostic commands subsystem.
+ *
+ * @since 1.8
+ */
+public class DiagnosticCommandImpl extends NotificationEmitterSupport
+    implements DiagnosticCommandMBean {
+
+    private final VMManagement jvm;
+    private volatile Map<String, Wrapper> wrappers = null;
+    private static final String strClassName = "".getClass().getName();
+    private static final String strArrayClassName = String[].class.getName();
+    private final boolean isSupported;
+    private static DiagnosticCommandImpl diagCommandMBean = null;
+
+    static synchronized DiagnosticCommandMBean getDiagnosticCommandMBean() {
+        VMManagement jvm = ManagementFactoryHelper.getVMManagement();
+
+        // Remote Diagnostic Commands may not be supported
+        if (diagCommandMBean == null && jvm.isRemoteDiagnosticCommandsSupported()) {
+            diagCommandMBean = new DiagnosticCommandImpl(jvm);
+        }
+        return diagCommandMBean;
+    }
+
+    @Override
+    public Object getAttribute(String attribute) throws AttributeNotFoundException,
+        MBeanException, ReflectionException {
+        throw new AttributeNotFoundException(attribute);
+    }
+
+    @Override
+    public void setAttribute(Attribute attribute) throws AttributeNotFoundException,
+        InvalidAttributeValueException, MBeanException, ReflectionException {
+        throw new AttributeNotFoundException(attribute.getName());
+    }
+
+    @Override
+    public AttributeList getAttributes(String[] attributes) {
+        return new AttributeList();
+    }
+
+    @Override
+    public AttributeList setAttributes(AttributeList attributes) {
+        return new AttributeList();
+    }
+
+    private class Wrapper {
+
+        String name;
+        String cmd;
+        DiagnosticCommandInfo info;
+        Permission permission;
+
+        Wrapper(String name, String cmd, DiagnosticCommandInfo info)
+                throws InstantiationException {
+            this.name = name;
+            this.cmd = cmd;
+            this.info = info;
+            this.permission = null;
+            Exception cause = null;
+            if (info.getPermissionClass() != null) {
+                try {
+                    Class<?> c = Class.forName(info.getPermissionClass());
+                    if (info.getPermissionAction() == null) {
+                        try {
+                            Constructor<?> constructor = c.getConstructor(String.class);
+                            permission = (Permission) constructor.newInstance(info.getPermissionName());
+
+                        } catch (InstantiationException | IllegalAccessException
+                                | IllegalArgumentException | InvocationTargetException
+                                | NoSuchMethodException | SecurityException ex) {
+                            cause = ex;
+                        }
+                    }
+                    if (permission == null) {
+                        try {
+                            Constructor<?> constructor = c.getConstructor(String.class, String.class);
+                            permission = (Permission) constructor.newInstance(
+                                    info.getPermissionName(),
+                                    info.getPermissionAction());
+                        } catch (InstantiationException | IllegalAccessException
+                                | IllegalArgumentException | InvocationTargetException
+                                | NoSuchMethodException | SecurityException ex) {
+                            cause = ex;
+                        }
+                    }
+                } catch (ClassNotFoundException ex) { }
+                if (permission == null) {
+                    InstantiationException iex =
+                            new InstantiationException("Unable to instantiate required permission");
+                    iex.initCause(cause);
+                }
+            }
+        }
+
+        public String execute(String[] args) {
+            if (permission != null) {
+                SecurityManager sm = System.getSecurityManager();
+                if (sm != null) {
+                    sm.checkPermission(permission);
+                }
+            }
+            if(args == null) {
+                return executeDiagnosticCommand(cmd);
+            } else {
+                StringBuilder sb = new StringBuilder();
+                sb.append(cmd);
+                for(int i=0; i<args.length; i++) {
+                    if(args[i] == null) {
+                        throw new IllegalArgumentException("Invalid null argument");
+                    }
+                    sb.append(" ");
+                    sb.append(args[i]);
+                }
+                return executeDiagnosticCommand(sb.toString());
+            }
+        }
+    }
+
+    DiagnosticCommandImpl(VMManagement jvm) {
+        this.jvm = jvm;
+        isSupported = jvm.isRemoteDiagnosticCommandsSupported();
+    }
+
+    private static class OperationInfoComparator implements Comparator<MBeanOperationInfo> {
+        @Override
+        public int compare(MBeanOperationInfo o1, MBeanOperationInfo o2) {
+            return o1.getName().compareTo(o2.getName());
+        }
+    }
+
+    @Override
+    public MBeanInfo getMBeanInfo() {
+        SortedSet<MBeanOperationInfo> operations = new TreeSet<>(new OperationInfoComparator());
+        Map<String, Wrapper> wrappersmap;
+        if (!isSupported) {
+            wrappersmap = Collections.emptyMap();
+        } else {
+            try {
+                String[] command = getDiagnosticCommands();
+                DiagnosticCommandInfo[] info = getDiagnosticCommandInfo(command);
+                MBeanParameterInfo stringArgInfo[] = new MBeanParameterInfo[]{
+                    new MBeanParameterInfo("arguments", strArrayClassName,
+                    "Array of Diagnostic Commands Arguments and Options")
+                };
+                wrappersmap = new HashMap<>();
+                for (int i = 0; i < command.length; i++) {
+                    String name = transform(command[i]);
+                    try {
+                        Wrapper w = new Wrapper(name, command[i], info[i]);
+                        wrappersmap.put(name, w);
+                        operations.add(new MBeanOperationInfo(
+                                w.name,
+                                w.info.getDescription(),
+                                (w.info.getArgumentsInfo() == null
+                                    || w.info.getArgumentsInfo().isEmpty())
+                                    ? null : stringArgInfo,
+                                strClassName,
+                                MBeanOperationInfo.ACTION_INFO,
+                                commandDescriptor(w)));
+                    } catch (InstantiationException ex) {
+                        // If for some reasons the creation of a diagnostic command
+                        // wrappers fails, the diagnostic command is just ignored
+                        // and won't appear in the DynamicMBean
+                    }
+                }
+            } catch (IllegalArgumentException | UnsupportedOperationException e) {
+                wrappersmap = Collections.emptyMap();
+            }
+        }
+        wrappers =  Collections.unmodifiableMap(wrappersmap);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("immutableInfo", "false");
+        map.put("interfaceClassName","com.sun.management.DiagnosticCommandMBean");
+        map.put("mxbean", "false");
+        Descriptor desc = new ImmutableDescriptor(map);
+        return new MBeanInfo(
+                this.getClass().getName(),
+                "Diagnostic Commands",
+                null, // attributes
+                null, // constructors
+                operations.toArray(new MBeanOperationInfo[operations.size()]), // operations
+                getNotificationInfo(), // notifications
+                desc);
+    }
+
+    @Override
+    public Object invoke(String actionName, Object[] params, String[] signature)
+            throws MBeanException, ReflectionException {
+        if (!isSupported) {
+            throw new UnsupportedOperationException();
+        }
+        if (wrappers == null) {
+            getMBeanInfo();
+        }
+        Wrapper w = wrappers.get(actionName);
+        if (w != null) {
+            if (w.info.getArgumentsInfo().isEmpty()
+                    && (params == null || params.length == 0)
+                    && (signature == null || signature.length == 0)) {
+                return w.execute(null);
+            } else if((params != null && params.length == 1)
+                    && (signature != null && signature.length == 1
+                    && signature[0] != null
+                    && signature[0].compareTo(strArrayClassName) == 0)) {
+                return w.execute((String[]) params[0]);
+            }
+        }
+        throw new ReflectionException(new NoSuchMethodException(actionName));
+    }
+
+    private static String transform(String name) {
+        StringBuilder sb = new StringBuilder();
+        boolean toLower = true;
+        boolean toUpper = false;
+        for (int i = 0; i < name.length(); i++) {
+            char c = name.charAt(i);
+            if (c == '.' || c == '_') {
+                toLower = false;
+                toUpper = true;
+            } else {
+                if (toUpper) {
+                    toUpper = false;
+                    sb.append(Character.toUpperCase(c));
+                } else if(toLower) {
+                    sb.append(Character.toLowerCase(c));
+                } else {
+                    sb.append(c);
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+    private Descriptor commandDescriptor(Wrapper w) throws IllegalArgumentException {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("dcmd.name", w.info.getName());
+        map.put("dcmd.description", w.info.getDescription());
+        map.put("dcmd.vmImpact", w.info.getImpact());
+        map.put("dcmd.permissionClass", w.info.getPermissionClass());
+        map.put("dcmd.permissionName", w.info.getPermissionName());
+        map.put("dcmd.permissionAction", w.info.getPermissionAction());
+        map.put("dcmd.enabled", w.info.isEnabled());
+        StringBuilder sb = new StringBuilder();
+        sb.append("help ");
+        sb.append(w.info.getName());
+        map.put("dcmd.help", executeDiagnosticCommand(sb.toString()));
+        if (w.info.getArgumentsInfo() != null && !w.info.getArgumentsInfo().isEmpty()) {
+            HashMap<String, Object> allargmap = new HashMap<>();
+            for (DiagnosticCommandArgumentInfo arginfo : w.info.getArgumentsInfo()) {
+                HashMap<String, Object> argmap = new HashMap<>();
+                argmap.put("dcmd.arg.name", arginfo.getName());
+                argmap.put("dcmd.arg.type", arginfo.getType());
+                argmap.put("dcmd.arg.description", arginfo.getDescription());
+                argmap.put("dcmd.arg.isMandatory", arginfo.isMandatory());
+                argmap.put("dcmd.arg.isMultiple", arginfo.isMultiple());
+                boolean isOption = arginfo.isOption();
+                argmap.put("dcmd.arg.isOption", isOption);
+                if(!isOption) {
+                    argmap.put("dcmd.arg.position", arginfo.getPosition());
+                } else {
+                    argmap.put("dcmd.arg.position", -1);
+                }
+                allargmap.put(arginfo.getName(), new ImmutableDescriptor(argmap));
+            }
+            map.put("dcmd.arguments", new ImmutableDescriptor(allargmap));
+        }
+        return new ImmutableDescriptor(map);
+    }
+
+    private final static String notifName =
+        "javax.management.Notification";
+
+    private final static String[] diagFramNotifTypes = {
+        "jmx.mbean.info.changed"
+    };
+
+    private MBeanNotificationInfo[] notifInfo = null;
+
+    @Override
+    public MBeanNotificationInfo[] getNotificationInfo() {
+        synchronized (this) {
+            if (notifInfo == null) {
+                 notifInfo = new MBeanNotificationInfo[1];
+                 notifInfo[0] =
+                         new MBeanNotificationInfo(diagFramNotifTypes,
+                                                   notifName,
+                                                   "Diagnostic Framework Notification");
+            }
+        }
+        return notifInfo;
+    }
+
+    private static long seqNumber = 0;
+    private static long getNextSeqNumber() {
+        return ++seqNumber;
+    }
+
+    private void createDiagnosticFrameworkNotification() {
+
+        if (!hasListeners()) {
+            return;
+        }
+        ObjectName on = null;
+        try {
+            on = ObjectName.getInstance(PlatformMBeanProviderImpl.DIAGNOSTIC_COMMAND_MBEAN_NAME);
+        } catch (MalformedObjectNameException e) { }
+        Notification notif = new Notification("jmx.mbean.info.changed",
+                                              on,
+                                              getNextSeqNumber());
+        notif.setUserData(getMBeanInfo());
+        sendNotification(notif);
+    }
+
+    @Override
+    public synchronized void addNotificationListener(NotificationListener listener,
+            NotificationFilter filter,
+            Object handback) {
+        boolean before = hasListeners();
+        super.addNotificationListener(listener, filter, handback);
+        boolean after = hasListeners();
+        if (!before && after) {
+            setNotificationEnabled(true);
+        }
+    }
+
+    @Override
+    public synchronized void removeNotificationListener(NotificationListener listener)
+            throws ListenerNotFoundException {
+        boolean before = hasListeners();
+        super.removeNotificationListener(listener);
+        boolean after = hasListeners();
+        if (before && !after) {
+            setNotificationEnabled(false);
+        }
+    }
+
+    @Override
+    public synchronized void removeNotificationListener(NotificationListener listener,
+            NotificationFilter filter,
+            Object handback)
+            throws ListenerNotFoundException {
+        boolean before = hasListeners();
+        super.removeNotificationListener(listener, filter, handback);
+        boolean after = hasListeners();
+        if (before && !after) {
+            setNotificationEnabled(false);
+        }
+    }
+
+    private native void setNotificationEnabled(boolean enabled);
+    private native String[] getDiagnosticCommands();
+    private native DiagnosticCommandInfo[] getDiagnosticCommandInfo(String[] commands);
+    private native String executeDiagnosticCommand(String command);
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2013, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import java.util.List;
+
+/**
+ * Diagnostic command information. It contains the description of a
+ * diagnostic command.
+ *
+ * @since 1.8
+ */
+
+class DiagnosticCommandInfo {
+    private final String name;
+    private final String description;
+    private final String impact;
+    private final String permissionClass;
+    private final String permissionName;
+    private final String permissionAction;
+    private final boolean enabled;
+    private final List<DiagnosticCommandArgumentInfo> arguments;
+
+    /**
+     * Returns the diagnostic command name.
+     *
+     * @return the diagnostic command name
+     */
+    String getName() {
+        return name;
+    }
+
+   /**
+     * Returns the diagnostic command description.
+     *
+     * @return the diagnostic command description
+     */
+    String getDescription() {
+        return description;
+    }
+
+    /**
+     * Returns the potential impact of the diagnostic command execution
+     *         on the Java virtual machine behavior.
+     *
+     * @return the potential impact of the diagnostic command execution
+     *         on the Java virtual machine behavior
+     */
+    String getImpact() {
+        return impact;
+    }
+
+    /**
+     * Returns the name of the permission class required to be allowed
+     *         to invoke the diagnostic command, or null if no permission
+     *         is required.
+     *
+     * @return the name of the permission class name required to be allowed
+     *         to invoke the diagnostic command, or null if no permission
+     *         is required
+     */
+    String getPermissionClass() {
+        return permissionClass;
+    }
+
+    /**
+     * Returns the permission name required to be allowed to invoke the
+     *         diagnostic command, or null if no permission is required.
+     *
+     * @return the permission name required to be allowed to invoke the
+     *         diagnostic command, or null if no permission is required
+     */
+    String getPermissionName() {
+        return permissionName;
+    }
+
+    /**
+     * Returns the permission action required to be allowed to invoke the
+     *         diagnostic command, or null if no permission is required or
+     *         if the permission has no action specified.
+     *
+     * @return the permission action required to be allowed to invoke the
+     *         diagnostic command, or null if no permission is required or
+     *         if the permission has no action specified
+     */
+    String getPermissionAction() {
+        return permissionAction;
+    }
+
+    /**
+     * Returns {@code true} if the diagnostic command is enabled,
+     *         {@code false} otherwise. The enabled/disabled
+     *         status of a diagnostic command can evolve during
+     *         the lifetime of the Java virtual machine.
+     *
+     * @return {@code true} if the diagnostic command is enabled,
+     *         {@code false} otherwise
+     */
+    boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Returns the list of the diagnostic command arguments description.
+     * If the diagnostic command has no arguments, it returns an empty list.
+     *
+     * @return a list of the diagnostic command arguments description
+     */
+    List<DiagnosticCommandArgumentInfo> getArgumentsInfo() {
+        return arguments;
+    }
+
+    DiagnosticCommandInfo(String name, String description,
+                                    String impact, String permissionClass,
+                                    String permissionName, String permissionAction,
+                                    boolean enabled,
+                                    List<DiagnosticCommandArgumentInfo> arguments)
+    {
+        this.name = name;
+        this.description = description;
+        this.impact = impact;
+        this.permissionClass = permissionClass;
+        this.permissionName = permissionName;
+        this.permissionAction = permissionAction;
+        this.enabled = enabled;
+        this.arguments = arguments;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/Flag.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import java.util.*;
+import com.sun.management.VMOption;
+import com.sun.management.VMOption.Origin;
+import java.security.AccessController;
+
+/**
+ * Flag class is a helper class for constructing a VMOption.
+ * It has the static methods for getting the Flag objects, each
+ * corresponds to one VMOption.
+ *
+ */
+class Flag {
+    private String name;
+    private Object value;
+    private Origin origin;
+    private boolean writeable;
+    private boolean external;
+
+    Flag(String name, Object value, boolean writeable,
+         boolean external, Origin origin) {
+        this.name = name;
+        this.value = value == null ? "" : value ;
+        this.origin = origin;
+        this.writeable = writeable;
+        this.external = external;
+    }
+
+    Object getValue() {
+        return value;
+    }
+
+    boolean isWriteable() {
+        return writeable;
+    }
+
+    boolean isExternal() {
+        return external;
+    }
+
+    VMOption getVMOption() {
+        return new VMOption(name, value.toString(), writeable, origin);
+    }
+
+    static Flag getFlag(String name) {
+        String[] names = new String[1];
+        names[0] = name;
+
+        List<Flag> flags = getFlags(names, 1);
+        if (flags.isEmpty()) {
+            return null;
+        } else {
+            // flags should have only one element
+            return flags.get(0);
+        }
+    }
+
+    static List<Flag> getAllFlags() {
+        int numFlags = getInternalFlagCount();
+
+        // Get all internal flags with names = null
+        return getFlags(null, numFlags);
+    }
+
+    private static List<Flag> getFlags(String[] names, int numFlags) {
+        Flag[] flags = new Flag[numFlags];
+        int count = getFlags(names, flags, numFlags);
+
+        List<Flag> result = new ArrayList<>();
+        for (Flag f : flags) {
+            if (f != null) {
+                result.add(f);
+            }
+        }
+        return result;
+    }
+
+    private static native String[] getAllFlagNames();
+    // getFlags sets each element in the given flags array
+    // with a Flag object only if the name is valid and the
+    // type is supported. The flags array may contain null elements.
+    private static native int getFlags(String[] names, Flag[] flags, int count);
+    private static native int getInternalFlagCount();
+
+    // These set* methods are synchronized on the class object
+    // to avoid multiple threads updating the same flag at the same time.
+    static synchronized native void setLongValue(String name, long value);
+    static synchronized native void setDoubleValue(String name, double value);
+    static synchronized native void setBooleanValue(String name, boolean value);
+    static synchronized native void setStringValue(String name, String value);
+
+    static {
+        AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("management");
+                    return null;
+                }
+            });
+        initialize();
+    }
+    private static native void initialize();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2011, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import com.sun.management.GarbageCollectionNotificationInfo;
+import com.sun.management.GcInfo;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.OpenDataException;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.SimpleType;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import sun.management.LazyCompositeData;
+import static sun.management.LazyCompositeData.getString;
+import sun.management.Util;
+
+/**
+ * A CompositeData for GarbageCollectionNotificationInfo for the local management support.
+ * This class avoids the performance penalty paid to the
+ * construction of a CompositeData use in the local case.
+ */
+public class GarbageCollectionNotifInfoCompositeData extends LazyCompositeData {
+    private final GarbageCollectionNotificationInfo gcNotifInfo;
+
+    public GarbageCollectionNotifInfoCompositeData(GarbageCollectionNotificationInfo info) {
+        this.gcNotifInfo = info;
+    }
+
+    public GarbageCollectionNotificationInfo getGarbageCollectionNotifInfo() {
+        return gcNotifInfo;
+    }
+
+    public static CompositeData toCompositeData(GarbageCollectionNotificationInfo info) {
+        GarbageCollectionNotifInfoCompositeData gcnicd =
+            new GarbageCollectionNotifInfoCompositeData(info);
+        return gcnicd.getCompositeData();
+    }
+
+    private CompositeType getCompositeTypeByBuilder() {
+        final GcInfoBuilder builder = AccessController.doPrivileged (new PrivilegedAction<GcInfoBuilder>() {
+                public GcInfoBuilder run() {
+                    try {
+                        Class<?> cl = Class.forName("com.sun.management.GcInfo");
+                        Field f = cl.getDeclaredField("builder");
+                        f.setAccessible(true);
+                        return (GcInfoBuilder)f.get(gcNotifInfo.getGcInfo());
+                    } catch(ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
+                        return null;
+                    }
+                }
+            });
+        CompositeType gict = null;
+        synchronized(compositeTypeByBuilder) {
+            gict = compositeTypeByBuilder.get(builder);
+            if(gict == null) {
+                OpenType<?>[] gcNotifInfoItemTypes = new OpenType<?>[] {
+                    SimpleType.STRING,
+                    SimpleType.STRING,
+                    SimpleType.STRING,
+                    builder.getGcInfoCompositeType(),
+                };
+                try {
+                    final String typeName =
+                        "sun.management.GarbageCollectionNotifInfoCompositeType";
+                    gict = new CompositeType(typeName,
+                                             "CompositeType for GC notification info",
+                                             gcNotifInfoItemNames,
+                                             gcNotifInfoItemNames,
+                                             gcNotifInfoItemTypes);
+                    compositeTypeByBuilder.put(builder,gict);
+                } catch (OpenDataException e) {
+                    // shouldn't reach here
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return gict;
+    }
+
+    protected CompositeData getCompositeData() {
+        // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH
+        // gcNotifInfoItemNames!
+        final Object[] gcNotifInfoItemValues;
+        gcNotifInfoItemValues = new Object[] {
+            gcNotifInfo.getGcName(),
+            gcNotifInfo.getGcAction(),
+            gcNotifInfo.getGcCause(),
+            GcInfoCompositeData.toCompositeData(gcNotifInfo.getGcInfo())
+        };
+
+        CompositeType gict = getCompositeTypeByBuilder();
+
+        try {
+            return new CompositeDataSupport(gict,
+                                            gcNotifInfoItemNames,
+                                            gcNotifInfoItemValues);
+        } catch (OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+    }
+
+    //    private static MappedMXBeanType gcInfoMapType;
+    private static final String GC_NAME = "gcName";
+    private static final String GC_ACTION = "gcAction";
+    private static final String GC_CAUSE = "gcCause";
+    private static final String GC_INFO     = "gcInfo";
+    private static final String[] gcNotifInfoItemNames = {
+        GC_NAME,
+        GC_ACTION,
+        GC_CAUSE,
+        GC_INFO
+    };
+    private static HashMap<GcInfoBuilder,CompositeType> compositeTypeByBuilder =
+        new HashMap<>();
+
+    public static String getGcName(CompositeData cd) {
+        String gcname = getString(cd, GC_NAME);
+        if (gcname == null) {
+            throw new IllegalArgumentException("Invalid composite data: " +
+                "Attribute " + GC_NAME + " has null value");
+        }
+        return gcname;
+    }
+
+    public static String getGcAction(CompositeData cd) {
+        String gcaction = getString(cd, GC_ACTION);
+        if (gcaction == null) {
+            throw new IllegalArgumentException("Invalid composite data: " +
+                "Attribute " + GC_ACTION + " has null value");
+        }
+        return gcaction;
+    }
+
+    public static String getGcCause(CompositeData cd) {
+        String gccause = getString(cd, GC_CAUSE);
+        if (gccause == null) {
+            throw new IllegalArgumentException("Invalid composite data: " +
+                "Attribute " + GC_CAUSE + " has null value");
+        }
+        return gccause;
+    }
+
+    public static GcInfo getGcInfo(CompositeData cd) {
+        CompositeData gcInfoData = (CompositeData) cd.get(GC_INFO);
+        return GcInfo.from(gcInfoData);
+    }
+
+    /** Validate if the input CompositeData has the expected
+     * CompositeType (i.e. contain all attributes with expected
+     * names and types).
+     */
+    public static void validateCompositeData(CompositeData cd) {
+        if (cd == null) {
+            throw new NullPointerException("Null CompositeData");
+        }
+
+        if (!isTypeMatched( getBaseGcNotifInfoCompositeType(), cd.getCompositeType())) {
+            throw new IllegalArgumentException(
+                "Unexpected composite type for GarbageCollectionNotificationInfo");
+        }
+    }
+
+    // This is only used for validation.
+    private static CompositeType baseGcNotifInfoCompositeType = null;
+    private static synchronized CompositeType getBaseGcNotifInfoCompositeType() {
+        if (baseGcNotifInfoCompositeType == null) {
+            try {
+                OpenType<?>[] baseGcNotifInfoItemTypes = new OpenType<?>[] {
+                    SimpleType.STRING,
+                    SimpleType.STRING,
+                    SimpleType.STRING,
+                    GcInfoCompositeData.getBaseGcInfoCompositeType()
+                };
+                baseGcNotifInfoCompositeType =
+                    new CompositeType("sun.management.BaseGarbageCollectionNotifInfoCompositeType",
+                                      "CompositeType for Base GarbageCollectionNotificationInfo",
+                                      gcNotifInfoItemNames,
+                                      gcNotifInfoItemNames,
+                                      baseGcNotifInfoItemTypes);
+            } catch (OpenDataException e) {
+                // shouldn't reach here
+                throw new RuntimeException(e);
+            }
+        }
+        return baseGcNotifInfoCompositeType;
+    }
+
+    private static final long serialVersionUID = -1805123446483771292L;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import com.sun.management.GarbageCollectionNotificationInfo;
+import com.sun.management.GarbageCollectorMXBean;
+import com.sun.management.GcInfo;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryPoolMXBean;
+import java.util.List;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanNotificationInfo;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.openmbean.CompositeData;
+import sun.management.GarbageCollectorImpl;
+
+/**
+ * Implementation class for the garbage collector.
+ * Standard and committed hotspot-specific metrics if any.
+ *
+ * ManagementFactory.getGarbageCollectorMXBeans() returns a list
+ * of instances of this class.
+ */
+public class GarbageCollectorExtImpl extends GarbageCollectorImpl
+    implements GarbageCollectorMXBean {
+
+    public GarbageCollectorExtImpl(String name) {
+        super(name);
+    }
+
+    // The memory pools are static and won't be changed.
+    // TODO: If the hotspot implementation begins to have pools
+    // dynamically created and removed, this needs to be modified.
+    private String[] poolNames = null;
+    private synchronized String[] getAllPoolNames() {
+        if (poolNames == null) {
+            List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
+            poolNames = new String[pools.size()];
+            int i = 0;
+            for (MemoryPoolMXBean m : pools) {
+                poolNames[i++] = m.getName();
+            }
+        }
+        return poolNames;
+    }
+
+    public GcInfo getLastGcInfo() {
+        GcInfo info = getGcInfoBuilder().getLastGcInfo();
+        return info;
+    }
+
+    private final static String notifName =
+        "javax.management.Notification";
+
+    private final static String[] gcNotifTypes = {
+        GarbageCollectionNotificationInfo.GARBAGE_COLLECTION_NOTIFICATION
+    };
+
+    private MBeanNotificationInfo[] notifInfo = null;
+    public MBeanNotificationInfo[] getNotificationInfo() {
+        synchronized (this) {
+            if (notifInfo == null) {
+                 notifInfo = new MBeanNotificationInfo[1];
+                 notifInfo[0] = new MBeanNotificationInfo(gcNotifTypes,
+                                                          notifName,
+                                                          "GC Notification");
+            }
+        }
+        return notifInfo;
+    }
+
+    private static long seqNumber = 0;
+    private static long getNextSeqNumber() {
+        return ++seqNumber;
+    }
+
+    protected void createGCNotification(long timestamp,
+                              String gcName,
+                              String gcAction,
+                              String gcCause,
+                              GcInfo gcInfo)  {
+        if (!hasListeners()) {
+            return;
+        }
+        Notification notif = new Notification(GarbageCollectionNotificationInfo.GARBAGE_COLLECTION_NOTIFICATION,
+                                              getObjectName(),
+                                              getNextSeqNumber(),
+                                              timestamp,
+                                              gcName);
+        GarbageCollectionNotificationInfo info =
+            new GarbageCollectionNotificationInfo(gcName,
+                                                  gcAction,
+                                                  gcCause,
+                                                  gcInfo);
+
+        CompositeData cd =
+            GarbageCollectionNotifInfoCompositeData.toCompositeData(info);
+        notif.setUserData(cd);
+        sendNotification(notif);
+    }
+
+    public synchronized void addNotificationListener(NotificationListener listener,
+                                                     NotificationFilter filter,
+                                                     Object handback)
+    {
+        boolean before = hasListeners();
+        super.addNotificationListener(listener, filter, handback);
+        boolean after = hasListeners();
+        if (!before && after) {
+            setNotificationEnabled(this, true);
+        }
+    }
+
+    public synchronized void removeNotificationListener(NotificationListener listener)
+        throws ListenerNotFoundException {
+        boolean before = hasListeners();
+        super.removeNotificationListener(listener);
+        boolean after = hasListeners();
+
+        if (before && !after) {
+            setNotificationEnabled(this,false);
+        }
+    }
+
+    public synchronized void removeNotificationListener(NotificationListener listener,
+                                                        NotificationFilter filter,
+                                                        Object handback)
+            throws ListenerNotFoundException
+    {
+        boolean before = hasListeners();
+        super.removeNotificationListener(listener,filter,handback);
+        boolean after = hasListeners();
+        if (before && !after) {
+            setNotificationEnabled(this,false);
+        }
+    }
+
+    private GcInfoBuilder gcInfoBuilder;
+    // Invoked also by the VM
+    private synchronized GcInfoBuilder getGcInfoBuilder() {
+        if(gcInfoBuilder == null) {
+            gcInfoBuilder = new GcInfoBuilder(this, getAllPoolNames());
+        }
+        return gcInfoBuilder;
+    }
+
+    private native void setNotificationEnabled(GarbageCollectorMXBean gc,
+                                                 boolean enabled);
+
+    // Invoked by the VM
+    private static java.lang.management.GarbageCollectorMXBean
+        createGarbageCollector(String name, String type) {
+
+        return new GarbageCollectorExtImpl(name);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+package com.sun.management.internal;
+
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.MemoryUsage;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.OpenDataException;
+import com.sun.management.GcInfo;
+import sun.management.Util;
+
+/**
+ * Helper class to build composite data.
+ */
+public class GcInfoBuilder {
+    private final GarbageCollectorMXBean gc;
+    private final String[] poolNames;
+    private String[] allItemNames;
+
+    // GC-specific composite type:
+    // Each GarbageCollectorMXBean may have different GC-specific attributes
+    // the CompositeType for the GcInfo could be different.
+    private CompositeType gcInfoCompositeType;
+
+    // GC-specific items
+    private final int gcExtItemCount;
+    private final String[] gcExtItemNames;
+    private final String[] gcExtItemDescs;
+    private final char[] gcExtItemTypes;
+
+    GcInfoBuilder(GarbageCollectorMXBean gc, String[] poolNames) {
+        this.gc = gc;
+        this.poolNames = poolNames;
+        this.gcExtItemCount = getNumGcExtAttributes(gc);
+        this.gcExtItemNames = new String[gcExtItemCount];
+        this.gcExtItemDescs = new String[gcExtItemCount];
+        this.gcExtItemTypes = new char[gcExtItemCount];
+
+        // Fill the information about extension attributes
+        fillGcAttributeInfo(gc, gcExtItemCount, gcExtItemNames,
+                            gcExtItemTypes, gcExtItemDescs);
+
+        // lazily build the CompositeType for the GcInfo
+        // including the GC-specific extension attributes
+        this.gcInfoCompositeType = null;
+    }
+
+    GcInfo getLastGcInfo() {
+        MemoryUsage[] usageBeforeGC = new MemoryUsage[poolNames.length];
+        MemoryUsage[] usageAfterGC = new MemoryUsage[poolNames.length];
+        Object[] values = new Object[gcExtItemCount];
+
+        return getLastGcInfo0(gc, gcExtItemCount, values, gcExtItemTypes,
+                              usageBeforeGC, usageAfterGC);
+    }
+
+    public String[] getPoolNames() {
+        return poolNames;
+    }
+
+    int getGcExtItemCount() {
+        return gcExtItemCount;
+    }
+
+    // Returns the CompositeType for the GcInfo including
+    // the extension attributes
+    synchronized CompositeType getGcInfoCompositeType() {
+        if (gcInfoCompositeType != null)
+            return gcInfoCompositeType;
+
+        // First, fill with the attributes in the GcInfo
+        String[] gcInfoItemNames = GcInfoCompositeData.getBaseGcInfoItemNames();
+        OpenType<?>[] gcInfoItemTypes = GcInfoCompositeData.getBaseGcInfoItemTypes();
+        int numGcInfoItems = gcInfoItemNames.length;
+
+        int itemCount = numGcInfoItems + gcExtItemCount;
+        allItemNames = new String[itemCount];
+        String[] allItemDescs = new String[itemCount];
+        OpenType<?>[] allItemTypes = new OpenType<?>[itemCount];
+
+        System.arraycopy(gcInfoItemNames, 0, allItemNames, 0, numGcInfoItems);
+        System.arraycopy(gcInfoItemNames, 0, allItemDescs, 0, numGcInfoItems);
+        System.arraycopy(gcInfoItemTypes, 0, allItemTypes, 0, numGcInfoItems);
+
+        // Then fill with the extension GC-specific attributes, if any.
+        if (gcExtItemCount > 0) {
+            fillGcAttributeInfo(gc, gcExtItemCount, gcExtItemNames,
+                                gcExtItemTypes, gcExtItemDescs);
+            System.arraycopy(gcExtItemNames, 0, allItemNames,
+                             numGcInfoItems, gcExtItemCount);
+            System.arraycopy(gcExtItemDescs, 0, allItemDescs,
+                             numGcInfoItems, gcExtItemCount);
+            for (int i = numGcInfoItems, j = 0; j < gcExtItemCount; i++, j++) {
+                switch (gcExtItemTypes[j]) {
+                    case 'Z':
+                        allItemTypes[i] = SimpleType.BOOLEAN;
+                        break;
+                    case 'B':
+                        allItemTypes[i] = SimpleType.BYTE;
+                        break;
+                    case 'C':
+                        allItemTypes[i] = SimpleType.CHARACTER;
+                        break;
+                    case 'S':
+                        allItemTypes[i] = SimpleType.SHORT;
+                        break;
+                    case 'I':
+                        allItemTypes[i] = SimpleType.INTEGER;
+                        break;
+                    case 'J':
+                        allItemTypes[i] = SimpleType.LONG;
+                        break;
+                    case 'F':
+                        allItemTypes[i] = SimpleType.FLOAT;
+                        break;
+                    case 'D':
+                        allItemTypes[i] = SimpleType.DOUBLE;
+                        break;
+                    default:
+                        throw new AssertionError(
+                            "Unsupported type [" + gcExtItemTypes[i] + "]");
+                }
+            }
+        }
+
+        CompositeType gict = null;
+        try {
+            final String typeName =
+                "sun.management." + gc.getName() + ".GcInfoCompositeType";
+
+            gict = new CompositeType(typeName,
+                                     "CompositeType for GC info for " +
+                                         gc.getName(),
+                                     allItemNames,
+                                     allItemDescs,
+                                     allItemTypes);
+        } catch (OpenDataException e) {
+            // shouldn't reach here
+            throw new RuntimeException(e);
+        }
+        gcInfoCompositeType = gict;
+
+        return gcInfoCompositeType;
+    }
+
+    synchronized String[] getItemNames() {
+        if (allItemNames == null) {
+            // initialize when forming the composite type
+            getGcInfoCompositeType();
+        }
+        return allItemNames;
+    }
+
+    // Retrieve information about extension attributes
+    private native int getNumGcExtAttributes(GarbageCollectorMXBean gc);
+    private native void fillGcAttributeInfo(GarbageCollectorMXBean gc,
+                                            int numAttributes,
+                                            String[] attributeNames,
+                                            char[] types,
+                                            String[] descriptions);
+
+    /**
+     * Returns the last GcInfo
+     *
+     * @param gc GarbageCollectorMXBean that the gc info is associated with.
+     * @param numExtAtts number of extension attributes
+     * @param extAttValues Values of extension attributes to be filled.
+     * @param before Memory usage before GC to be filled.
+     * @param after Memory usage after GC to be filled.
+     */
+    private native GcInfo getLastGcInfo0(GarbageCollectorMXBean gc,
+                                         int numExtAtts,
+                                         Object[] extAttValues,
+                                         char[] extAttTypes,
+                                         MemoryUsage[] before,
+                                         MemoryUsage[] after);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2004, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import java.lang.management.MemoryUsage;
+import java.lang.reflect.Method;
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.io.InvalidObjectException;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.TabularData;
+import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.OpenDataException;
+import com.sun.management.GcInfo;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import sun.management.LazyCompositeData;
+import static sun.management.LazyCompositeData.getLong;
+import sun.management.MappedMXBeanType;
+import sun.management.Util;
+
+/**
+ * A CompositeData for GcInfo for the local management support.
+ * This class avoids the performance penalty paid to the
+ * construction of a CompositeData use in the local case.
+ */
+public class GcInfoCompositeData extends LazyCompositeData {
+    private final GcInfo info;
+    private final GcInfoBuilder builder;
+    private final Object[] gcExtItemValues;
+
+    public GcInfoCompositeData(GcInfo info,
+                        GcInfoBuilder builder,
+                        Object[] gcExtItemValues) {
+        this.info = info;
+        this.builder = builder;
+        this.gcExtItemValues = gcExtItemValues;
+    }
+
+    public GcInfo getGcInfo() {
+        return info;
+    }
+
+    public static CompositeData toCompositeData(final GcInfo info) {
+        final GcInfoBuilder builder = AccessController.doPrivileged (new PrivilegedAction<GcInfoBuilder>() {
+                        public GcInfoBuilder run() {
+                            try {
+                                Class<?> cl = Class.forName("com.sun.management.GcInfo");
+                                Field f = cl.getDeclaredField("builder");
+                                f.setAccessible(true);
+                                return (GcInfoBuilder)f.get(info);
+                            } catch(ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
+                                return null;
+                            }
+                        }
+                    });
+        final Object[] extAttr = AccessController.doPrivileged (new PrivilegedAction<Object[]>() {
+                        public Object[] run() {
+                            try {
+                                Class<?> cl = Class.forName("com.sun.management.GcInfo");
+                                Field f = cl.getDeclaredField("extAttributes");
+                                f.setAccessible(true);
+                                return (Object[])f.get(info);
+                            } catch(ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
+                                return null;
+                            }
+                        }
+                    });
+        GcInfoCompositeData gcicd =
+            new GcInfoCompositeData(info,builder,extAttr);
+        return gcicd.getCompositeData();
+    }
+
+    protected CompositeData getCompositeData() {
+        // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH
+        // baseGcInfoItemNames!
+        final Object[] baseGcInfoItemValues;
+
+        try {
+            baseGcInfoItemValues = new Object[] {
+                info.getId(),
+                info.getStartTime(),
+                info.getEndTime(),
+                info.getDuration(),
+                memoryUsageMapType.toOpenTypeData(info.getMemoryUsageBeforeGc()),
+                memoryUsageMapType.toOpenTypeData(info.getMemoryUsageAfterGc()),
+            };
+        } catch (OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+
+        // Get the item values for the extension attributes
+        final int gcExtItemCount = builder.getGcExtItemCount();
+        if (gcExtItemCount == 0 &&
+            gcExtItemValues != null && gcExtItemValues.length != 0) {
+            throw new AssertionError("Unexpected Gc Extension Item Values");
+        }
+
+        if (gcExtItemCount > 0 && (gcExtItemValues == null ||
+             gcExtItemCount != gcExtItemValues.length)) {
+            throw new AssertionError("Unmatched Gc Extension Item Values");
+        }
+
+        Object[] values = new Object[baseGcInfoItemValues.length +
+                                     gcExtItemCount];
+        System.arraycopy(baseGcInfoItemValues, 0, values, 0,
+                         baseGcInfoItemValues.length);
+
+        if (gcExtItemCount > 0) {
+            System.arraycopy(gcExtItemValues, 0, values,
+                             baseGcInfoItemValues.length, gcExtItemCount);
+        }
+
+        try {
+            return new CompositeDataSupport(builder.getGcInfoCompositeType(),
+                                            builder.getItemNames(),
+                                            values);
+        } catch (OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+    }
+
+    private static final String ID                     = "id";
+    private static final String START_TIME             = "startTime";
+    private static final String END_TIME               = "endTime";
+    private static final String DURATION               = "duration";
+    private static final String MEMORY_USAGE_BEFORE_GC = "memoryUsageBeforeGc";
+    private static final String MEMORY_USAGE_AFTER_GC  = "memoryUsageAfterGc";
+
+    private static final String[] baseGcInfoItemNames = {
+        ID,
+        START_TIME,
+        END_TIME,
+        DURATION,
+        MEMORY_USAGE_BEFORE_GC,
+        MEMORY_USAGE_AFTER_GC,
+    };
+
+
+    private static MappedMXBeanType memoryUsageMapType;
+    static {
+        try {
+            Method m = GcInfo.class.getMethod("getMemoryUsageBeforeGc");
+            memoryUsageMapType =
+                MappedMXBeanType.getMappedType(m.getGenericReturnType());
+        } catch (NoSuchMethodException | OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+    }
+
+    static String[] getBaseGcInfoItemNames() {
+        return baseGcInfoItemNames;
+    }
+
+    private static OpenType<?>[] baseGcInfoItemTypes = null;
+    static synchronized OpenType<?>[] getBaseGcInfoItemTypes() {
+        if (baseGcInfoItemTypes == null) {
+            OpenType<?> memoryUsageOpenType = memoryUsageMapType.getOpenType();
+            baseGcInfoItemTypes = new OpenType<?>[] {
+                SimpleType.LONG,
+                SimpleType.LONG,
+                SimpleType.LONG,
+                SimpleType.LONG,
+
+                memoryUsageOpenType,
+                memoryUsageOpenType,
+            };
+        }
+        return baseGcInfoItemTypes;
+    }
+
+    public static long getId(CompositeData cd) {
+        return getLong(cd, ID);
+    }
+    public static long getStartTime(CompositeData cd) {
+        return getLong(cd, START_TIME);
+    }
+    public static long getEndTime(CompositeData cd) {
+        return getLong(cd, END_TIME);
+    }
+
+    public static Map<String, MemoryUsage>
+            getMemoryUsageBeforeGc(CompositeData cd) {
+        try {
+            TabularData td = (TabularData) cd.get(MEMORY_USAGE_BEFORE_GC);
+            return cast(memoryUsageMapType.toJavaTypeData(td));
+        } catch (InvalidObjectException | OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Map<String, MemoryUsage> cast(Object x) {
+        return (Map<String, MemoryUsage>) x;
+    }
+    public static Map<String, MemoryUsage>
+            getMemoryUsageAfterGc(CompositeData cd) {
+        try {
+            TabularData td = (TabularData) cd.get(MEMORY_USAGE_AFTER_GC);
+            //return (Map<String,MemoryUsage>)
+            return cast(memoryUsageMapType.toJavaTypeData(td));
+        } catch (InvalidObjectException | OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Returns true if the input CompositeData has the expected
+     * CompositeType (i.e. contain all attributes with expected
+     * names and types).  Otherwise, return false.
+     */
+    public static void validateCompositeData(CompositeData cd) {
+        if (cd == null) {
+            throw new NullPointerException("Null CompositeData");
+        }
+
+        if (!isTypeMatched(getBaseGcInfoCompositeType(),
+                           cd.getCompositeType())) {
+           throw new IllegalArgumentException(
+                "Unexpected composite type for GcInfo");
+        }
+    }
+
+    // This is only used for validation.
+    private static CompositeType baseGcInfoCompositeType = null;
+    static synchronized CompositeType getBaseGcInfoCompositeType() {
+        if (baseGcInfoCompositeType == null) {
+            try {
+                baseGcInfoCompositeType =
+                    new CompositeType("sun.management.BaseGcInfoCompositeType",
+                                      "CompositeType for Base GcInfo",
+                                      getBaseGcInfoItemNames(),
+                                      getBaseGcInfoItemNames(),
+                                      getBaseGcInfoItemTypes());
+            } catch (OpenDataException e) {
+                // shouldn't reach here
+                throw new RuntimeException(e);
+            }
+        }
+        return baseGcInfoCompositeType;
+    }
+
+    private static final long serialVersionUID = -5716428894085882742L;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2005, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.management.ObjectName;
+
+import com.sun.management.HotSpotDiagnosticMXBean;
+import com.sun.management.VMOption;
+import sun.management.Util;
+
+/**
+ * Implementation of the diagnostic MBean for Hotspot VM.
+ */
+public class HotSpotDiagnostic implements HotSpotDiagnosticMXBean {
+    public HotSpotDiagnostic() {
+    }
+
+    @Override
+    public void dumpHeap(String outputFile, boolean live) throws IOException {
+        SecurityManager security = System.getSecurityManager();
+        if (security != null) {
+            security.checkWrite(outputFile);
+            Util.checkControlAccess();
+        }
+
+        dumpHeap0(outputFile, live);
+    }
+
+    private native void dumpHeap0(String outputFile, boolean live) throws IOException;
+
+    @Override
+    public List<VMOption> getDiagnosticOptions() {
+        List<Flag> allFlags = Flag.getAllFlags();
+        List<VMOption> result = new ArrayList<>();
+        for (Flag flag : allFlags) {
+            if (flag.isWriteable() && flag.isExternal()) {
+                result.add(flag.getVMOption());
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public VMOption getVMOption(String name) {
+        if (name == null) {
+            throw new NullPointerException("name cannot be null");
+        }
+
+        Flag f = Flag.getFlag(name);
+        if (f == null) {
+            throw new IllegalArgumentException("VM option \"" +
+                name + "\" does not exist");
+        }
+        return f.getVMOption();
+    }
+
+    @Override
+    public void setVMOption(String name, String value) {
+        if (name == null) {
+            throw new NullPointerException("name cannot be null");
+        }
+        if (value == null) {
+            throw new NullPointerException("value cannot be null");
+        }
+
+        Util.checkControlAccess();
+        Flag flag = Flag.getFlag(name);
+        if (flag == null) {
+            throw new IllegalArgumentException("VM option \"" +
+                name + "\" does not exist");
+        }
+        if (!flag.isWriteable()){
+            throw new IllegalArgumentException("VM Option \"" +
+                name + "\" is not writeable");
+        }
+
+        // Check the type of the value
+        Object v = flag.getValue();
+        if (v instanceof Long) {
+            try {
+                long l = Long.parseLong(value);
+                Flag.setLongValue(name, l);
+            } catch (NumberFormatException e) {
+                throw new IllegalArgumentException("Invalid value:" +
+                        " VM Option \"" + name + "\"" +
+                        " expects numeric value", e);
+            }
+        } else if (v instanceof Double) {
+            try {
+                double d = Double.parseDouble(value);
+                Flag.setDoubleValue(name, d);
+            } catch (NumberFormatException e) {
+                throw new IllegalArgumentException("Invalid value:" +
+                        " VM Option \"" + name + "\"" +
+                        " expects numeric value", e);
+            }
+        } else if (v instanceof Boolean) {
+            if (!value.equalsIgnoreCase("true") &&
+                !value.equalsIgnoreCase("false")) {
+                throw new IllegalArgumentException("Invalid value:" +
+                    " VM Option \"" + name + "\"" +
+                    " expects \"true\" or \"false\".");
+            }
+            Flag.setBooleanValue(name, Boolean.parseBoolean(value));
+        } else if (v instanceof String) {
+            Flag.setStringValue(name, value);
+        } else {
+            throw new IllegalArgumentException("VM Option \"" +
+                name + "\" is of an unsupported type: " +
+                v.getClass().getName());
+        }
+    }
+
+    @Override
+    public ObjectName getObjectName() {
+        return Util.newObjectName("com.sun.management:type=HotSpotDiagnostic");
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+package com.sun.management.internal;
+
+import com.sun.management.ThreadMXBean;
+import sun.management.ManagementFactoryHelper;
+import sun.management.ThreadImpl;
+import sun.management.VMManagement;
+
+/**
+ *
+ */
+public class HotSpotThreadImpl extends ThreadImpl implements ThreadMXBean {
+    public HotSpotThreadImpl(VMManagement vm) {
+        super(ManagementFactoryHelper.getVMManagement());
+    }
+
+    @Override
+    public boolean isThreadAllocatedMemorySupported() {
+        return super.isThreadAllocatedMemorySupported();
+    }
+
+    @Override
+    public boolean isThreadAllocatedMemoryEnabled() {
+        return super.isThreadAllocatedMemoryEnabled();
+    }
+
+    @Override
+    public long[] getThreadCpuTime(long[] ids) {
+        return super.getThreadCpuTime(ids);
+    }
+
+    @Override
+    public long[] getThreadUserTime(long[] ids) {
+        return super.getThreadUserTime(ids);
+    }
+
+    @Override
+    public long getThreadAllocatedBytes(long id) {
+        return super.getThreadAllocatedBytes(id);
+    }
+
+    @Override
+    public long[] getThreadAllocatedBytes(long[] ids) {
+        return super.getThreadAllocatedBytes(ids);
+    }
+
+    @Override
+    public void setThreadAllocatedMemoryEnabled(boolean enable) {
+        super.setThreadAllocatedMemoryEnabled(enable);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+package com.sun.management.internal;
+
+import com.sun.management.DiagnosticCommandMBean;
+import com.sun.management.HotSpotDiagnosticMXBean;
+import com.sun.management.ThreadMXBean;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryManagerMXBean;
+import java.lang.management.OperatingSystemMXBean;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.management.DynamicMBean;
+import sun.management.ManagementFactoryHelper;
+import sun.management.spi.PlatformMBeanProvider;
+
+public final class PlatformMBeanProviderImpl extends PlatformMBeanProvider {
+    final static String DIAGNOSTIC_COMMAND_MBEAN_NAME =
+        "com.sun.management:type=DiagnosticCommand";
+
+    private final List<PlatformComponent<?>> mxbeanList;
+    private static HotSpotDiagnostic hsDiagMBean = null;
+    private static OperatingSystemMXBean osMBean = null;
+
+    static {
+       AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+           System.loadLibrary("management_ext");
+           return null;
+       });
+    }
+
+    public PlatformMBeanProviderImpl() {
+        mxbeanList = Collections.unmodifiableList(init());
+    }
+
+    @Override
+    public List<PlatformComponent<?>> getPlatformComponentList() {
+        return mxbeanList;
+    }
+
+    private List<PlatformComponent<?>> init() {
+        ArrayList<PlatformComponent<?>> initMBeanList = new ArrayList<>();
+        /**
+         * Garbage Collector in the Java virtual machine.
+         */
+        initMBeanList.add(new PlatformComponent<MemoryManagerMXBean>() {
+            private final Set<String> garbageCollectorMXBeanInterfaceNames
+                    = Collections.unmodifiableSet(
+                            Stream.of("java.lang.management.MemoryManagerMXBean",
+                                    "java.lang.management.GarbageCollectorMXBean",
+                                    "com.sun.management.GarbageCollectorMXBean")
+                            .collect(Collectors.toSet()));
+
+            @Override
+            public Set<Class<? extends MemoryManagerMXBean>> mbeanInterfaces() {
+                return Stream.of(MemoryManagerMXBean.class,
+                        java.lang.management.GarbageCollectorMXBean.class,
+                        com.sun.management.GarbageCollectorMXBean.class)
+                        .collect(Collectors.toSet());
+            }
+
+            @Override
+            public Set<String> mbeanInterfaceNames() {
+                return garbageCollectorMXBeanInterfaceNames;
+            }
+
+            @Override
+            public String getObjectNamePattern() {
+                return ManagementFactory.GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",name=*";
+            }
+
+            @Override
+            public boolean isSingleton() {
+                return false; // zero or more instances
+            }
+
+            @Override
+            public Map<String, MemoryManagerMXBean> nameToMBeanMap() {
+                List<java.lang.management.GarbageCollectorMXBean> list
+                        = ManagementFactoryHelper.getGarbageCollectorMXBeans();
+                Map<String, MemoryManagerMXBean> map;
+                if (list.isEmpty()) {
+                    map = Collections.emptyMap();
+                } else {
+                    map = new HashMap<>(list.size());
+                    for (MemoryManagerMXBean gcm : list) {
+                        map.put(gcm.getObjectName().getCanonicalName(),
+                                gcm);
+                    }
+                }
+
+                return map;
+            }
+        });
+
+        /**
+         * Threading system of the Java virtual machine.
+         */
+        initMBeanList.add(new PlatformComponent<java.lang.management.ThreadMXBean>() {
+            private final Set<String> threadMXBeanInterfaceNames
+                    = Collections.unmodifiableSet(
+                            Stream.of("java.lang.management.ThreadMXBean",
+                                    "com.sun.management.ThreadMXBean")
+                            .collect(Collectors.toSet()));
+            private ThreadMXBean threadMBean = null;
+
+            @Override
+            public Set<Class<? extends java.lang.management.ThreadMXBean>> mbeanInterfaces() {
+                return Stream.of(java.lang.management.ThreadMXBean.class,
+                        com.sun.management.ThreadMXBean.class)
+                        .collect(Collectors.toSet());
+            }
+
+            @Override
+            public Set<String> mbeanInterfaceNames() {
+                return threadMXBeanInterfaceNames;
+            }
+
+            @Override
+            public String getObjectNamePattern() {
+                return ManagementFactory.THREAD_MXBEAN_NAME;
+            }
+
+            @Override
+            public synchronized Map<String, java.lang.management.ThreadMXBean> nameToMBeanMap() {
+                if (threadMBean == null) {
+                    threadMBean = new HotSpotThreadImpl(ManagementFactoryHelper.getVMManagement());
+                }
+                return Collections.singletonMap(
+                        ManagementFactory.THREAD_MXBEAN_NAME,
+                        threadMBean);
+            }
+        });
+
+        /**
+         * OperatingSystemMXBean
+         */
+        initMBeanList.add(new PlatformComponent<OperatingSystemMXBean>() {
+            private final Set<String> operatingSystemMXBeanInterfaceNames
+                    = Collections.unmodifiableSet(
+                            Stream.of("java.lang.management.OperatingSystemMXBean",
+                                    "com.sun.management.OperatingSystemMXBean",
+                                    "com.sun.management.UnixOperatingSystemMXBean")
+                            .collect(Collectors.toSet()));
+
+            @Override
+            public Set<Class<? extends OperatingSystemMXBean>> mbeanInterfaces() {
+                return Stream.of(java.lang.management.OperatingSystemMXBean.class,
+                        com.sun.management.OperatingSystemMXBean.class,
+                        com.sun.management.UnixOperatingSystemMXBean.class)
+                        .collect(Collectors.toSet());
+            }
+
+            @Override
+            public Set<String> mbeanInterfaceNames() {
+                return operatingSystemMXBeanInterfaceNames;
+            }
+
+            @Override
+            public String getObjectNamePattern() {
+                return ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME;
+            }
+
+            @Override
+            public Map<String, java.lang.management.OperatingSystemMXBean> nameToMBeanMap() {
+                return Collections.<String, java.lang.management.OperatingSystemMXBean>singletonMap(
+                        ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME,
+                        getOperatingSystemMXBean());
+            }
+        });
+
+        /**
+         * Diagnostic support for the HotSpot Virtual Machine.
+         */
+        initMBeanList.add(new PlatformComponent<com.sun.management.HotSpotDiagnosticMXBean>() {
+            private final Set<String> hotSpotDiagnosticMXBeanInterfaceNames =
+                    Collections.unmodifiableSet(Collections.<String>singleton(
+                            "com.sun.management.HotSpotDiagnosticMXBean"));
+
+            @Override
+            public Set<Class<? extends com.sun.management.HotSpotDiagnosticMXBean>> mbeanInterfaces() {
+                return Collections.singleton(com.sun.management.HotSpotDiagnosticMXBean.class);
+            }
+
+            @Override
+            public Set<String> mbeanInterfaceNames() {
+                return hotSpotDiagnosticMXBeanInterfaceNames;
+            }
+
+            @Override
+            public String getObjectNamePattern() {
+                return "com.sun.management:type=HotSpotDiagnostic";
+            }
+
+            @Override
+            public Map<String, com.sun.management.HotSpotDiagnosticMXBean> nameToMBeanMap() {
+                return Collections.<String, com.sun.management.HotSpotDiagnosticMXBean>singletonMap(
+                        "com.sun.management:type=HotSpotDiagnostic",
+                        getDiagnosticMXBean());
+            }
+        });
+
+        /**
+         * Diagnostic command MBean
+         */
+        DiagnosticCommandMBean diagMBean = DiagnosticCommandImpl.getDiagnosticCommandMBean();
+        if (diagMBean != null) {
+            initMBeanList.add(new PlatformComponent<DynamicMBean>() {
+                final Set<String> dynamicMBeanInterfaceNames
+                        = Collections.unmodifiableSet(Collections.<String>singleton(
+                                "javax.management.DynamicMBean"));
+
+                @Override
+                public Set<String> mbeanInterfaceNames() {
+                    return dynamicMBeanInterfaceNames;
+                }
+
+                @Override
+                public Set<Class<? extends DynamicMBean>> mbeanInterfaces() {
+                    // DynamicMBean cannot be used to find an MBean by ManagementFactory
+                    return Collections.emptySet();
+                }
+
+                @Override
+                public String getObjectNamePattern() {
+                    return DIAGNOSTIC_COMMAND_MBEAN_NAME;
+                }
+
+                @Override
+                public Map<String, DynamicMBean> nameToMBeanMap() {
+                    return Collections.<String, DynamicMBean>singletonMap(
+                            DIAGNOSTIC_COMMAND_MBEAN_NAME,
+                            diagMBean);
+                }
+            });
+        }
+
+        initMBeanList.trimToSize();
+        return initMBeanList;
+    }
+
+    private static synchronized HotSpotDiagnosticMXBean getDiagnosticMXBean() {
+        if (hsDiagMBean == null) {
+            hsDiagMBean = new HotSpotDiagnostic();
+        }
+        return hsDiagMBean;
+    }
+
+    private static synchronized OperatingSystemMXBean getOperatingSystemMXBean() {
+        if (osMBean == null) {
+            osMBean = new OperatingSystemImpl(ManagementFactoryHelper.getVMManagement());
+        }
+        return osMBean;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2005, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import com.sun.management.VMOption;
+import com.sun.management.VMOption.Origin;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.OpenDataException;
+import sun.management.LazyCompositeData;
+import sun.management.MappedMXBeanType;
+
+/**
+ * A CompositeData for VMOption for the local management support.
+ * This class avoids the performance penalty paid to the
+ * construction of a CompositeData use in the local case.
+ */
+public class VMOptionCompositeData extends LazyCompositeData {
+    private final VMOption option;
+
+    private VMOptionCompositeData(VMOption option) {
+        this.option = option;
+    }
+
+    public VMOption getVMOption() {
+        return option;
+    }
+
+    public static CompositeData toCompositeData(VMOption option) {
+        VMOptionCompositeData vcd = new VMOptionCompositeData(option);
+        return vcd.getCompositeData();
+    }
+
+    protected CompositeData getCompositeData() {
+        // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH
+        // vmOptionItemNames!
+        final Object[] vmOptionItemValues = {
+            option.getName(),
+            option.getValue(),
+            option.isWriteable(),
+            option.getOrigin().toString(),
+        };
+
+        try {
+            return new CompositeDataSupport(vmOptionCompositeType,
+                                            vmOptionItemNames,
+                                            vmOptionItemValues);
+        } catch (OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+    }
+
+    private static final CompositeType vmOptionCompositeType;
+    static {
+        try {
+            vmOptionCompositeType = (CompositeType)
+                MappedMXBeanType.toOpenType(VMOption.class);
+        } catch (OpenDataException e) {
+            // Should never reach here
+            throw new AssertionError(e);
+        }
+    }
+
+    static CompositeType getVMOptionCompositeType() {
+        return vmOptionCompositeType;
+    }
+
+    private static final String NAME      = "name";
+    private static final String VALUE     = "value";
+    private static final String WRITEABLE = "writeable";
+    private static final String ORIGIN    = "origin";
+
+    private static final String[] vmOptionItemNames = {
+        NAME,
+        VALUE,
+        WRITEABLE,
+        ORIGIN,
+    };
+
+    public static String getName(CompositeData cd) {
+        return getString(cd, NAME);
+    }
+    public static String getValue(CompositeData cd) {
+        return getString(cd, VALUE);
+    }
+    public static Origin getOrigin(CompositeData cd) {
+        String o = getString(cd, ORIGIN);
+        return Enum.valueOf(Origin.class, o);
+    }
+    public static boolean isWriteable(CompositeData cd) {
+        return getBoolean(cd, WRITEABLE);
+    }
+
+    /** Validate if the input CompositeData has the expected
+     * CompositeType (i.e. contain all attributes with expected
+     * names and types).
+     */
+    public static void validateCompositeData(CompositeData cd) {
+        if (cd == null) {
+            throw new NullPointerException("Null CompositeData");
+        }
+
+        if (!isTypeMatched(vmOptionCompositeType, cd.getCompositeType())) {
+            throw new IllegalArgumentException(
+                "Unexpected composite type for VMOption");
+        }
+    }
+
+    private static final long serialVersionUID = -2395573975093578470L;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2004, 2013, 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.
+ */
+
+/**
+ * This package contains Oracle Corporation's platform extension to
+ * the implementation of the
+ * <a href="{@docRoot}/../../../../api/java/lang/management/package-summary.html">
+ * java.lang.management</a> API and also defines the management
+ * interface for some other components for the platform.
+ *
+ * <p>
+ * All platform MBeans are registered in the <em>platform MBeanServer</em>
+ * which can be obtained via the
+ * <a href="{@docRoot}/../../../../api/java/lang/management/ManagementFactory.html#getPlatformMBeanServer()">
+ * java.lang.management.ManagementFactory.getPlatformMBeanServer</a>
+ *
+ * @author  Mandy Chung
+ * @since   1.5
+ */
+
+@jdk.Exported
+package com.sun.management;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2013, 2015, 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.
+ */
+
+#include <stdlib.h>
+#include <jni.h>
+#include "management_ext.h"
+#include "com_sun_management_internal_DiagnosticCommandImpl.h"
+
+JNIEXPORT void JNICALL Java_com_sun_management_internal_DiagnosticCommandImpl_setNotificationEnabled
+(JNIEnv *env, jobject dummy, jboolean enabled) {
+    if (jmm_version <= JMM_VERSION_1_2_2) {
+        JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
+                        "JMX interface to diagnostic framework notifications is not supported by this VM");
+        return;
+    }
+    jmm_interface->SetDiagnosticFrameworkNotificationEnabled(env, enabled);
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommands
+  (JNIEnv *env, jobject dummy)
+{
+  return jmm_interface->GetDiagnosticCommands(env);
+}
+
+jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
+                                              int num_arg) {
+  int i;
+  jobject obj;
+  jobjectArray result;
+  dcmdArgInfo* dcmd_arg_info_array;
+  jclass dcmdArgInfoCls;
+  jclass arraysCls;
+  jmethodID mid;
+  jobject resultList;
+
+  dcmd_arg_info_array = (dcmdArgInfo*) malloc(num_arg * sizeof(dcmdArgInfo));
+  /* According to ISO C it is perfectly legal for malloc to return zero if called with a zero argument */
+  if (dcmd_arg_info_array == NULL && num_arg != 0) {
+    return NULL;
+  }
+  jmm_interface->GetDiagnosticCommandArgumentsInfo(env, command,
+                                                   dcmd_arg_info_array);
+  dcmdArgInfoCls = (*env)->FindClass(env,
+                                     "com/sun/management/internal/DiagnosticCommandArgumentInfo");
+  if ((*env)->ExceptionCheck(env)) {
+    free(dcmd_arg_info_array);
+    return NULL;
+  }
+
+  result = (*env)->NewObjectArray(env, num_arg, dcmdArgInfoCls, NULL);
+  if (result == NULL) {
+    free(dcmd_arg_info_array);
+    return NULL;
+  }
+  for (i=0; i<num_arg; i++) {
+    obj = JNU_NewObjectByName(env,
+                              "com/sun/management/internal/DiagnosticCommandArgumentInfo",
+                              "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZI)V",
+                              (*env)->NewStringUTF(env,dcmd_arg_info_array[i].name),
+                              (*env)->NewStringUTF(env,dcmd_arg_info_array[i].description),
+                              (*env)->NewStringUTF(env,dcmd_arg_info_array[i].type),
+                              dcmd_arg_info_array[i].default_string == NULL ? NULL:
+                              (*env)->NewStringUTF(env, dcmd_arg_info_array[i].default_string),
+                              dcmd_arg_info_array[i].mandatory,
+                              dcmd_arg_info_array[i].option,
+                              dcmd_arg_info_array[i].multiple,
+                              dcmd_arg_info_array[i].position);
+    if (obj == NULL) {
+      free(dcmd_arg_info_array);
+      return NULL;
+    }
+    (*env)->SetObjectArrayElement(env, result, i, obj);
+  }
+  free(dcmd_arg_info_array);
+  arraysCls = (*env)->FindClass(env, "java/util/Arrays");
+  if ((*env)->ExceptionCheck(env)) {
+    return NULL;
+  }
+  mid = (*env)->GetStaticMethodID(env, arraysCls,
+                                  "asList", "([Ljava/lang/Object;)Ljava/util/List;");
+  resultList = (*env)->CallStaticObjectMethod(env, arraysCls, mid, result);
+  if ((*env)->ExceptionCheck(env)) {
+    // Make sure we return NULL in case of OOM inside Java
+    return NULL;
+  }
+  return resultList;
+}
+
+/* Throws IllegalArgumentException if at least one of the diagnostic command
+ * passed in argument is not supported by the JVM
+ */
+JNIEXPORT jobjectArray JNICALL
+Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
+(JNIEnv *env, jobject dummy, jobjectArray commands)
+{
+  int i;
+  jclass dcmdInfoCls;
+  jobject result;
+  jobjectArray args;
+  jobject obj;
+  jmmOptionalSupport mos;
+  jint ret = jmm_interface->GetOptionalSupport(env, &mos);
+  jsize num_commands;
+  dcmdInfo* dcmd_info_array;
+
+  if (commands == NULL) {
+      JNU_ThrowNullPointerException(env, "Invalid String Array");
+      return NULL;
+  }
+  num_commands = (*env)->GetArrayLength(env, commands);
+  dcmdInfoCls = (*env)->FindClass(env,
+                                  "com/sun/management/internal/DiagnosticCommandInfo");
+  if ((*env)->ExceptionCheck(env)) {
+    return NULL;
+  }
+
+  result = (*env)->NewObjectArray(env, num_commands, dcmdInfoCls, NULL);
+  if (result == NULL) {
+      JNU_ThrowOutOfMemoryError(env, 0);
+      return NULL;
+  }
+  if (num_commands == 0) {
+      /* Handle the 'zero commands' case specially to avoid calling 'malloc()' */
+      /* with a zero argument because that may legally return a NULL pointer.  */
+      return result;
+  }
+  dcmd_info_array = (dcmdInfo*) malloc(num_commands * sizeof(dcmdInfo));
+  if (dcmd_info_array == NULL) {
+      JNU_ThrowOutOfMemoryError(env, NULL);
+      return NULL;
+  }
+  jmm_interface->GetDiagnosticCommandInfo(env, commands, dcmd_info_array);
+  for (i=0; i<num_commands; i++) {
+      args = getDiagnosticCommandArgumentInfoArray(env,
+                                                   (*env)->GetObjectArrayElement(env,commands,i),
+                                                   dcmd_info_array[i].num_arguments);
+      if (args == NULL) {
+          free(dcmd_info_array);
+          JNU_ThrowOutOfMemoryError(env, 0);
+          return NULL;
+      }
+      obj = JNU_NewObjectByName(env,
+                                "com/sun/management/internal/DiagnosticCommandInfo",
+                                "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V",
+                                (*env)->NewStringUTF(env,dcmd_info_array[i].name),
+                                (*env)->NewStringUTF(env,dcmd_info_array[i].description),
+                                (*env)->NewStringUTF(env,dcmd_info_array[i].impact),
+                                dcmd_info_array[i].permission_class==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_class),
+                                dcmd_info_array[i].permission_name==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_name),
+                                dcmd_info_array[i].permission_action==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_action),
+                                dcmd_info_array[i].enabled,
+                                args);
+      if (obj == NULL) {
+          free(dcmd_info_array);
+          JNU_ThrowOutOfMemoryError(env, 0);
+          return NULL;
+      }
+      (*env)->SetObjectArrayElement(env, result, i, obj);
+  }
+  free(dcmd_info_array);
+  return result;
+}
+
+/* Throws IllegalArgumentException if the diagnostic command
+ * passed in argument is not supported by the JVM
+ */
+JNIEXPORT jstring JNICALL
+Java_com_sun_management_internal_DiagnosticCommandImpl_executeDiagnosticCommand
+(JNIEnv *env, jobject dummy, jstring command) {
+  return jmm_interface->ExecuteDiagnosticCommand(env, command);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/native/libmanagement_ext/Flag.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <jni.h>
+#include "management_ext.h"
+#include "com_sun_management_internal_Flag.h"
+
+static jobject default_origin = NULL;
+static jobject vm_creation_origin = NULL;
+static jobject mgmt_origin = NULL;
+static jobject envvar_origin = NULL;
+static jobject config_file_origin = NULL;
+static jobject ergo_origin = NULL;
+static jobject attach_origin = NULL;
+static jobject other_origin = NULL;
+
+JNIEXPORT jint JNICALL
+Java_com_sun_management_internal_Flag_getInternalFlagCount
+  (JNIEnv *env, jclass cls)
+{
+    jlong count = jmm_interface->GetLongAttribute(env, NULL,
+                                                  JMM_VM_GLOBAL_COUNT);
+    return (jint) count;
+}
+
+JNIEXPORT jobjectArray JNICALL
+  Java_com_sun_management_internal_Flag_getAllFlagNames
+(JNIEnv *env, jclass cls)
+{
+  return jmm_interface->GetVMGlobalNames(env);
+}
+
+static jobject find_origin_constant(JNIEnv* env, const char* enum_name) {
+    jvalue field;
+    field = JNU_GetStaticFieldByName(env,
+                                     NULL,
+                                     "com/sun/management/VMOption$Origin",
+                                     enum_name,
+                                     "Lcom/sun/management/VMOption$Origin;");
+    return (*env)->NewGlobalRef(env, field.l);
+}
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_Flag_initialize
+  (JNIEnv *env, jclass cls)
+{
+    default_origin = find_origin_constant(env, "DEFAULT");
+    vm_creation_origin = find_origin_constant(env, "VM_CREATION");
+    mgmt_origin = find_origin_constant(env, "MANAGEMENT");
+    envvar_origin = find_origin_constant(env, "ENVIRON_VAR");
+    config_file_origin = find_origin_constant(env, "CONFIG_FILE");
+    ergo_origin = find_origin_constant(env, "ERGONOMIC");
+    attach_origin = find_origin_constant(env, "ATTACH_ON_DEMAND");
+    other_origin = find_origin_constant(env, "OTHER");
+}
+
+JNIEXPORT jint JNICALL
+Java_com_sun_management_internal_Flag_getFlags
+  (JNIEnv *env, jclass cls, jobjectArray names, jobjectArray flags, jint count)
+{
+    jint num_flags, i, index;
+    jmmVMGlobal* globals;
+    size_t gsize;
+    const char* class_name = "com/sun/management/internal/Flag";
+    const char* signature = "(Ljava/lang/String;Ljava/lang/Object;ZZLcom/sun/management/VMOption$Origin;)V";
+    jobject origin;
+    jobject valueObj;
+    jobject flag;
+
+    if (flags == NULL) {
+        JNU_ThrowNullPointerException(env, 0);
+        return 0;
+    }
+
+    if (count <= 0) {
+        JNU_ThrowIllegalArgumentException(env, 0);
+        return 0;
+    }
+
+    gsize = (size_t)count * sizeof(jmmVMGlobal);
+    globals = (jmmVMGlobal*) malloc(gsize);
+    if (globals == NULL) {
+        JNU_ThrowOutOfMemoryError(env, 0);
+        return 0;
+    }
+
+    memset(globals, 0, gsize);
+    num_flags = jmm_interface->GetVMGlobals(env, names, globals, count);
+    if (num_flags == 0) {
+        free(globals);
+        return 0;
+    }
+
+    index = 0;
+    for (i = 0; i < count; i++) {
+        if (globals[i].name == NULL) {
+            continue;
+        }
+        switch (globals[i].type) {
+        case JMM_VMGLOBAL_TYPE_JBOOLEAN:
+            valueObj = JNU_NewObjectByName(env, "java/lang/Boolean", "(Z)V",
+                                           globals[i].value.z);
+            break;
+        case JMM_VMGLOBAL_TYPE_JSTRING:
+            valueObj = globals[i].value.l;
+            break;
+        case JMM_VMGLOBAL_TYPE_JLONG:
+            valueObj = JNU_NewObjectByName(env, "java/lang/Long", "(J)V",
+                                           globals[i].value.j);
+            break;
+        case JMM_VMGLOBAL_TYPE_JDOUBLE:
+            valueObj = JNU_NewObjectByName(env, "java/lang/Double", "(D)V",
+                                           globals[i].value.d);
+            break;
+        default:
+            // ignore unsupported type
+            continue;
+        }
+        switch (globals[i].origin) {
+        case JMM_VMGLOBAL_ORIGIN_DEFAULT:
+            origin = default_origin;
+            break;
+        case JMM_VMGLOBAL_ORIGIN_COMMAND_LINE:
+            origin = vm_creation_origin;
+            break;
+        case JMM_VMGLOBAL_ORIGIN_MANAGEMENT:
+            origin = mgmt_origin;
+            break;
+        case JMM_VMGLOBAL_ORIGIN_ENVIRON_VAR:
+            origin = envvar_origin;
+            break;
+        case JMM_VMGLOBAL_ORIGIN_CONFIG_FILE:
+            origin = config_file_origin;
+            break;
+        case JMM_VMGLOBAL_ORIGIN_ERGONOMIC:
+            origin = ergo_origin;
+            break;
+        case JMM_VMGLOBAL_ORIGIN_ATTACH_ON_DEMAND:
+            origin = attach_origin;
+            break;
+        case JMM_VMGLOBAL_ORIGIN_OTHER:
+            origin = other_origin;
+            break;
+        default:
+            // unknown origin
+            origin = other_origin;
+            break;
+        }
+        flag = JNU_NewObjectByName(env, class_name, signature, globals[i].name,
+                                   valueObj, globals[i].writeable,
+                                   globals[i].external, origin);
+        if (flag == NULL) {
+            free(globals);
+            JNU_ThrowOutOfMemoryError(env, 0);
+            return 0;
+        }
+        (*env)->SetObjectArrayElement(env, flags, index, flag);
+        index++;
+    }
+
+    if (index != num_flags) {
+        JNU_ThrowInternalError(env, "Number of Flag objects created unmatched");
+        free(globals);
+        return 0;
+    }
+
+    free(globals);
+
+    /* return the number of Flag objects created */
+    return num_flags;
+}
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_Flag_setLongValue
+  (JNIEnv *env, jclass cls, jstring name, jlong value)
+{
+   jvalue v;
+   v.j = value;
+
+   jmm_interface->SetVMGlobal(env, name, v);
+}
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_Flag_setDoubleValue
+  (JNIEnv *env, jclass cls, jstring name, jdouble value)
+{
+   jvalue v;
+   v.d = value;
+
+   jmm_interface->SetVMGlobal(env, name, v);
+}
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_Flag_setBooleanValue
+  (JNIEnv *env, jclass cls, jstring name, jboolean value)
+{
+   jvalue v;
+   v.z = value;
+
+   jmm_interface->SetVMGlobal(env, name, v);
+}
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_Flag_setStringValue
+  (JNIEnv *env, jclass cls, jstring name, jstring value)
+{
+   jvalue v;
+   v.l = value;
+
+   jmm_interface->SetVMGlobal(env, name, v);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include <jni.h>
+#include "management_ext.h"
+#include "com_sun_management_internal_GarbageCollectorExtImpl.h"
+
+JNIEXPORT void JNICALL Java_com_sun_management_internal_GarbageCollectorExtImpl_setNotificationEnabled
+(JNIEnv *env, jobject dummy, jobject gc,jboolean enabled) {
+
+    if (gc == NULL) {
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        return;
+    }
+    if((jmm_version > JMM_VERSION_1_2)
+       || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=1))) {
+      jmm_interface->SetGCNotificationEnabled(env, gc, enabled);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <jni.h>
+#include "management_ext.h"
+#include "com_sun_management_internal_GcInfoBuilder.h"
+
+JNIEXPORT jint JNICALL Java_com_sun_management_internal_GcInfoBuilder_getNumGcExtAttributes
+  (JNIEnv *env, jobject dummy, jobject gc) {
+    jlong value;
+
+    if (gc == NULL) {
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        return 0;
+    }
+    value = jmm_interface->GetLongAttribute(env, gc,
+                                            JMM_GC_EXT_ATTRIBUTE_INFO_SIZE);
+    return (jint) value;
+}
+
+JNIEXPORT void JNICALL Java_com_sun_management_internal_GcInfoBuilder_fillGcAttributeInfo
+  (JNIEnv *env, jobject dummy, jobject gc,
+   jint num_attributes, jobjectArray attributeNames,
+   jcharArray types, jobjectArray descriptions) {
+
+    jmmExtAttributeInfo* ext_att_info;
+    jchar* nativeTypes;
+    jstring attName = NULL;
+    jstring desc = NULL;
+    jint ret = 0;
+    jint i;
+
+    if (gc == NULL) {
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        return;
+    }
+
+    if (num_attributes <= 0) {
+        JNU_ThrowIllegalArgumentException(env, "Invalid num_attributes");
+        return;
+    }
+
+    ext_att_info = (jmmExtAttributeInfo*) malloc((size_t)num_attributes *
+                                                 sizeof(jmmExtAttributeInfo));
+    if (ext_att_info == NULL) {
+        JNU_ThrowOutOfMemoryError(env, 0);
+        return;
+    }
+    ret = jmm_interface->GetGCExtAttributeInfo(env, gc,
+                                               ext_att_info, num_attributes);
+    if (ret != num_attributes) {
+        JNU_ThrowInternalError(env, "Unexpected num_attributes");
+        free(ext_att_info);
+        return;
+    }
+
+    nativeTypes = (jchar*) malloc((size_t)num_attributes * sizeof(jchar));
+    if (nativeTypes == NULL) {
+        free(ext_att_info);
+        JNU_ThrowOutOfMemoryError(env, 0);
+        return;
+    }
+    for (i = 0; i < num_attributes; i++) {
+        nativeTypes[i] = ext_att_info[i].type;
+        attName = (*env)->NewStringUTF(env, ext_att_info[i].name);
+        desc = (*env)->NewStringUTF(env, ext_att_info[i].description);
+        (*env)->SetObjectArrayElement(env, attributeNames, i, attName);
+        (*env)->SetObjectArrayElement(env, descriptions, i, desc);
+    }
+    (*env)->SetCharArrayRegion(env, types, 0, num_attributes, nativeTypes);
+
+    if (ext_att_info != NULL) {
+        free(ext_att_info);
+    }
+    if (nativeTypes != NULL) {
+        free(nativeTypes);
+    }
+}
+
+static void setLongValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                      jsize index, jlong value) {
+    static const char* class_name = "java/lang/Long";
+    static const char* signature = "(J)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+static void setBooleanValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                         jsize index, jboolean value) {
+    static const char* class_name = "java/lang/Boolean";
+    static const char* signature = "(Z)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+static void setByteValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                      jsize index, jbyte value) {
+    static const char* class_name = "java/lang/Byte";
+    static const char* signature = "(B)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+static void setIntValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                     jsize index, jint value) {
+    static const char* class_name = "java/lang/Integer";
+    static const char* signature = "(I)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+static void setShortValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                       jsize index, jshort value) {
+    static const char* class_name = "java/lang/Short";
+    static const char* signature = "(S)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+static void setDoubleValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                        jsize index, jdouble value) {
+    static const char* class_name = "java/lang/Double";
+    static const char* signature = "(D)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+static void setFloatValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                       jsize index, jfloat value) {
+    static const char* class_name = "java/lang/Float";
+    static const char* signature = "(D)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+static void setCharValueAtObjectArray(JNIEnv *env, jobjectArray array,
+                                      jsize index, jchar value) {
+    static const char* class_name = "java/lang/Character";
+    static const char* signature = "(C)V";
+    jobject obj = JNU_NewObjectByName(env, class_name, signature, value);
+
+    (*env)->SetObjectArrayElement(env, array, index, obj);
+}
+
+JNIEXPORT jobject JNICALL Java_com_sun_management_internal_GcInfoBuilder_getLastGcInfo0
+  (JNIEnv *env, jobject builder, jobject gc,
+   jint ext_att_count, jobjectArray ext_att_values, jcharArray ext_att_types,
+   jobjectArray usageBeforeGC, jobjectArray usageAfterGC) {
+
+    jmmGCStat   gc_stat;
+    jchar*      nativeTypes;
+    jsize       i;
+    jvalue      v;
+
+    if (gc == NULL) {
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        return 0;
+    }
+
+    if (ext_att_count <= 0) {
+        JNU_ThrowIllegalArgumentException(env, "Invalid ext_att_count");
+        return 0;
+    }
+
+    gc_stat.usage_before_gc = usageBeforeGC;
+    gc_stat.usage_after_gc = usageAfterGC;
+    gc_stat.gc_ext_attribute_values_size = ext_att_count;
+    if (ext_att_count > 0) {
+        gc_stat.gc_ext_attribute_values = (jvalue*) malloc((size_t)ext_att_count *
+                                                           sizeof(jvalue));
+        if (gc_stat.gc_ext_attribute_values == NULL) {
+            JNU_ThrowOutOfMemoryError(env, 0);
+            return 0;
+        }
+    } else {
+        gc_stat.gc_ext_attribute_values = NULL;
+    }
+
+
+    jmm_interface->GetLastGCStat(env, gc, &gc_stat);
+    if (gc_stat.gc_index == 0) {
+        if (gc_stat.gc_ext_attribute_values != NULL) {
+            free(gc_stat.gc_ext_attribute_values);
+        }
+        return 0;
+    }
+
+    // convert the ext_att_types to native types
+    nativeTypes = (jchar*) malloc((size_t)ext_att_count * sizeof(jchar));
+    if (nativeTypes == NULL) {
+        if (gc_stat.gc_ext_attribute_values != NULL) {
+            free(gc_stat.gc_ext_attribute_values);
+        }
+        JNU_ThrowOutOfMemoryError(env, 0);
+        return 0;
+    }
+    (*env)->GetCharArrayRegion(env, ext_att_types, 0, ext_att_count, nativeTypes);
+    for (i = 0; i < ext_att_count; i++) {
+       v = gc_stat.gc_ext_attribute_values[i];
+       switch (nativeTypes[i]) {
+            case 'Z':
+                setBooleanValueAtObjectArray(env, ext_att_values, i, v.z);
+                break;
+            case 'B':
+                setByteValueAtObjectArray(env, ext_att_values, i, v.b);
+                break;
+            case 'C':
+                setCharValueAtObjectArray(env, ext_att_values, i, v.c);
+                break;
+            case 'S':
+                setShortValueAtObjectArray(env, ext_att_values, i, v.s);
+                break;
+            case 'I':
+                setIntValueAtObjectArray(env, ext_att_values, i, v.i);
+                break;
+            case 'J':
+                setLongValueAtObjectArray(env, ext_att_values, i, v.j);
+                break;
+            case 'F':
+                setFloatValueAtObjectArray(env, ext_att_values, i, v.f);
+                break;
+            case 'D':
+                setDoubleValueAtObjectArray(env, ext_att_values, i, v.d);
+                break;
+            default:
+                if (gc_stat.gc_ext_attribute_values != NULL) {
+                    free(gc_stat.gc_ext_attribute_values);
+                }
+                if (nativeTypes != NULL) {
+                    free(nativeTypes);
+                }
+                JNU_ThrowInternalError(env, "Unsupported attribute type");
+                return 0;
+       }
+    }
+    if (gc_stat.gc_ext_attribute_values != NULL) {
+        free(gc_stat.gc_ext_attribute_values);
+    }
+    if (nativeTypes != NULL) {
+        free(nativeTypes);
+    }
+
+    return JNU_NewObjectByName(env,
+       "com/sun/management/GcInfo",
+       "(Lcom/sun/management/internal/GcInfoBuilder;JJJ[Ljava/lang/management/MemoryUsage;[Ljava/lang/management/MemoryUsage;[Ljava/lang/Object;)V",
+       builder,
+       gc_stat.gc_index,
+       gc_stat.start_time,
+       gc_stat.end_time,
+       usageBeforeGC,
+       usageAfterGC,
+       ext_att_values);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/native/libmanagement_ext/HotSpotDiagnostic.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2005, 2015, 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.
+ */
+
+#include <jni.h>
+#include "jvm.h"
+#include "management_ext.h"
+#include "com_sun_management_internal_HotSpotDiagnostic.h"
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_HotSpotDiagnostic_dumpHeap0
+  (JNIEnv *env, jobject dummy, jstring outputfile, jboolean live)
+{
+    jmm_interface->DumpHeap0(env, outputfile, live);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/native/libmanagement_ext/management_ext.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include <stdio.h>
+#include <jni.h>
+#include "jvm.h"
+#include "management_ext.h"
+
+#define ERR_MSG_SIZE 128
+
+const JmmInterface* jmm_interface = NULL;
+JavaVM* jvm = NULL;
+jint jmm_version = 0;
+
+JNIEXPORT jint JNICALL
+   JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+
+    jvm = vm;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {
+        return JNI_ERR;
+    }
+
+    jmm_interface = (JmmInterface*) JVM_GetManagement(JMM_VERSION_1_0);
+    if (jmm_interface == NULL) {
+        JNU_ThrowInternalError(env, "Unsupported Management version");
+        return JNI_ERR;
+    }
+
+    jmm_version = jmm_interface->GetVersion(env);
+    return (*env)->GetVersion(env);
+}
+
+void throw_internal_error(JNIEnv* env, const char* msg) {
+    char errmsg[128];
+
+    sprintf(errmsg, "errno: %d error: %s\n", errno, msg);
+    JNU_ThrowInternalError(env, errmsg);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/share/native/libmanagement_ext/management_ext.h	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include <jni.h>
+
+#include "jni_util.h"
+#include "jmm.h"
+
+#ifndef _MANAGEMENT_EXT_H_
+#define _MANAGEMENT_EXT_H_
+
+extern const JmmInterface* jmm_interface;
+extern jint jmm_version;
+extern void throw_internal_error(JNIEnv* env, const char* msg);
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2011, 2015, 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.
+ */
+
+#include <fcntl.h>
+#include <kstat.h>
+#include <procfs.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/sysinfo.h>
+#include <sys/lwp.h>
+#include <pthread.h>
+#include <utmpx.h>
+#include <dlfcn.h>
+#include <sys/loadavg.h>
+#include <jni.h>
+#include "jvm.h"
+#include "com_sun_management_internal_OperatingSystemImpl.h"
+
+typedef struct {
+    kstat_t *kstat;
+    uint64_t  last_idle;
+    uint64_t  last_total;
+    double  last_ratio;
+} cpuload_t;
+
+static cpuload_t   *cpu_loads = NULL;
+static unsigned int num_cpus;
+static kstat_ctl_t *kstat_ctrl = NULL;
+
+static void map_cpu_kstat_counters() {
+    kstat_t     *kstat;
+    int          i;
+
+    // Get number of CPU(s)
+    if ((num_cpus = sysconf(_SC_NPROCESSORS_ONLN)) == -1) {
+        num_cpus = 1;
+    }
+
+    // Data structure for saving CPU load
+    if ((cpu_loads = calloc(num_cpus,sizeof(cpuload_t))) == NULL) {
+        return;
+    }
+
+    // Get kstat cpu_stat counters for every CPU
+    // (loop over kstat to find our cpu_stat(s)
+    i = 0;
+    for (kstat = kstat_ctrl->kc_chain; kstat != NULL; kstat = kstat->ks_next) {
+        if (strncmp(kstat->ks_module, "cpu_stat", 8) == 0) {
+
+            if (kstat_read(kstat_ctrl, kstat, NULL) == -1) {
+            // Failed to initialize kstat for this CPU so ignore it
+            continue;
+            }
+
+            if (i == num_cpus) {
+            // Found more cpu_stats than reported CPUs
+            break;
+            }
+
+            cpu_loads[i++].kstat = kstat;
+        }
+    }
+}
+
+static int init_cpu_kstat_counters() {
+    static int initialized = 0;
+
+    // Concurrence in this method is prevented by the lock in
+    // the calling method get_cpu_load();
+    if(!initialized) {
+        if ((kstat_ctrl = kstat_open()) != NULL) {
+            map_cpu_kstat_counters();
+            initialized = 1;
+        }
+    }
+    return initialized ? 0 : -1;
+}
+
+static void update_cpu_kstat_counters() {
+    if(kstat_chain_update(kstat_ctrl) != 0) {
+        free(cpu_loads);
+        map_cpu_kstat_counters();
+    }
+}
+
+int read_cpustat(cpuload_t *load, cpu_stat_t *cpu_stat) {
+    if (load->kstat == NULL) {
+        // no handle.
+        return -1;
+    }
+    if (kstat_read(kstat_ctrl, load->kstat, cpu_stat) == -1) {
+        //  disabling for now, a kstat chain update is likely to happen next time
+        load->kstat = NULL;
+        return -1;
+    }
+    return 0;
+}
+
+double get_single_cpu_load(unsigned int n) {
+    cpuload_t  *load;
+    cpu_stat_t  cpu_stat;
+    uint_t     *usage;
+    uint64_t          c_idle;
+    uint64_t          c_total;
+    uint64_t          d_idle;
+    uint64_t          d_total;
+    int           i;
+
+    if (n >= num_cpus) {
+        return -1.0;
+    }
+
+    load = &cpu_loads[n];
+    if (read_cpustat(load, &cpu_stat) < 0) {
+        return -1.0;
+    }
+
+    usage   = cpu_stat.cpu_sysinfo.cpu;
+    c_idle  = usage[CPU_IDLE];
+
+    for (c_total = 0, i = 0; i < CPU_STATES; i++) {
+        c_total += usage[i];
+    }
+
+    // Calculate diff against previous snapshot
+    d_idle  = c_idle - load->last_idle;
+    d_total = c_total - load->last_total;
+
+    /** update if weve moved */
+    if (d_total > 0) {
+        // Save current values for next time around
+        load->last_idle  = c_idle;
+        load->last_total = c_total;
+        load->last_ratio = (double) (d_total - d_idle) / d_total;
+    }
+
+    return load->last_ratio;
+}
+
+int get_info(const char *path, void *info, size_t s, off_t o) {
+    int fd;
+    int ret = 0;
+    if ((fd = open(path, O_RDONLY)) < 0) {
+        return -1;
+    }
+    if (pread(fd, info, s, o) != s) {
+        ret = -1;
+    }
+    close(fd);
+    return ret;
+}
+
+#define MIN(a, b)           ((a < b) ? a : b)
+
+static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+
+/**
+ * Return the cpu load (0-1) for proc number 'which' (or average all if which == -1)
+ */
+double  get_cpu_load(int which) {
+    double load =.0;
+
+    pthread_mutex_lock(&lock);
+    if(init_cpu_kstat_counters()==0) {
+
+        update_cpu_kstat_counters();
+
+        if (which == -1) {
+            unsigned int i;
+            double       t;
+
+            for (t = .0, i = 0; i < num_cpus; i++) {
+                t += get_single_cpu_load(i);
+            }
+
+            // Cap total systemload to 1.0
+            load = MIN((t / num_cpus), 1.0);
+        } else {
+            load = MIN(get_single_cpu_load(which), 1.0);
+        }
+    } else {
+        load = -1.0;
+    }
+    pthread_mutex_unlock(&lock);
+
+    return load;
+}
+
+/**
+ * Return the cpu load (0-1) for the current process (i.e the JVM)
+ * or -1.0 if the get_info() call failed
+ */
+double get_process_load(void) {
+    psinfo_t info;
+
+    // Get the percentage of "recent cpu usage" from all the lwp:s in the JVM:s
+    // process. This is returned as a value between 0.0 and 1.0 multiplied by 0x8000.
+    if (get_info("/proc/self/psinfo",&info.pr_pctcpu, sizeof(info.pr_pctcpu), offsetof(psinfo_t, pr_pctcpu)) == 0) {
+        return (double) info.pr_pctcpu / 0x8000;
+    }
+    return -1.0;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getSystemCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    return get_cpu_load(-1);
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    return get_process_load();
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import sun.management.BaseOperatingSystemImpl;
+import sun.management.VMManagement;
+/**
+ * Implementation class for the operating system.
+ * Standard and committed hotspot-specific metrics if any.
+ *
+ * ManagementFactory.getOperatingSystemMXBean() returns an instance
+ * of this class.
+ */
+class OperatingSystemImpl extends BaseOperatingSystemImpl
+    implements com.sun.management.UnixOperatingSystemMXBean {
+
+    OperatingSystemImpl(VMManagement vm) {
+        super(vm);
+    }
+
+    public long getCommittedVirtualMemorySize() {
+        return getCommittedVirtualMemorySize0();
+    }
+
+    public long getTotalSwapSpaceSize() {
+        return getTotalSwapSpaceSize0();
+    }
+
+    public long getFreeSwapSpaceSize() {
+        return getFreeSwapSpaceSize0();
+    }
+
+    public long getProcessCpuTime() {
+        return getProcessCpuTime0();
+    }
+
+    public long getFreePhysicalMemorySize() {
+        return getFreePhysicalMemorySize0();
+    }
+
+    public long getTotalPhysicalMemorySize() {
+        return getTotalPhysicalMemorySize0();
+    }
+
+    public long getOpenFileDescriptorCount() {
+        return getOpenFileDescriptorCount0();
+    }
+
+    public long getMaxFileDescriptorCount() {
+        return getMaxFileDescriptorCount0();
+    }
+
+    public double getSystemCpuLoad() {
+        return getSystemCpuLoad0();
+    }
+
+    public double getProcessCpuLoad() {
+        return getProcessCpuLoad0();
+    }
+
+    /* native methods */
+    private native long getCommittedVirtualMemorySize0();
+    private native long getFreePhysicalMemorySize0();
+    private native long getFreeSwapSpaceSize0();
+    private native long getMaxFileDescriptorCount0();
+    private native long getOpenFileDescriptorCount0();
+    private native long getProcessCpuTime0();
+    private native double getProcessCpuLoad0();
+    private native double getSystemCpuLoad0();
+    private native long getTotalPhysicalMemorySize0();
+    private native long getTotalSwapSpaceSize0();
+
+    static {
+        initialize0();
+    }
+
+    private static native void initialize0();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+#include "jni.h"
+#include "jni_util.h"
+#include "jlong.h"
+#include "jvm.h"
+#include "management_ext.h"
+#include "com_sun_management_internal_OperatingSystemImpl.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#if defined(_ALLBSD_SOURCE)
+#include <sys/sysctl.h>
+#ifdef __APPLE__
+#include <sys/param.h>
+#include <sys/mount.h>
+#include <mach/mach.h>
+#include <sys/proc_info.h>
+#include <libproc.h>
+#endif
+#elif !defined(_AIX)
+#include <sys/swap.h>
+#endif
+#include <sys/resource.h>
+#include <sys/times.h>
+#ifndef _ALLBSD_SOURCE
+#include <sys/sysinfo.h>
+#endif
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#if defined(_AIX)
+#include <libperfstat.h>
+#endif
+
+static jlong page_size = 0;
+
+#if defined(_ALLBSD_SOURCE) || defined(_AIX)
+#define MB      (1024UL * 1024UL)
+#else
+
+/* This gets us the new structured proc interfaces of 5.6 & later */
+/* - see comment in <sys/procfs.h> */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+
+#endif /* _ALLBSD_SOURCE */
+
+static struct dirent* read_dir(DIR* dirp, struct dirent* entry) {
+#ifdef __solaris__
+    struct dirent* dbuf = readdir(dirp);
+    return dbuf;
+#else /* __linux__ || _ALLBSD_SOURCE */
+    struct dirent* p;
+    if (readdir_r(dirp, entry, &p) == 0) {
+        return p;
+    } else {
+        return NULL;
+    }
+#endif
+}
+
+// true = get available swap in bytes
+// false = get total swap in bytes
+static jlong get_total_or_available_swap_space_size(JNIEnv* env, jboolean available) {
+#ifdef __solaris__
+    long total, avail;
+    int nswap, i, count;
+    swaptbl_t *stbl;
+    char *strtab;
+
+    // First get the number of swap resource entries
+    if ((nswap = swapctl(SC_GETNSWP, NULL)) == -1) {
+        throw_internal_error(env, "swapctl failed to get nswap");
+        return -1;
+    }
+    if (nswap == 0) {
+        return 0;
+    }
+
+    // Allocate storage for resource entries
+    stbl = (swaptbl_t*) malloc(nswap * sizeof(swapent_t) +
+                               sizeof(struct swaptable));
+    if (stbl == NULL) {
+        JNU_ThrowOutOfMemoryError(env, 0);
+        return -1;
+    }
+
+    // Allocate storage for the table
+    strtab = (char*) malloc((nswap + 1) * MAXPATHLEN);
+    if (strtab == NULL) {
+        free(stbl);
+        JNU_ThrowOutOfMemoryError(env, 0);
+        return -1;
+    }
+
+    for (i = 0; i < (nswap + 1); i++) {
+      stbl->swt_ent[i].ste_path = strtab + (i * MAXPATHLEN);
+    }
+    stbl->swt_n = nswap + 1;
+
+    // Get the entries
+    if ((count = swapctl(SC_LIST, stbl)) < 0) {
+        free(stbl);
+        free(strtab);
+        throw_internal_error(env, "swapctl failed to get swap list");
+        return -1;
+    }
+
+    // Sum the entries to get total and free swap
+    total = 0;
+    avail = 0;
+    for (i = 0; i < count; i++) {
+      total += stbl->swt_ent[i].ste_pages;
+      avail += stbl->swt_ent[i].ste_free;
+    }
+
+    free(stbl);
+    free(strtab);
+    return available ? ((jlong)avail * page_size) :
+                       ((jlong)total * page_size);
+#elif defined(__linux__)
+    int ret;
+    FILE *fp;
+    jlong total = 0, avail = 0;
+
+    struct sysinfo si;
+    ret = sysinfo(&si);
+    if (ret != 0) {
+        throw_internal_error(env, "sysinfo failed to get swap size");
+    }
+    total = (jlong)si.totalswap * si.mem_unit;
+    avail = (jlong)si.freeswap * si.mem_unit;
+
+    return available ? avail : total;
+#elif defined(__APPLE__)
+    struct xsw_usage vmusage;
+    size_t size = sizeof(vmusage);
+    if (sysctlbyname("vm.swapusage", &vmusage, &size, NULL, 0) != 0) {
+        throw_internal_error(env, "sysctlbyname failed");
+    }
+    return available ? (jlong)vmusage.xsu_avail : (jlong)vmusage.xsu_total;
+#else /* _ALLBSD_SOURCE */
+    /*
+     * XXXBSD: there's no way available to get swap info in
+     *         FreeBSD.  Usage of libkvm is not an option here
+     */
+    // throw_internal_error(env, "Unimplemented in FreeBSD");
+    return (0);
+#endif
+}
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_initialize0
+  (JNIEnv *env, jclass cls)
+{
+    page_size = sysconf(_SC_PAGESIZE);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getCommittedVirtualMemorySize0
+  (JNIEnv *env, jobject mbean)
+{
+#ifdef __solaris__
+    psinfo_t psinfo;
+    ssize_t result;
+    size_t remaining;
+    char* addr;
+    int fd;
+
+    fd = open64("/proc/self/psinfo", O_RDONLY, 0);
+    if (fd < 0) {
+        throw_internal_error(env, "Unable to open /proc/self/psinfo");
+        return -1;
+    }
+
+    addr = (char *)&psinfo;
+    for (remaining = sizeof(psinfo_t); remaining > 0;) {
+        result = read(fd, addr, remaining);
+        if (result < 0) {
+            if (errno != EINTR) {
+                close(fd);
+                throw_internal_error(env, "Unable to read /proc/self/psinfo");
+                return -1;
+            }
+        } else {
+            remaining -= result;
+            addr += result;
+        }
+    }
+
+    close(fd);
+    return (jlong) psinfo.pr_size * 1024;
+#elif defined(__linux__)
+    FILE *fp;
+    unsigned long vsize = 0;
+
+    if ((fp = fopen("/proc/self/stat", "r")) == NULL) {
+        throw_internal_error(env, "Unable to open /proc/self/stat");
+        return -1;
+    }
+
+    // Ignore everything except the vsize entry
+    if (fscanf(fp, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %*d %*d %*d %*d %*d %*d %*u %*u %*d %lu %*[^\n]\n", &vsize) == EOF) {
+        throw_internal_error(env, "Unable to get virtual memory usage");
+        fclose(fp);
+        return -1;
+    }
+
+    fclose(fp);
+    return (jlong)vsize;
+#elif defined(__APPLE__)
+    struct task_basic_info t_info;
+    mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT;
+
+    kern_return_t res = task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&t_info, &t_info_count);
+    if (res != KERN_SUCCESS) {
+        throw_internal_error(env, "task_info failed");
+    }
+    return t_info.virtual_size;
+#else /* _ALLBSD_SOURCE */
+    /*
+     * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
+     */
+    // throw_internal_error(env, "Unimplemented in FreeBSD");
+    return (64 * MB);
+#endif
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getTotalSwapSpaceSize0
+  (JNIEnv *env, jobject mbean)
+{
+    return get_total_or_available_swap_space_size(env, JNI_FALSE);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getFreeSwapSpaceSize0
+  (JNIEnv *env, jobject mbean)
+{
+    return get_total_or_available_swap_space_size(env, JNI_TRUE);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuTime0
+  (JNIEnv *env, jobject mbean)
+{
+#ifdef __APPLE__
+    struct rusage usage;
+    if (getrusage(RUSAGE_SELF, &usage) != 0) {
+        throw_internal_error(env, "getrusage failed");
+        return -1;
+    }
+    jlong microsecs =
+        usage.ru_utime.tv_sec * 1000 * 1000 + usage.ru_utime.tv_usec +
+        usage.ru_stime.tv_sec * 1000 * 1000 + usage.ru_stime.tv_usec;
+    return microsecs * 1000;
+#else
+    jlong clk_tck, ns_per_clock_tick;
+    jlong cpu_time_ns;
+    struct tms time;
+
+    /*
+     * BSDNOTE: FreeBSD implements _SC_CLK_TCK since FreeBSD 5, so
+     *          add a magic to handle it
+     */
+#if defined(__solaris__) || defined(_SC_CLK_TCK)
+    clk_tck = (jlong) sysconf(_SC_CLK_TCK);
+#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
+    clk_tck = 100;
+#endif
+    if (clk_tck == -1) {
+        throw_internal_error(env,
+                             "sysconf failed - not able to get clock tick");
+        return -1;
+    }
+
+    times(&time);
+    ns_per_clock_tick = (jlong) 1000 * 1000 * 1000 / (jlong) clk_tck;
+    cpu_time_ns = ((jlong)time.tms_utime + (jlong) time.tms_stime) *
+                      ns_per_clock_tick;
+    return cpu_time_ns;
+#endif
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getFreePhysicalMemorySize0
+  (JNIEnv *env, jobject mbean)
+{
+#ifdef __APPLE__
+    mach_msg_type_number_t count;
+    vm_statistics_data_t vm_stats;
+    kern_return_t res;
+
+    count = HOST_VM_INFO_COUNT;
+    res = host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)&vm_stats, &count);
+    if (res != KERN_SUCCESS) {
+        throw_internal_error(env, "host_statistics failed");
+        return -1;
+    }
+    return (jlong)vm_stats.free_count * page_size;
+#elif defined(_ALLBSD_SOURCE)
+    /*
+     * XXBSDL no way to do it in FreeBSD
+     */
+    // throw_internal_error(env, "unimplemented in FreeBSD")
+    return (128 * MB);
+#elif defined(_AIX)
+    perfstat_memory_total_t memory_info;
+    if (-1 != perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1)) {
+        return (jlong)(memory_info.real_free * 4L * 1024L);
+    }
+    return -1;
+#else // solaris / linux
+    jlong num_avail_physical_pages = sysconf(_SC_AVPHYS_PAGES);
+    return (num_avail_physical_pages * page_size);
+#endif
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getTotalPhysicalMemorySize0
+  (JNIEnv *env, jobject mbean)
+{
+#ifdef _ALLBSD_SOURCE
+    jlong result = 0;
+    int mib[2];
+    size_t rlen;
+
+    mib[0] = CTL_HW;
+    mib[1] = HW_MEMSIZE;
+    rlen = sizeof(result);
+    if (sysctl(mib, 2, &result, &rlen, NULL, 0) != 0) {
+        throw_internal_error(env, "sysctl failed");
+        return -1;
+    }
+    return result;
+#elif defined(_AIX)
+    perfstat_memory_total_t memory_info;
+    if (-1 != perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1)) {
+        return (jlong)(memory_info.real_total * 4L * 1024L);
+    }
+    return -1;
+#else // solaris / linux
+    jlong num_physical_pages = sysconf(_SC_PHYS_PAGES);
+    return (num_physical_pages * page_size);
+#endif
+}
+
+
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getOpenFileDescriptorCount0
+  (JNIEnv *env, jobject mbean)
+{
+#ifdef __APPLE__
+    // This code is influenced by the darwin lsof source
+    pid_t my_pid;
+    struct proc_bsdinfo bsdinfo;
+    struct proc_fdinfo *fds;
+    int nfiles;
+    kern_return_t kres;
+    int res;
+    size_t fds_size;
+
+    kres = pid_for_task(mach_task_self(), &my_pid);
+    if (kres != KERN_SUCCESS) {
+        throw_internal_error(env, "pid_for_task failed");
+        return -1;
+    }
+
+    // get the maximum number of file descriptors
+    res = proc_pidinfo(my_pid, PROC_PIDTBSDINFO, 0, &bsdinfo, PROC_PIDTBSDINFO_SIZE);
+    if (res <= 0) {
+        throw_internal_error(env, "proc_pidinfo with PROC_PIDTBSDINFO failed");
+        return -1;
+    }
+
+    // allocate memory to hold the fd information (we don't acutally use this information
+    // but need it to get the number of open files)
+    fds_size = bsdinfo.pbi_nfiles * sizeof(struct proc_fdinfo);
+    fds = malloc(fds_size);
+    if (fds == NULL) {
+        JNU_ThrowOutOfMemoryError(env, "could not allocate space for file descriptors");
+        return -1;
+    }
+
+    // get the list of open files - the return value is the number of bytes
+    // proc_pidinfo filled in
+    res = proc_pidinfo(my_pid, PROC_PIDLISTFDS, 0, fds, fds_size);
+    if (res <= 0) {
+        free(fds);
+        throw_internal_error(env, "proc_pidinfo failed for PROC_PIDLISTFDS");
+        return -1;
+    }
+    nfiles = res / sizeof(struct proc_fdinfo);
+    free(fds);
+
+    return nfiles;
+#elif defined(_ALLBSD_SOURCE)
+    /*
+     * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
+     */
+    // throw_internal_error(env, "Unimplemented in FreeBSD");
+    return (100);
+#else /* solaris/linux */
+    DIR *dirp;
+    struct dirent dbuf;
+    struct dirent* dentp;
+    jlong fds = 0;
+
+#if defined(_AIX)
+/* AIX does not understand '/proc/self' - it requires the real process ID */
+#define FD_DIR aix_fd_dir
+    char aix_fd_dir[32];     /* the pid has at most 19 digits */
+    snprintf(aix_fd_dir, 32, "/proc/%d/fd", getpid());
+#else
+#define FD_DIR "/proc/self/fd"
+#endif
+
+    dirp = opendir(FD_DIR);
+    if (dirp == NULL) {
+        throw_internal_error(env, "Unable to open directory /proc/self/fd");
+        return -1;
+    }
+
+    // iterate through directory entries, skipping '.' and '..'
+    // each entry represents an open file descriptor.
+    while ((dentp = read_dir(dirp, &dbuf)) != NULL) {
+        if (isdigit(dentp->d_name[0])) {
+            fds++;
+        }
+    }
+
+    closedir(dirp);
+    // subtract by 1 which was the fd open for this implementation
+    return (fds - 1);
+#endif
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getMaxFileDescriptorCount0
+  (JNIEnv *env, jobject mbean)
+{
+    struct rlimit rlp;
+
+    if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) {
+        throw_internal_error(env, "getrlimit failed");
+        return -1;
+    }
+    return (jlong) rlp.rlim_cur;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+package com.sun.management.internal;
+
+import com.sun.management.OperatingSystemMXBean;
+import sun.management.BaseOperatingSystemImpl;
+import sun.management.VMManagement;
+
+/**
+ * Implementation class for the operating system.
+ * Standard and committed hotspot-specific metrics if any.
+ *
+ * ManagementFactory.getOperatingSystemMXBean() returns an instance
+ * of this class.
+ */
+class OperatingSystemImpl extends BaseOperatingSystemImpl
+    implements OperatingSystemMXBean {
+
+    // psapiLock is a lock to make sure only one thread loading
+    // PSAPI DLL.
+    private static Object psapiLock = new Object();
+
+    OperatingSystemImpl(VMManagement vm) {
+        super(vm);
+    }
+
+    @Override
+    public long getCommittedVirtualMemorySize() {
+        synchronized (psapiLock) {
+            return getCommittedVirtualMemorySize0();
+        }
+    }
+
+    @Override
+    public long getTotalSwapSpaceSize() {
+        return getTotalSwapSpaceSize0();
+    }
+
+    @Override
+    public long getFreeSwapSpaceSize() {
+        return getFreeSwapSpaceSize0();
+    }
+
+    @Override
+    public long getProcessCpuTime() {
+        return getProcessCpuTime0();
+    }
+
+    @Override
+    public long getFreePhysicalMemorySize() {
+        return getFreePhysicalMemorySize0();
+    }
+
+    @Override
+    public long getTotalPhysicalMemorySize() {
+        return getTotalPhysicalMemorySize0();
+    }
+
+    @Override
+    public double getSystemCpuLoad() {
+        return getSystemCpuLoad0();
+    }
+
+    @Override
+    public double getProcessCpuLoad() {
+        return getProcessCpuLoad0();
+    }
+
+    /* native methods */
+    private native long getCommittedVirtualMemorySize0();
+    private native long getFreePhysicalMemorySize0();
+    private native long getFreeSwapSpaceSize0();
+    private native double getProcessCpuLoad0();
+    private native long getProcessCpuTime0();
+    private native double getSystemCpuLoad0();
+    private native long getTotalPhysicalMemorySize0();
+    private native long getTotalSwapSpaceSize0();
+
+    static {
+        initialize0();
+    }
+
+    private static native void initialize0();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,1363 @@
+/*
+ * Copyright (c) 2003, 2015, 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.
+ */
+
+#include "jni.h"
+#include "jni_util.h"
+#include "jlong.h"
+#include "jvm.h"
+#include "management_ext.h"
+#include "com_sun_management_internal_OperatingSystemImpl.h"
+
+#include <psapi.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include <malloc.h>
+#pragma warning (push,0)
+#include <windows.h>
+#pragma warning (pop)
+#include <stdio.h>
+#include <time.h>
+#include <stdint.h>
+#include <assert.h>
+
+/* Disable warnings due to broken header files from Microsoft... */
+#pragma warning(push, 3)
+#include <pdh.h>
+#include <pdhmsg.h>
+#include <process.h>
+#pragma warning(pop)
+
+typedef unsigned __int32 juint;
+typedef unsigned __int64 julong;
+
+static void set_low(jlong* value, jint low) {
+    *value &= (jlong)0xffffffff << 32;
+    *value |= (jlong)(julong)(juint)low;
+}
+
+static void set_high(jlong* value, jint high) {
+    *value &= (jlong)(julong)(juint)0xffffffff;
+    *value |= (jlong)high       << 32;
+}
+
+static jlong jlong_from(jint h, jint l) {
+    jlong result = 0; // initialization to avoid warning
+    set_high(&result, h);
+    set_low(&result,  l);
+    return result;
+}
+
+static HANDLE main_process;
+
+static void perfInit(void);
+
+JNIEXPORT void JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_initialize0
+  (JNIEnv *env, jclass cls)
+{
+    main_process = GetCurrentProcess();
+    perfInit();
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getCommittedVirtualMemorySize0
+  (JNIEnv *env, jobject mbean)
+{
+    PROCESS_MEMORY_COUNTERS pmc;
+    if (GetProcessMemoryInfo(main_process, &pmc, sizeof(PROCESS_MEMORY_COUNTERS)) == 0) {
+        return (jlong)-1L;
+    } else {
+        return (jlong) pmc.PagefileUsage;
+    }
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getTotalSwapSpaceSize0
+  (JNIEnv *env, jobject mbean)
+{
+    MEMORYSTATUSEX ms;
+    ms.dwLength = sizeof(ms);
+    GlobalMemoryStatusEx(&ms);
+    return (jlong) ms.ullTotalPageFile;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getFreeSwapSpaceSize0
+  (JNIEnv *env, jobject mbean)
+{
+    MEMORYSTATUSEX ms;
+    ms.dwLength = sizeof(ms);
+    GlobalMemoryStatusEx(&ms);
+    return (jlong) ms.ullAvailPageFile;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuTime0
+  (JNIEnv *env, jobject mbean)
+{
+
+    FILETIME process_creation_time, process_exit_time,
+             process_user_time, process_kernel_time;
+
+    // Using static variables declared above
+    // Units are 100-ns intervals.  Convert to ns.
+    GetProcessTimes(main_process, &process_creation_time,
+                    &process_exit_time,
+                    &process_kernel_time, &process_user_time);
+    return (jlong_from(process_user_time.dwHighDateTime,
+                        process_user_time.dwLowDateTime) +
+            jlong_from(process_kernel_time.dwHighDateTime,
+                        process_kernel_time.dwLowDateTime)) * 100;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getFreePhysicalMemorySize0
+  (JNIEnv *env, jobject mbean)
+{
+    MEMORYSTATUSEX ms;
+    ms.dwLength = sizeof(ms);
+    GlobalMemoryStatusEx(&ms);
+    return (jlong) ms.ullAvailPhys;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getTotalPhysicalMemorySize0
+  (JNIEnv *env, jobject mbean)
+{
+    MEMORYSTATUSEX ms;
+    ms.dwLength = sizeof(ms);
+    GlobalMemoryStatusEx(&ms);
+    return (jlong) ms.ullTotalPhys;
+}
+
+/* Performance Data Helper API (PDH) support */
+
+typedef PDH_STATUS (WINAPI *PdhAddCounterFunc)(
+                           HQUERY      hQuery,
+                           LPCSTR      szFullCounterPath,
+                           DWORD       dwUserData,
+                           HCOUNTER    *phCounter
+                           );
+typedef PDH_STATUS (WINAPI *PdhOpenQueryFunc)(
+                           LPCWSTR     szDataSource,
+                           DWORD       dwUserData,
+                           HQUERY      *phQuery
+                           );
+typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)(
+                           HQUERY      hQuery
+                           );
+
+typedef PDH_STATUS (WINAPI *PdhEnumObjectItemsFunc)(
+                           LPCTSTR     szDataSource,
+                           LPCTSTR     szMachineName,
+                           LPCTSTR     szObjectName,
+                           LPTSTR      mszCounterList,
+                           LPDWORD     pcchCounterListLength,
+                           LPTSTR      mszInstanceList,
+                           LPDWORD     pcchInstanceListLength,
+                           DWORD       dwDetailLevel,
+                           DWORD       dwFlags
+                           );
+typedef PDH_STATUS (WINAPI *PdhRemoveCounterFunc)(
+                           HCOUNTER   hCounter
+                           );
+typedef PDH_STATUS (WINAPI *PdhLookupPerfNameByIndexFunc)(
+                           LPCSTR     szMachineName,
+                           DWORD      dwNameIndex,
+                           LPSTR      szNameBuffer,
+                           LPDWORD    pcchNameBufferSize
+                           );
+typedef DWORD (WINAPI *PdhCloseQueryFunc)(
+                      HQUERY      hQuery
+                      );
+
+typedef DWORD (WINAPI *PdhGetFormattedCounterValueFunc)(
+                      HCOUNTER                hCounter,
+                      DWORD                   dwFormat,
+                      LPDWORD                 lpdwType,
+                      PPDH_FMT_COUNTERVALUE   pValue
+                      );
+
+static PdhAddCounterFunc PdhAddCounter_i;
+static PdhOpenQueryFunc PdhOpenQuery_i;
+static PdhCloseQueryFunc PdhCloseQuery_i;
+static PdhCollectQueryDataFunc PdhCollectQueryData_i;
+static PdhGetFormattedCounterValueFunc PdhGetFormattedCounterValue_i;
+static PdhEnumObjectItemsFunc PdhEnumObjectItems_i;
+static PdhRemoveCounterFunc PdhRemoveCounter_i;
+static PdhLookupPerfNameByIndexFunc PdhLookupPerfNameByIndex_i;
+
+/*
+ * Struct for PDH queries.
+ */
+typedef struct {
+    HQUERY      query;
+    uint64_t    lastUpdate; // Last time query was updated (ticks)
+} UpdateQueryS, *UpdateQueryP;
+
+// Min time between query updates (ticks)
+static const int MIN_UPDATE_INTERVAL = 500;
+
+/*
+ * Struct for a PDH query with multiple counters.
+ */
+typedef struct {
+    UpdateQueryS  query;
+    HCOUNTER*     counters;
+    int           noOfCounters;
+} MultipleCounterQueryS, *MultipleCounterQueryP;
+
+/*
+ * Struct for a PDH query with a single counter.
+ */
+typedef struct {
+    UpdateQueryS  query;
+    HCOUNTER      counter;
+} SingleCounterQueryS, *SingleCounterQueryP;
+
+
+typedef struct {
+    CRITICAL_SECTION cs;
+    DWORD owningThread;
+    DWORD recursionCount;
+} PdhCriticalSectionS, *PdhCriticalSectionP;
+
+static PdhCriticalSectionS initializationLock;
+
+static void InitializePdhCriticalSection(PdhCriticalSectionP criticalSection) {
+    assert(criticalSection);
+
+    InitializeCriticalSection(&criticalSection->cs);
+    criticalSection->owningThread = 0;
+    criticalSection->recursionCount = 0;
+}
+
+static void EnterPdhCriticalSection(PdhCriticalSectionP criticalSection) {
+    assert(criticalSection);
+
+    EnterCriticalSection(&criticalSection->cs);
+    criticalSection->recursionCount++;
+    if (!criticalSection->owningThread) {
+        criticalSection->owningThread = GetCurrentThreadId();
+    }
+}
+
+static void LeavePdhCriticalSection(PdhCriticalSectionP criticalSection) {
+    assert(criticalSection);
+    assert(GetCurrentThreadId() == criticalSection->owningThread);
+    assert(criticalSection->recursionCount >= 1);
+
+    criticalSection->recursionCount--;
+    if (!criticalSection->recursionCount) {
+        criticalSection->owningThread = 0;
+    }
+    LeaveCriticalSection(&criticalSection->cs);
+}
+
+/*
+ * INFO: Using PDH APIs Correctly in a Localized Language (Q287159)
+ *   http://support.microsoft.com/default.aspx?scid=kb;EN-US;q287159
+ * The index value for the base system counters and objects like processor,
+ * process, thread, memory, and so forth are always the same irrespective
+ * of the localized version of the operating system or service pack installed.
+ * To find the correct index for an object or counter, inspect the registry key/value:
+ * [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Perflib\009\Counter]
+ */
+static const DWORD PDH_PROCESSOR_IDX = 238;
+static const DWORD PDH_PROCESSOR_TIME_IDX = 6;
+static const DWORD PDH_PROCESS_IDX = 230;
+static const DWORD PDH_ID_PROCESS_IDX = 784;
+
+/* useful pdh fmt's */
+static const char* const OBJECT_COUNTER_FMT = "\\%s\\%s";
+static const size_t OBJECT_COUNTER_FMT_LEN = 2;
+static const char* const OBJECT_WITH_INSTANCES_COUNTER_FMT = "\\%s(%s)\\%s";
+static const size_t OBJECT_WITH_INSTANCES_COUNTER_FMT_LEN = 4;
+static const char* const PROCESS_OBJECT_INSTANCE_COUNTER_FMT = "\\%s(%s#%s)\\%s";
+static const size_t PROCESS_OBJECT_INSTANCE_COUNTER_FMT_LEN = 5;
+
+static const char* pdhProcessImageName = NULL; /* "java" */
+static char* pdhIDProcessCounterFmt = NULL;    /* "\Process(java#%d)\ID Process" */
+
+static int numberOfJavaProcessesAtInitialization = 0;
+
+/*
+ * Currently used CPU queries/counters and variables
+ */
+static SingleCounterQueryP processTotalCPULoad = NULL;
+static MultipleCounterQueryP multiCounterCPULoad = NULL;
+static double cpuFactor = .0;
+static DWORD  numCpus = 0;
+
+/*
+ * Seems WinXP PDH returns PDH_MORE_DATA whenever we send in a NULL buffer.
+ * Let's just ignore it, since we make sure we have enough buffer anyway.
+ */
+static int
+pdhFail(PDH_STATUS pdhStat) {
+    return pdhStat != ERROR_SUCCESS && pdhStat != PDH_MORE_DATA;
+}
+
+static const char*
+allocateAndCopy(const char* const originalString) {
+    size_t len;
+    char* allocatedString;
+
+    assert(originalString);
+
+    len = strlen(originalString);
+
+    allocatedString = malloc(len + 1);
+
+    if (!allocatedString) {
+        return NULL;
+    }
+
+    strncpy(allocatedString, originalString, len);
+    allocatedString[len] = '\0';
+
+    return allocatedString;
+}
+
+/*
+ * Allocates memory into the supplied pointer and
+ * fills it with the localized PDH artifact description, if indexed correctly.
+ * Caller owns the memory from the point of returning from this function.
+ *
+ * @param index    the PDH counter index as specified in the registry
+ * @param ppBuffer pointer to a char*.
+ * @return         0 if successful, negative on failure.
+ */
+static int
+lookupNameByIndex(DWORD index, char** ppBuffer) {
+    DWORD size;
+
+    assert(ppBuffer);
+
+    /* determine size needed */
+    if (PdhLookupPerfNameByIndex_i(NULL, index, NULL, &size) != PDH_MORE_DATA) {
+      /* invalid index? */
+      return -1;
+    }
+
+    *ppBuffer = malloc((size_t)size);
+
+    if (!*ppBuffer) {
+        return -1;
+    }
+
+    if (PdhLookupPerfNameByIndex_i(NULL, index, *ppBuffer, &size) != ERROR_SUCCESS) {
+        free(*ppBuffer);
+        *ppBuffer = NULL;
+        return -1;
+    }
+
+    /* windows vista does not null-terminate the string
+     * (although the docs says it will) */
+    (*ppBuffer)[size - 1] = '\0';
+
+    return 0;
+}
+
+/*
+* Construct a fully qualified PDH path
+*
+* @param objectName   a PDH Object string representation (required)
+* @param counterName  a PDH Counter string representation (required)
+* @param imageName    a process image name string, ex. "java" (opt)
+* @param instance     an instance string, ex. "0", "1", ... (opt)
+* @return             the fully qualified PDH path.
+*
+* Caller will own the returned malloc:ed string
+*/
+static const char*
+makeFullCounterPath(const char* const objectName,
+                    const char* const counterName,
+                    const char* const imageName,
+                    const char* const instance) {
+
+    size_t fullCounterPathLen;
+    char* fullCounterPath;
+
+    assert(objectName);
+    assert(counterName);
+
+    fullCounterPathLen = strlen(objectName);
+    fullCounterPathLen += strlen(counterName);
+
+    if (imageName) {
+        /*
+         * For paths using the "Process" Object.
+         *
+         * Examples:
+         * abstract: "\Process(imageName#instance)\Counter"
+         * actual:   "\Process(java#2)\ID Process"
+         */
+        fullCounterPathLen += PROCESS_OBJECT_INSTANCE_COUNTER_FMT_LEN;
+        fullCounterPathLen += strlen(imageName);
+
+        /*
+         * imageName must be passed together with an associated
+         * instance "number" ("0", "1", "2", ...).
+         * This is required in order to create valid "Process" Object paths.
+         *
+         * Examples: "\Process(java#0)", \Process(java#1"), ...
+         */
+        assert(instance);
+
+        fullCounterPathLen += strlen(instance);
+
+        fullCounterPath = malloc(fullCounterPathLen + 1);
+
+        if (!fullCounterPath) {
+            return NULL;
+        }
+
+        _snprintf(fullCounterPath,
+                  fullCounterPathLen,
+                  PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
+                  objectName,
+                  imageName,
+                  instance,
+                  counterName);
+    } else {
+        if (instance) {
+            /*
+             * For paths where the Object has multiple instances.
+             *
+             * Examples:
+             * abstract: "\Object(instance)\Counter"
+             * actual:   "\Processor(0)\% Privileged Time"
+             */
+            fullCounterPathLen += strlen(instance);
+            fullCounterPathLen += OBJECT_WITH_INSTANCES_COUNTER_FMT_LEN;
+        } else {
+            /*
+             * For "normal" paths.
+             *
+             * Examples:
+             * abstract: "\Object\Counter"
+             * actual:   "\Memory\Available Mbytes"
+             */
+            fullCounterPathLen += OBJECT_COUNTER_FMT_LEN;
+        }
+
+        fullCounterPath = malloc(fullCounterPathLen + 1);
+
+        if (!fullCounterPath) {
+            return NULL;
+        }
+
+        if (instance) {
+            _snprintf(fullCounterPath,
+                      fullCounterPathLen,
+                      OBJECT_WITH_INSTANCES_COUNTER_FMT,
+                      objectName,
+                      instance,
+                      counterName);
+        } else {
+            _snprintf(fullCounterPath,
+                      fullCounterPathLen,
+                      OBJECT_COUNTER_FMT,
+                      objectName,
+                      counterName);
+        }
+    }
+
+    fullCounterPath[fullCounterPathLen] = '\0';
+
+    return fullCounterPath;
+}
+
+/*
+ * Resolves an index for a PDH artifact to
+ * a localized, malloc:ed string representation.
+ * Caller will own the returned malloc:ed string.
+ *
+ * @param pdhArtifactIndex  PDH index
+ * @return                  malloc:ed string representation
+ *                          of the requested pdh artifact (localized).
+ *                          NULL on failure.
+ */
+static const char*
+getPdhLocalizedArtifact(DWORD pdhArtifactIndex) {
+    char* pdhLocalizedArtifactString;
+
+    if (lookupNameByIndex(pdhArtifactIndex,
+                          &pdhLocalizedArtifactString) != 0) {
+        return NULL;
+    }
+
+    return pdhLocalizedArtifactString;
+}
+
+static void
+pdhCleanup(HQUERY* const query, HCOUNTER* const counter) {
+    if (counter && *counter) {
+        PdhRemoveCounter_i(*counter);
+        *counter = NULL;
+    }
+    if (query && *query) {
+        PdhCloseQuery_i(*query);
+        *query = NULL;
+    }
+}
+
+static void
+destroySingleCounter(SingleCounterQueryP counterQuery) {
+    if (counterQuery) {
+        pdhCleanup(&counterQuery->query.query, &counterQuery->counter);
+    }
+}
+
+static void
+destroyMultiCounter(MultipleCounterQueryP multiCounterQuery) {
+    int i;
+    if (multiCounterQuery) {
+        if (multiCounterQuery->counters) {
+            for (i = 0; i < multiCounterQuery->noOfCounters; i++) {
+                pdhCleanup(NULL, &multiCounterQuery->counters[i]);
+            }
+            free(multiCounterQuery->counters);
+            multiCounterQuery->counters = NULL;
+        }
+        pdhCleanup(&multiCounterQuery->query.query, NULL);
+    }
+}
+
+static int
+openQuery(HQUERY* const query) {
+    assert(query);
+
+    if (PdhOpenQuery_i(NULL, 0, query) != ERROR_SUCCESS) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+addCounter(HQUERY query,
+           const char* const fullCounterPath,
+           HCOUNTER* const counter) {
+
+    assert(fullCounterPath);
+    assert(counter);
+
+    if (PdhAddCounter_i(query,
+                        fullCounterPath,
+                        0,
+                        counter) != ERROR_SUCCESS) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * Sets up the supplied SingleCounterQuery to listen for the specified counter.
+ *
+ * @param counterQuery       the counter query to set up.
+ * @param fullCounterPath    the string specifying the full path to the counter.
+ * @returns                  0 if successful, negative on failure.
+ */
+static int
+initializeSingleCounterQuery(SingleCounterQueryP counterQuery,
+                             const char* const fullCounterPath) {
+    assert(counterQuery);
+    assert(fullCounterPath);
+
+    if (openQuery(&counterQuery->query.query) == 0) {
+        if (addCounter(counterQuery->query.query,
+                       fullCounterPath,
+                       &counterQuery->counter) == 0) {
+            return 0;
+        }
+    }
+
+    return -1;
+}
+
+/*
+ * Sets up a SingleCounterQuery
+ *
+ * param counter             the counter query to set up.
+ * param localizedObject     string representing the PDH object to query
+ * param localizedCounter    string representing the PDH counter to query
+ * param processImageName    if the counter query needs the process image name ("java")
+ * param instance            if the counter has instances, this is the instance ("\Processor(0)\")
+                                 where 0 is the instance
+ * param firstSampleOnInit   for counters that need two queries to yield their values,
+                                 the first query can be issued just after initialization
+ *
+ * @returns                   0 if successful, negative on failure.
+ */
+static int
+initializeSingleCounter(SingleCounterQueryP const counter,
+                        const char* const localizedObject,
+                        const char* const localizedCounter,
+                        const char* const processImageName,
+                        const char* const instance,
+                        BOOL firstSampleOnInit) {
+    int retValue = -1;
+
+    const char* fullCounterPath = makeFullCounterPath(localizedObject,
+                                                      localizedCounter,
+                                                      processImageName,
+                                                      instance);
+
+    if (fullCounterPath) {
+
+        assert(counter);
+
+        if (initializeSingleCounterQuery(counter, fullCounterPath) == 0) {
+            /*
+             * According to the MSDN documentation, rate counters must be read twice:
+             *
+             * "Obtaining the value of rate counters such as Page faults/sec requires that
+             *  PdhCollectQueryData be called twice, with a specific time interval between
+             *  the two calls, before calling PdhGetFormattedCounterValue. Call Sleep to
+             *  implement the waiting period between the two calls to PdhCollectQueryData."
+             *
+             *  Take the first sample here already to allow for the next (first) "real" sample
+             *  to succeed.
+             */
+            if (firstSampleOnInit) {
+                PdhCollectQueryData_i(counter->query.query);
+            }
+
+            retValue = 0;
+        }
+        free((char*)fullCounterPath);
+    }
+
+    return retValue;
+}
+
+static void
+perfInit(void) {
+    InitializePdhCriticalSection(&initializationLock);
+}
+
+static int
+getProcessID() {
+    static int myPid = 0;
+    if (0 == myPid) {
+        myPid = _getpid();
+    }
+    return myPid;
+}
+
+/*
+ * Working against the Process object and it's related counters is inherently problematic
+ * when using the PDH API:
+ *
+ * For PDH, a process is not primarily identified by it's process id,
+ * but with a sequential number, for example \Process(java#0), \Process(java#1), ....
+ * The really bad part is that this list is reset as soon as one process exits:
+ * If \Process(java#1) exits, \Process(java#3) now becomes \Process(java#2) etc.
+ *
+ * The PDH query api requires a process identifier to be submitted when registering
+ * a query, but as soon as the list resets, the query is invalidated (since the name
+ * changed).
+ *
+ * Solution:
+ * The #number identifier for a Process query can only decrease after process creation.
+ *
+ * Therefore we create an array of counter queries for all process object instances
+ * up to and including ourselves:
+ *
+ * Ex. we come in as third process instance (java#2), we then create and register
+ * queries for the following Process object instances:
+ * java#0, java#1, java#2
+ *
+ * currentQueryIndexForProcess() keeps track of the current "correct" query
+ * (in order to keep this index valid when the list resets from underneath,
+ * ensure to call getCurrentQueryIndexForProcess() before every query involving
+ * Process object instance data).
+ */
+static int
+currentQueryIndexForProcess(void) {
+    HQUERY tmpQuery = NULL;
+    HCOUNTER handleCounter = NULL;
+    int retValue = -1;
+
+    assert(pdhProcessImageName);
+    assert(pdhIDProcessCounterFmt);
+
+    if (openQuery(&tmpQuery) == 0) {
+        int index;
+
+        /* iterate over all instance indexes and try to find our own pid */
+        for (index = 0; index < INT_MAX; ++index) {
+            char fullIDProcessCounterPath[MAX_PATH];
+            PDH_FMT_COUNTERVALUE counterValue;
+            PDH_STATUS res;
+
+            _snprintf(fullIDProcessCounterPath,
+                      MAX_PATH,
+                      pdhIDProcessCounterFmt,
+                      index);
+
+            if (addCounter(tmpQuery, fullIDProcessCounterPath, &handleCounter) != 0) {
+                break;
+            }
+
+            res = PdhCollectQueryData_i(tmpQuery);
+
+            if (PDH_INVALID_HANDLE == res || PDH_NO_DATA == res) {
+                break;
+            }
+
+            PdhGetFormattedCounterValue_i(handleCounter,
+                                          PDH_FMT_LONG,
+                                          NULL,
+                                          &counterValue);
+            /*
+             * This check seems to be needed for Win2k SMP boxes, since
+             * they for some reason don't return PDH_NO_DATA for non existing
+             * counters.
+             */
+            if (counterValue.CStatus != PDH_CSTATUS_VALID_DATA) {
+                break;
+            }
+
+            if ((LONG)getProcessID() == counterValue.longValue) {
+                retValue = index;
+                break;
+            }
+        }
+    }
+
+    pdhCleanup(&tmpQuery, &handleCounter);
+
+    return retValue;
+}
+
+/*
+ * If successful, returns the #index corresponding to our PID
+ * as resolved by the pdh query:
+ * "\Process(java#index)\ID Process" (or localized equivalent)
+ *
+ * This function should be called before attempting to read
+ * from any Process related counter(s), and the return value
+ * is the index to be used for indexing an array of Process object query's:
+ *
+ * Example:
+ * processTotalCPULoad[currentQueryIndex].query
+ *
+ * Returns -1 on failure.
+ */
+static int
+getCurrentQueryIndexForProcess() {
+    int currentQueryIndex = currentQueryIndexForProcess();
+
+    assert(currentQueryIndex >= 0 &&
+           currentQueryIndex < numberOfJavaProcessesAtInitialization);
+
+    return currentQueryIndex;
+}
+
+/*
+ * Returns the PDH string identifying the current process image name.
+ * Use this name as a qualifier when getting counters from the PDH Process Object
+ * representing your process.
+
+ * Example:
+ * "\Process(java#0)\Virtual Bytes" - where "java" is the PDH process
+ * image name.
+ *
+ * Please note that the process image name is not necessarily "java",
+ * hence the use of GetModuleFileName() to detect the process image name.
+ *
+ * @return   the process image name to be used when retrieving
+ *           PDH counters from the current process. The caller will
+             own the returned malloc:ed string. NULL if failure.
+ */
+static const char*
+getPdhProcessImageName() {
+    char moduleName[MAX_PATH];
+    char* processImageName;
+    char* dotPos;
+
+    // Find our module name and use it to extract the image name used by PDH
+    DWORD getmfnReturn = GetModuleFileName(NULL, moduleName, sizeof(moduleName));
+
+    if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+        return NULL;
+    }
+
+    if (getmfnReturn >= MAX_PATH || 0 == getmfnReturn) {
+        return NULL;
+    }
+
+    processImageName = strrchr(moduleName, '\\'); //drop path
+    processImageName++;                           //skip slash
+    dotPos = strrchr(processImageName, '.');      //drop .exe
+    dotPos[0] = '\0';
+
+    return allocateAndCopy(processImageName);
+}
+
+/*
+ * Sets up the supplied MultipleCounterQuery to check on the processors via PDH CPU counters.
+ * TODO: Refactor and prettify as with the the SingleCounter queries
+ * if more MultipleCounterQueries are discovered/needed.
+ *
+ * @param multiCounterCPULoad  a pointer to a MultipleCounterQueryS, will be filled in with
+ *                             the necessary info to check the PDH processor counters.
+ * @return                     0 if successful, negative on failure.
+ */
+static int
+initializeMultipleCounterForCPUs(MultipleCounterQueryP multiCounterCPULoad) {
+    DWORD cSize = 0;
+    DWORD iSize = 0;
+    DWORD pCount;
+    DWORD index;
+    char* processor = NULL; //'Processor' == PDH_PROCESSOR_IDX
+    char* time = NULL;      //'Time' == PDH_PROCESSOR_TIME_IDX
+    char* instances = NULL;
+    char* tmp;
+    int   retValue = -1;
+    PDH_STATUS pdhStat;
+
+    if (lookupNameByIndex(PDH_PROCESSOR_IDX, &processor) != 0) {
+        goto end;
+    }
+
+    if (lookupNameByIndex(PDH_PROCESSOR_TIME_IDX, &time) != 0) {
+        goto end;
+    }
+
+    //ok, now we have enough to enumerate all processors.
+    pdhStat = PdhEnumObjectItems_i(
+                                   NULL, // reserved
+                                   NULL, // local machine
+                                   processor, // object to enumerate
+                                   NULL, // pass in NULL buffers
+                                   &cSize, // and 0 length to get
+                                   NULL, // required size
+                                   &iSize, // of the buffers in chars
+                                   PERF_DETAIL_WIZARD, // counter detail level
+                                   0);
+
+    if (pdhFail(pdhStat)) {
+        goto end;
+    }
+
+    instances = calloc(iSize, 1);
+
+    if (!instances) {
+        goto end;
+    }
+
+    cSize = 0;
+
+    pdhStat = PdhEnumObjectItems_i(
+                                   NULL, // reserved
+                                   NULL, // local machine
+                                   processor, // object to enumerate
+                                   NULL, // pass in NULL buffers
+                                   &cSize,
+                                   instances, // now allocated to be filled in
+                                   &iSize, // and size is known
+                                   PERF_DETAIL_WIZARD, // counter detail level
+                                   0);
+
+    if (pdhFail(pdhStat)) {
+        goto end;
+    }
+
+    // enumerate the Processor instances ("\Processor(0)", "\Processor(1)", ..., "\Processor(_Total)")
+    for (pCount = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[strlen(tmp)+1], pCount++);
+
+    assert(pCount == numCpus+1);
+
+    //ok, we now have the number of Processor instances - allocate an HCOUNTER for each
+    multiCounterCPULoad->counters = (HCOUNTER*)malloc(pCount * sizeof(HCOUNTER));
+
+    if (!multiCounterCPULoad->counters) {
+        goto end;
+    }
+
+    multiCounterCPULoad->noOfCounters = pCount;
+
+    if (openQuery(&multiCounterCPULoad->query.query) != 0) {
+        goto end;
+    }
+
+    // fetch instance and register its corresponding HCOUNTER with the query
+    for (index = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[strlen(tmp)+1], ++index) {
+        const char* const fullCounterPath = makeFullCounterPath(processor, time, NULL, tmp);
+
+        if (!fullCounterPath) {
+            goto end;
+        }
+
+        retValue = addCounter(multiCounterCPULoad->query.query,
+                              fullCounterPath,
+                              &multiCounterCPULoad->counters[index]);
+
+        free((char*)fullCounterPath);
+
+        if (retValue != 0) {
+            goto end;
+        }
+    }
+
+    // Query once to initialize the counters which require at least two samples
+    // (like the % CPU usage) to calculate correctly.
+    PdhCollectQueryData_i(multiCounterCPULoad->query.query);
+
+  end:
+    if (processor) {
+        free(processor);
+    }
+
+    if (time) {
+        free(time);
+    }
+
+    if (instances) {
+        free(instances);
+    }
+
+    return retValue;
+}
+
+/*
+ * Dynamically sets up function pointers to the PDH library.
+ *
+ * @param h  HMODULE for the PDH library
+ * @return   0 on success, negative on failure.
+ */
+static int
+bindPdhFunctionPointers(HMODULE h) {
+    assert(h);
+    assert(GetCurrentThreadId() == initializationLock.owningThread);
+
+    /* The 'A' at the end means the ANSI (not the UNICODE) vesions of the methods */
+    PdhAddCounter_i         = (PdhAddCounterFunc)GetProcAddress(h, "PdhAddCounterA");
+    PdhOpenQuery_i         = (PdhOpenQueryFunc)GetProcAddress(h, "PdhOpenQueryA");
+    PdhCloseQuery_i         = (PdhCloseQueryFunc)GetProcAddress(h, "PdhCloseQuery");
+    PdhCollectQueryData_i     = (PdhCollectQueryDataFunc)GetProcAddress(h, "PdhCollectQueryData");
+    PdhGetFormattedCounterValue_i = (PdhGetFormattedCounterValueFunc)GetProcAddress(h, "PdhGetFormattedCounterValue");
+    PdhEnumObjectItems_i         = (PdhEnumObjectItemsFunc)GetProcAddress(h, "PdhEnumObjectItemsA");
+    PdhRemoveCounter_i         = (PdhRemoveCounterFunc)GetProcAddress(h, "PdhRemoveCounter");
+    PdhLookupPerfNameByIndex_i     = (PdhLookupPerfNameByIndexFunc)GetProcAddress(h, "PdhLookupPerfNameByIndexA");
+
+    if (!PdhAddCounter_i || !PdhOpenQuery_i ||
+        !PdhCloseQuery_i || !PdhCollectQueryData_i ||
+        !PdhGetFormattedCounterValue_i || !PdhEnumObjectItems_i ||
+        !PdhRemoveCounter_i || !PdhLookupPerfNameByIndex_i)
+    {
+        return -1;
+    }
+    return 0;
+}
+
+/*
+ * Returns the counter value as a double for the specified query.
+ * Will collect the query data and update the counter values as necessary.
+ *
+ * @param query       the query to update (if needed).
+ * @param c           the counter to read.
+ * @param value       where to store the formatted value.
+ * @param format      the format to use (i.e. PDH_FMT_DOUBLE, PDH_FMT_LONG etc)
+ * @return            0 if no error
+ *                    -1 if PdhCollectQueryData fails
+ *                    -2 if PdhGetFormattedCounterValue fails
+ */
+static int
+getPerformanceData(UpdateQueryP query, HCOUNTER c, PDH_FMT_COUNTERVALUE* value, DWORD format) {
+    clock_t now = clock();
+
+    /*
+     * Need to limit how often we update the query
+     * to minimize the Heisenberg effect.
+     * (PDH behaves erratically if the counters are
+     * queried too often, especially counters that
+     * store and use values from two consecutive updates,
+     * like cpu load.)
+     */
+    if (now - query->lastUpdate > MIN_UPDATE_INTERVAL) {
+        if (PdhCollectQueryData_i(query->query) != ERROR_SUCCESS) {
+            return -1;
+        }
+        query->lastUpdate = now;
+    }
+
+    if (PdhGetFormattedCounterValue_i(c, format, NULL, value) != ERROR_SUCCESS) {
+        return -2;
+    }
+
+    return 0;
+}
+
+static int
+allocateAndInitializePdhConstants() {
+    const char* pdhLocalizedProcessObject = NULL;
+    const char* pdhLocalizedIDProcessCounter = NULL;
+    size_t pdhIDProcessCounterFmtLen;
+    int currentQueryIndex;
+    int retValue = -1;
+
+    assert(GetCurrentThreadId() == initializationLock.owningThread);
+
+    assert(!pdhProcessImageName);
+    pdhProcessImageName = getPdhProcessImageName();
+    if (!pdhProcessImageName) {
+        goto end;
+    }
+
+    pdhLocalizedProcessObject = getPdhLocalizedArtifact(PDH_PROCESS_IDX);
+    if (!pdhLocalizedProcessObject) {
+        goto end;
+    }
+
+    pdhLocalizedIDProcessCounter = getPdhLocalizedArtifact(PDH_ID_PROCESS_IDX);
+    if (!pdhLocalizedIDProcessCounter) {
+        goto end;
+    }
+
+    assert(!pdhIDProcessCounterFmt);
+
+    pdhIDProcessCounterFmtLen = strlen(pdhProcessImageName);
+    pdhIDProcessCounterFmtLen += strlen(pdhLocalizedProcessObject);
+    pdhIDProcessCounterFmtLen += strlen(pdhLocalizedIDProcessCounter);
+    pdhIDProcessCounterFmtLen += PROCESS_OBJECT_INSTANCE_COUNTER_FMT_LEN;
+    pdhIDProcessCounterFmtLen += 2; // "%d"
+
+    assert(pdhIDProcessCounterFmtLen < MAX_PATH);
+    pdhIDProcessCounterFmt = malloc(pdhIDProcessCounterFmtLen + 1);
+    if (!pdhIDProcessCounterFmt) {
+        goto end;
+    }
+
+    /* "\Process(java#%d)\ID Process" */
+    _snprintf(pdhIDProcessCounterFmt,
+              pdhIDProcessCounterFmtLen,
+              PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
+              pdhLocalizedProcessObject,
+              pdhProcessImageName,
+              "%d",
+              pdhLocalizedIDProcessCounter);
+
+    pdhIDProcessCounterFmt[pdhIDProcessCounterFmtLen] = '\0';
+
+    assert(0 == numberOfJavaProcessesAtInitialization);
+    currentQueryIndex = currentQueryIndexForProcess();
+    if (-1 == currentQueryIndex) {
+        goto end;
+    }
+
+    numberOfJavaProcessesAtInitialization = currentQueryIndex + 1;
+    assert(numberOfJavaProcessesAtInitialization >= 1);
+
+    retValue = 0;
+
+  end:
+
+    if (pdhLocalizedProcessObject) {
+        free((char*)pdhLocalizedProcessObject);
+    }
+
+    if (pdhLocalizedIDProcessCounter) {
+        free((char*)pdhLocalizedIDProcessCounter);
+    }
+
+    return retValue;
+}
+
+static void
+deallocatePdhConstants() {
+    assert(GetCurrentThreadId() == initializationLock.owningThread);
+
+    if (pdhProcessImageName) {
+        free((char*)pdhProcessImageName);
+        pdhProcessImageName = NULL;
+    }
+
+    if (pdhIDProcessCounterFmt) {
+      free(pdhIDProcessCounterFmt);
+      pdhIDProcessCounterFmt = NULL;
+    }
+
+    numberOfJavaProcessesAtInitialization = 0;
+}
+
+static int
+initializeCPUCounters() {
+    SYSTEM_INFO si;
+    char* localizedProcessObject;
+    char* localizedProcessorTimeCounter;
+    int i;
+    int retValue = -1;
+
+    assert(GetCurrentThreadId() == initializationLock.owningThread);
+
+    assert(0 == numCpus);
+    GetSystemInfo(&si);
+    numCpus = si.dwNumberOfProcessors;
+    assert(numCpus >= 1);
+
+    /* Initialize the denominator for the jvm load calculations */
+    assert(.0 == cpuFactor);
+    cpuFactor = numCpus * 100;
+
+    if (lookupNameByIndex(PDH_PROCESS_IDX,
+                          &localizedProcessObject) == 0) {
+
+        if (lookupNameByIndex(PDH_PROCESSOR_TIME_IDX,
+                              &localizedProcessorTimeCounter) == 0) {
+
+            assert(processTotalCPULoad);
+            assert(pdhProcessImageName);
+
+            for (i = 0; i < numberOfJavaProcessesAtInitialization; ++i) {
+                char instanceIndexBuffer[32];
+                retValue = initializeSingleCounter(&processTotalCPULoad[i],
+                                                   localizedProcessObject,
+                                                   localizedProcessorTimeCounter,
+                                                   pdhProcessImageName,
+                                                   itoa(i, instanceIndexBuffer, 10),
+                                                   TRUE);
+                if (retValue != 0) {
+                    break;
+                }
+            }
+            free(localizedProcessorTimeCounter);
+        }
+        free(localizedProcessObject);
+    }
+
+    if (retValue != 0) {
+        return -1;
+    }
+
+    assert(multiCounterCPULoad);
+    return initializeMultipleCounterForCPUs(multiCounterCPULoad);
+}
+
+static void
+deallocateCPUCounters() {
+    int i;
+
+    assert(GetCurrentThreadId() == initializationLock.owningThread);
+
+    if (processTotalCPULoad) {
+        for (i = 0; i < numberOfJavaProcessesAtInitialization; ++i) {
+            destroySingleCounter(&processTotalCPULoad[i]);
+        }
+        free(processTotalCPULoad);
+        processTotalCPULoad = NULL;
+    }
+
+    if (multiCounterCPULoad) {
+        destroyMultiCounter(multiCounterCPULoad);
+        free(multiCounterCPULoad);
+        multiCounterCPULoad = NULL;
+    }
+
+    cpuFactor = .0;
+    numCpus = 0;
+}
+
+static void
+pdhInitErrorHandler(HMODULE h) {
+    assert(GetCurrentThreadId() == initializationLock.owningThread);
+
+    deallocatePdhConstants();
+
+    if (h) {
+        FreeLibrary(h);
+    }
+}
+
+/*
+ * Helper to initialize the PDH library, function pointers and constants.
+ *
+ * @return  0 if successful, negative on failure.
+ */
+static int
+pdhInit() {
+    static BOOL initialized = FALSE;
+    int retValue;
+
+    if (initialized) {
+        return 0;
+    }
+
+    retValue = 0;
+
+    EnterPdhCriticalSection(&initializationLock); {
+        if (!initialized) {
+            HMODULE h = NULL;
+            if ((h = LoadLibrary("pdh.dll")) == NULL) {
+                retValue = -1;
+            } else if (bindPdhFunctionPointers(h) < 0) {
+                retValue = -1;
+            } else if (allocateAndInitializePdhConstants() < 0) {
+                retValue = -1;
+            }
+
+            if (0 == retValue) {
+                initialized = TRUE;
+            } else {
+                pdhInitErrorHandler(h);
+            }
+        }
+    } LeavePdhCriticalSection(&initializationLock);
+
+    return retValue;
+}
+
+static int
+allocateCPUCounters() {
+    assert(GetCurrentThreadId() == initializationLock.owningThread);
+    assert(numberOfJavaProcessesAtInitialization >= 1);
+    assert(!processTotalCPULoad);
+    assert(!multiCounterCPULoad);
+
+    /*
+     * Create an array of Process object queries, for each instance
+     * up to and including our own (java#0, java#1, java#2, ...).
+     */
+    processTotalCPULoad = calloc(numberOfJavaProcessesAtInitialization,
+                                 sizeof(SingleCounterQueryS));
+
+    if (!processTotalCPULoad) {
+        return -1;
+    }
+
+    multiCounterCPULoad = calloc(1, sizeof(MultipleCounterQueryS));
+
+    if (!multiCounterCPULoad) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+initializePdhCPUCounters() {
+    static BOOL initialized = FALSE;
+    int retValue;
+
+    if (initialized) {
+        return 0;
+    }
+
+    retValue = 0;
+
+    EnterPdhCriticalSection(&initializationLock); {
+        if (!initialized) {
+            if (pdhInit() < 0) {
+                retValue = -1;
+            }  else if (allocateCPUCounters() < 0) {
+                retValue = -1;
+            } else if (initializeCPUCounters() < 0) {
+                retValue = -1;
+            }
+
+            if (0 == retValue) {
+                initialized = TRUE;
+            } else {
+              deallocateCPUCounters();
+            }
+        }
+    } LeavePdhCriticalSection(&initializationLock);
+
+    return retValue;
+}
+
+static int
+perfCPUInit() {
+    return initializePdhCPUCounters();
+}
+
+static double
+perfGetProcessCPULoad() {
+    PDH_FMT_COUNTERVALUE cv;
+    int currentQueryIndex;
+
+    if (perfCPUInit() < 0) {
+        // warn?
+        return -1.0;
+    }
+
+    currentQueryIndex = getCurrentQueryIndexForProcess();
+
+    if (getPerformanceData(&processTotalCPULoad[currentQueryIndex].query,
+                           processTotalCPULoad[currentQueryIndex].counter,
+                           &cv,
+                           PDH_FMT_DOUBLE | PDH_FMT_NOCAP100) == 0) {
+        double d = cv.doubleValue / cpuFactor;
+        d = min(1, d);
+        d = max(0, d);
+        return d;
+    }
+    return -1.0;
+}
+
+static double
+perfGetCPULoad(int which) {
+    PDH_FMT_COUNTERVALUE cv;
+    HCOUNTER c;
+
+    if (perfCPUInit() < 0) {
+        // warn?
+        return -1.0;
+    }
+
+    if (-1 == which) {
+        c = multiCounterCPULoad->counters[multiCounterCPULoad->noOfCounters - 1];
+    } else {
+        if (which < multiCounterCPULoad->noOfCounters) {
+            c = multiCounterCPULoad->counters[which];
+        } else {
+            return -1.0;
+        }
+    }
+    if (getPerformanceData(&multiCounterCPULoad->query, c, &cv, PDH_FMT_DOUBLE ) == 0) {
+        return cv.doubleValue / 100;
+    }
+    return -1.0;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getSystemCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    return perfGetCPULoad(-1);
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0
+(JNIEnv *env, jobject dummy)
+{
+    return perfGetProcessCPULoad();
+}
--- a/jdk/src/linux/doc/man/ja/appletviewer.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/appletviewer.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: appletviewer
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "appletviewer" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "appletviewer" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-appletviewer \- Web֥饦γ¦ǥץåȤ¹Ԥޤ
-.SH ""
+appletviewer \- Webブラウザの外側でアプレットを実行します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,39 +64,39 @@
 .PP
 \fIoptions\fR
 .RS 4
-Ƕڤ줿ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+空白で区切られたコマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIurl\fR
 .RS 4
-ɽɥȤޤϥ꥽ξꡣǶڤ줿ʣURLǤޤ
+表示するドキュメントまたはリソースの場所。空白で区切られた複数のURLを指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIappletviewer\fRޥɤ\fIurls\fR˻ꤵ줿ɥȤ뤤ϥ꥽³ơΥɥȤȤ뤽줾ΥץåȤȼΥɥɽޤurlsˤäƻȤ줿ɥȤ\fIOBJECT\fR\fIEMBED\fRޤ\fIAPPLET\fRǤɤΥץåȤ⻲ȤƤʤ硢\fIappletviewer\fRޥɤϲԤޤ\fIappletviewer\fRޥɤǥݡȤHTMLξܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/tools/appletviewertags\&.htmlˤ
-ץåȡӥ塼򻲾ȤƤ
+\fIappletviewer\fRコマンドは\fIurls\fRに指定されたドキュメントあるいはリソースと接続して、そのドキュメントが参照するそれぞれのアプレットを独自のウィンドウで表示します。urlsによって参照されたドキュメントが、\fIOBJECT\fR、\fIEMBED\fRまたは\fIAPPLET\fRタグでどのアプレットも参照していない場合、\fIappletviewer\fRコマンドは何も行いません。\fIappletviewer\fRコマンドでサポートされるHTMLタグの詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/appletviewertags\&.htmlにある
+アプレット・ビューア・タグを参照してください。
 .PP
-\fIappletviewer\fRޥɤϡRFC2396줿סᥫ˥˽äƥ󥳡ɤ줿URLɬפȤޤݡȤΤϡ󥳡ɤ줿URLΤߤǤե̾ˤĤƤϡRFC2396λͤ˽äƥ󥳡ɤƤɬפޤ
+\fIappletviewer\fRコマンドは、RFC2396で定義されたエスケープ・メカニズムに従ってエンコードされたURLを必要とします。サポートされるのは、エンコードされたURLのみです。ただし、ファイル名については、RFC2396の仕様に従ってエンコードを解除しておく必要があります。
 .PP
-\fB:\fR
+\fB注意:\fR
 The
-\fIappletviewer\fRޥɤϳȯѤǤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/samples/aboutCodeSamples\&.htmlˤ
-ץ/ƥȡץꥱ󤪤ӥɤˤĤƤ򻲾ȤƤ
-.SH "ץ"
+\fIappletviewer\fRコマンドは開発専用です。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/aboutCodeSamples\&.htmlにある
+サンプル/テスト・アプリケーションおよびコードについてを参照してください。
+.SH "オプション"
 .PP
 \-debug
 .RS 4
-\fIjdb\fRޥɤѤJavaǥХåǥץåȡӥ塼򳫻ϤơɥΥץåȤǥХåޤ
+\fIjdb\fRコマンドを使用してJavaデバッガでアプレット・ビューアを開始して、ドキュメント中のアプレットをデバッグします。
 .RE
 .PP
 \-encoding \fIencoding\-name\fR
 .RS 4
-HTMLեΥ󥳡ǥ̾ꤷޤ
+入力HTMLファイルのエンコーディング名を指定します。
 .RE
 .PP
 \-J\fIjavaoption\fR
 .RS 4
-ʸ\fIjavaoption\fRϡץåȡӥ塼¹ԤJava󥿥ץ꥿1ĤΰȤϤޤ˥ڡޤʤǤʣΰϡ٤ƤƬ\fI\-J\fRǻϤޤɬפޤϡѥμ¹ԴĶޤϥ꡼ѤĴͭǤ
+文字列\fIjavaoption\fRは、アプレット・ビューアを実行するJavaインタプリタに1つの引数として渡されます。引数にスペースを含めないでください。複数の引数は、すべてが接頭辞\fI\-J\fRで始まる必要があります。これは、コンパイラの実行環境またはメモリー使用の調整に有効です。
 .RE
 .PP
 
--- a/jdk/src/linux/doc/man/ja/idlj.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/idlj.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: idlj
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "idlj" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "idlj" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idlj \- ꤵ줿󥿥ե(IDL)եФJavaХǥ󥰤ޤ
-.SH ""
+idlj \- 指定されたインタフェース定義言語(IDL)ファイルに対してJavaバインディングを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,22 +64,22 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤoptionsν֤ǤդǤ\fIidlfile\fR˻ꤹɬפޤ
+コマンドライン・オプション。オプションを参照してください。optionsの順番は任意ですが、\fIidlfile\fRよりも前に指定する必要があります。
 .RE
 .PP
 \fIidlfile\fR
 .RS 4
-󥿥ե(IDL)ˤޤޤե̾
+インタフェース定義言語(IDL)による定義が含まれるファイルの名前。
 .RE
-.SH ""
+.SH "説明"
 .PP
-IDL\-to\-Javaѥϡꤵ줿IDLեФJavaХǥ󥰤ޤХǥ󥰤ξܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.htmlˤ
-Java IDL: Javaޥåԥ󥰤ؤIDL򻲾ȤƤ
+IDL\-to\-Javaコンパイラは、指定されたIDLファイルに対してJavaバインディングを生成します。バインディングの詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.htmlにある
+Java IDL: Java言語マッピングへのIDLを参照してください。
 .PP
-IDL\-to\-JavaѥΰΥ꡼ˤϡ\fIidltojava\fRȤ̾äΤޤ
-.SS "饤ȡХǥ󥰤ӥСХǥ󥰤ȯ"
+IDL\-to\-Javaコンパイラの以前のリリースの中には、\fIidltojava\fRという名前だったものがあります。
+.SS "クライアント・バインディングおよびサーバー・バインディングの発行"
 .PP
-\fIidlj\fRޥɤϡ饤¦Хǥ󥰤ޤ\fIMy\&.idl\fRȤ̾IDLեޤ
+次の\fIidlj\fRコマンドは、クライアント側バインディングを含む\fIMy\&.idl\fRという名前のIDLファイルを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -91,7 +91,7 @@
 .RE
 .\}
 .PP
-ιʸϼƱǤ
+前の構文は次と同等です。
 .sp
 .if n \{\
 .RS 4
@@ -103,7 +103,7 @@
 .RE
 .\}
 .PP
-ǤϡС¦Хǥ󥰤饤¦Хǥ󥰤ӥȥޤƤꡢϤ٤ơPOA (Ѿǥ)Ǥ
+次の例では、サーバー側バインディングを生成し、クライアント側バインディングおよびスケルトンを含めており、これらはすべて、POA (継承モデル)です。
 .sp
 .if n \{\
 .RS 4
@@ -115,7 +115,7 @@
 .RE
 .\}
 .PP
-饤¦ȥС¦ξΥХǥ󥰤ϡΥޥ(ɤ)Τ1ĤѤޤ
+クライアント側とサーバー側の両方のバインディングを生成する場合は、次のコマンド(どれも等価)のうちの1つを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -128,7 +128,7 @@
 .RE
 .\}
 .PP
-С¦Dzǽʥǥ2ĤޤܿǽХȷѾǥTieǥǤTieѾǥ򻲾ȤƤ
+サーバー側で可能なモデルは2つあります。移殖可能サーバント継承モデルとTieモデルです。Tie委譲モデルを参照してください。
 .if n \{\
 .sp
 .\}
@@ -138,21 +138,21 @@
 .nr an-break-flag 1
 .br
 .ps +1
-\fBܿǽХȷѾǥ\fR
+\fB移殖可能サーバント継承モデル\fR
 .ps -1
 .br
 .PP
-ǥեȤΥС¦ΥǥϡܿǽХȷѾǥǤ\fIMy\&.idl\fR\fIMy\fR󥿥եƤϡ\fIMyPOA\&.java\fRȤե뤬ޤ\fIMy\fR󥿥եμ󶡤ɬפꡢ\fIMy\fR󥿥ե\fIMyPOA\fR饹Ѿɬפޤ\fIMyPOA\&.java\fRϡhttp://docs\&.oracle\&.com/javase/8/docs/api/org/omg/PortableServer/Servant\&.htmlˤ
-\fIorg\&.omg\&.PortableServer\&.Servant\fR饹ĥ륹ȥ꡼١ΥȥǤ
+デフォルトのサーバー側のモデルは、移殖可能サーバント継承モデルです。\fIMy\&.idl\fR内で\fIMy\fRインタフェースが定義されている場合は、\fIMyPOA\&.java\fRというファイルが生成されます。\fIMy\fRインタフェースの実装を提供する必要があり、\fIMy\fRインタフェースは\fIMyPOA\fRクラスから継承する必要があります。\fIMyPOA\&.java\fRは、http://docs\&.oracle\&.com/javase/8/docs/api/org/omg/PortableServer/Servant\&.htmlにある
+\fIorg\&.omg\&.PortableServer\&.Servant\fRクラスを拡張するストリームベースのスケルトンです。
 .PP
-\fIMy\fR󥿥եϡȥ󤬼IDL󥿥ե˴ϢդƤ\fIcallHandler\fR󥿥ե󥿥եޤ
+\fIMy\fRインタフェースは、スケルトンが実装するIDLインタフェースに関連付けられている\fIcallHandler\fRインタフェースと操作インタフェースを実装します。
 .PP
-ݡ֥롦֥ȡץ(POA)\fIPortableServer\fR⥸塼ϡͥƥ֤\fIServant\fRޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/POA\&.htmlˤ
-ݡ֥롦֥ȡץ(POA)򻲾ȤƤ
+ポータブル・オブジェクト・アダプタ(POA)の\fIPortableServer\fRモジュールは、ネイティブの\fIServant\fR型を定義します。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/POA\&.htmlにある
+ポータブル・オブジェクト・アダプタ(POA)を参照してください。
 .PP
-Javaץߥ󥰸Ǥϡ\fIServant\fRJava\fIorg\&.omg\&.PortableServer\&.Servant\fR饹˥ޥåפޤϡ٤ƤPOAХȼΥ١饹ȤƵǽץꥱ󡦥ץޤƤӽФȤΤǤ뤤ĤΥ᥽åɡPOAˤäƸƤӽФ졢ХȤư椹뤿˥桼С饤ɤǤ᥽åɤ󶡤ޤ
+Javaプログラミング言語では、\fIServant\fR型はJavaの\fIorg\&.omg\&.PortableServer\&.Servant\fRクラスにマップされます。これは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッド、およびPOAによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドを提供します。
 .PP
-ѾǥΤ⤦1ĤΥץϡ\fI\-oldImplBase\fRե饰ѤơJava SE 1\&.4Υ꡼Javaץߥ󥰸ȸߴΤ륵С¦Хǥ󥰤뤳ȤǤ\-\fIoldImplBase\fRե饰ɸǡAPI侩ǤΥե饰ѤΤϡJava SE 1\&.3ǵҤ줿¸ΥСȤθߴɬפʾΤߤǤξ硢¸makeեѹơ\fI\-oldImplBase\fRե饰\fIidlj\fRѥɲäɬפޤʳξ硢POA١ΥС¦ޥåԥ󥰤ޤ̸ߴΤ륵С¦Хǥ󥰤ˤϡ¹Ԥޤ
+継承モデルのもう1つのオプションは、\fI\-oldImplBase\fRフラグを使用して、Java SE 1\&.4より前のリリースのJavaプログラミング言語と互換性のあるサーバー側バインディングを生成することです。\-\fIoldImplBase\fRフラグは非標準で、これらのAPIは非推奨です。このフラグを使用するのは、Java SE 1\&.3で記述された既存のサーバーとの互換性が必要な場合のみです。その場合、既存のmakeファイルを変更して、\fI\-oldImplBase\fRフラグを\fIidlj\fRコンパイラに追加する必要があります。それ以外の場合、POAベースのサーバー側マッピングが生成されます。下位互換性のあるサーバー側バインディングを生成するには、次を実行します。
 .sp .5v
 .RE
 .sp
@@ -167,7 +167,7 @@
 .RE
 .\}
 .PP
-\fIMy\&.idl\fR\fIMy\fR󥿥եƤϡ\fI_MyImplBase\&.java\fRȤե뤬ޤ\fIMy\fR󥿥եμ󶡤ɬפꡢ\fIMy\fR󥿥ե\fI_MyImplBase\fR饹Ѿɬפޤ
+\fIMy\&.idl\fR内で\fIMy\fRインタフェースが定義されている場合は、\fI_MyImplBase\&.java\fRというファイルが生成されます。\fIMy\fRインタフェースの実装を提供する必要があり、\fIMy\fRインタフェースは\fI_MyImplBase\fRクラスから継承する必要があります。
 .if n \{\
 .sp
 .\}
@@ -177,11 +177,11 @@
 .nr an-break-flag 1
 .br
 .ps +1
-\fBTieѾǥ\fR
+\fBTie委譲モデル\fR
 .ps -1
 .br
 .PP
-⤦1ĤΥС¦ǥϡTieǥȸƤФΤǤΥС¦ǥϡѾǥǤTieȥȥƱ뤳ȤϤǤʤᡢ̡ɬפޤΥޥɤˤäơTieǥѤΥХǥ󥰤ޤ
+もう1つのサーバー側モデルは、Tieモデルと呼ばれるものです。このサーバー側モデルは、委譲モデルです。Tieとスケルトンを同時に生成することはできないため、それらは別々に生成する必要があります。次のコマンドによって、Tieモデル用のバインディングが生成されます。
 .sp .5v
 .RE
 .sp
@@ -196,7 +196,7 @@
 .RE
 .\}
 .PP
-\fIMy\fR󥿥եξ硢2ܤΥޥɤˤꡢ\fIMyPOATie\&.java\fRޤ\fIMyPOATie\fR饹ؤΥ󥹥ȥ饯ϡdelegateޤǤϡǥեȤPOAǥѤƤ뤿ᡢ󥹥ȥ饯ˤPOAɬפǤdelegateФƼ󶡤ɬפޤμ\fIMyOperations\fR󥿥եѾɬפΤߤǡ¾Υ饹ѾɬפϤޤ󡣤ORBȰ˻ѤˤϡȤмΤ褦\fIMyPOATie\fR饹Ǽåפɬפޤ
+\fIMy\fRインタフェースの場合、2番目のコマンドにより、\fIMyPOATie\&.java\fRが生成されます。\fIMyPOATie\fRクラスへのコンストラクタは、delegateを取ります。この例では、デフォルトのPOAモデルを使用しているため、コンストラクタにもPOAが必要です。delegateに対して実装を提供する必要がありますが、この実装は\fIMyOperations\fRインタフェースから継承する必要があるのみで、その他のクラスから継承する必要はありません。これをORBと一緒に使用するには、たとえば次のように\fIMyPOATie\fRクラス内で実装をラップする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -222,9 +222,9 @@
 .RE
 .\}
 .PP
-¾μѾɬפ硢ɸηѾǥǤϤʤTieǥѤ뤳ȤǤޤJavaξϡ󥿥եηѾθĿ¤Ϥޤ󤬡饹ηѾ˻ѤǤ륹åȤ1ĤΤߤǤѾǥѤϡΥåȤͭޤTieǥѤȡΥåȤѤ줺桼ȼŪǻѤǤޤˡˤϡΥ٥뤬1ƳȤû꤬ޤ᥽åɤƤӽФȤˡ;ʬʥ᥽åɸƽФ1ȯޤ
+他の実装から継承する必要がある場合、標準の継承モデルではなくTieモデルを使用することもできます。Javaの場合は、インタフェースの継承の個数に制限はありませんが、クラスの継承に使用できるスロットは1つのみです。継承モデルを使用した場合は、そのスロットが占有されます。Tieモデルを使用すると、そのスロットが使用されず、ユーザーが独自の目的で使用できます。この方法には、間接性のレベルが1つ導入されるという短所があります。メソッドを呼び出すときに、余分なメソッド呼出しが1回発生します。
 .PP
-С¦ξ硢Java SE 1\&.4ΥСJava˥ޥåԥ󥰤IDLΥСȸߴΤ롢TieǥΥХǥ󥰤Ǥ
+サーバー側の生成の場合、Java SE 1\&.4より前のバージョンのJava言語にマッピングするIDLのバージョンと互換性のある、Tieモデルのバインディングです。
 .sp
 .if n \{\
 .RS 4
@@ -237,7 +237,7 @@
 .RE
 .\}
 .PP
-\fIMy\fR󥿥եξ硢ˤꡢ\fIMy_Tie\&.java\fRޤ\fIMy_Tie\fR饹ؤΥ󥹥ȥ饯ϡ\fIimpl\fR֥Ȥޤ\fIimpl\fRФƼ󶡤ɬפޤμ\fIHelloOperations\fR󥿥եѾɬפΤߤǡ¾Υ饹ѾɬפϤޤ󡣤ORBȰ˻ѤˤϡȤмΤ褦\fIMy_Tie\fRǼåפɬפޤ
+\fIMy\fRインタフェースの場合、これにより、\fIMy_Tie\&.java\fRが生成されます。\fIMy_Tie\fRクラスへのコンストラクタは、\fIimpl\fRオブジェクトを取ります。\fIimpl\fRに対して実装を提供する必要がありますが、その実装は\fIHelloOperations\fRインタフェースから継承する必要があるのみで、その他のクラスから継承する必要はありません。しかし、これをORBと一緒に使用するには、たとえば次のように\fIMy_Tie\fR内で実装をラップする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -258,15 +258,15 @@
 .if n \{\
 .RE
 .\}
-.SS "ȯԤ줿եذ֤λ"
+.SS "発行されたファイルの代替位置の指定"
 .PP
-ȯԤ줿ե򸽺ߤΥǥ쥯ȥʳΥǥ쥯ȥ֤ˤϡ\fIi\fR\fIdlj \-td /altdir My\&.idl\fRΥޥɤǥѥƤӽФޤ
+発行されたファイルを現在のディレクトリ以外のディレクトリに置くには、\fIi\fR\fIdlj \-td /altdir My\&.idl\fRのコマンドでコンパイラを呼び出します。
 .PP
 
-\fIMy\fR󥿥եξ硢Хǥ󥰤ϡ\fI\&./My\&.java\fRǤϤʤ\fI/altdir/My\&.java\fRʤɤȯԤޤ
-.SS "󥯥롼ɡեذ֤λ"
+\fIMy\fRインタフェースの場合、バインディングは、\fI\&./My\&.java\fRではなく、\fI/altdir/My\&.java\fRなどに発行されます。
+.SS "インクルード・ファイルの代替位置の指定"
 .PP
-\fIMy\&.idl\fRե뤬̤\fIidl\fRեǤ\fIMyOther\&.idl\fR򥤥󥯥롼ɤ硢ѥǤϡ\fIMyOther\&.idl\fRե뤬롦ǥ쥯ȥ¸ߤ뤳ȤȤƤޤȤС줬\fI/includes\fRˤϡΤ褦ʥޥɤǥѥƤӽФޤ
+\fIMy\&.idl\fRファイルが別の\fIidl\fRファイルである\fIMyOther\&.idl\fRをインクルードする場合、コンパイラでは、\fIMyOther\&.idl\fRファイルがローカル・ディレクトリに存在することを前提としています。たとえば、それが\fI/includes\fRにある場合は、次のようなコマンドでコンパイラを呼び出します。
 .sp
 .if n \{\
 .RS 4
@@ -278,7 +278,7 @@
 .RE
 .\}
 .PP
-ȤС\fI/moreIncludes\fRˤ\fIAnother\&.idl\fR\fIMy\&.idl\fR˥󥯥롼ɤƤΤǤСΤ褦ʥޥɤǥѥƤӽФޤ
+たとえば、\fI/moreIncludes\fRにある\fIAnother\&.idl\fRも\fIMy\&.idl\fRにインクルードされているのであれば、次のようなコマンドでコンパイラを呼び出します。
 .sp
 .if n \{\
 .RS 4
@@ -290,7 +290,7 @@
 .RE
 .\}
 .PP
-Τ褦ʷ\fIinclude\fRĹʤ뤿ᡢ󥯥롼ɡե򸡺򥳥ѥ˻ؼ뤿̤ˡѰդƤޤˡϡĶѿιͤȻƤޤ\fICLASSPATH\fRѿ˰ɽƤǥ쥯ȥidl\&.configȤ̾Υեޤ\fIidl\&.config\fRˡΤ褦ʷιԤޤ
+このような形式の\fIinclude\fRは長くなるため、インクルード・ファイルを検索する場所をコンパイラに指示するための別の方法が用意されています。この方法は、環境変数の考え方と似ています。\fICLASSPATH\fR変数に一覧表示されているディレクトリ内にidl\&.configという名前のファイルを作成します。その\fIidl\&.config\fRの中に、次のような形式の行を入れます。
 .sp
 .if n \{\
 .RS 4
@@ -302,10 +302,10 @@
 .RE
 .\}
 .PP
-ѥϡΥե򸡺󥯥롼ɡꥹȤɤ߹ߤޤǤϡǥ쥯ȥδ֤ζڤʸϥߥ(;)ˤʤäƤޤζڤʸϡץåȥեˤäưۤʤޤWindowsץåȥեǤϥߥѤUNIXץåȥեǤϥѤʤɤǤ
-.SS "󥯥롼ɡեФХǥ󥰤ȯ"
+コンパイラは、このファイルを検索し、インクルード・リストを読み込みます。この例では、ディレクトリの間の区切り文字はセミコロン(;)になっています。この区切り文字は、プラットフォームによって異なります。Windowsプラットフォームではセミコロンを使用し、UNIXプラットフォームではコロンを使用するなどです。
+.SS "インクルード・ファイルに対するバインディングの発行"
 .PP
-ǥեȤǤϡޥɥ饤˻ꤷ\fIidl\fRեƤ륤󥿥ե乽¤ΤʤɤˤĤƤΤߡJavaХǥ󥰤ޤ󥯥롼ɤ줿եƤ뷿ˤĤƤޤ󡣤ȤС2Ĥ\fIidl\fRեˤĤƹͤƤߤޤ
+デフォルトでは、コマンドラインに指定した\fIidl\fRファイルで定義されているインタフェースや構造体などについてのみ、Javaバインディングが生成されます。インクルードされたファイルで定義されている型については生成されません。たとえば、次の2つの\fIidl\fRファイルについて考えてみます。
 .sp
 .if n \{\
 .RS 4
@@ -328,7 +328,7 @@
 .RE
 .\}
 .PP
-ǥեȤΥ롼˴ؤƷٹ𤬤ޤХ롦פɽ\fI#include\fRʸϡҤΤȤ˽ޤ\fI#include\fRʸϡݡʸȸʤȤǤޤϤޤ줿ɽ\fI#include\fRʸϡΰ̣Ǥ\fI#include\fRʸȤƽޤĤޤꡢ󥯥롼ɤ줿եˤ륳ɤΥեˤΤޤɽƤ뤫Τ褦˽졢ФJavaХǥ󥰤ȯԤޤϤǤ
+デフォルトのルールに関して警告があります。グローバル・スコープに表示される\fI#include\fR文は、前述のとおりに処理されます。これらの\fI#include\fR文は、インポート文と見なすことができます。囲まれたスコープ内に表示される\fI#include\fR文は、本当の意味での\fI#include\fR文として処理されます。つまり、インクルードされたファイルにあるコードが、元のファイルにそのまま表示されているかのように処理され、それに対してJavaバインディングが発行されます。次はその例です。
 .sp
 .if n \{\
 .RS 4
@@ -356,7 +356,7 @@
 .RE
 .\}
 .PP
-\fI idlj My\&.idl \fR¹ԤơJavaեμΥꥹȤޤݡʸȤߤʤ\fI#include\fRƤᡢ\fIMyOther\&.java\fRޤǤΰ̣Ǥ\fI#include\fRƤᡢ\fIE\&.java\fRޤ\fIEmbedded\&.idl\fRե뤬\fIMy\fR󥿥եΥ˥󥯥롼ɤƤ뤿ᡢ\fIMy\fRΥ(Ĥޤꡢ\fIMyPackage\fR)Ƥޤ\fI\-emitAll\fRե饰Ѥ硢󥯥롼ɤ줿٤ƤΥեˤ뤹٤ƤηȯԤޤ
+\fI idlj My\&.idl \fRを実行して、Javaファイルの次のリストを生成します。インポート文とみなされる\fI#include\fRに定義されていたため、\fIMyOther\&.java\fRは生成されませんでした。ただし、本当の意味での\fI#include\fRで定義されていたため、\fIE\&.java\fRは生成されました。\fIEmbedded\&.idl\fRファイルが\fIMy\fRインタフェースのスコープ内にインクルードされているため、\fIMy\fRのスコープ内(つまり、\fIMyPackage\fR内)に生成されています。\fI\-emitAll\fRフラグを使用した場合、インクルードされたすべてのファイルにあるすべての型が発行されます。
 .sp
 .if n \{\
 .RS 4
@@ -374,9 +374,9 @@
 .if n \{\
 .RE
 .\}
-.SS "ѥåƬ"
+.SS "パッケージの接頭辞の挿入"
 .PP
-ABCȤ̾βҤΤ˺ȤƤơΤ褦IDLեۤȤޤ礦
+ABCという名前の会社のために作業していて、次のようなIDLファイルを構築したとしましょう。
 .sp
 .if n \{\
 .RS 4
@@ -394,7 +394,7 @@
 .RE
 .\}
 .PP
-IDL\-to\-Javaѥ𤷤ƤΥե¹Ԥ硢W1W2ФJavaХǥ󥰤ϡ\fIWidgets\fRѥå˳ǼޤȳδˤȡҤΥѥåϡ\fIcom\&.<company name>\fRȤ̾Υѥå֤ȤˤʤäƤޤδ˽ˤϡѥå̾\fIcom\&.abc\&.Widgets\fRˤɬפޤΥѥåƬWidgets⥸塼ղäˤϡΥޥɤ¹Ԥޤ
+IDL\-to\-Javaコンパイラを介してこのファイルを実行した場合、W1およびW2に対するJavaバインディングは、\fIWidgets\fRパッケージ内に格納されます。業界の慣例によると、会社のパッケージは、\fIcom\&.<company name>\fRという名前のパッケージ内に置くことになっています。この慣例に従うには、パッケージ名を\fIcom\&.abc\&.Widgets\fRにする必要があります。このパッケージ接頭辞をWidgetsモジュールに付加するには、次のコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -406,30 +406,30 @@
 .RE
 .\}
 .PP
-Widgets\&.idl򥤥󥯥롼ɤƤIDLե뤬ϡΥޥɤˤ\fI\-pkgPrefix\fRե饰ɬפǤΥե饰ꤷʤȡIDLեϡ\fIcom\&.abc\&.Widgets\fRѥåǤϤʤ\fIWidgets\fRѥå򸡺뤳Ȥˤʤޤ
+Widgets\&.idlをインクルードしているIDLファイルがある場合は、そのコマンドにも\fI\-pkgPrefix\fRフラグが必要です。このフラグを指定しないと、そのIDLファイルは、\fIcom\&.abc\&.Widgets\fRパッケージではなく、\fIWidgets\fRパッケージを検索することになります。
 .PP
-ƬɬפʥѥåĤ⤢ϡҤidl\&.configեƬꤹΤñǤѥåƬγƹԤϡ\fIPkgPrefix\&.<type>=<prefix>\fRηǤɬפޤҤιԤǤϡ\fIPkgPrefix\&.Widgets=com\&.abc\fRˤʤޤΥץϡݥȥIDˤϱƶޤ
-.SS "ѥΥܥ"
+接頭辞が必要なパッケージがいくつもある場合は、前述のidl\&.configファイルで接頭辞を指定するのが簡単です。パッケージ接頭辞の各行は、\fIPkgPrefix\&.<type>=<prefix>\fRの形式である必要があります。前述の例の行では、\fIPkgPrefix\&.Widgets=com\&.abc\fRになります。このオプションは、リポジトリIDには影響しません。
+.SS "コンパイル前のシンボルの定義"
 .PP
-ѥѤΥܥ뤬IDLեƤʤϡΥܥɬפޤϡȤСХǥ˥ǥХåɤȤȤ˻Ѥޤޥ\fIidlj \-d MYDEF My\&.idl \fRϡMy\&.idl˹\fI#define MYDEF\fR֤Ʊˤʤޤ
-.SS "¸ΥХǥ󥰤ݻ"
+コンパイル用のシンボルがIDLファイル内で定義されていない場合は、そのシンボルを定義する必要があります。これは、たとえば、バインディング内にデバッグ・コードを組み入れるときに使用します。コマンド\fIidlj \-d MYDEF My\&.idl \fRは、My\&.idl内に行\fI#define MYDEF\fRを配置した場合と同等になります。
+.SS "既存のバインディングの保持"
 .PP
-JavaХǥ󥰡ե뤬Ǥ¸ߤϡ\fI\-keep\fRե饰ꤹȡѥˤ񤭤ǤޤǥեȤǤϡǤ¸ߤ뤫ɤˤ餺٤ƤΥե뤬ޤΥե򥫥ޥ(ƤΤǤȤʳϥޥ򤱤)\fI\-keep\fRץͭѤǤޥ\fIidlj \-keep My\&.idl\fRϡǤ¸ߤʤ٤ƤΥ饤¦Хǥ󥰤ȯԤޤ
-.SS "ѥοĽɽ"
+Javaバインディング・ファイルがすでに存在する場合は、\fI\-keep\fRフラグを指定すると、コンパイラによる上書きを回避できます。デフォルトでは、すでに存在するかどうかにかかわらず、すべてのファイルが生成されます。これらのファイルをカスタマイズした場合(ただし、それらの内容が正確であるとき以外はカスタマイズは避ける)、\fI\-keep\fRオプションは有用です。コマンド\fIidlj \-keep My\&.idl\fRは、すでに存在しないすべてのクライアント側バインディングを発行します。
+.SS "コンパイルの進捗状況の表示"
 .PP
-IDL\-to\-Javaѥϡ¹ԤγʳǾ֥åޤ\fI\-v\fRץѤơ\fIidlj \-v My\&.idl\fRΤ褦ʾĹ⡼ɤ򥢥ƥֲޤ
+IDL\-to\-Javaコンパイラは、実行の各段階で状態メッセージを生成します。\fI\-v\fRオプションを使用して、\fIidlj \-v My\&.idl\fRのような冗長モードをアクティブ化します。
 .PP
-ǥեȤǤϡѥϾĹ⡼ɤǤϼ¹Ԥޤ
-.SS "Сɽ"
+デフォルトでは、コンパイラは冗長モードでは実行されません。
+.SS "バージョン情報の表示"
 .PP
-IDL\-to\-JavaѥΥӥɡСɽˤϡޥɥ饤\fIidlj \-version\fR\fI\-version\fRץꤷޤ
+IDL\-to\-Javaコンパイラのビルド・バージョンを表示するには、コマンドライン\fIidlj \-version\fRで\fI\-version\fRオプションを指定します。
 .PP
-Сϡѥˤä줿Хǥˤ񤭹ޤƤޤΥץ򥳥ޥɥ饤˻ꤹȡʳΥץꤷƤ⡢٤̵뤵ޤ
-.SH "ץ"
+バージョン情報は、コンパイラによって生成されたバインディング内にも書き込まれています。このオプションをコマンドラインに指定すると、それ以外のオプションを指定しても、すべて無視されます。
+.SH "オプション"
 .PP
 \-d \fIsymbol\fR
 .RS 4
-ΥץϡIDLե˼Τ褦ʹԤɲäǤ
+このオプションは、IDLファイルに次のような行を追加した場合と等価です。
 .sp
 .if n \{\
 .RS 4
@@ -444,46 +444,46 @@
 .PP
 \-demitAll
 .RS 4
-\fI#include\fRեƤΤޤơ٤ƤηȯԤޤ
+\fI#include\fRファイル内で定義されているものも含めて、すべての型を発行します。
 .RE
 .PP
 \-fside
 .RS 4
-ȯԤХǥ󥰤ޤ\fIside\fRѥ᡼ˤϡ\fIclient\fR\fIserver\fR\fIserverTIE\fR\fIall\fRޤ\fIallTIE\fRǤޤ\fI\-fserverTIE\fRޤ\fI\-fallTIE\fRץꤹȡѾǥ롦ȥȯԤޤե饰ꤷʤ硢\fI\-fclient\fR˥ǥեꤵޤ
+発行するバインディングを定義します。\fIside\fRパラメータには、\fIclient\fR、\fIserver\fR、\fIserverTIE\fR、\fIall\fRまたは\fIallTIE\fRを指定できます。\fI\-fserverTIE\fRまたは\fI\-fallTIE\fRオプションを指定すると、委譲モデル・スケルトンが発行されます。フラグを指定しない場合、\fI\-fclient\fRにデフォルト設定されます。
 .RE
 .PP
 \-i \fIinclude\-path\fR
 .RS 4
-ǥեȤǤϡ󥯥롼ɡեϸߤΥǥ쥯ȥ꤫鸡ޤΥץꤹȡ¾Υǥ쥯ȥɲäǤޤ
+デフォルトでは、インクルード・ファイルは現在のディレクトリから検索されます。このオプションを指定すると、他のディレクトリを追加できます。
 .RE
 .PP
 \-i \fIkeep\fR
 .RS 4
-ե뤬Ǥ¸ߤƤϡΥե뤬񤭤ޤ󡣥ǥեȤǤϡ񤭤ޤ
+生成されるファイルがすでに存在している場合は、そのファイルが上書きされません。デフォルトでは、上書きされます。
 .RE
 .PP
 \-noWarn
 .RS 4
-ٹåɽʤ褦ˤޤ
+警告メッセージを表示しないようにします。
 .RE
 .PP
 \-oldImplBase
 .RS 4
-1\&.4JDK ORBȸߴΤ륹ȥޤǥեȤǤϡPOAѾǥΥС¦Хǥ󥰤ޤΥץꤹȡ\fIImplBase\fRѾǥΥ饹Ǥ륵С¦Хǥ󥰤ΤǡΥ꡼Javaץߥ󥰸Ȥβ̸ߴޤ
+1\&.4より前のJDK ORBと互換性のあるスケルトンを生成します。デフォルトでは、POA継承モデルのサーバー側バインディングが生成されます。このオプションを指定すると、\fIImplBase\fR継承モデルのクラスであるサーバー側バインディングが生成されるので、以前のリリースのJavaプログラミング言語との下位互換性が得られます。
 .RE
 .PP
 \-pkgPrefix \fItype\fR \fIprefix\fR
 .RS 4
-\fItype\fRե롦פǸФ줿ϡηФ뤹٤ƤΥեˤĤơJavaѥå̾\fIprefix\fRȤƬղäޤtypeϡȥåץ٥롦⥸塼ñ̾ɤΥ⥸塼⳰¦줿IDLñ̾Τɤ餫Ǥ
+\fItype\fRがファイル・スコープで検出された場合は、その型に対して生成されるすべてのファイルについて、生成されるJavaパッケージ名に\fIprefix\fRという接頭辞が付加されます。typeは、トップレベル・モジュールの単純名か、どのモジュールよりも外側で定義されたIDL型の単純名のどちらかです。
 .RE
 .PP
 \-pkgTranslate \fItype\fR \fIpackage\fR
 .RS 4
-̻Ҥ˥⥸塼̾typeФȡJavaѥåΤ٤ƤΥեˤĤơ̻ҤΤ̾package֤ޤǽ\fIpkgPrefix\fRѹԤޤtypeͤϡȥåץ٥Υ⥸塼ñ̾ޤϤ٤ƤΥ⥸塼γ줿IDLñ̾ǡʥѥå̾Τ˰פɬפޤ
+識別子の中にモジュール名typeが検出されると、生成されるJavaパッケージ内のすべてのファイルについて、識別子の中のその名前がpackageで置き換えられます。最初に\fIpkgPrefix\fRの変更が行われます。typeの値は、トップレベルのモジュールの単純名、またはすべてのモジュールの外部で定義されたIDL型の単純名で、完全なパッケージ名に正確に一致する必要があります。
 .sp
-ʣѴ̻Ҥ˰פ硢˼褦ˡǤĹפ򤵤ޤ
+複数の変換が識別子に一致する場合、次の例に示すように、最も長い一致が選択されます。
 .sp
-\fBޥ\fR:
+\fBコマンド\fR:
 .sp
 .if n \{\
 .RS 4
@@ -494,7 +494,7 @@
 .if n \{\
 .RE
 .\}
-\fB̤Ѵ\fR:
+\fB結果の変換\fR:
 .sp
 .if n \{\
 .RS 4
@@ -508,47 +508,47 @@
 .if n \{\
 .RE
 .\}
-ѥå̾\fIorg\fR\fIorg\fR\&.o\fImg\fRޤ\fIorg\&.omg\fRΥ֥ѥåϡѴǤޤ󡣤Υѥå̾Ѵ褦ȤȡߴΤʤɤ졢\fI\-pkgTranslate\fRθκǽΰȤƤΥѥåѤȡ顼Ȥưޤ
+パッケージ名\fIorg\fR、\fIorg\fR\&.o\fImg\fR、または\fIorg\&.omg\fRのサブパッケージは、変換できません。これらのパッケージ名を変換しようとすると、互換性のないコードが生成され、\fI\-pkgTranslate\fRの後の最初の引数としてそれらのパッケージを使用すると、エラーとして扱われます。
 .RE
 .PP
 \-skeletonName \fIxxx%yyy\fR
 .RS 4
-\fIxxx%yyy\fRȥ̾դѥȤƻѤޤǥեȤϼΤȤǤ\fIPOA\fR١饹ξ\fI%POA\fR
-(\fI\-fserver\fRޤ\fI\-fall\fR)\fIoldImplBase\fR饹ξ\fI_%ImplBase\fR
-(\-\fIoldImplBase\fR)(\fI\-fserver\fRޤ\fI\-fall\fR))
+\fIxxx%yyy\fRが、スケルトンに名前を付けるパターンとして使用されます。デフォルトは次のとおりです。\fIPOA\fRベース・クラスの場合は\fI%POA\fR
+(\fI\-fserver\fRまたは\fI\-fall\fR)、\fIoldImplBase\fRクラスの場合は\fI_%ImplBase\fR
+(\-\fIoldImplBase\fR)および(\fI\-fserver\fRまたは\fI\-fall\fR))。
 .RE
 .PP
 \-td \fIdir\fR
 .RS 4
-ϥǥ쥯ȥȤơߤΥǥ쥯ȥǤϤʤ\fIdir\fRѤޤ
+出力ディレクトリとして、現在のディレクトリではなく、\fIdir\fRが使用されます。
 .RE
 .PP
 \-tieName \fIxxx%yyy\fR
 .RS 4
-ѥ˽äơ\fIxxx%yyy\fRѤޤǥեȤϼΤȤǤ\fIPOA\fR١饹ξ\fI%POA\fR
-(\fI\-fserverTieޤ\-fallTie\fR)\fIoldImplBase\fR
-tie饹ξ\fI_%Tie\fR
-(\-\fIoldImplBase\fR)(\fI\-fserverTie\fRޤ\fI\-fallTie\fR))
+パターンに従って、\fIxxx%yyy\fRを使用します。デフォルトは次のとおりです。\fIPOA\fRベース・クラスの場合は\fI%POA\fR
+(\fI\-fserverTieまたは\-fallTie\fR)、\fIoldImplBase\fR
+tieクラスの場合は\fI_%Tie\fR
+(\-\fIoldImplBase\fR)および(\fI\-fserverTie\fRまたは\fI\-fallTie\fR))。
 .RE
 .PP
-\-nowarn\-verbose
+\-nowarn、\-verbose
 .RS 4
-꡼ɽƽλޤ
+リリース情報を表示して終了します。
 .RE
 .PP
 \-version
 .RS 4
-꡼ɽƽλޤ
+リリース情報を表示して終了します。
 .RE
-.SH "»"
+.SH "制限事項"
 .PP
-Х롦Υפ줿̻ҤϡIDLץߥƥַ\fIObject\fRޤ\fIValueBase\fRƱ֤ˤʤǤϡܥɽμ̻ҤǥץɤƤ뤿ǤκĤȡ񤭤ޤϡ餯ŪǤ
+グローバル・スコープ内のエスケープされた識別子は、IDLプリミティブ型の\fIObject\fRまたは\fIValueBase\fRと同じ綴りにしないでください。これは、シンボル表がこれらの識別子でプリロードされているためです。これらの再定義を許可すると、元の定義が上書きされます。これは、おそらく恒久的な制約です。
 .PP
-\fIfixed\fRȤIDLϥݡȤƤޤ
-.SH "Τ"
+\fIfixed\fRというIDL型はサポートされていません。
+.SH "既知の問題"
 .PP
-Х뼱̻ҤˤĤƥݡȤޤͽʤ\fIimpl\fR֥ȤƤӽФȡ㳰ޤθϡ\fIServerDelegate\fR
-DSI\fINullPointerException\fRˤ褦Ǥ
+グローバル識別子についてインポートが生成されません。予期されないローカル\fIimpl\fRオブジェクトを呼び出すと、例外を受け取ります。しかし、その原因は、\fIServerDelegate\fR
+DSIコード内の\fINullPointerException\fRにあるようです。
 .br
 'pl 8.5i
 'bp
--- a/jdk/src/linux/doc/man/ja/jar.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jar.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jar
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jar" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jar" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,9 +49,9 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jar \- Java Archive (JAR)եޤ
-.SH ""
-JARեκ
+jar \- Java Archive (JAR)ファイルを操作します。
+.SH "概要"
+JARファイルの作成
 .sp
 .if n \{\
 .RS 4
@@ -62,7 +62,7 @@
 .if n \{\
 .RE
 .\}
-JARեι
+JARファイルの更新
 .sp
 .if n \{\
 .RS 4
@@ -73,7 +73,7 @@
 .if n \{\
 .RE
 .\}
-JARե
+JARファイルの抽出
 .sp
 .if n \{\
 .RS 4
@@ -84,7 +84,7 @@
 .if n \{\
 .RE
 .\}
-JARեΥƥĤΥꥹ
+JARファイルのコンテンツのリスト
 .sp
 .if n \{\
 .RS 4
@@ -95,7 +95,7 @@
 .if n \{\
 .RE
 .\}
-JARեؤκɲ
+JARファイルへの索引の追加
 .sp
 .if n \{\
 .RS 4
@@ -106,48 +106,48 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "説明"
 .PP
-\fIjar\fRޥɤϡZIPZLIB̷˴ŤѤΥ֤Ӱ̥ġǤ\fIjar\fRޥɤϡˤĤJavaץåȤ䥢ץꥱñΥ֤˥ѥå褦߷פޤץåȤ䥢ץꥱΥݡͥ(ե롢᡼ӥ)1ĤΥ֤˷礵ƤȡJava(֥饦ʤ)ϡΥݡͥȤ1HTTPȥ󥶥ǥɤ뤳ȤǤݡͥȤȤ˿³פˤʤޤˤꡢɻ֤ṳ̂ޤޤ\fIjar\fRޥɤϥեΰ̤Ԥᡢɻ֤ṳ̂ޤޤ\fIjar\fRޥɤˤäơեθġΥȥ˥ץåȺԤˤ̾񤭹뤿ᡢ۸ǧڤǽˤʤޤJARեϡ̤Ƥ뤫ɤˤ餺饹ѥΥȥȤƻѤǤޤ
+\fIjar\fRコマンドは、ZIPおよびZLIB圧縮形式に基づく汎用のアーカイブおよび圧縮ツールです。ただし、\fIjar\fRコマンドは、主にいくつかのJavaアプレットやアプリケーションを単一のアーカイブにパッケージ化するように設計されました。アプレットやアプリケーションのコンポーネント(ファイル、イメージ、およびサウンド)が1つのアーカイブに結合されていると、Javaエージェント(ブラウザなど)は、それらのコンポーネントを1回のHTTPトランザクションでダウンロードすることができ、コンポーネントごとに新しい接続が不要になります。これにより、ダウンロード時間が大幅に短縮されます。また、\fIjar\fRコマンドはファイルの圧縮も行うため、ダウンロード時間がさらに短縮されます。また、\fIjar\fRコマンドによって、ファイル内の個々のエントリにアプレット作成者による署名を書き込めるため、配布元の認証が可能になります。JARファイルは、圧縮されているかどうかにかかわらず、クラス・パスのエントリとして使用できます。
 .PP
-\fIjar\fRޥɤιʸϡ\fItar\fRޥɤιʸ˻Ƥޤɬܤ\fIΰ\fR1Ĥ줿ʣ⡼ɤޤ¾ΰϡưѹ\fIץ\fRޤ¹Ԥ뤿ɬפ\fIڥ\fRѤޤ
-.SH "ΰ"
+\fIjar\fRコマンドの構文は、\fItar\fRコマンドの構文に似ています。必須の\fI操作の引数\fRの1つで定義された複数の操作モードがあります。他の引数は、操作の動作を変更する\fIオプション\fR、または操作を実行するために必要な\fIオペランド\fRを使用します。
+.SH "操作の引数"
 .PP
-\fIjar\fRޥɤѤϡΰΤ줫ꤷƼ¹Ԥ򤹤ɬפޤޥɥ饤¾1ʸΥץȺߤ뤳ȤǤޤ̾ΰϻꤵǽΰǤ
+\fIjar\fRコマンドを使用する場合は、次の操作の引数のいずれかを指定して実行される操作を選択する必要があります。コマンドラインで他の1文字のオプションと混在させることができますが、通常、操作の引数は指定される最初の引数です。
 .PP
 c
 .RS 4
-JAR֤ޤ
+新しいJARアーカイブを作成します。
 .RE
 .PP
 i
 .RS 4
-JAR֤κޤ
+JARアーカイブの索引情報を生成します。
 .RE
 .PP
 t
 .RS 4
-JAR֤ΥƥĤꥹȤޤ
+JARアーカイブのコンテンツをリストします。
 .RE
 .PP
 u
 .RS 4
-JAR֤򹹿ޤ
+JARアーカイブを更新します。
 .RE
 .PP
 x
 .RS 4
-JAR֤եФޤ
+JARアーカイブからファイルを抽出します。
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
-ΥץѤơJARեФޤɽˡ򥫥ޥޤ
+次のオプションを使用して、JARファイルを作成、更新、抽出または表示する方法をカスタマイズします。
 .PP
 e
 .RS 4
-\fIentrypoint\fRڥɤǻꤵ륯饹򡢼¹ԲǽJARե˥Хɥ뤵륹ɥJavaץꥱΥȥꡦݥȤꤷޤΥץѤȡޥ˥եȡե\fIMain\-Class\fR°ͤޤϥС饤ɤޤ\fIe\fRץϡJARեκ(\fIc\fR)ޤϹ(\fIu\fR)˻ѤǤޤ
+\fIentrypoint\fRオペランドで指定されるクラスを、実行可能JARファイルにバンドルされるスタンドアロンJavaアプリケーションのエントリ・ポイントに設定します。このオプションを使用すると、マニフェスト・ファイル内の\fIMain\-Class\fR属性値が作成またはオーバーライドされます。\fIe\fRオプションは、JARファイルの作成時(\fIc\fR)または更新時(\fIu\fR)に使用できます。
 .sp
-ȤСΥޥɤǤϡ\fIMain\&.jar\fR֤\fIMain\&.class\fRեȤȤ˺ޤκݡޥ˥ե\fIMain\-Class\fR°ͤ\fIMain\fRꤵޤ
+たとえば、次のコマンドでは、\fIMain\&.jar\fRアーカイブが\fIMain\&.class\fRファイルとともに作成されますが、その際、マニフェスト内の\fIMain\-Class\fR属性値は\fIMain\fRに設定されます。
 .sp
 .if n \{\
 .RS 4
@@ -158,7 +158,7 @@
 .if n \{\
 .RE
 .\}
-Java Runtime Environment (JRE)ϡΥޥɤ¹ԤơΥץꥱľܸƤӽФȤǤޤ
+Java Runtime Environment (JRE)は、次のコマンドを実行して、このアプリケーションを直接呼び出すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -169,7 +169,7 @@
 .if n \{\
 .RE
 .\}
-ѥå˥ȥꡦݥȤΥ饹̾ޤޤƤ硢ɥå(\&.)ޤϥå(/)Τ줫ڤʸȤƻѤǤޤȤС\fIMain\&.class\fR\fImydir\fRȤ̾Υѥå˴ޤޤƤ硢ȥꡦݥȤϼΤ줫ˡǻǤޤ
+あるパッケージ内にエントリ・ポイントのクラス名が含まれている場合、ドット(\&.)またはスラッシュ(/)のいずれかを区切り文字として使用できます。たとえば、\fIMain\&.class\fRが\fImydir\fRという名前のパッケージに含まれている場合、エントリ・ポイントは次のいずれかの方法で指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -197,8 +197,8 @@
 allbox tab(:);
 l.
 T{
-
-Υޥ˥եȤˤ\fIMain\-Class\fR°ޤޤƤ\fIm\fRץ\fIe\fRץξƱ˻ꤹȡ\fIMain\-Class\fRλ꤬ޤˤʤޤΤޤˤäƥ顼ȯ\fIjar\fRޥɤκ乹λޤ
+注意
+特定のマニフェストにも\fIMain\-Class\fR属性が含まれている場合に\fIm\fRオプションと\fIe\fRオプションの両方を同時に指定すると、\fIMain\-Class\fRの指定があいまいになります。このあいまいさによってエラーが発生し、\fIjar\fRコマンドの作成や更新の操作が終了します。
 T}
 .TE
 .sp 1
@@ -208,42 +208,42 @@
 .PP
 f
 .RS 4
-\fIjarfile\fRڥɤǻꤵ줿ե򡢺(\fIc\fR)(\fIu\fR)(\fIx\fR)ޤɽ(\fIt\fR)JARե̾ꤷޤ\fIf\fRץ󤪤\fIjarfile\fRڥɤάȡ\fIjar\fRޥɤˡ\fIstdin\fRJARե̾뤫(\fIx\fR\fIt\fRξ)JARե\fIstdout\fR뤳(\fIc\fR\fIu\fRξ)ؼޤ
+\fIjarfile\fRオペランドで指定されたファイルを、作成(\fIc\fR)、更新(\fIu\fR)、抽出(\fIx\fR)または表示(\fIt\fR)されるJARファイルの名前に設定します。\fIf\fRオプションおよび\fIjarfile\fRオペランドを省略すると、\fIjar\fRコマンドに、\fIstdin\fRからのJARファイル名を受け入れるか(\fIx\fRおよび\fIt\fRの場合)、JARファイルを\fIstdout\fRに送信すること(\fIc\fRおよび\fIu\fRの場合)が指示されます。
 .RE
 .PP
 m
 .RS 4
-(\fIMETA\-INF/MANIFEST\&.MF\fRΥ֤ˤ)
-\fIjar\fRޥɤΥޥ˥եȡե\fImanifest\fRڥɤǻꤵ줿ե뤫顢°̾ͤΥڥޤޤ\fIjar\fRޥɤϡƱ̾Υȥ꤬Ǥ¸ߤ°̾ͤJARեɲäޤƱ̾Υȥ꤬Ǥ¸ߤ硢\fIjar\fRޥɤ°ͤ򹹿ޤ\fIm\fRץϡJARեκ(\fIc\fR)ޤϹ(\fIu\fR)˻ѤǤޤ
+(\fIMETA\-INF/MANIFEST\&.MF\fRのアーカイブにある)
+\fIjar\fRコマンドのマニフェスト・ファイルの\fImanifest\fRオペランドで指定されたファイルから、属性の名前と値のペアを含めます。\fIjar\fRコマンドは、同じ名前のエントリがすでに存在する場合を除き、属性の名前と値をJARファイルに追加します。同じ名前のエントリがすでに存在する場合、\fIjar\fRコマンドは属性の値を更新します。\fIm\fRオプションは、JARファイルの作成時(\fIc\fR)または更新時(\fIu\fR)に使用できます。
 .sp
-ǥեȤΥޥ˥եȡեˤϴޤޤʤޥ˥եȤˡ̤Ū̾\-ͤ°ڥɲäǤޤȤС٥󡢥꡼󡢥ѥå󥰤ꤹ°ޤJAR˥Хɥ뤵줿ץꥱ¹Բǽˤ뤿°ɲäǤޤ\fIm\fRץλϡhttp://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlˤ
-ץΥѥå˴ؤ򻲾ȤƤ
+デフォルトのマニフェスト・ファイルには含まれないマニフェストに、特別な目的の名前\-値の属性ペアを追加できます。たとえば、ベンダー情報、リリース情報、パッケージ・シーリングを指定する属性、またはJARにバンドルされたアプリケーションを実行可能にするための属性を追加できます。\fIm\fRオプションの使用例は、http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlにある
+プログラムのパッケージ化に関する項を参照してください。
 .RE
 .PP
 M
 .RS 4
-ޥ˥եȡե롦ȥʤ(\fIc\fR\fIu\fRξ)ޤϥޥ˥եȡե롦ȥ꤬¸ߤϺޤ(\fIu\fRξ)\fIM\fRץϡJARեκ(\fIc\fR)ޤϹ(\fIu\fR)˻ѤǤޤ
+マニフェスト・ファイル・エントリを作成しない(\fIc\fRおよび\fIu\fRの場合)か、またはマニフェスト・ファイル・エントリが存在する場合は削除します(\fIu\fRの場合)。\fIM\fRオプションは、JARファイルの作成時(\fIc\fR)または更新時(\fIu\fR)に使用できます。
 .RE
 .PP
 n
 .RS 4
-JARեκ(\fIc\fR)ˡΥץϡƥĤpack200(1)ޥɤΥѥåӥѥåαƶʤ褦˥֤ޤѤʤ硢̾դJARν̵̾ˤʤޤ
+JARファイルの作成(\fIc\fR)時に、このオプションは、コンテンツがpack200(1)コマンドのパックおよびアンパック操作の影響を受けないようにアーカイブを正規化します。この正規化を使用しない場合、署名付きJARの署名は無効になります。
 .RE
 .PP
 v
 .RS 4
-ܺ٤ʽϤɸϤޤ򻲾ȤƤ
+詳細な出力を標準出力に生成します。例を参照してください。
 .RE
 .PP
 0
 .RS 4
-() ZIP̤ѤʤJARե(\fIc\fR)ޤϹ(\fIu\fR)ޤ
+(ゼロ) ZIP圧縮を使用しないでJARファイルを作成(\fIc\fR)または更新(\fIu\fR)します。
 .RE
 .PP
 \-C \fIdir\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡΥץ\fIfile\fRڥɤǻꤵ줿եν˥ǥ쥯ȥŪѹޤϡUNIX
-\fItar\fR桼ƥƥ\fI\-C\fRץƱͤˤʤ뤳ȤŪȤƤޤȤСΥޥɤˤäơ\fIclasses\fRǥ쥯ȥѹ졢Υǥ쥯ȥ꤫\fImy\&.jar\fR\fIBar\&.class\fRե뤬ɲäޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、このオプションは\fIfile\fRオペランドで指定されたファイルの処理中にディレクトリを一時的に変更します。この操作は、UNIX
+\fItar\fRユーティリティの\fI\-C\fRオプションと同様になることを目的としています。たとえば、次のコマンドによって、\fIclasses\fRディレクトリに変更され、そのディレクトリから\fImy\&.jar\fRに\fIBar\&.class\fRファイルが追加されます。
 .sp
 .if n \{\
 .RS 4
@@ -254,7 +254,7 @@
 .if n \{\
 .RE
 .\}
-ΥޥɤǤϡ\fIclasses\fRǥ쥯ȥ˰ưclassesǥ쥯ȥΤ٤ƤΥե\fImy\&.jar\fRɲäޤ(JARեˤ\fIclasses\fRǥ쥯ȥޤ)˸Υǥ쥯ȥäƤ顢\fIbin\fRǥ쥯ȥ˰ư\fIXyz\&.class\fR\fImy\&.jar\fRɲäޤ
+次のコマンドでは、\fIclasses\fRディレクトリに移動し、classesディレクトリ内のすべてのファイルを\fImy\&.jar\fRに追加します(JARファイルには\fIclasses\fRディレクトリを作成しません)。次に元のディレクトリに戻ってから、\fIbin\fRディレクトリに移動し、\fIXyz\&.class\fRを\fImy\&.jar\fRに追加します。
 .sp
 .if n \{\
 .RS 4
@@ -265,7 +265,7 @@
 .if n \{\
 .RE
 .\}
-\fIclasses\fR\fIbar1\fRե\fIbar2\fRե뤬ޤޤƤ硢ҤΥޥɤ¹Ԥ塢JARեˤϼΤΤޤޤޤ
+\fIclasses\fRに\fIbar1\fRファイルと\fIbar2\fRファイルが含まれている場合、前述のコマンドを実行した後、JARファイルには次のものが含まれます。
 .sp
 .if n \{\
 .RS 4
@@ -285,41 +285,41 @@
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤷJVMץJREJARե¹Ԥݤ˻Ѥ褦ꤷޤJVMץϡjava(1)ޥɤΥե󥹡ڡƤޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤ
+指定したJVMオプションを、JREがJARファイルを実行する際に使用するように設定します。JVMオプションは、java(1)コマンドのリファレンス・ページで説明されています。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。
 .RE
-.SH "ڥ"
+.SH "オペランド"
 .PP
-Υڥɤϡ\fIjar\fRޥɤǧޤ
+次のオペランドは、\fIjar\fRコマンドで認識されます。
 .PP
 \fIfile\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡ\fIfile\fRڥɤϡ֤ɲäɬפΤեޤϥǥ쥯ȥΥѥ̾ޤJARե(\fIx\fR)ޤϥƥĤΥꥹ(\fIt\fR)ˡ\fIfile\fRڥɤФޤϥꥹȤեΥѥ̾ޤʤȤ1Ĥͭʥեޤϥǥ쥯ȥꤹɬפޤʣ\fIfile\fRڥɤǶڤޤ\fIentrypoint\fR\fIjarfile\fRޤ\fImanifest\fRڥɤѤϡθ\fIfile\fRڥɤꤹɬפޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、\fIfile\fRオペランドは、アーカイブに追加する必要のあるファイルまたはディレクトリのパスと名前を定義します。JARファイルの抽出(\fIx\fR)またはコンテンツのリスト(\fIt\fR)時に、\fIfile\fRオペランドは抽出またはリストするファイルのパスと名前を定義します。少なくとも1つの有効なファイルまたはディレクトリを指定する必要があります。複数の\fIfile\fRオペランドを空白で区切ります。\fIentrypoint\fR、\fIjarfile\fRまたは\fImanifest\fRオペランドが使用される場合は、その後に\fIfile\fRオペランドを指定する必要があります。
 .RE
 .PP
 \fIentrypoint\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡ\fIentrypoint\fRڥɤϡ¹ԲǽJARե˥Хɥ뤵Ƥ륹ɥJavaץꥱΥȥꡦݥȤȤʤ륯饹̾ޤ\fIe\fRץ¸ߤ\fIentrypoint\fRڥɤꤹɬפޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、\fIentrypoint\fRオペランドは、実行可能JARファイルにバンドルされているスタンドアロンJavaアプリケーションのエントリ・ポイントとなるクラスの名前を定義します。\fIe\fRオプションが存在する場合は\fIentrypoint\fRオペランドを指定する必要があります。
 .RE
 .PP
 \fIjarfile\fR
 .RS 4
-(\fIc\fR)(\fIu\fR)(\fIx\fR)ޤɽ(\fIt\fR)ե̾ޤ\fIf\fRץ¸ߤ\fIjarfile\fRڥɤꤹɬפޤ\fIf\fRץ󤪤\fIjarfile\fRڥɤάȡ\fIjar\fRޥɤˡ\fIstdin\fRJARե̾뤫(\fIx\fR\fIt\fRξ)JARե\fIstdout\fR뤳(\fIc\fR\fIu\fRξ)ؼޤ
+作成(\fIc\fR)、更新(\fIu\fR)、抽出(\fIx\fR)または表示(\fIt\fR)するファイルの名前を定義します。\fIf\fRオプションが存在する場合は\fIjarfile\fRオペランドを指定する必要があります。\fIf\fRオプションおよび\fIjarfile\fRオペランドを省略すると、\fIjar\fRコマンドに、\fIstdin\fRからのJARファイル名を受け入れるか(\fIx\fRおよび\fIt\fRの場合)、JARファイルを\fIstdout\fRに送信すること(\fIc\fRおよび\fIu\fRの場合)が指示されます。
 .sp
-JARեդ(\fIi\fR)ϡ\fIf\fRץꤷʤ\fIjarfile\fRڥɤꤷޤ
+JARファイルを索引付け(\fIi\fR)する場合は、\fIf\fRオプションを指定しないで\fIjarfile\fRオペランドを指定します。
 .RE
 .PP
 \fImanifest\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡ\fImanifest\fRڥɤJARե\fIMANIFEST\&.MF\fR˴ޤ°̾ͤĴ¸Υޥ˥եȡեޤ\fIf\fRץ¸ߤ\fImanifest\fRڥɤꤹɬפޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、\fImanifest\fRオペランドはJARファイルの\fIMANIFEST\&.MF\fRに含める属性の名前と値を持つ既存のマニフェスト・ファイルを定義します。\fIf\fRオプションが存在する場合は\fImanifest\fRオペランドを指定する必要があります。
 .RE
 .PP
 \fI@arg\-file\fR
 .RS 4
-\fIjar\fRޥɤṳ̂ޤϴDzˤϡ̤ΥƥȡեΰꤷƬȤƥåȥޡ(@)դ\fIjar\fRޥɤϤȤǤޤ\fIjar\fRޥɤϡåȥޡʸǻϤޤ򸫤ĤȡΥեƤŸưꥹȤޤ
+\fIjar\fRコマンドを短縮または簡素化するには、別のテキスト・ファイル内の引数を指定し、接頭辞としてアットマーク(@)を付けて\fIjar\fRコマンドに渡すことができます。\fIjar\fRコマンドは、アットマーク文字で始まる引数を見つけると、そのファイルの内容を展開して引数リストに挿入します。
 .sp
-եˤϡ\fIjar\fRޥɤΥץȰ(ե򥵥ݡȤʤưġϤ\fI\-J\fRץ)ޤ뤳ȤǤޤեΰϡޤϲʸǶڤ뤳ȤǤޤեΥե̾ϡ\fIjar\fRޥɤ¹ԤǤ븽ߤΥǥ쥯ȥФŪǤꡢեξФƤŪǤϤޤ̾ϥڥ졼ƥ󥰡ƥࡦˤäŸ륢ꥹ(*)ʤɤΥ磻ɥɤŸޤ
+引数ファイルには、\fIjar\fRコマンドのオプションと引数(引数ファイルをサポートしない起動ツールに渡される\fI\-J\fRオプションを除く)を含めることができます。ファイル内の引数は、空白または改行文字で区切ることができます。引数ファイル内のファイル名は、\fIjar\fRコマンドを実行できる現在のディレクトリに対して相対的であり、引数ファイルの場所に対しては相対的ではありません。通常はオペレーティング・システム・シェルによって展開されるアスタリスク(*)などのワイルドカードは展開されません。
 .sp
-ϡ\fIfind\fRޥɤˤ븽ߤΥǥ쥯ȥϤΥե̾\fIclasses\&.list\fRեˡ򼨤ޤ
+次の例は、\fIfind\fRコマンドによる現在のディレクトリ出力からのファイル名で\fIclasses\&.list\fRファイルを作成する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -330,7 +330,7 @@
 .if n \{\
 .RE
 .\}
-\fIjar\fRޥɤ¹Ԥ\fI@arg\-file\fRʸѤ\fIclasses\&.list\fRեϤȤǤޤ
+\fIjar\fRコマンドを実行し、\fI@arg\-file\fR構文を使用して\fIclasses\&.list\fRファイルを渡すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -341,7 +341,7 @@
 .if n \{\
 .RE
 .\}
-եϥѥǤޤХѥҤ줿եΤ٤ƤΥե̾ϡϤ줿ѥФŪǤϤʤ\fIjar\fRޥɤθߤκȥǥ쥯ȥŪȤʤޤȤСΤ褦ˤʤޤ
+引数ファイルはパスを指定できますが、相対パスが記述された引数ファイル内のすべてのファイル名は、渡されたパスに対して相対的ではなく、\fIjar\fRコマンドの現在の作業ディレクトリに相対的となります。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -353,9 +353,9 @@
 .RE
 .\}
 .RE
-.SH ""
+.SH "注意"
 .PP
-\fIe\fR\fIf\fR\fIm\fRץϡ\fIentrypoint\fR\fIjarfile\fR\fImanifest\fRڥɤƱǥޥɥ饤˽иɬפޤ
+\fIe\fR、\fIf\fRおよび\fIm\fRオプションは、\fIentrypoint\fR、\fIjarfile\fRおよび\fImanifest\fRオペランドと同じ順序でコマンドラインに出現する必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -366,9 +366,9 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "例"
 .PP
-\fBExample 1\fR, ĹʽϤˤ븽ߤΥǥ쥯ȥ꤫Τ٤ƤΥեɲ
+\fBExample 1\fR, 冗長な出力による現在のディレクトリからのすべてのファイルの追加
 .RS 4
 .sp
 .if n \{\
@@ -396,7 +396,7 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ֥ǥ쥯ȥ꤫Υեɲ
+\fBExample 2\fR, サブディレクトリからのファイルの追加
 .RS 4
 .sp
 .if n \{\
@@ -427,7 +427,7 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, JARΥƥĤΥꥹ
+\fBExample 3\fR, JARのコンテンツのリスト
 .RS 4
 .sp
 .if n \{\
@@ -460,9 +460,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, ɲ
+\fBExample 4\fR, 索引の追加
 .RS 4
-Υץꥱ߰¸饹\fImain\&.jar\fR\fIbuy\&.jar\fR\fIsell\&.jar\fR3ĤJARեʬ䤹硢\fIi\fRץѤޤ\fImain\&.jar\fRޥ˥ե\fIClass\-Path\fR°ꤹ硢\fIi\fRץѤơץꥱΥ饹ɤ®٤Ǥޤ
+株式取引のアプリケーションの相互依存クラスを、\fImain\&.jar\fR、\fIbuy\&.jar\fRおよび\fIsell\&.jar\fRの3つのJARファイルに分割する場合、\fIi\fRオプションを使用します。\fImain\&.jar\fRマニフェスト内の\fIClass\-Path\fR属性を指定する場合、\fIi\fRオプションを使用して、アプリケーションのクラス・ロードの速度を向上できます。
 .sp
 .if n \{\
 .RS 4
@@ -474,9 +474,9 @@
 .if n \{\
 .RE
 .\}
-\fIINDEX\&.LIST\fRե뤬\fIMETA\-INF\fRǥ쥯ȥޤˤꡢץꥱΥ饹ˤäƥ饹ޤϥ꥽θԤȤˡꤷJARե뤬ɤ褦ˤʤޤ
+\fIINDEX\&.LIST\fRファイルが\fIMETA\-INF\fRディレクトリに挿入されます。これにより、アプリケーションのクラス・ローダーによってクラスまたはリソースの検索が行われるときに、指定したJARファイルがダウンロードされるようになります。
 .sp
-ץꥱΥ饹ϡΥե˳ǼƤѤơΨŪ˥饹ɤޤǥ쥯ȥ򥳥ԡˤϡǽ\fIdir1\fRΥե\fIstdout\fR˰̤Ƥ顢\fIstdin\fR\fIdir2\fR˥ѥץ饤Фޤ(\fI\-f\fRץξ\fIjar\fRޥɤǾάޤ)
+アプリケーションのクラス・ローダーは、このファイルに格納されている情報を使用して、効率的にクラスをロードします。ディレクトリをコピーするには、最初に\fIdir1\fR内のファイルを\fIstdout\fRに圧縮してから、\fIstdin\fRから\fIdir2\fRにパイプラインを作成して抽出します(\fI\-f\fRオプションは両方の\fIjar\fRコマンドで省略します)。
 .sp
 .if n \{\
 .RS 4
@@ -488,7 +488,7 @@
 .RE
 .\}
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -509,8 +509,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlˤ
-Java塼ȥꥢJAR˴ؤ
+http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlにある
+JavaチュートリアルのJARに関する項
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/jarsigner.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jarsigner.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jarsigner
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ƥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: セキュリティ・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jarsigner" "1" "2013ǯ1121" "JDK 8" "ƥġ"
+.TH "jarsigner" "1" "2013年11月21日" "JDK 8" "セキュリティ・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jarsigner \- Java(JAR)եФƽ̾ӸڤԤޤ
-.SH ""
+jarsigner \- Javaアーカイブ(JAR)ファイルに対して署名および検証を行います。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -74,30 +74,30 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \-verify
 .RS 4
-\fI\-verify\fRץǤϡJARե̾θ0İʾΥȥ̾Ǥޤ\fI\-verify\fRץ󤬻ꤵ줿硢\fIjarsigner\fRޥɤǤϡJARեγƽ̾դƥƥθڤ˻Ѥ񤬡줫Υȥ̾˰פ뤳Ȥåޤ̾ϡ\fI\-keystore\fRǻꤵ줿ȥޤϥǥեȤΥȥޤ
+\fI\-verify\fRオプションでは、JARファイル名の後に0個以上のキーストア別名を指定できます。\fI\-verify\fRオプションが指定された場合、\fIjarsigner\fRコマンドでは、JARファイル内の各署名付きエンティティの検証に使用される証明書が、いずれかのキーストア別名に一致することをチェックします。別名は、\fI\-keystore\fRで指定されたキーストア内またはデフォルトのキーストア内に定義されます。
 .sp
-\fI\-strict\fRץꤷ硢\fIjarsigner\fRޥɤˤʷٹ𤬸Фȡåjarڤޤ̾ԥ顼פɽޤ
+\fI\-strict\fRオプションも指定した場合、\fIjarsigner\fRコマンドにより重大な警告が検出されると、メッセージ「jarが検証されました。署名者エラー」が表示されます。
 .RE
 .PP
 \fIjar\-file\fR
 .RS 4
-̾JARե롣
+署名されるJARファイル。
 .sp
-\fI\-strict\fRץꤷ硢\fIjarsigner\fRޥɤˤʷٹ𤬸ФȡåjarϽ̾ޤ \- ̾ԥ顼ޤפȤåɽޤ
+\fI\-strict\fRオプションも指定した場合、\fIjarsigner\fRコマンドにより重大な警告が検出されると、メッセージ「jarは署名されました \- 署名者エラーがあります。」というメッセージが表示されます。
 .RE
 .PP
 \fIalias\fR
 .RS 4
-̾ϡ\fI\-keystore\fRǻꤵ줿ȥޤϥǥեȤΥȥޤ
+別名は、\fI\-keystore\fRで指定されたキーストア内またはデフォルトのキーストア内に定義されます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjarsigner\fRġˤϡ2ĤŪޤ
+\fIjarsigner\fRツールには、次の2つの目的があります。
 .sp
 .RS 4
 .ie n \{\
@@ -107,7 +107,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java(JAR)ե˽̾Ū
+Javaアーカイブ(JAR)ファイルに署名する目的。
 .RE
 .sp
 .RS 4
@@ -118,12 +118,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̾դJARեν̾򸡾ڤŪ
+署名付きJARファイルの署名と整合性を検証する目的。
 .RE
 .PP
-JARǽѤȡ饹ե롢᡼ɤӤ¾Υǥ롦ǡñΥե˥ѥåǤΤǡե®ưפۤǤޤ\fIjar\fRȤ̾ΥġѤơȯԤJARեǤޤ(ŪʴС٤ƤZIPեJARեȤߤʤȤǤޤ\fIjar\fRޥɤˤäƺ줿JARե롢ޤ\fIjarsigner\fRޥɤˤäƽ줿JARեˤϡ\fIMETA\-INF/MANIFEST\&.MF\fRեޤޤƤޤ)
+JAR機能を使用すると、クラス・ファイル、イメージ、サウンドおよびその他のデジタル・データを単一のファイルにパッケージ化できるので、ファイルを迅速かつ容易に配布できます。\fIjar\fRという名前のツールを使用して、開発者はJARファイルを作成できます。(技術的な観点から言えば、すべてのZIPファイルもJARファイルとみなすことができます。ただし、\fIjar\fRコマンドによって作成されたJARファイル、または\fIjarsigner\fRコマンドによって処理されたJARファイルには、\fIMETA\-INF/MANIFEST\&.MF\fRファイルも含まれています。)
 .PP
-ǥ̾ϡʤ餫Υǡ(̾оݤȤʤǡ)ӥƥƥ(͡Ҥʤ)̩׻ӥåȤʸǤ񤭤ν̾Ʊ͡ǥ̾ˤ¿ޤ
+デジタル署名は、なんらかのデータ(署名の対象となるデータ)、およびエンティティ(人、会社など)の秘密鍵から計算されるビットの文字列です。手書きの署名同様、デジタル署名には多くの利点があります。
 .sp
 .RS 4
 .ie n \{\
@@ -133,7 +133,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̾˻Ѥ줿̩бѤ׻ˤäơ줬ʪǤ뤳Ȥ򸡾ڤǤޤ
+署名の生成に使用された秘密鍵に対応する公開鍵を使用する計算によって、それが本物であることを検証できます。
 .RE
 .sp
 .RS 4
@@ -144,7 +144,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̩¾ͤΤʤ¤ꡢǥ̾ε¤ԲǽǤ
+秘密鍵が他人に知られない限り、デジタル署名の偽造は不可能です。
 .RE
 .sp
 .RS 4
@@ -155,7 +155,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ϡ̾դǡεǽǤꡢ¾Υǡν̾Ȥʤ褦׵Ǥޤ
+これは、署名が付いたデータの機能であり、他のデータの署名となるように要求できません。
 .RE
 .sp
 .RS 4
@@ -166,27 +166,27 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̾դǡѹǤޤ󡣥ǡѹ줿硢̾ˤäʪǤȸڤǤޤ
+署名付きデータは変更できません。データが変更された場合、署名によって本物であると検証できません。
 .RE
 .PP
-եФƥƥƥν̾ˤϡޤƥƥϡΥƥƥ˴Ϣ/̩Υڥȡǧڤ1İʾξɬפޤȤϡ륨ƥƥΥǥ̾դʸǡ̤ΥƥƥθͤĤȤ򼨤Ƥޤ
+ファイルに対してエンティティの署名を生成するには、まず、エンティティは、そのエンティティに関連する公開鍵/秘密鍵のペアと、公開鍵を認証する1つ以上の証明書を持つ必要があります。証明書とは、あるエンティティからのデジタル署名付きの文書で、別のエンティティの公開鍵が特定の値を持つことを示しています。
 .PP
-\fIjarsigner\fRޥɤϡȥθȾѤơJARեΥǥ̾ޤȥϡ̩бǧڤ롢̩˴ϢX\&.509Υǡ١Ǥ\fIkeytool\fRޥɤѤơȥӴޤ
+\fIjarsigner\fRコマンドは、キーストアからの鍵と証明書情報を使用して、JARファイルのデジタル署名を生成します。キーストアは、秘密鍵、および対応する公開鍵を認証する、秘密鍵に関連したX\&.509証明書チェーンのデータベースです。\fIkeytool\fRコマンドを使用して、キーストアを作成および管理します。
 .PP
-\fIjarsigner\fRޥɤǤϡƥƥ̩Ѥƽ̾ޤ̾դJARեˤϡäˡեؤν̾˻Ѥ̩бΥȥξΥԡޤޤޤ\fIjarsigner\fRޥɤǤϡ(֥̾åե)ξѤơ̾դJARեΥǥ̾򸡾ڤǤޤ
+\fIjarsigner\fRコマンドでは、エンティティの秘密鍵を使用して署名を生成します。署名付きJARファイルには、特に、ファイルへの署名に使用する秘密鍵に対応する公開鍵のキーストアからの証明書のコピーが含まれます。\fIjarsigner\fRコマンドでは、内部(署名ブロック・ファイル内)の証明書を使用して、署名付きJARファイルのデジタル署名を検証できます。
 .PP
-\fIjarsigner\fRޥɤǤϡ̾ͭJARե뤬̾줿줿ɤ򥷥ƥǥץ(Java Plug\-inޤ)åǤ롢ॹפޤ̾ǤޤˡAPIѤȡץꥱǥॹ׾Ǥޤ
+\fIjarsigner\fRコマンドでは、署名証明書の有効期間中にJARファイルが署名されたされたかどうかをシステムやデプロイヤ(Java Plug\-inを含む)がチェックできる、タイムスタンプを含む署名を生成できます。さらに、APIを使用すると、アプリケーションでタイムスタンプ情報を取得できます。
 .PP
-Ǥϡ\fIjarsigner\fRޥɤǤϡ\fIjar\fRޥɤޤZIPեˤäƺ줿JARեΤߤ˽̾ǤޤJARեZIPեƱǤJARեˤ\fIMETA\-INF/MANIFEST\&.MF\fRեޤޤƤۤʤޤ\fIMETA\-INF/MANIFEST\&.MF\fRեϡ\fIjarsigner\fRޥɤˤäZIPե˽̾ݤ˺ޤ
+現時点では、\fIjarsigner\fRコマンドでは、\fIjar\fRコマンドまたはZIPファイルによって作成されたJARファイルのみに署名できます。JARファイルはZIPファイルと同じですが、JARファイルには\fIMETA\-INF/MANIFEST\&.MF\fRファイルも含まれている点が異なります。\fIMETA\-INF/MANIFEST\&.MF\fRファイルは、\fIjarsigner\fRコマンドによってZIPファイルに署名する際に作成されます。
 .PP
-ǥեȤ\fIjarsigner\fRޥɤưǤϡJARޤZIPե˽̾ޤ\fI\-verify\fRץѤơ̾դJARե򸡾ڤޤ
+デフォルトの\fIjarsigner\fRコマンドの動作では、JARまたはZIPファイルに署名します。\fI\-verify\fRオプションを使用して、署名付きJARファイルを検証します。
 .PP
-\fIjarsigner\fRޥɤϡ̾ޤϸڤθ˽̾ԤξθڤԤޤڥ顼ޤϤ¾꤬ȯȡޥɤˤٹåޤ\fI\-strict\fRץꤷ硢ޥɤˤʷٹ𤬥顼Ȥƽޤ顼ȷٹ򻲾ȤƤ
-.SS "ȥ̾"
+\fIjarsigner\fRコマンドは、署名または検証の後に署名者の証明書の検証も試行します。検証エラーまたはその他の問題が発生すると、コマンドにより警告メッセージが生成されます。\fI\-strict\fRオプションを指定した場合、コマンドにより重大な警告がエラーとして処理されます。エラーと警告を参照してください。
+.SS "キーストアの別名"
 .PP
-ȥΤ٤ƤΥƥƥϡդ̾Ѥƥޤ
+キーストアのすべてのエンティティは、一意の別名を使用してアクセスされます。
 .PP
-\fIjarsigner\fRޥɤѤJARե˽̾Ȥϡ̾ɬפ̩ޤ७ȥȥ̾ꤹɬפޤȤСΥޥɤǤϡ\fIworking\fRǥ쥯ȥ\fImystore\fRȤ̾Υȥ˴ޤޤ̾\fIduke\fR˴Ϣդ줿̩Ѥơ\fIMyJARFile\&.jar\fRȤ̾JARե˽̾ޤϥեϻꤵƤʤᡢ\fIMyJARFile\&.jar\fRϽ̾դJARեˤäƾ񤭤ޤ
+\fIjarsigner\fRコマンドを使用してJARファイルに署名するときは、署名の生成に必要な秘密鍵を含むキーストア・エントリの別名を指定する必要があります。たとえば、次のコマンドでは、\fIworking\fRディレクトリの\fImystore\fRという名前のキーストアに含まれる別名\fIduke\fRに関連付けられた秘密鍵を使用して、\fIMyJARFile\&.jar\fRという名前のJARファイルに署名します。出力ファイルは指定されていないため、\fIMyJARFile\&.jar\fRは署名付きのJARファイルによって上書きされます。
 .sp
 .if n \{\
 .RS 4
@@ -199,36 +199,36 @@
 .RE
 .\}
 .PP
-ȥϥѥɤݸƤΤǡȥΥѥɤꤹɬפޤޥɥ饤ǻꤷʤȡϤޤƱͤˡ̩⥭ȥǥѥɤˤäݸƤ뤿ᡢ̩Υѥɤꤹɬפޤޥɥ饤ǥѥɤꤷƤʤ硢ޤϻꤷѥȤ¸ƤѥɤƱǤϤʤϡѥɤϤޤ
-.SS "ȥξ"
+キーストアはパスワードで保護されているので、ストアのパスワードを指定する必要があります。コマンドラインで指定しないと、入力を求められます。同様に、秘密鍵もキーストア内でパスワードによって保護されているため、秘密鍵のパスワードを指定する必要があります。コマンドラインでパスワードを指定していない場合、または指定したパスワートが保存されているパスワードと同じではない場合は、パスワードの入力を求められます。
+.SS "キーストアの場所"
 .PP
-\fIjarsigner\fRޥɤˤϡѤ륭ȥURLꤹ\fI\-keystore\fRץ󤬤ޤȥϥǥեȤǡ\fIuser\&.home\fRƥࡦץѥƥǷޤ桼Υۡࡦǥ쥯ȥ\fI\&.keystore\fRȤ̾Υե˳Ǽޤ
+\fIjarsigner\fRコマンドには、使用するキーストアのURLを指定する\fI\-keystore\fRオプションがあります。キーストアはデフォルトで、\fIuser\&.home\fRシステム・プロパティで決まるユーザーのホーム・ディレクトリの\fI\&.keystore\fRという名前のファイル内に格納されます。
 .PP
-Oracle Solarisƥξ硢\fIuser\&.home\fRϡ桼Υۡࡦǥ쥯ȥ˥ǥեꤵޤ
+Oracle Solarisシステムの場合、\fIuser\&.home\fRは、ユーザーのホーム・ディレクトリにデフォルト設定されます。
 .PP
-\fI\-keystore\fRץ󤫤ϥȥ꡼ϡ\fIKeyStore\&.load\fR᥽åɤϤޤURLȤ\fINONE\fRꤵƤϡnullΥȥ꡼ब\fIKeyStore\&.load\fR᥽åɤϤޤ\fINONE\fRϡ\fIKeyStore\fR饹ե١ǤϤʤ硢ȤСϡɥȡ󡦥ǥХ֤Ƥ˻ꤷޤ
-.SS "ȥμ"
+\fI\-keystore\fRオプションからの入力ストリームは、\fIKeyStore\&.load\fRメソッドに渡されます。URLとして\fINONE\fRが指定されている場合は、nullのストリームが\fIKeyStore\&.load\fRメソッドに渡されます。\fINONE\fRは、\fIKeyStore\fRクラスがファイルベースではない場合、たとえば、ハードウェア・トークン・デバイスに置かれている場合に指定します。
+.SS "キーストアの実装"
 .PP
-\fIjava\&.security package\fR󶡤Ƥ\fIKeyStore\fR饹ϡȥξؤΥӾѹԤΡΤ줿¿Υ󥿥ե󶡤ޤʣΰۤʤꤹ뤳ȤǤƼΥפΥȥоݤȤޤ
+\fIjava\&.security package\fRで提供されている\fIKeyStore\fRクラスは、キーストア内の情報へのアクセスおよび情報の変更を行うための、明確に定義された多くのインタフェースを提供します。複数の異なる固定実装を指定することができ、各実装は特定のタイプのキーストアを対象とします。
 .PP
-ߡȥμѤ2ĤΥޥɥ饤󡦥ġ(\fIkeytool\fR\fIjarsigner\fR)ӥݥꥷġȤ̾1ĤGUI١Υġ뤬ޤ\fIKeyStore\fR饹ϸƤ뤿ᡢJDK桼ϡѤ¾Υƥץꥱ񤭹ळȤǤޤ
+現在、キーストアの実装を使用する2つのコマンドライン・ツール(\fIkeytool\fRと\fIjarsigner\fR)、およびポリシー・ツールという名前の1つのGUIベースのツールがあります。\fIKeyStore\fRクラスは公開されているため、JDKユーザーは、それを使用する他のセキュリティ・アプリケーションを書き込むことができます。
 .PP
-Oracle󶡤ȹߤΥǥեȤμޤϡJKSȤ̾ȼΥȥ()ѤΤǡȥեȤƼƤޤȹߤμǤϡ̩ϸ̤Υѥɤˤäݸ졢ȥΤ(̩Ȥ̤)ѥɤˤäݸޤ
+Oracleが提供する組込みのデフォルトの実装があります。これは、JKSという名前の独自のキーストア・タイプ(形式)を使用するもので、キーストアをファイルとして実装しています。組込みの実装では、各秘密鍵は個別のパスワードによって保護され、キーストア全体の整合性は(秘密鍵とは別の)パスワードによって保護されます。
 .PP
-ȥμϥץХ١ǡĤޤꡢ\fIKeyStore\fR饹ˤ󶡤륢ץꥱ󡦥󥿥եϡӥץХ󥿥ե(SPI)˴ؤƼޤб\fIKeystoreSpi\fRݥ饹ꡢ\fIjava\&.security package\fR˴ޤޤƤޤΥ饹ץХɬפΤ륵ӥץХ󥿥եΥ᥽åɤƤޤǡץХȤϡJava Security APIˤäƥǽʥӥΥ֥åȤФθ󶡤ѥåޤϥѥåνΤȤǤȥμ󶡤ˤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlˤ
-JavaŹ沽ƥΥץХμˡƤ褦ˡ饤ȤϥץХ\fIKeystoreSpi\fR֥饹μ󶡤ɬפޤ
+キーストアの実装はプロバイダベースで、つまり、\fIKeyStore\fRクラスにより提供されるアプリケーション・インタフェースは、サービス・プロバイダ・インタフェース(SPI)に関して実装されます。対応する\fIKeystoreSpi\fR抽象クラスがあり、これも\fIjava\&.security package\fRに含まれています。このクラスが、プロバイダが実装する必要のあるサービス・プロバイダ・インタフェースのメソッドを定義しています。ここで、プロバイダとは、Java Security APIによってアクセス可能なサービスのサブセットに対し、その固定実装を提供するパッケージまたはパッケージの集合のことです。キーストアの実装を提供するには、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlにある
+Java暗号化アーキテクチャのプロバイダの実装方法で説明しているように、クライアントはプロバイダを実装し、\fIKeystoreSpi\fRサブクラスの実装を提供する必要があります。
 .PP
-ץꥱǤϡ\fIKeyStore\fR饹\fIgetInstance\fRեȥꡦ᥽åɤѤơ͡ʥץХۤʤ륿פΥȥμǤޤȥΥפϡȥγǼȥǡȤȤˡȥ̩ȥȥΤݸ뤿˻Ѥ륢르ꥺޤۤʤ륿פΥȥμˤϡߴϤޤ
+アプリケーションでは、\fIKeyStore\fRクラスの\fIgetInstance\fRファクトリ・メソッドを使用して、様々なプロバイダから異なるタイプのキーストアの実装を選択できます。キーストアのタイプは、キーストア情報の格納形式とデータ形式を定義するとともに、キーストア内の秘密鍵とキーストア自体の整合性を保護するために使用されるアルゴリズムを定義します。異なるタイプのキーストアの実装には、互換性はありません。
 .PP
-\fIjarsigner\fR\fIpolicytool\fRޥɤϡURLѤƻǤǤդξ꤫ե١Υȥɤ߼뤳ȤǤޤޤΥޥɤϡWindowsMSCAPIӤ٤ƤΥץåȥեPKCS11󶡤褦ե١Υȥɤ߼뤳ȤǤޤ
+\fIjarsigner\fRおよび\fIpolicytool\fRコマンドは、URLを使用して指定できる任意の場所からファイルベースのキーストアを読み取ることができます。また、これらのコマンドは、Windows上のMSCAPIおよびすべてのプラットフォーム上のPKCS11で提供されるような非ファイルベースのキーストアを読み取ることができます。
 .PP
-\fIjarsigner\fRޥɤ\fIkeytool\fRޥɤξ硢\fI\-storetype\fRץѤơޥɥ饤ǥȥΥפǤޤݥꥷġξ硢\fB֥ȥ\fR˥塼\fBԽ\fRޥɤѤơȥΥפǤޤ
+\fIjarsigner\fRコマンドおよび\fIkeytool\fRコマンドの場合、\fI\-storetype\fRオプションを使用して、コマンドラインでキーストアのタイプを指定できます。ポリシー・ツールの場合、\fB「キーストア」\fRメニューの\fB「編集」\fRコマンドを使用して、キーストアのタイプを指定できます。
 .PP
-桼ȥΥפŪ˻ꤷʤä硢ƥץѥƥեǻꤵ줿\fIkeystore\&.type\fRץѥƥͤ˴Ťơġˤäƥȥμ򤵤ޤΥƥץѥƥե\fIjava\&.security\fRȸƤФ졢JDKƥץѥƥǥ쥯ȥ\fIjava\&.home/lib/security\fR¸ߤƤޤǡ\fIjava\&.home\fRϼ¹ԻĶΥǥ쥯ȥǤ\fIjre\fRǥ쥯ȥϡJDKޤJava Runtime Environment (JRE)κǾ̤Υǥ쥯ȥˤޤ
+ユーザーがキーストアのタイプを明示的に指定しなかった場合、セキュリティ・プロパティ・ファイルで指定された\fIkeystore\&.type\fRプロパティの値に基づいて、ツールによってキーストアの実装が選択されます。このセキュリティ・プロパティ・ファイルは\fIjava\&.security\fRと呼ばれ、JDKセキュリティ・プロパティ・ディレクトリ\fIjava\&.home/lib/security\fR内に存在しています。ここで、\fIjava\&.home\fRは実行時環境のディレクトリです。\fIjre\fRディレクトリは、JDKまたはJava Runtime Environment (JRE)の最上位のディレクトリにあります。
 .PP
-ƥġϡ\fIkeystore\&.type\fRͤΥפΥȥƤץХĤޤǡ󥹥ȡ뤵Ƥ뤹٤ƤΥץХĴ٤ޤŪΥץХĤȡΥץХΥȥμѤޤ
+各ツールは、\fIkeystore\&.type\fRの値を取得し、そのタイプのキーストアを実装しているプロバイダが見つかるまで、インストールされているすべてのプロバイダを調べます。目的のプロバイダが見つかると、そのプロバイダからのキーストアの実装を使用します。
 .PP
-\fIKeyStore\fR饹Ƥstatic᥽å\fIgetDefaultType\fRѤȡץꥱ䥢ץåȤ\fIkeystore\&.type\fRץѥƥͤǤޤΥɤιԤǤϡ\fIkeystore\&.type property\fRǻꤵ줿ǥեȤΥȥפΥ󥹥󥹤ޤ
+\fIKeyStore\fRクラスに定義されているstaticメソッド\fIgetDefaultType\fRを使用すると、アプリケーションやアプレットから\fIkeystore\&.type\fRプロパティの値を取得できます。次のコードの行では、\fIkeystore\&.type property\fRで指定された、デフォルトのキーストア・タイプのインスタンスを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -240,8 +240,8 @@
 .RE
 .\}
 .PP
-ǥեȤΥȥפϡ\fIjks\fR
-(Oracle󶡤ȼΥפΥȥμ)ǤϡƥץѥƥեμιԤˤäƻꤵƤޤ
+デフォルトのキーストア・タイプは、\fIjks\fR
+(Oracleが提供する独自のタイプのキーストアの実装)です。これは、セキュリティ・プロパティ・ファイル内の次の行によって指定されています。
 .sp
 .if n \{\
 .RS 4
@@ -253,9 +253,9 @@
 .RE
 .\}
 .PP
-ȥΥפλǤϡʸȾʸ϶̤ޤ󡣤ȤС\fIJKS\fR\fIjks\fRƱˤʤޤ
+キーストアのタイプの指定では、大文字と小文字は区別されません。たとえば、\fIJKS\fRは\fIjks\fRと同じになります。
 .PP
-ġǥǥեȰʳΥȥμѤˤϡιԤѹ̤ΥȥΥפꤷޤȤС\fIpkcs12\fRȸƤФ륭ȥΥפΥȥμ󶡤ץХѥå硢Ԥ򼡤Τ褦ѹޤ
+ツールでデフォルト以外のキーストアの実装を使用するには、その行を変更して別のキーストアのタイプを指定します。たとえば、\fIpkcs12\fRと呼ばれるキーストアのタイプのキーストアの実装を提供するプロバイダ・パッケージがある場合、行を次のように変更します。
 .sp
 .if n \{\
 .RS 4
@@ -267,12 +267,12 @@
 .RE
 .\}
 .PP
-\fB:\fR
-PKCS 11ץХѥåѤ硢http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/p11guide\&.htmlˤ
-Java PKCS #11ե󥹡ɤΡKeyToolפӡJarSignerפ򻲾ȤƤ
-.SS "ݡȤ륢르ꥺ"
+\fB注意:\fR
+PKCS 11プロバイダ・パッケージを使用する場合、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/p11guide\&.htmlにある
+Java PKCS #11リファレンス・ガイドの「KeyTool」および「JarSigner」を参照してください。
+.SS "サポートされるアルゴリズム"
 .PP
-ǥեȤǡ\fIjarsigner\fRޥɤǤϼΤ줫Υ르ꥺѤJARե˽̾ޤ
+デフォルトで、\fIjarsigner\fRコマンドでは次のいずれかのアルゴリズムを使用してJARファイルに署名します。
 .sp
 .RS 4
 .ie n \{\
@@ -282,7 +282,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHA1ȡ르ꥺѤǥ̾르ꥺ(DSA)
+SHA1ダイジェスト・アルゴリズムを使用したデジタル署名アルゴリズム(DSA)
 .RE
 .sp
 .RS 4
@@ -293,7 +293,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHA256ȡ르ꥺѤRSA르ꥺࡣ
+SHA256ダイジェスト・アルゴリズムを使用したRSAアルゴリズム。
 .RE
 .sp
 .RS 4
@@ -304,15 +304,15 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHA256ʱ߶ǥ̾르ꥺ(ECDSA)Ѥʱ߶(EC)Ź르ꥺ
+SHA256と楕円曲線デジタル署名アルゴリズム(ECDSA)を使用した楕円曲線(EC)暗号方式アルゴリズム
 .RE
 .PP
-̾Ԥθ̩DSAǤ硢\fIjarsigner\fR\fISHA1withDSA\fR르ꥺѤJARե˽̾ޤ̾ԤθRSAǤ硢\fIjarsigner\fR\fISHA256withRSA\fR르ꥺѤJARե˽̾褦Ȥޤ̾ԤθECǤ硢\fIjarsigner\fR\fISHA256withECDSA\fR르ꥺѤJARե˽̾ޤ
+署名者の公開鍵と秘密鍵がDSA鍵である場合、\fIjarsigner\fRは\fISHA1withDSA\fRアルゴリズムを使用してJARファイルに署名します。署名者の鍵がRSA鍵である場合、\fIjarsigner\fRは\fISHA256withRSA\fRアルゴリズムを使用してJARファイルに署名しようとします。署名者の鍵がEC鍵である場合、\fIjarsigner\fRは\fISHA256withECDSA\fRアルゴリズムを使用してJARファイルに署名します。
 .PP
-ΥǥեȤν̾르ꥺϡ\fI\-sigalg\fRץѤƥС饤ɤǤޤ
-.SS "̾դJARե"
+これらのデフォルトの署名アルゴリズムは、\fI\-sigalg\fRオプションを使用してオーバーライドできます。
+.SS "署名付きJARファイル"
 .PP
-\fIjarsigner\fRޥɤѤJARե˽̾硢Ϥ̾դJARեJARեƱǤ2Ĥɲåե뤬META\-INFǥ쥯ȥ֤ۤʤޤ
+\fIjarsigner\fRコマンドを使用してJARファイルに署名する場合、出力される署名付きJARファイルは入力JARファイルと同じですが、次の2つの追加ファイルがMETA\-INFディレクトリに置かれる点が異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -322,7 +322,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\&.SF\fRĥҤդ̾ե
+\fI\&.SF\fR拡張子の付いた署名ファイル
 .RE
 .sp
 .RS 4
@@ -333,14 +333,14 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\&.DSA\fR\fI\&.RSA\fRޤ\fI\&.EC\fRĥҤդ֥̾åե
+\fI\&.DSA\fR、\fI\&.RSA\fRまたは\fI\&.EC\fR拡張子の付いた署名ブロック・ファイル
 .RE
 .PP
-2ĤΥեΥ١ե̾ϡ\fI\-sigFile\fRץͤޤȤСץ\fI\-sigFile MKSIGN\fRξ硢ե\fIMKSIGN\&.SF\fR\fIMKSIGN\&.DSA\fRȤ̾ˤʤޤ
+これら2つのファイルのベース・ファイル名は、\fI\-sigFile\fRオプションの値から作成されます。たとえば、オプションが\fI\-sigFile MKSIGN\fRの場合、ファイルは\fIMKSIGN\&.SF\fRおよび\fIMKSIGN\&.DSA\fRという名前になります。
 .PP
-ޥɥ饤\fI\-sigfile\fRץꤷʤä硢\fI\&.SF\fRե\fI\&.DSA\fRեΥ١ե̾ϡޥɥ饤ǻꤵ줿̾Ƭ8ʸ򤹤٤ʸѴΤˤʤޤ̾8ʸ̤ξϡ̾Τޤ޻Ѥޤ̾ˡ̾ե̾ǻѤǤʤʸޤޤƤ硢ե̾κˡʸ(_)ʸѴޤͭʸϡե٥åȡӥϥեǤ
-̾ե.PP
-̾ե(\fI\&.SF\fRե)ϡ\fIjarsigner\fRޥɤѤƥե˽̾ݤJARե˾˴ޤޤޥ˥եȡեȻƤޤJARե˴ޤޤƤ륽ե뤴Ȥˡ\fI\&.SF\fRեˤϡޥ˥եȡեˤ褦ʡ˼3ĤιԤޤ
+コマンドラインで\fI\-sigfile\fRオプションを指定しなかった場合、\fI\&.SF\fRファイルと\fI\&.DSA\fRファイルのベース・ファイル名は、コマンドラインで指定された別名の先頭の8文字をすべて大文字に変換したものになります。別名が8文字未満の場合は、別名がそのまま使用されます。別名に、署名ファイル名で使用できない文字が含まれている場合、ファイル名の作成時に、該当する文字が下線(_)文字に変換されます。有効な文字は、アルファベット、数字、下線およびハイフンです。
+署名ファイル.PP
+署名ファイル(\fI\&.SF\fRファイル)は、\fIjarsigner\fRコマンドを使用してファイルに署名する際にJARファイルに常に含まれるマニフェスト・ファイルと似ています。JARファイルに含まれているソース・ファイルごとに、\fI\&.SF\fRファイルには、マニフェスト・ファイルにあるような、次に示す3つの行があります。
 .sp
 .RS 4
 .ie n \{\
@@ -350,7 +350,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ե̾
+ファイル名
 .RE
 .sp
 .RS 4
@@ -361,7 +361,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ȡ르ꥺ(SHA)̾
+ダイジェスト・アルゴリズム(SHA)の名前
 .RE
 .sp
 .RS 4
@@ -372,17 +372,17 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHAȤ
+SHAダイジェストの値
 .RE
 .PP
-ޥ˥եȡեǤϡƥեSHAȤͤϡեΥХʥꡦǡΥ(ϥå)ˤʤޤ\fI\&.SF\fRեǤϡꤵ줿եΥȤͤϡեΥޥ˥եȡեΤ3ԤΥϥåˤʤޤ
+マニフェスト・ファイルでは、各ソース・ファイルのSHAダイジェストの値は、ソース・ファイルのバイナリ・データのダイジェスト(ハッシュ)になります。\fI\&.SF\fRファイルでは、指定されたソース・ファイルのダイジェストの値は、ソース・ファイルのマニフェスト・ファイル内のその3行のハッシュになります。
 .PP
-̾եˤϡǥեȤǡޥ˥եȡեΤΥϥå夬Ǽ줿إåޤޤƤޤإåˤϥޥ˥եȡإåΥϥåޤޤƤޤإå¸ߤȡڤκŬͭˤʤޤJARեθڤ򻲾ȤƤ
-֥̾åե.PP
-\fI\&.SF\fRեˤϽ̾դ졢̾Ͻ֥̾åե֤ޤΥեˤϡ̾˻Ѥ줿̩бǧڤ륭ȥξޤϾ⡢ǥ󥳡ɤƴޤޤƤޤեγĥҤϡѤȡ르ꥺ˱ơ\fI\&.DSA\fR\fI\&.RSA\fRޤ\fI\&.EC\fRˤʤޤ
-.SS "̾ॹ"
+署名ファイルには、デフォルトで、マニフェスト・ファイル全体のハッシュが格納されたヘッダーが含まれています。ヘッダーにはマニフェスト・ヘッダーのハッシュも含まれています。ヘッダーが存在すると、検証の最適化が有効になります。JARファイルの検証を参照してください。
+署名ブロック・ファイル.PP
+\fI\&.SF\fRファイルには署名が付けられ、署名は署名ブロック・ファイルに置かれます。このファイルには、署名に使用された秘密鍵に対応する公開鍵を認証するキーストアからの証明書または証明書チェーンも、内部でエンコードされて含まれています。ファイルの拡張子は、使用されるダイジェスト・アルゴリズムに応じて、\fI\&.DSA\fR、\fI\&.RSA\fRまたは\fI\&.EC\fRになります。
+.SS "署名タイムスタンプ"
 .PP
-\fIjarsigner\fRޥɤǤϡJARեν̾˽̾ॹפ¸Ǥޤˡ\fIjarsigner\fRؽ̾򥵥ݡȤޤưϾάǽǡ̾˼γƥץˤä椵ޤץ򻲾ȤƤ
+\fIjarsigner\fRコマンドでは、JARファイルの署名時に署名タイムスタンプを生成および保存できます。さらに、\fIjarsigner\fRは代替署名機構をサポートします。この動作は省略可能で、署名時に次の各オプションによって制御されます。オプションを参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -397,9 +397,9 @@
 .if n \{\
 .RE
 .\}
-.SS "JARեθ"
+.SS "JARファイルの検証"
 .PP
-JARեθڤΤϡ̾ͭǤꡢĽ̾ʹߤJARեΤɤΥեѹƤʤǤJARեθڤϡμǹԤޤ
+JARファイルの検証が成功するのは、署名が有効であり、かつ署名の生成以降にJARファイル内のどのファイルも変更されていない場合です。JARファイルの検証は、次の手順で行われます。
 .sp
 .RS 4
 .ie n \{\
@@ -409,9 +409,9 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-\fI\&.SF\fRեν̾򸡾ڤޤ
+\fI\&.SF\fRファイルの署名を検証します。
 .sp
-ڤǤϡƽ֥̾å(\fI\&.DSA\fR)ե˳Ǽ줿̾(ޤϾ)\fI\&.DSA\fRե˼б̩Ѥ줿Ȥǧޤޤ̾б̾(\fI\&.SF\fR)եͭʽ̾Ǥ뤳Ȥǧ졢ˤꡢ\fI\&.SF\fRե뤬󤵤ƤʤȤǧޤ
+検証では、各署名ブロック(\fI\&.DSA\fR)ファイルに格納された署名が、証明書(または証明書チェーン)も\fI\&.DSA\fRファイルに示される公開鍵に対応する秘密鍵を使用して生成されたことを確認します。また、署名が対応する署名(\fI\&.SF\fR)ファイルの有効な署名であることが確認され、それにより、\fI\&.SF\fRファイルが改ざんされていないことも確認されます。
 .RE
 .sp
 .RS 4
@@ -422,13 +422,13 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-\fI\&.SF\fRեγƥȥ˼Ȥ򡢥ޥ˥եбƥͤ碌Ƹڤޤ
+\fI\&.SF\fRファイル内の各エントリに示されるダイジェストを、マニフェスト内の対応する各セクションと突きあわせて検証します。
 .sp
-\fI\&.SF\fRեˤϡޥ˥եȡեΤΥϥå夬Ǽ줿إåǥեȤǴޤޤƤޤإå¸ߤ硢ڤǤϡإåΥϥå夬ޥ˥եȡեΥϥåȰפ뤫ɤǧ뤿˥åǤޤפ硢ڤϼμ˿ʤߤޤ
+\fI\&.SF\fRファイルには、マニフェスト・ファイル全体のハッシュが格納されたヘッダーがデフォルトで含まれています。ヘッダーが存在する場合、検証では、ヘッダー内のハッシュがマニフェスト・ファイルのハッシュと一致するかどうかを確認するためにチェックできます。一致する場合、検証は次の手順に進みます。
 .sp
-פʤ硢\fI\&.SF\fRեγƥե󥻥Υϥå夬ޥ˥եȡեб륻ΥϥåȰפ뤳Ȥǧ뤿ˡޤŬƤʤڤɬפˤʤޤ̾ե򻲾ȤƤ
+一致しない場合、\fI\&.SF\fRファイル内の各ソース・ファイル情報セクションのハッシュが、マニフェスト・ファイル内の対応するセクションのハッシュと一致することを確認するために、あまり最適化されていない検証が必要になります。署名ファイルを参照してください。
 .sp
-\fI\&.SF\fRեΥإå˳Ǽ줿ޥ˥եȡեΥϥå夬ߤΥޥ˥եȡեΥϥå˰פʤͳ1Ĥϡ̾\fI\&.SF\fRեˡ(\fIjar\fRġѤ)1İʾΥե뤬JARեɲä줿ȤǤ\fIjar\fRġѤƥեɲä硢եѤΥɲä뤳Ȥˤꡢޥ˥եȡեѹޤ\fI\&.SF\fRեѹޤ󡣸ڤޤƤȤߤʤΤϡ̾ʹߤJARեΤɤΥեѹƤʤǤ줬ȯΤϡ\fI\&.SF\fRեΥإåʳΥΥϥå夬ޥ˥եȡեб륻ΥϥåȰפǤ
+\fI\&.SF\fRファイルのヘッダーに格納されたマニフェスト・ファイルのハッシュが、現在のマニフェスト・ファイルのハッシュに一致しない理由の1つは、署名および\fI\&.SF\fRファイルの生成後に、(\fIjar\fRツールを使用して)1つ以上のファイルがJARファイルに追加されたことです。\fIjar\fRツールを使用してファイルを追加した場合、新しいファイル用のセクションが追加されることにより、マニフェスト・ファイルは変更されますが、\fI\&.SF\fRファイルは変更されません。検証がまだ成功しているとみなされるのは、署名の生成以降にJARファイル内のどのファイルも変更されていない場合です。これが発生するのは、\fI\&.SF\fRファイルのヘッダー以外のセクションのハッシュが、マニフェスト・ファイル内の対応するセクションのハッシュと一致する場合です。
 .RE
 .sp
 .RS 4
@@ -439,16 +439,16 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-\fI\&.SF\fRե˥ȥJARեγƥեɤ߼ޤɼ˥եΥȤ׻̤ޥ˥եȡΤΥեΥȤӤޤȤƱǤɬפꡢǤʤϸڤԤޤ
+\fI\&.SF\fRファイル内にエントリを持つJARファイル内の各ファイルを読み取ります。読取り中にファイルのダイジェストを計算し、結果をマニフェスト・セクション内のこのファイルのダイジェストと比較します。ダイジェストは同じである必要があり、そうでない場合は検証が失敗します。
 .sp
-ڥץˤʤ餫νʸڥ顼ȯ硢Υץߤ졢ƥ㳰ޤ\fIjarsigner\fRޥɤǤϡ㳰ªɽޤ
+検証プロセス中になんらかの重大な検証エラーが発生した場合、そのプロセスは停止され、セキュリティ例外がスローされます。\fIjarsigner\fRコマンドでは、例外を捕捉および表示します。
 .RE
 .PP
-\fB:\fR
-ɲäηٹ(ޤϡ\fI\-strict\fRץꤷϥ顼)Ϥ٤ɤɬפޤƱͤˡǤ뤫ꤹ뤿ˡ(\fI\-verbose\fR\fI\-certs\fRץꤷ)Ƥɤɬפޤ
-.SS "1ĤJARեоݤȤʣν̾"
+\fB注意:\fR
+追加の警告(または、\fI\-strict\fRオプションを指定した場合はエラー)はすべて読む必要があります。同様に、証明が信頼できるかを決定するために、(\fI\-verbose\fRおよび\fI\-certs\fRオプションを指定して)証明書の内容も読む必要があります。
+.SS "1つのJARファイルを対象とする複数の署名"
 .PP
-Τ褦ˡ\fIjarsigner\fRޥɤեʣ¹Ԥ¹ԤΤӤ˰ۤʤ桼̾ꤹ뤳Ȥˤäơ1ĤJARեʣΥ桼ν̾դ뤳ȤǤޤ
+次のように、\fIjarsigner\fRコマンドをファイルで複数回実行し、実行のたびに異なるユーザーの別名を指定することによって、1つのJARファイルに複数のユーザーの署名を付けることができます。
 .sp
 .if n \{\
 .RS 4
@@ -461,7 +461,7 @@
 .RE
 .\}
 .PP
-JARե뤬ʣ̾Ƥ硢JARեˤϡʣ\fI\&.SF\fRե\fI\&.DSA\fRե뤬ޤޤƤꡢ1ν̾Ф1ĤΥڥȤʤޤҤǤϡJARեˤϡ̾Υե뤬ޤޤƤޤ
+JARファイルが複数回署名されている場合、そのJARファイルには、複数の\fI\&.SF\fRファイルと\fI\&.DSA\fRファイルが含まれており、1回の署名に対して1つのペアとなります。前述の例では、出力JARファイルには、次の名前のファイルが含まれています。
 .sp
 .if n \{\
 .RS 4
@@ -475,9 +475,9 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
-γƹǤϡ͡\fIjarsigner\fRץˤĤޤɸդƤ
+次の各項では、様々な\fIjarsigner\fRオプションについて説明します。次の標準に注意してください。
 .sp
 .RS 4
 .ie n \{\
@@ -487,7 +487,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɤΥץ̾ˤƬ˥ޥʥ(\-)դޤ
+どのオプション名にも先頭にマイナス記号(\-)が付きます。
 .RE
 .sp
 .RS 4
@@ -498,7 +498,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץǤդνǻǤޤ
+オプションは任意の順序で指定できます。
 .RE
 .sp
 .RS 4
@@ -509,7 +509,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åΤޤϲդι(ץ)μºݤͤϡꤹɬפޤ
+イタリック体または下線付きの項目(オプションの値)の実際の値は、指定する必要があります。
 .RE
 .sp
 .RS 4
@@ -520,18 +520,18 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-storepass\fR\fI\-keypass\fR\fI\-sigfile\fR\fI\-sigalg\fR\fI\-digestalg\fR\fI\-signedjar\fRTSAϢΥץѤǤΤϡJARե˽̾ΤߤǤ̾դJARե򸡾ڤǤϤޤ\fI\-keystore \fRץϡJARեν̾Ӹڤ˴Ϣޤޤ̾ϡJARեν̾Ӹڻ˻ꤷޤ
+\fI\-storepass\fR、\fI\-keypass\fR、\fI\-sigfile\fR、\fI\-sigalg\fR、\fI\-digestalg\fR、\fI\-signedjar\fRおよびTSA関連のオプションを使用できるのは、JARファイルに署名する場合のみです。署名付きJARファイルを検証する場合ではありません。\fI\-keystore \fRオプションは、JARファイルの署名および検証に関連します。また、別名は、JARファイルの署名および検証時に指定します。
 .RE
 .PP
 \-keystore \fIurl\fR
 .RS 4
-ȥξ򼨤URLꤷޤˤꡢ\fIuser\&.home\fRƥࡦץѥƥǷꤵ줿桼Υۡࡦǥ쥯ȥΥե\fI\&.keystore\fR˥ǥեꤵޤ
+キーストアの場所を示すURLを指定します。これにより、\fIuser\&.home\fRシステム・プロパティで決定されたユーザーのホーム・ディレクトリ内のファイル\fI\&.keystore\fRにデフォルト設定されます。
 .sp
-ȥϽ̾ˤɬפǤǥեȤΥȥ¸ߤʤ硢ޤϥǥեȰʳΥȥѤϡȥŪ˻ꤹɬפޤ
+キーストアは署名時には必要です。デフォルトのキーストアが存在しない場合、またはデフォルト以外のキーストアを使用する場合は、キーストアを明示的に指定する必要があります。
 .sp
-ڤȤϥȥɬפޤ󡣤ȥꤵƤ뤫뤤ϥǥեȤΥȥ¸ߤƤơ\fI\-verbose\fRץꤵƤ硢JARեθڤ˻Ѥ񤬤Υȥ1ĤǤޤޤƤ뤫ɤ˴ؤɲþ󤬽Ϥޤ
+検証するときはキーストアは必要ありません。ただし、キーストアが指定されているか、あるいはデフォルトのキーストアが存在していて、さらに\fI\-verbose\fRオプションも指定されていた場合、JARファイルの検証に使用される証明書がそのキーストアに1つでも含まれているかどうかに関する追加情報が出力されます。
 .sp
-\fI\-keystore\fRˤϡURLǤϤʤե̾ȥѥǤξ硢ե: URLƱ褦˽ޤȤСˤ褦˻ꤹƱˤʤޤ
+\fI\-keystore\fR引数には、URLではなくファイル名とパスを指定でき、この場合、ファイル: URLと同じように処理されます。たとえば、次にように指定すると同等になります。
 .sp
 .if n \{\
 .RS 4
@@ -543,8 +543,8 @@
 .if n \{\
 .RE
 .\}
-(JRE\fI$JAVA_HOME/lib/security directory\fRˤ)
-\fIjava\&.security\fRƥץѥƥեSun PKCS #11ץХ줿硢\fIkeytool\fR\fIjarsigner\fRġPKCS#11ȡ˴ŤưǤޤΥץꤷޤ
+(JREの\fI$JAVA_HOME/lib/security directory\fRにある)
+\fIjava\&.security\fRセキュリティ・プロパティ・ファイル内でSun PKCS #11プロバイダが構成された場合、\fIkeytool\fRおよび\fIjarsigner\fRツールはPKCS#11トークンに基づいて動作できます。次のオプションを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -556,7 +556,7 @@
 .if n \{\
 .RE
 .\}
-ȤСΥޥɤϡ줿PKCS#11ȡƤɽޤ
+たとえば、次のコマンドは、構成されたPKCS#11トークンの内容を一覧表示します。
 .sp
 .if n \{\
 .RS 4
@@ -571,17 +571,17 @@
 .PP
 \-storetype \fIstoretype\fR
 .RS 4
-󥹥󥹤륭ȥΥפꤷޤǥեȤΥȥפϡƥץѥƥե\fIkeystore\&.type\fRץѥƥͤǻꤵ줿פǤͤϡ\fIjava\&.security\&.KeyStore\fRstatic
-\fIgetDefaultType\fR᥽åɤˤä֤ޤ
+インスタンスを生成するキーストアのタイプを指定します。デフォルトのキーストア・タイプは、セキュリティ・プロパティ・ファイル内の\fIkeystore\&.type\fRプロパティの値で指定されたタイプです。この値は、\fIjava\&.security\&.KeyStore\fRのstatic
+\fIgetDefaultType\fRメソッドによって返されます。
 .sp
-\fI\-storepass\fRץѤơPCKS #11ȡPINꤹ뤳ȤǤޤꤷʤ硢\fIkeytool\fR\fIjarsigner\fRޥɤˤäơȡPINλޤȡݸ줿ǧڥѥ(ѤPINѥåɤɼ굡ʤ)硢\fI\-protected\fRץꤹɬפޤѥɡץϻǤޤ
+\fI\-storepass\fRオプションを使用して、PCKS #11トークンのPINを指定することもできます。何も指定しない場合、\fIkeytool\fRおよび\fIjarsigner\fRコマンドによって、トークンPINの指定を求められます。トークンに保護された認証パス(専用のPINパッドや生体読取り機など)がある場合、\fI\-protected\fRオプションを指定する必要がありますが、パスワード・オプションは指定できません。
 .RE
 .PP
 \-storepass[:env | :file] \fIargument\fR
 .RS 4
-ȥ˥Τɬפʥѥɤꤷޤ줬ɬפʤΤϡJARե˽̾դȤΤߤǤ(ڤȤˤפǤ)ξ硢\fI\-storepass\fRץ򥳥ޥɥ饤ǻꤷʤȡѥɤϤޤ
+キーストアにアクセスするのに必要なパスワードを指定します。これが必要なのは、JARファイルに署名を付けるときのみです(検証するときには不要です)。その場合、\fI\-storepass\fRオプションをコマンドラインで指定しないと、パスワードの入力を求められます。
 .sp
-\fIenv\fRޤ\fIfile\fRꤵƤʤ硢ѥɤͤ\fIargument\fRˤʤޤʳξ硢ѥɤϼΤ褦ˤƼޤ
+修飾子\fIenv\fRまたは\fIfile\fRが指定されていない場合、パスワードの値は\fIargument\fRになります。それ以外の場合、パスワードは次のようにして取得されます。
 .sp
 .RS 4
 .ie n \{\
@@ -592,7 +592,7 @@
 .IP \(bu 2.3
 .\}
 \fIenv\fR:
-\fIargument\fRȤ̾δĶѿѥɤޤ
+\fIargument\fRという名前の環境変数からパスワードを取得します。
 .RE
 .sp
 .RS 4
@@ -604,18 +604,18 @@
 .IP \(bu 2.3
 .\}
 \fIfile\fR:
-\fIargument\fRȤ̾Υե뤫ѥɤޤ
+\fIargument\fRという名前のファイルからパスワードを取得します。
 .RE
 .sp
-\fB:\fR
-ƥȤŪȤޤϥƥݸ줿ƥѤƤʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤ
+\fB注意:\fR
+テストを目的とする場合またはセキュリティ保護されたシステムを使用している場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。
 .RE
 .PP
 \-keypass [:env | :file] \fIargument\fR
 .RS 4
-ޥɥ饤ǻꤵ줿̾б륭ȥȥ̩ݸΤ˻Ѥѥɤꤷޤ\fIjarsigner\fRѤJARե˽̾դȤϡѥɤɬפǤޥɥ饤ǥѥɤꤵƤ餺ɬפʥѥɤȥΥѥɤȰۤʤϡѥɤϤޤ
+コマンドラインで指定された別名に対応するキーストア・エントリの秘密鍵を保護するのに使用するパスワードを指定します。\fIjarsigner\fRを使用してJARファイルに署名を付けるときは、パスワードが必要です。コマンドラインでパスワードが指定されておらず、必要なパスワードがストアのパスワードと異なる場合は、パスワードの入力を求められます。
 .sp
-\fIenv\fRޤ\fIfile\fRꤵƤʤ硢ѥɤͤ\fIargument\fRˤʤޤʳξ硢ѥɤϼΤ褦ˤƼޤ
+修飾子\fIenv\fRまたは\fIfile\fRが指定されていない場合、パスワードの値は\fIargument\fRになります。それ以外の場合、パスワードは次のようにして取得されます。
 .sp
 .RS 4
 .ie n \{\
@@ -626,7 +626,7 @@
 .IP \(bu 2.3
 .\}
 \fIenv\fR:
-\fIargument\fRȤ̾δĶѿѥɤޤ
+\fIargument\fRという名前の環境変数からパスワードを取得します。
 .RE
 .sp
 .RS 4
@@ -638,84 +638,84 @@
 .IP \(bu 2.3
 .\}
 \fIfile\fR:
-\fIargument\fRȤ̾Υե뤫ѥɤޤ
+\fIargument\fRという名前のファイルからパスワードを取得します。
 .RE
 .sp
-\fB:\fR
-ƥȤŪȤޤϥƥݸ줿ƥѤƤʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤ
+\fB注意:\fR
+テストを目的とする場合またはセキュリティ保護されたシステムを使用している場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。
 .RE
 .PP
 \-sigfile \fIfile\fR
 .RS 4
-줿\fI\&.SF\fRե뤪\fI\&.DSA\fRե˻Ѥ١ե̾ꤷޤȤСե뤬\fIDUKESIGN\fRξ硢\fI\&.SF\fR\fI\&.DSA\fRեϡ\fIDUKESIGN\&.SF\fR\fIDUKESIGN\&.DSA\fRȤ̾ǡ̾դJARե\fIMETA\-INF\fRǥ쥯ȥ˳Ǽޤ
+生成された\fI\&.SF\fRファイルおよび\fI\&.DSA\fRファイルに使用するベース・ファイル名を指定します。たとえば、ファイルが\fIDUKESIGN\fRの場合、生成される\fI\&.SF\fRおよび\fI\&.DSA\fRファイルは、\fIDUKESIGN\&.SF\fRおよび\fIDUKESIGN\&.DSA\fRという名前で、署名付きJARファイルの\fIMETA\-INF\fRディレクトリに格納されます。
 .sp
-եʸϡå\fIa\-zA\-Z0\-9_\-\fRꤵɬפޤե٥åȡӥϥեʸΤߤѤǤޤ\fI\&.SF\fR\fI\&.DSA\fRΥե̾ǤϡʸϤ٤ʸѴޤ
+ファイル内の文字は、セット\fIa\-zA\-Z0\-9_\-\fRから指定される必要があります。アルファベット、数字、下線およびハイフン文字のみを使用できます。\fI\&.SF\fRおよび\fI\&.DSA\fRのファイル名では、小文字はすべて大文字に変換されます。
 .sp
-ޥɥ饤\fI\-sigfile\fRץꤷʤä硢\fI\&.SF\fRե\fI\&.DSA\fRեΥ١ե̾ϡޥɥ饤ǻꤵ줿̾Ƭ8ʸ򤹤٤ʸѴΤˤʤޤ̾8ʸ̤ξϡ̾Τޤ޻Ѥޤ̾ˡ̾ե̵̾ʸޤޤƤ硢ե̾뤿ˡʸ(_)ʸѴޤ
+コマンドラインで\fI\-sigfile\fRオプションを指定しなかった場合、\fI\&.SF\fRファイルと\fI\&.DSA\fRファイルのベース・ファイル名は、コマンドラインで指定された別名の先頭の8文字をすべて大文字に変換したものになります。別名が8文字未満の場合は、別名がそのまま使用されます。別名に、署名ファイル名で無効な文字が含まれている場合、ファイル名を作成するために、該当する文字が下線(_)文字に変換されます。
 .RE
 .PP
 \-sigalg \fIalgorithm\fR
 .RS 4
-JARեν̾˻Ѥ̾르ꥺ̾ꤷޤ
+JARファイルの署名に使用する署名アルゴリズムの名前を指定します。
 .sp
-ɸŪʽ̾르ꥺ̾ΥꥹȤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAˤ
-Java Cryptography Architecture (JCA)ե󥹡ɤΡϿA: ɸ̾פ򻲾ȤƤ
+標準的な署名アルゴリズム名のリストは、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAにある
+Java Cryptography Architecture (JCA)リファレンス・ガイドの「付録A: 標準名」を参照してください。
 .sp
-Υ르ꥺˤϡJARեν̾˻Ѥ̩ȤθߴɬפǤΥץꤷʤ硢̩Υפ˱ơ\fISHA1withDSA\fR\fISHA256withRSA\fRޤ\fISHA256withECDSA\fRѤޤꤵ줿르ꥺμ󶡤ץХŪ˥󥹥ȡ뤵Ƥ뤫\fI\-providerClass\fRץѤƤΤ褦ʥץХ桼ꤹɬפޤǤʤ硢ޥɤϼԤޤ
+このアルゴリズムには、JARファイルの署名に使用する秘密鍵との互換性が必要です。このオプションを指定しない場合、秘密鍵のタイプに応じて、\fISHA1withDSA\fR、\fISHA256withRSA\fRまたは\fISHA256withECDSA\fRが使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\fI\-providerClass\fRオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドは失敗します。
 .RE
 .PP
 \-digestalg \fIalgorithm\fR
 .RS 4
-JARեΥȥȤݤ˻Ѥåȡ르ꥺ̾ꤷޤ
+JARファイルのエントリをダイジェストする際に使用するメッセージ・ダイジェスト・アルゴリズムの名前を指定します。
 .sp
-ɸŪʥåȡ르ꥺ̾ΥꥹȤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAˤ
-Java Cryptography Architecture (JCA)ե󥹡ɤΡϿA: ɸ̾פ򻲾ȤƤ
+標準的なメッセージ・ダイジェスト・アルゴリズム名のリストは、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAにある
+Java Cryptography Architecture (JCA)リファレンス・ガイドの「付録A: 標準名」を参照してください。
 .sp
-Υץꤷʤ硢\fISHA256\fRѤޤꤵ줿르ꥺμ󶡤ץХŪ˥󥹥ȡ뤵Ƥ뤫\fI\-providerClass\fRץѤƤΤ褦ʥץХ桼ꤹɬפޤǤʤ硢ޥɤϼԤޤ
+このオプションを指定しない場合、\fISHA256\fRが使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\fI\-providerClass\fRオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドは失敗します。
 .RE
 .PP
 \-certs
 .RS 4
-ޥɥ饤ǡ\fI\-certs\fRץ\fI\-verify\fR\fI\-verbose\fRץȤȤ˻ꤷ硢JARեγƽ̾Ԥξ󤬽Ϥ˴ޤޤޤξˤϡ̾Ԥθ(\fI\&.DSA\fRե˳Ǽ)Υפ̾ޤޤ졢X\&.509(\fIjava\&.security\&.cert\&.X509Certificate\fRΥ󥹥)ξ硢̾Ԥμ̾ޤޤޤ
+コマンドラインで、\fI\-certs\fRオプションを\fI\-verify\fRおよび\fI\-verbose\fRオプションとともに指定した場合、JARファイルの各署名者の証明書情報が出力に含まれます。この情報には、署名者の公開鍵を証明する証明書(\fI\&.DSA\fRファイルに格納)のタイプの名前が含まれ、証明書がX\&.509証明書(\fIjava\&.security\&.cert\&.X509Certificate\fRのインスタンス)の場合、署名者の識別名が含まれます。
 .sp
-ȥγǧԤޤޥɥ饤ǥȥͤꤵƤʤ硢ǥեȤΥȥե()åޤ̾Ԥθξ񤬥ȥΥȥȰפ硢ν̾ԤΥȥΥȥ̾ݥåɽޤ
+キーストアの確認も行われます。コマンドラインでキーストアの値が指定されていない場合、デフォルトのキーストア・ファイル(ある場合)がチェックされます。署名者の公開鍵の証明書がキーストア内のエントリと一致する場合、その署名者のキーストアのエントリの別名が丸カッコ内に表示されます。
 .RE
 .PP
 \-certchain \fIfile\fR
 .RS 4
-ޥɥ饤ǻꤷ̾ˤäɽ륭ȥȥ̩˴Ϣդ줿󤬴ǤϤʤˡѤꤷޤϡΤݻΤ˽ʬΰ褬ʤϡɥȡ˥ȥǼƤȯޤΥեϰϢϢ뤵줿X\&.509PKCS#7ñǡ֥åΤ줫ȤʤꡢΥ󥳡ǥ󥰷ϥХʥꡦ󥳡ǥ󥰷Internet RFC 1421ɸǵꤵǽ󥳡ǥ󥰷(Base64󥳡ǥ󥰤ȤƤФ)Τ줫ˤʤޤ󥿡ͥåRFC 1421沽ʤhttp://tools\&.ietf\&.org/html/rfc1421򻲾ȤƤ
+コマンドラインで指定した別名によって表されるキーストア・エントリの秘密鍵に関連付けられた証明書チェーンが完全ではない場合に、使用する証明書チェーンを指定します。これは、証明書チェーン全体を保持するのに十分な領域がないハードウェア・トークン上にキーストアが格納されている場合に発生します。このファイルは一連の連結されたX\&.509証明書、PKCS#7形式の単一データ・ブロックのいずれかとなり、そのエンコーディング形式はバイナリ・エンコーディング形式、Internet RFC 1421標準で規定される印刷可能エンコーディング形式(Base64エンコーディングとも呼ばれる)のいずれかになります。インターネットRFC 1421証明書符号化規格およびhttp://tools\&.ietf\&.org/html/rfc1421を参照してください。
 .RE
 .PP
 \-verbose
 .RS 4
-ޥɥ饤\fI\-verbose\fRץꤷ硢Ĺ⡼ɤưΥ⡼ɤǤϡ\fIjarsigner\fRϡJARν̾ޤϸڤοʹԾ˴ؤɲþϤޤ
+コマンドラインで\fI\-verbose\fRオプションを指定した場合、冗長モードで動作し、このモードでは、\fIjarsigner\fRは、JARの署名または検証の進行状況に関する追加情報を出力します。
 .RE
 .PP
 \-internalsf
 .RS 4
-ϡJARեν̾줿\fI\&.DSA\fR
-(֥̾å)եˡ줿\fI\&.SF\fRե(̾ե)Υ󥳡ɤ줿ʥԡޤޤƤޤ ưѹޤJARեΤΥ򾮤뤿ˡǥեȤǤ\fI\&.DSA\fRեˤ\fI\&.SF\fRեΥԡޤޤʤ褦ˤʤäƤޤޥɥ饤\fI\-internalsf\fRꤷ硢Ʊ褦ưޤΥץϡƥȤԤǤºݤˤϡ\fI\-internalsf\fRץϡСإåɤ礭ʤ뤿ᡢѤʤǤ
+以前は、JARファイルの署名時に生成された\fI\&.DSA\fR
+(署名ブロック)ファイルに、生成された\fI\&.SF\fRファイル(署名ファイル)のエンコードされた完全なコピーが含まれていました。 この動作は変更されました。出力JARファイル全体のサイズを小さくするために、デフォルトでは\fI\&.DSA\fRファイルには\fI\&.SF\fRファイルのコピーが含まれないようになっています。コマンドラインで\fI\-internalsf\fRを指定した場合、以前と同じように動作します。このオプションは、テストを行う場合に便利です。実際には、\fI\-internalsf\fRオプションは、オーバーヘッドが大きくなるため、使用しないでください。
 .RE
 .PP
 \-sectionsonly
 .RS 4
-ޥɥ饤\fI\-sectionsonly\fRץꤷ硢JARեν̾\fI\&.SF\fRե(̾ե)ˤϡޥ˥եȡեΤΥϥåޤإåϴޤޤޤ󡣤˴ޤޤΤϡJARեγƥե˴Ϣ󤪤ӥϥåΤߤǤ̾ե򻲾ȤƤ
+コマンドラインで\fI\-sectionsonly\fRオプションを指定した場合、JARファイルの署名時に生成される\fI\&.SF\fRファイル(署名ファイル)には、マニフェスト・ファイル全体のハッシュを含むヘッダーは含まれません。これに含まれるのは、JARファイル内の各ソース・ファイルに関連する情報およびハッシュのみです。署名ファイルを参照してください。
 .sp
-ǥեȤǤϡŬΤˡΥإåɲäޤإå¸ߤ硢JARե򸡾ڤ뤿ӤˡڤǤϡޤإåΥϥå夬ޥ˥եȡեΤΥϥåȰפ뤫ɤǧ뤿˥åǤޤפ硢ڤϼμ˿ʤߤޤפʤ硢\fI\&.SF\fRեγƥե󥻥Υϥå夬ޥ˥եȡեб륻ΥϥåȰפȤޤŬƤʤڤ¹ԤɬפޤJARեθڤ򻲾ȤƤ
+デフォルトでは、最適化のために、このヘッダーが追加されます。ヘッダーが存在する場合、JARファイルを検証するたびに、検証では、まずヘッダー内のハッシュがマニフェスト・ファイル全体のハッシュと一致するかどうかを確認するためにチェックできます。一致する場合、検証は次の手順に進みます。一致しない場合、\fI\&.SF\fRファイル内の各ソース・ファイル情報セクションのハッシュが、マニフェスト・ファイル内の対応するセクションのハッシュと一致するという、あまり最適化されていない検証を実行する必要があります。JARファイルの検証を参照してください。
 .sp
-\fI\-sectionsonly\fRץϡ˥ƥѤ˻ѤޤѤȥСإåɤ礭ʤ뤿ᡢƥѰʳǤϻѤʤǤ
+\fI\-sectionsonly\fRオプションは、主にテスト用に使用されます。これを使用するとオーバーヘッドが大きくなるため、テスト用以外では使用しないでください。
 .RE
 .PP
 \-protected
 .RS 4
-\fItrue\fRޤ\fIfalse\fRΤ줫ͤǤޤPIN꡼ʤɤݸ줿ǧڥѥˤäƥѥɤꤹɬפ硢\fItrue\fRꤷޤ
+\fItrue\fRまたは\fIfalse\fRのいずれかの値を指定できます。専用PINリーダーなどの保護された認証パスによってパスワードを指定する必要がある場合、\fItrue\fRを指定します。
 .RE
 .PP
 \-providerClass \fIprovider\-class\-name\fR
 .RS 4
-Ź沽ӥץХ\fIjava\&.security\fRƥץѥƥե˻ꤵƤʤȤϡΥޥ饹ե̾ꤹȤ˻Ѥޤ
+暗号化サービス・プロバイダが\fIjava\&.security\fRセキュリティ・プロパティ・ファイルに指定されていないときは、そのマスター・クラス・ファイルの名前を指定するときに使用されます。
 .sp
-\fI\-providerArg ConfigFilePath\fRץȤȤ˻Ѥ\fIkeytool\fR\fIjarsigner\fRġϡץХưŪ˥󥹥ȡ뤷ȡեؤΥѥ\fIConfigFilePath\fRѤޤϡOracle PKCS #11ץХƥץѥƥե˹Ƥʤä\fIPKCS #11\fRȥɽ륳ޥɤ򼨤Ƥޤ
+\fI\-providerArg ConfigFilePath\fRオプションとともに使用し、\fIkeytool\fRおよび\fIjarsigner\fRツールは、プロバイダを動的にインストールし、トークン構成ファイルへのパスに\fIConfigFilePath\fRを使用します。次の例は、Oracle PKCS #11プロバイダがセキュリティ・プロパティ・ファイルに構成されていなかった場合に\fIPKCS #11\fRキーストアを一覧表示するコマンドを示しています。
 .sp
 .if n \{\
 .RS 4
@@ -733,9 +733,9 @@
 .PP
 \-providerName \fIproviderName\fR
 .RS 4
-\fIjava\&.security\fRƥץѥƥե2İʾΥץХ줿硢\fI\-providerName\fRץѤơΥץХ󥹥󥹤оݤˤ뤳ȤǤޤΥץΰϡץХ̾Ǥ
+\fIjava\&.security\fRセキュリティ・プロパティ・ファイル内で2つ以上のプロバイダが構成された場合、\fI\-providerName\fRオプションを使用して、特定のプロバイダ・インスタンスを対象にすることができます。このオプションの引数は、プロバイダの名前です。
 .sp
-Oracle PKCS #11ץХξ硢\fIproviderName\fR\fISunPKCS11\-\fR\fITokenName\fRȤˤʤޤǡ°ɽǾܺ٤Ƥ褦ˡ\fITokenName\fRϡץХ󥹥󥹤줿̾ǤȤСΥޥɤϡ̾\fISmartCard\fR\fIPKCS #11\fRȥץХ󥹥󥹤Ƥɽޤ
+Oracle PKCS #11プロバイダの場合、\fIproviderName\fRは\fISunPKCS11\-\fR\fITokenName\fRという形式になります。ここで、構成属性の表で詳細に説明されているように、\fITokenName\fRは、プロバイダ・インスタンスが構成された名前の接尾辞です。たとえば、次のコマンドは、名前接尾辞\fISmartCard\fRの\fIPKCS #11\fRキーストア・プロバイダ・インスタンスの内容を一覧表示します。
 .sp
 .if n \{\
 .RS 4
@@ -752,45 +752,45 @@
 .PP
 \-J\fIjavaoption\fR
 .RS 4
-ꤵ줿\fIjavaoption\fRʸJava󥿥ץ꥿ľϤޤ\fIjarsigner\fRޥɤϡ󥿥ץ꥿ФåѡǤΥץˤϡޤ뤳ȤϤǤޤ󡣤Υץϡ¹ԴĶޤϥ꡼ѤĴǤǤ륤󥿥ץ꥿ץɽˤϡޥɥ饤\fIjava \-h\fRޤ\fIjava \-X\fRϤƤ
+指定された\fIjavaoption\fR文字列をJavaインタプリタに直接渡します。\fIjarsigner\fRコマンドは、インタプリタに対するラッパーです。このオプションには、空白を含めることはできません。このオプションは、実行環境またはメモリー使用を調整する場合に便利です。指定できるインタプリタ・オプションを一覧表示するには、コマンドラインで\fIjava \-h\fRまたは\fIjava \-X\fRと入力してください。
 .RE
 .PP
 \-tsa \fIurl\fR
 .RS 4
-\fI\-tsa http://example\&.tsa\&.url\fRJARեν̾˥ޥɥ饤ˤ硢̾ΥॹפޤURL
-\fIhttp://example\&.tsa\&.url\fRϡTime Stamping Authority (TSA)ξꤷ\fI\-tsacert\fRץꤷƸФ줿URL򥪡С饤ɤޤ\fI\-tsa\fRץǤϡTSAθ򥭡ȥ֤ɬפϤޤ
+\fI\-tsa http://example\&.tsa\&.url\fRがJARファイルの署名時にコマンドラインにある場合、署名のタイムスタンプが生成されます。URL
+\fIhttp://example\&.tsa\&.url\fRは、Time Stamping Authority (TSA)の場所を特定し、\fI\-tsacert\fRオプションを指定して検出されたURLをオーバーライドします。\fI\-tsa\fRオプションでは、TSAの公開鍵証明書をキーストアに配置する必要はありません。
 .sp
-ॹפ뤿ˡ\fIjarsigner\fRϡRFC 3161Ƥ륿ॹסץȥ(TSP)ѤTSA̿ޤȡTSAˤä֤줿ॹסȡϡ֥̾åեν̾ȤȤ¸ޤ
+タイムスタンプを生成するために、\fIjarsigner\fRは、RFC 3161で定義されているタイムスタンプ・プロトコル(TSP)を使用してTSAと通信します。成功すると、TSAによって返されたタイムスタンプ・トークンは、署名ブロック・ファイルの署名とともに保存されます。
 .RE
 .PP
 \-tsacert \fIalias\fR
 .RS 4
-\fI\-tsacert alias\fRJARեν̾˥ޥɥ饤ˤ硢̾Υॹפޤ̾ϡȥͭTSAθꤷޤȥξǡTSAξꤹURLޤSubject Information Accessĥǽǧޤ
+\fI\-tsacert alias\fRがJARファイルの署名時にコマンドラインにある場合、署名のタイムスタンプが生成されます。別名は、キーストア内の有効なTSAの公開鍵証明書を特定します。エントリの証明書で、TSAの場所を特定するURLを含むSubject Information Access拡張機能が確認されます。
 .sp
-\fI\-tsacert\fRץѤϡTSAθ񤬥ȥ֤Ƥɬפޤ
+\fI\-tsacert\fRオプションを使用する場合は、TSAの公開鍵証明書がキーストアに配置されている必要があります。
 .RE
 .PP
 \-tsapolicyid \fIpolicyid\fR
 .RS 4
-TSAСݥꥷID̤륪֥ȼ̻(OID)ꤷޤΥץꤷʤ硢ݥꥷID줺TSAСϥǥեȤΥݥꥷID򤷤ޤ
+TSAサーバーに送信するポリシーIDを識別するオブジェクト識別子(OID)を指定します。このオプションを指定しない場合、ポリシーIDは送信されず、TSAサーバーはデフォルトのポリシーIDを選択します。
 .sp
-֥ȼ̻ҤϡITU Telecommunication Standardization Sector (ITU\-T)ɸǤX\&.696ˤäޤμ̻Ҥϡ̾\fI1\&.2\&.3\&.4\fRʤɤΡǤϤʤΥԥꥪɶڤΥåȤǤ
+オブジェクト識別子は、ITU Telecommunication Standardization Sector (ITU\-T)標準であるX\&.696によって定義されます。これらの識別子は、通常、\fI1\&.2\&.3\&.4\fRなどの、負ではない数字のピリオド区切りのセットです。
 .RE
 .PP
 \-altsigner \fIclass\fR
 .RS 4
-Υץϡؽ̾ᥫ˥ꤷޤ饹̾ϡ\fIcom\&.sun\&.jarsigner\&.ContentSigner\fRݥ饹ĥ륯饹ե̤ޤΥ饹եؤΥѥϡ\fI\-altsignerpath\fRץˤäޤ\fI\-altsigner\fRץѤ硢\fIjarsigner\fRޥɤǤϡꤵ줿饹ˤä󶡤̾ᥫ˥Ѥޤʳξ硢\fIjarsigner\fRޥɤϥǥեȤν̾ᥫ˥Ѥޤ
+このオプションは、代替署名メカニズムを指定します。完全修飾クラス名は、\fIcom\&.sun\&.jarsigner\&.ContentSigner\fR抽象クラスを拡張するクラス・ファイルを識別します。このクラス・ファイルへのパスは、\fI\-altsignerpath\fRオプションによって定義されます。\fI\-altsigner\fRオプションを使用した場合、\fIjarsigner\fRコマンドでは、指定されたクラスによって提供される署名メカニズムを使用します。それ以外の場合、\fIjarsigner\fRコマンドはデフォルトの署名メカニズムを使用します。
 .sp
-ȤС\fIcom\&.sun\&.sun\&.jarsigner\&.AuthSigner\fRȤ̾Υ饹󶡤̾ᥫ˥ѤˤϡjarsignerΥץ\fI\-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fRѤޤ
+たとえば、\fIcom\&.sun\&.sun\&.jarsigner\&.AuthSigner\fRという名前のクラスが提供する署名メカニズムを使用するには、jarsignerのオプション\fI\-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fRを使用します。
 .RE
 .PP
 \-altsignerpath \fIclasspathlist\fR
 .RS 4
-饹ե뤪Ӥ줬¸JARեؤΥѥꤷޤ\fI\-altsigner\fRץѤơ饹ե̾ꤷޤ饹ե뤬JARեˤ硢ΥץǤϡJARեؤΥѥꤷޤ
+クラス・ファイルおよびそれが依存するJARファイルへのパスを指定します。\fI\-altsigner\fRオプションを使用して、クラス・ファイル名を指定します。クラス・ファイルがJARファイル内にある場合、このオプションでは、そのJARファイルへのパスを指定します。
 .sp
-ХѥޤϸߤΥǥ쥯ȥؤХѥǤޤ\fIclasspathlist\fRʣΥѥJARե뤬ޤޤ硢Oracle Solarisξϥ(:)ǡWindowsξϥߥ(;)ǡ줾ڤޤŪΥ饹Ǥ˸ѥˤϡΥץפǤ
+絶対パスまたは現在のディレクトリへの相対パスを指定できます。\fIclasspathlist\fRに複数のパスやJARファイルが含まれる場合、それらを、Oracle Solarisの場合はコロン(:)で、Windowsの場合はセミコロン(;)で、それぞれ区切ります。目的のクラスがすでに検索パス内にある場合は、このオプションは不要です。
 .sp
-Ǥϡ饹եޤJARեؤΥѥꤹˡ򼨤ޤJARե̾ޤޤ
+次の例では、クラス・ファイルを含むJARファイルへのパスを指定する方法を示します。JARファイル名を含めます。
 .sp
 .if n \{\
 .RS 4
@@ -801,7 +801,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ饹եޤJARեؤΥѥꤹˡ򼨤ޤJARե̾άޤ
+次の例では、クラス・ファイルを含むJARファイルへのパスを指定する方法を示します。JARファイル名を省略します。
 .sp
 .if n \{\
 .RS 4
@@ -816,101 +816,101 @@
 .PP
 \-strict
 .RS 4
-̾ޤϸڽˡޥɤˤٹåȯԤ礬ޤΥץꤹȡޥɤˤ긡Ф줿ʷٹåġνλɤȿǤޤ顼ȷٹ򻲾ȤƤ
+署名または検証処理中に、コマンドにより警告メッセージが発行される場合があります。このオプションを指定すると、コマンドにより検出された重大な警告メッセージがツールの終了コードに反映されます。エラーと警告を参照してください。
 .RE
 .PP
 \-verbose \fIsuboptions\fR
 .RS 4
-ڽξ硢\fI\-verbose\fRץˤϡɽ̤ꤹ륵֥ץꤷޤ\fI\-certs\fRץꤷ硢ǥեȡ⡼(ޤϥ֥ץ\fIall\fR)Ǥϡȥ꤬뤿Ӥ˳ƥȥ꤬ɽ졢θJARեγƽ̾Ԥξɽޤ\fI\-certs\fR\fI\-verbose:grouped\fR֥ץꤷ硢Ʊ̾Ծĥȥ꤬ξȤȤˡ롼ײɽޤ\fI\-certs\fR\fI\-verbose:summary\fR֥ץꤷ硢Ʊ̾Ծĥȥ꤬ξȤȤˡ롼ײɽޤƥȥξܺ٤ϡ\fI1ĤΥȥ(ʾ)\fRˤޤȤɽޤ򻲾ȤƤ
+検証処理の場合、\fI\-verbose\fRオプションには、表示する情報の量を決定するサブオプションを指定します。\fI\-certs\fRオプションも指定した場合、デフォルト・モード(またはサブオプション\fIall\fR)では、エントリが処理されるたびに各エントリが表示され、その後にJARファイルの各署名者の証明書情報も表示されます。\fI\-certs\fRおよび\fI\-verbose:grouped\fRサブオプションを指定した場合、同じ署名者情報を持つエントリが、その証明書情報とともに、グループ化されて表示されます。\fI\-certs\fRおよび\fI\-verbose:summary\fRサブオプションを指定した場合、同じ署名者情報を持つエントリが、その証明書情報とともに、グループ化されて表示されます。各エントリの詳細は、\fI1つのエントリ(以上)\fRにまとめられて表示されます。例を参照してください。
 .RE
-.SH "顼ȷٹ"
+.SH "エラーと警告"
 .PP
-̾ޤϸڥץˡ\fIjarsigner\fRޥɤǡ͡ʥ顼ޤϷٹȯԤǽޤ
+署名または検証プロセス中に、\fIjarsigner\fRコマンドで、様々なエラーまたは警告が発行される可能性があります。
 .PP
-㳲硢\fIjarsigner\fRޥɤϥ1ǽλޤ㳲Ϥʤ1İʾνʷٹ𤬤硢\fI\-strict\fRץ󤬻ꤵ\fBʤ\fRϡ\fIjarsigner\fRޥɤϥ0ǽλ\fI\-strict\fRꤵƤϷٹ𥳡ɤORͤǽλޤٹΤߤ롢ޤϷٹ𤬤ޤäʤ硢ޥɤϾ˥0ǽλޤ
+障害がある場合、\fIjarsigner\fRコマンドはコード1で終了します。障害はないが、1つ以上の重大な警告がある場合、\fI\-strict\fRオプションが指定されて\fBいない\fR場合は、\fIjarsigner\fRコマンドはコード0で終了し、\fI\-strict\fRが指定されている場合は警告コードのOR値で終了します。情報警告のみがある、または警告がまったくない場合、コマンドは常にコード0で終了します。
 .PP
-ȤСȥν̾˻Ѥ񤬴ڤǡեν̾ĤʤKeyUsageĥǽѤƤ硢\fI\-strict\fRץ󤬻ꤵƤȡ\fIjarsigner\fRޥɤϥ12 (=4+8)ǽλޤ
+たとえば、エントリの署名に使用される証明書が期限切れで、ファイルの署名を許可しないKeyUsage拡張機能を使用している場合、\fI\-strict\fRオプションが指定されていると、\fIjarsigner\fRコマンドはコード12 (=4+8)で終了します。
 .PP
-\fB:\fR
-UNIX١Υڥ졼ƥ󥰡ƥǤ0255ޤǤͤΤߤͭΤᡢλɤϺѤޤ
+\fB注意:\fR
+UNIXベースのオペレーティング・システムでは0から255までの値のみが有効のため、終了コードは再利用されます。
 .PP
-ΥǤϡ\fIjarsigner\fRޥɤˤȯԤǤ륨顼ӷٹ̾ɡ򵭽Ҥޤ
-.SS "㳲"
+次のセクションでは、\fIjarsigner\fRコマンドにより発行できるエラーおよび警告の名前、コード、説明を記述します。
+.SS "障害"
 .PP
-ޥɥ饤ϥ顼JARե˽̾븰ڥ򸡺ǤʤޤϽ̾դJARեθڼԤʤ(ꤵޤ)\fIjarsigner\fRޥɤμͳ
+コマンドライン解析エラー、JARファイルに署名する鍵ペアを検索できない、または署名付きJARファイルの検証失敗など(限定されません)、\fIjarsigner\fRコマンドの失敗理由。
 .PP
 failure
 .RS 4
-1̾ޤϸڤԤޤ
+コード1。署名または検証が失敗します。
 .RE
-.SS "ʷٹ"
+.SS "重大な警告"
 .PP
-\fB:\fR
-\fI\-strict\fRץꤷ硢ʷٹϥ顼Ȥ𤵤ޤ
+\fB注意:\fR
+\fI\-strict\fRオプションを指定した場合、重大な警告はエラーとして報告されます。
 .PP
-JARեν̾˻Ѥ˥顼롢ޤϽ̾դJARե¾꤬ʤɡ\fIjarsigner\fRޥɤʷٹȯԤͳ
+JARファイルの署名に使用する証明書にエラーがある、または署名付きJARファイルに他の問題があるなど、\fIjarsigner\fRコマンドが重大な警告を発行する理由。
 .PP
 hasExpiredCert
 .RS 4
-4jarˤϡ̾Ծ񤬴ڤΥȥ꤬ޤޤƤޤ
+コード4。このjarには、署名者証明書が期限切れのエントリが含まれています。
 .RE
 .PP
 notYetValidCert
 .RS 4
-4jarˤϡ̾Ծ񤬤ޤͭˤʤäƤʤȥ꤬ޤޤƤޤ
+コード4。このjarには、署名者証明書がまだ有効になっていないエントリが含まれています。
 .RE
 .PP
 chainNotValidated
 .RS 4
-4jarˤϡڤǤʤȥ꤬ޤޤƤޤ
+コード4。このjarには、証明書チェーンが正しく検証できないエントリが含まれています。
 .RE
 .PP
 badKeyUsage
 .RS 4
-8JARˤϡ̾ԾKeyUsageĥǽɽ̾Ĥʤȥ꤬ޤޤƤޤ
+コード8。このJARには、署名者証明書のKeyUsage拡張機能がコード署名を許可しないエントリが含まれています。
 .RE
 .PP
 badExtendedKeyUsage
 .RS 4
-8jarˤϡ̾ԾExtendedKeyUsageĥǽɽ̾Ĥʤȥ꤬ޤޤƤޤ
+コード8。このjarには、署名者証明書のExtendedKeyUsage拡張機能がコード署名を許可しないエントリが含まれています。
 .RE
 .PP
 badNetscapeCertType
 .RS 4
-8jarˤϡ̾ԾNetscapeCertTypeĥǽɽ̾Ĥʤȥ꤬ޤޤƤޤ
+コード8。このjarには、署名者証明書のNetscapeCertType拡張機能がコード署名を許可しないエントリが含まれています。
 .RE
 .PP
 hasUnsignedEntry
 .RS 4
-16jarˤϡå򤷤Ƥʤ̤̾Υȥ꤬ޤޤƤޤ
+コード16。このjarには、整合性チェックをしていない未署名のエントリが含まれています。
 .RE
 .PP
 notSignedByAlias
 .RS 4
-32jarˤϡꤵ줿̾ˤäƽ̾Ƥʤ̾ѥȥ꤬ޤޤƤޤ
+コード32。このjarには、指定された別名によって署名されていない署名済エントリが含まれています。
 .RE
 .PP
 aliasNotInStore
 .RS 4
-32jarˤϡΥȥ̾ˤäƽ̾Ƥʤ̾ѥȥ꤬ޤޤޤ
+コード32。このjarには、このキーストア内の別名によって署名されていない署名済エントリが含まれます。
 .RE
-.SS "ٹ"
+.SS "情報警告"
 .PP
-ٹˤϡ顼ǤϤʤŬڤȤߤʤΤޤޤޤɤϤޤ
+情報警告には、エラーではないが不適切とみなされるものが含まれます。コードはありません。
 .PP
 hasExpiringCert
 .RS 4
-jarˤϡ̾Ծ6˴ڤȤʤ륨ȥ꤬ޤޤƤޤ
+このjarには、署名者証明書が6か月以内に期限切れとなるエントリが含まれています。
 .RE
 .PP
 noTimestamp
 .RS 4
-jarˤϡॹפޤޤʤ̾ޤޤƤޤॹפʤǤϡ̾Ծͭ(\fIYYYY\-MM\-DD\fR)ޤϾμ塢桼ϤJARե򸡾ڤǤʤ礬ޤ
+このjarには、タイムスタンプを含まない署名が含まれています。タイムスタンプなしでは、署名者証明書の有効期限(\fIYYYY\-MM\-DD\fR)後または将来の取消日後、ユーザーはこのJARファイルを検証できない場合があります。
 .RE
-.SH ""
-.SS "JARեν̾"
+.SH "例"
+.SS "JARファイルの署名"
 .PP
-ΥޥɤѤơȥ̾\fIworking\fRǥ쥯ȥ\fImystore\fRȤ̾Υȥˤ\fIjane\fRǤ桼̩bundle\&.jar˽̾̾դJARե\fIsbundle\&.jar\fRȤ̾դޤ
+次のコマンドを使用して、キーストア別名が\fIworking\fRディレクトリの\fImystore\fRという名前のキーストアにある\fIjane\fRであるユーザーの秘密鍵でbundle\&.jarに署名し、署名付きJARファイルに\fIsbundle\&.jar\fRという名前を付けます。
 .sp
 .if n \{\
 .RS 4
@@ -925,9 +925,9 @@
 .RE
 .\}
 .PP
-ҤΥޥɤǤ\fI\-sigfile\fRꤵƤʤᡢ̾դJARե˳Ǽ줿\fI\&.SF\fRե뤪\fI\&.DSA\fRե̾ϡ̾˴ŤǥեȤ̾ˤʤޤϡ̾դ\fIJANE\&.SF\fR\fIJANE\&.DSA\fRǤ
+前述のコマンドでは\fI\-sigfile\fRが指定されていないため、署名付きJARファイルに格納される生成された\fI\&.SF\fRファイルおよび\fI\&.DSA\fRファイルの名前は、別名に基づいたデフォルトの名前になります。これらは、名前付きの\fIJANE\&.SF\fRおよび\fIJANE\&.DSA\fRです。
 .PP
-ȥΥѥɤ̩Υѥɤ硢ҤΥޥɤṳ̂ơΤȤ¹ԤǤޤ
+ストアのパスワードおよび秘密鍵のパスワードを求められる場合、前述のコマンドを短縮して、次のことを実行できます。
 .sp
 .if n \{\
 .RS 4
@@ -940,7 +940,7 @@
 .RE
 .\}
 .PP
-ȥǥեȤΥȥ(ۡࡦǥ쥯ȥ\&.keystore)Ǥ硢˼褦ˡȥꤹɬפޤ
+キーストアがデフォルトのキーストア(ホーム・ディレクトリ内の\&.keystore)である場合、次に示すように、キーストアを指定する必要がありません。
 .sp
 .if n \{\
 .RS 4
@@ -952,7 +952,7 @@
 .RE
 .\}
 .PP
-JARե(bundle\&.jar)̾դJARեǾ񤭤硢Τ褦\fI\-signedjar\fRץꤹɬפϤޤ
+入力JARファイル(bundle\&.jar)を署名付きJARファイルで上書きする場合、次のように\fI\-signedjar\fRオプションを指定する必要はありません。
 .sp
 .if n \{\
 .RS 4
@@ -963,9 +963,9 @@
 .if n \{\
 .RE
 .\}
-.SS "̾դJARեθ"
+.SS "署名付きJARファイルの検証"
 .PP
-̾դJARե򸡾ڤơ̾ͭJARե뤬󤵤ʤäȤǧˤϡΤ褦ʥޥɤѤޤ
+署名付きJARファイルを検証して、署名が有効でJARファイルが改ざんされなかったことを確認するには、次のようなコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -977,7 +977,7 @@
 .RE
 .\}
 .PP
-ڤȡ\fIjar verified\fRɽޤǤʤϡ顼åɽޤ\fI\-verbose\fRץѤȡܺپǤޤ\fIjarsigner\fR\fI\-verbose\fRץȤȤ˻Ѥ륵ץ򡢼˼ޤ
+検証が成功すると、\fIjar verified\fRが表示されます。そうでない場合は、エラー・メッセージが表示されます。\fI\-verbose\fRオプションを使用すると、詳細情報を取得できます。\fIjarsigner\fRを\fI\-verbose\fRオプションとともに使用するサンプルを、次に示します。
 .sp
 .if n \{\
 .RS 4
@@ -1000,9 +1000,9 @@
 .if n \{\
 .RE
 .\}
-.SS "Ѥ"
+.SS "証明書情報を使用した検証"
 .PP
-\fI\-certs\fRץ\fI\-verify\fR\fI\-verbose\fRץȤȤ˻ꤷ硢JARեγƽ̾Ԥξ󤬽Ϥ˴ޤޤޤξˤϡ񥿥ס̾Ԥμ̾(X\&.509ξ)ޤޤ졢ݥåˤϡJARեθ񤬥ȥȥθ˰פν̾ԤΥȥ̾ޤޤޤȤСΤ褦ˤʤޤ
+\fI\-certs\fRオプションを\fI\-verify\fRおよび\fI\-verbose\fRオプションとともに指定した場合、JARファイルの各署名者の証明書情報が出力に含まれます。この情報には、証明書タイプ、署名者の識別名情報(X\&.509証明書の場合)が含まれ、丸カッコ内には、JARファイルの公開鍵証明書がキーストア・エントリの公開鍵証明書に一致する場合の署名者のキーストア別名が含まれます。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1030,8 +1030,8 @@
 .RE
 .\}
 .PP
-̾ԤξX\&.509ǤϤʤ硢̾ɽޤ󡣤ξˤϡΥפ̾ΤߤɽޤȤСPGPǡ̾\fIbob\fRǤ硢\fIPGP, (bob)\fRޤ
-.SH "Ϣ"
+署名者の証明書がX\&.509証明書ではない場合、識別名情報は表示されません。その場合には、証明書のタイプと別名のみが表示されます。たとえば、証明書がPGP証明書で、別名が\fIbob\fRである場合、\fIPGP, (bob)\fRを取得します。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -1063,8 +1063,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlˤ
-֥: Java SEΥƥǽ
+http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlにある
+「コース: Java SEのセキュリティ機能」
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/java.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/java.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: java
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "java" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "java" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-java \- Javaץꥱưޤ
-.SH ""
+java \- Javaアプリケーションを起動します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -74,26 +74,26 @@
 .PP
 \fIoptions\fR
 .RS 4
-Ƕڤ줿ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+空白で区切られたコマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclassname\fR
 .RS 4
-ư륯饹̾
+起動するクラスの名前。
 .RE
 .PP
 \fIfilename\fR
 .RS 4
-ƤӽФJava(JAR)ե̾\fI\-jar\fRץȰˤΤ߻Ѥޤ
+呼び出されるJavaアーカイブ(JAR)ファイルの名前。\fI\-jar\fRオプションと一緒にのみ使用します。
 .RE
 .PP
 \fIargs\fR
 .RS 4
-Ƕڤ줿\fImain()\fR᥽åɤϤ
+空白で区切られた\fImain()\fRメソッドに渡される引数。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjava\fRޥɤJavaץꥱ򳫻ϤޤJava Runtime Environment (JRE)ư塢ꤷ饹ɤΥ饹\fImain()\fR᥽åɤƤӽФȤˤꡢԤޤΥ᥽åɤϡ\fIpublic\fR\fIstatic\fRȤɬפޤޤ֤ͤޤ󡣤ˡ\fIString\fRѥ᡼ȤƻǤɬפޤ᥽åϼηޤߤޤ
+\fIjava\fRコマンドはJavaアプリケーションを開始します。Java Runtime Environment (JRE)を起動した後、指定したクラスをロードし、そのクラスの\fImain()\fRメソッドを呼び出すことにより、これを行います。このメソッドは、\fIpublic\fRおよび\fIstatic\fRとして宣言する必要があります。また、値は返せません。さらに、\fIString\fR配列をパラメータとして指定できる必要があります。メソッド宣言は次の形式を含みます。
 .sp
 .if n \{\
 .RS 4
@@ -105,16 +105,16 @@
 .RE
 .\}
 .PP
-\fIjava\fRޥɤѤơ\fImain()\fR᥽åɤ뤫\fIjavafx\&.application\&.Application\fRĥ륯饹ɤ뤳ȤǡJavaFXץꥱưǤޤԤξ硢ưġ\fIApplication\fR饹Υ󥹥󥹤\fIinit()\fR᥽åɤ򥳡뤷\fIstart(javafx\&.stage\&.Stage)\fR᥽åɤ򥳡뤷ޤ
+\fIjava\fRコマンドを使用して、\fImain()\fRメソッドがあるか\fIjavafx\&.application\&.Application\fRを拡張するクラスをロードすることで、JavaFXアプリケーションを起動できます。後者の場合、起動ツールは\fIApplication\fRクラスのインスタンスを構成し、その\fIinit()\fRメソッドをコールし、\fIstart(javafx\&.stage\&.Stage)\fRメソッドをコールします。
 .PP
-ǥեȤǤϡ\fIjava\fRޥɤΥץǤϤʤǽΰϡƤӽФ륯饹δ̾Ǥ\fI\-jar\fRץꤷ硢ΰϡץꥱΥ饹եȥ꥽եޤJARե̾ˤʤޤư饹ϡɤ\fIMain\-Class\fRޥ˥եȡإåˤäƻꤵɬפޤ
+デフォルトでは、\fIjava\fRコマンドのオプションではない最初の引数は、呼び出されるクラスの完全修飾名です。\fI\-jar\fRオプションを指定した場合、その引数は、アプリケーションのクラス・ファイルとリソース・ファイルを含むJARファイルの名前になります。起動クラスは、ソース・コードの\fIMain\-Class\fRマニフェスト・ヘッダーによって指定される必要があります。
 .PP
-JREϡ֡ȥȥåס饹ѥ󥹥ȡѳĥǽӥ桼Υ饹ѥ3ս꤫顢ư饹(ӥץꥱǻѤƤ¾Υ饹)򸡺ޤ
+JREは、ブートストラップ・クラス・パス、インストール済拡張機能およびユーザーのクラス・パスの3箇所から、起動クラス(およびアプリケーションで使用されている他のクラス)を検索します。
 .PP
-饹ե̾ޤJARե̾θΰϡ\fImain()\fR᥽åɤϤޤ
-.SH "ץ"
+クラス・ファイル名またはJARファイル名の後の引数は、\fImain()\fRメソッドに渡されます。
+.SH "オプション"
 .PP
-\fIjava\fRޥɤϡΥƥʬǤ빭Ϥʥץ򥵥ݡȤƤޤ
+\fIjava\fRコマンドは、次のカテゴリに分類できる広範なオプションをサポートしています。
 .sp
 .RS 4
 .ie n \{\
@@ -124,7 +124,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ
+標準オプション
 .RE
 .sp
 .RS 4
@@ -135,7 +135,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ
+非標準オプション
 .RE
 .sp
 .RS 4
@@ -146,7 +146,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤ʥ󥿥ࡦץ
+高度なランタイム・オプション
 .RE
 .sp
 .RS 4
@@ -157,7 +157,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤JITѥ顦ץ
+高度なJITコンパイラ・オプション
 .RE
 .sp
 .RS 4
@@ -168,7 +168,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤ʥӥӥƥץ
+高度なサービスアビリティ・オプション
 .RE
 .sp
 .RS 4
@@ -179,31 +179,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤ʥ١쥯󡦥ץ
+高度なガベージ・コレクション・オプション
 .RE
 .PP
-ɸΥץϡJava Virtual Machine (JVM)Τ٤ƤμǥݡȤ뤳ȤݾڤޤϡJREΥСγǧ饹ѥꡢĹʽϤͭʤɤΰŪʥ˻Ѥޤ
+標準のオプションは、Java Virtual Machine (JVM)のすべての実装でサポートすることが保証されます。これらは、JREのバージョンの確認、クラス・パスの設定、冗長な出力の有効化などの一般的なアクションに使用されます。
 .PP
-ɸʳΥץϡJava HotSpotۥޥ˸ͭѥץǤ뤿ᡢ٤ƤJVMǥݡȤ뤳Ȥݾڤ줺ѹǽޤΥץ\fI\-X\fRdzϤޤ
+標準以外のオプションは、Java HotSpot仮想マシンに固有の汎用オプションであるため、すべてのJVM実装でサポートされることは保証されず、変更される可能性があります。これらのオプションは\fI\-X\fRで開始します。
 .PP
-ĥץϡѰդ˻ѤʤȤᤷޤϡΥƥ׷ĤȤ¿ƥ๽ѥ᡼ؤøɬפʾ礬Java HotSpotۥޥΰĴ뤿˻Ѥ볫ȯԥץǤϡ٤ƤJVMǥݡȤ뤳Ȥݾڤ줺ѹǽޤĥץ\fI\-XX\fRǻϤޤޤ
+拡張オプションは、不用意に使用しないことをお薦めします。これらは、特定のシステム要件を持つことが多く、システム構成パラメータへの特権アクセスが必要な場合があるJava HotSpot仮想マシン操作の特定の領域を調整するために使用される開発者オプションです。これらは、すべてのJVM実装でサポートされることは保証されず、変更される可能性があります。拡張オプションは\fI\-XX\fRで始まります。
 .PP
-ǿ꡼侩ޤϺ륪ץפ뤿ˡɥȤκǸ侩Ǻ줿ץȤ̾Υ󤬤ޤ
+最新リリースで非推奨または削除されるオプションを追跡するために、ドキュメントの最後に非推奨で削除されたオプションという名前のセクションがあります。
 .PP
-֡롦ץϡǥեȤ̵ˤʤäƤ뵡ǽͭˤꡢǥեȤͭˤʤäƤ뵡ǽ̵ˤ뤿˻ѤޤΤ褦ʥץϡѥ᡼ɬפȤޤ󡣥֡\fI\-XX\fRץϡץ饹(\fI\-XX:+\fR\fIOptionName\fR)Ѥͭˤޥʥ(\fI\-XX:\-\fR\fIOptionName\fR)Ѥ̵ˤޤ
+ブール・オプションは、デフォルトで無効になっている機能を有効にしたり、デフォルトで有効になっている機能を無効にするために使用されます。このようなオプションは、パラメータを必要としません。ブール値\fI\-XX\fRオプションは、プラス記号(\fI\-XX:+\fR\fIOptionName\fR)を使用して有効にし、マイナス記号(\fI\-XX:\-\fR\fIOptionName\fR)を使用して無効にします。
 .PP
-ɬפʥץξ硢ϡץ̾򡢥(:)ޤ(=)ǶڤäΤˤʤ뤫뤤ϰץθľ³⤢ޤ(Τʹʸϳƥץˤäưۤʤޤ)Хñ̤ǻꤹ褦Ƥ硢Ѥʤ뤤ϥХ(KB)ˤ\fIk\fRޤ\fIK\fRᥬХ(MB)ˤ\fIm\fRޤ\fIM\fRХ(GB)ˤ\fIg\fRޤ\fIG\fRѤޤȤС8GBꤹˤϡ\fI8g\fR\fI8192m\fR\fI8388608k\fRޤ\fI8589934592\fRΤ줫ȤƻǤޤѡȤλ꤬ɬפʾϡ01οͤѤޤ(ȤС25%ξ\fI0\&.25\fRꤷޤ)
-.SS "ɸ४ץ"
+引数が必要なオプションの場合、引数は、オプション名を空白、コロン(:)または等号(=)で区切ったものになるか、あるいは引数がオプションの後に直接続く場合もあります(正確な構文は各オプションによって異なります)。サイズをバイト単位で指定するよう求められている場合、接尾辞を使用しないか、あるいはキロバイト(KB)には接尾辞\fIk\fRまたは\fIK\fR、メガバイト(MB)には接尾辞\fIm\fRまたは\fIM\fR、ギガバイト(GB)には接尾辞\fIg\fRまたは\fIG\fRを使用します。たとえば、サイズを8GBに設定するには、\fI8g\fR、\fI8192m\fR、\fI8388608k\fRまたは\fI8589934592\fRのいずれかを引数として指定できます。パーセントの指定が必要な場合は、0から1の数値を使用します(たとえば、25%の場合は\fI0\&.25\fRを指定します)。
+.SS "標準オプション"
 .PP
-ϡJVMΤ٤ƤμǥݡȤǤŪ˻Ѥ륪ץǤ
+これらは、JVMのすべての実装でサポートされる最も一般的に使用されるオプションです。
 .PP
 \-agentlib:\fIlibname\fR[=\fIoptions\fR]
 .RS 4
-ꤷͥƥ֡ȡ饤֥ɤޤ饤֥̾θˡ饤֥˸ͭΥץΥ޶ڤꥹȤѤǤޤ
+指定したネイティブ・エージェント・ライブラリをロードします。ライブラリ名の後に、ライブラリに固有のオプションのカンマ区切りリストを使用できます。
 .sp
-ץ\fI\-agentlib:foo\fRꤷ硢JVMϡ\fILD_LIBRARY_PATH\fRƥѿ(OS XǤϡѿ\fIDYLD_LIBRARY_PATH\fRˤʤޤ)ǻꤵ줿\fIlibfoo\&.so\fRȤ̾Υ饤֥ɤ褦Ȥޤ
+オプション\fI\-agentlib:foo\fRを指定した場合、JVMは、\fILD_LIBRARY_PATH\fRシステム変数(OS Xでは、この変数は\fIDYLD_LIBRARY_PATH\fRになります)で指定された場所に\fIlibfoo\&.so\fRという名前のライブラリをロードしようとします。
 .sp
-Ǥϡåο3ǡ20ߥäȤ˥ҡסץե󥰡ġ(HPROF)饤֥ɤơץCPUˡ򼨤ޤ
+次の例では、スタックの深さ3で、20ミリ秒ごとにヒープ・プロファイリング・ツール(HPROF)ライブラリをロードして、サンプルのCPU情報を取得する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -214,7 +214,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡᥤ󡦥饹ΥJVMߤơJavaǥХå磻䡦ץȥ(JDWP)饤֥ɤơݡ8000ǤΥå³Ѥ˥ꥹ˥󥰤ˡ򼨤ޤ
+次の例では、メイン・クラスのロード前にJVMを一時停止して、Javaデバッグ・ワイヤ・プロトコル(JDWP)ライブラリをロードして、ポート8000でのソケット接続用にリスニングする方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -225,7 +225,7 @@
 .if n \{\
 .RE
 .\}
-ͥƥ֡ȡ饤֥ξܺ٤ϡ򻲾ȤƤ
+ネイティブ・エージェント・ライブラリの詳細は、次を参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -235,7 +235,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlˤ\fIjava\&.lang\&.instrument\fRѥå
+http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlにある\fIjava\&.lang\&.instrument\fRパッケージの説明
 .RE
 .sp
 .RS 4
@@ -246,54 +246,54 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/platform/jvmti/jvmti\&.html#startingˤJVMġ롦󥿥եɤΥȤΥޥɥ饤󡦥ץ˴ؤ
+http://docs\&.oracle\&.com/javase/8/docs/platform/jvmti/jvmti\&.html#startingにあるJVMツール・インタフェース・ガイドのエージェントのコマンドライン・オプションに関する項
 .RE
 .RE
 .PP
 \-agentpath:\fIpathname\fR[=\fIoptions\fR]
 .RS 4
-Хѥ̾ǻꤵ줿ͥƥ֡ȡ饤֥ɤޤΥץ\fI\-agentlib\fRƱǤ饤֥Υե롦ѥӥե̾Ѥޤ
+絶対パス名で指定されたネイティブ・エージェント・ライブラリをロードします。このオプションは\fI\-agentlib\fRと同等ですが、ライブラリのフル・パスおよびファイル名を使用します。
 .RE
 .PP
 \-client
 .RS 4
-Java HotSpot Client VM򤷤ޤ64ӥåȡСJava SE Development Kit (JDK)ǤϡߡΥץ̵뤵졢Server JVMѤޤ
+Java HotSpot Client VMを選択します。64ビット・バージョンのJava SE Development Kit (JDK)では、現在、このオプションは無視され、かわりにServer JVMが使用されます。
 .sp
-ǥեȤJVMϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlˤ
-С饹ޥθФ򻲾ȤƤ
+デフォルトのJVM選択は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlにある
+サーバークラス・マシンの検出を参照してください。
 .RE
 .PP
 \-D\fIproperty\fR=\fIvalue\fR
 .RS 4
-ƥࡦץѥƥͤꤷޤ\fIproperty\fRѿϡץѥƥ̾ɽΤʤʸǤ\fIvalue\fRѿϡץѥƥͤɽʸǤ\fIvalue\fRޤʸξ硢ǰϤߤޤ(:
-\fI\-Dfoo="foo bar"\fR)
+システム・プロパティの値を設定します。\fIproperty\fR変数は、プロパティの名前を表す、空白のない文字列です。\fIvalue\fR変数は、プロパティの値を表す文字列です。\fIvalue\fRが空白を含む文字列の場合、それを引用符で囲みます(例:
+\fI\-Dfoo="foo bar"\fR)。
 .RE
 .PP
 \-d32
 .RS 4
-ץꥱ32ӥåȴĶǼ¹Ԥޤ32ӥåȴĶ󥹥ȡ뤵ƤʤݡȤƤʤϡ顼𤵤ޤǥեȤǤϡ64ӥåȡƥबѤƤץꥱ32ӥåȴĶǼ¹Ԥޤ
+アプリケーションを32ビット環境で実行します。32ビット環境がインストールされていないかサポートされていない場合は、エラーが報告されます。デフォルトでは、64ビット・システムが使用されている場合を除き、アプリケーションは32ビット環境で実行されます。
 .RE
 .PP
 \-d64
 .RS 4
-ץꥱ64ӥåȴĶǼ¹Ԥޤ64ӥåȴĶ󥹥ȡ뤵ƤʤݡȤƤʤϡ顼𤵤ޤǥեȤǤϡ64ӥåȡƥबѤƤץꥱ32ӥåȴĶǼ¹Ԥޤ
+アプリケーションを64ビット環境で実行します。64ビット環境がインストールされていないかサポートされていない場合は、エラーが報告されます。デフォルトでは、64ビット・システムが使用されている場合を除き、アプリケーションは32ビット環境で実行されます。
 .sp
-ߤΤȤJava HotSpot Server VMΤߤ64ӥåȤ򥵥ݡȤƤ뤿ᡢ\fI\-d64\fRѻˤ\fI\-server\fRץ󤬰Ū˻Ѥޤ\fI\-d64\fRѻˤϡ\fI\-client\fRץ̵뤵ޤλͤϡΥ꡼Ǥѹˤʤǽޤ
+現在のところ、Java HotSpot Server VMのみが64ビットの操作をサポートしているため、\fI\-d64\fR使用時には\fI\-server\fRオプションが暗黙的に使用されます。\fI\-d64\fR使用時には、\fI\-client\fRオプションは無視されます。この仕様は、将来のリリースでは変更になる可能性があります。
 .RE
 .PP
 \-disableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR], \-da[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR]
 .RS 4
-̵ˤޤǥեȤǤϡϤ٤ƤΥѥåӥ饹̵ˤʤäƤޤ
+アサーションを無効にします。デフォルトでは、アサーションはすべてのパッケージおよびクラスで無効になっています。
 .sp
-ʤ\fI\-disableassertions\fR
-(\fI\-da\fR)ꤹȡ٤ƤΥѥåӥ饹ǥ̵ˤʤޤ\fI\&.\&.\&.\fRǽ\fIpackagename\fRꤹȡꤷѥåȤΥ֥ѥåǥ̵ˤʤޤȤ\fI\&.\&.\&.\fRΤߤꤹȡߤκȥǥ쥯ȥˤ̾Τʤѥåǥ̵ˤʤޤ\fIclassname\fRꤹȡؤˤäơꤷ饹ǥ̵ˤʤޤ
+引数なしの\fI\-disableassertions\fR
+(\fI\-da\fR)を指定すると、すべてのパッケージおよびクラスでアサーションが無効になります。\fI\&.\&.\&.\fRで終わる\fIpackagename\fR引数を指定すると、指定したパッケージとそのサブパッケージ内でアサーションが無効になります。引数として\fI\&.\&.\&.\fRのみを指定すると、現在の作業ディレクトリにある名前のないパッケージ内でアサーションが無効になります。\fIclassname\fR引数を指定すると、切替えによって、指定したクラス内でアサーションが無効になります。
 .sp
 \fI\-disableassertions\fR
-(\fI\-da\fR)ץϡ٤ƤΥ饹ӥƥࡦ饹ŬѤޤ(ƥࡦ饹ˤϥ饹Ϥޤ)Υ롼ˤ1㳰ޤץΰꤵƤʤϡƥࡦ饹ŬѤޤ󡣤ˤꡢƥࡦ饹٤ƤΥ饹ǥñ̵ˤ뤳ȤǤޤ\fI\-disablesystemassertions\fRץѤȡ٤ƤΥƥࡦ饹ǥ̵ˤ뤳ȤǤޤ
+(\fI\-da\fR)オプションは、すべてのクラス・ローダーおよびシステム・クラスに適用されます(システム・クラスにはクラス・ローダーはありません)。このルールには1つ例外があります。オプションの引数が指定されていない場合は、システム・クラスに適用されません。これにより、システム・クラスを除くすべてのクラスでアサーションを簡単に無効にすることができます。\fI\-disablesystemassertions\fRオプションを使用すると、すべてのシステム・クラスでアサーションを無効にすることができます。
 .sp
-Υѥå䥯饹ǥŪͭˤˤϡ\fI\-enableassertions\fR
-(\fI\-ea\fR)ץѤޤξΥץƱ˻ѤǤޤȤСѥå\fIcom\&.wombat\&.fruitbat\fR
-(ӤΥ֥ѥå)Ǥϥͭˤơ饹\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRǤϥ̵ˤơ\fIMyClass\fRץꥱ¹ԤˤϡΥޥɤѤޤ
+特定のパッケージやクラスでアサーションを明示的に有効にするには、\fI\-enableassertions\fR
+(\fI\-ea\fR)オプションを使用します。両方のオプションを同時に使用できます。たとえば、パッケージ\fIcom\&.wombat\&.fruitbat\fR
+(およびそのサブパッケージ)ではアサーションを有効にして、クラス\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRではアサーションを無効にして、\fIMyClass\fRアプリケーションを実行するには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -308,22 +308,22 @@
 .PP
 \-disablesystemassertions, \-dsa
 .RS 4
-٤ƤΥƥࡦ饹ǥ̵ˤޤ
+すべてのシステム・クラス内でアサーションを無効にします。
 .RE
 .PP
 \-enableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR], \-ea[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR]
 .RS 4
-ͭˤޤǥեȤǤϡϤ٤ƤΥѥåӥ饹̵ˤʤäƤޤ
+アサーションを有効にします。デフォルトでは、アサーションはすべてのパッケージおよびクラスで無効になっています。
 .sp
-ʤ\fI\-enableassertions\fR
-(\fI\-ea\fR)ꤹȡ٤ƤΥѥåӥ饹ǥͭˤʤޤ\fI\&.\&.\&.\fRǽ\fIpackagename\fRꤹȡꤷѥåȤΥ֥ѥåǥͭˤʤޤȤ\fI\&.\&.\&.\fRΤߤꤹȡߤκȥǥ쥯ȥˤ̾Τʤѥåǥͭˤʤޤ\fIclassname\fRꤹȡؤˤäơꤷ饹ǥͭˤʤޤ
+引数なしの\fI\-enableassertions\fR
+(\fI\-ea\fR)を指定すると、すべてのパッケージおよびクラスでアサーションが有効になります。\fI\&.\&.\&.\fRで終わる\fIpackagename\fR引数を指定すると、指定したパッケージとそのサブパッケージ内でアサーションが有効になります。引数として\fI\&.\&.\&.\fRのみを指定すると、現在の作業ディレクトリにある名前のないパッケージ内でアサーションが有効になります。\fIclassname\fR引数を指定すると、切替えによって、指定したクラス内でアサーションが有効になります。
 .sp
 \fI\-enableassertions\fR
-(\fI\-ea\fR)ץϡ٤ƤΥ饹ӥƥࡦ饹ŬѤޤ(ƥࡦ饹ˤϥ饹Ϥޤ)Υ롼ˤ1㳰ޤץΰꤵƤʤϡƥࡦ饹ŬѤޤ󡣤ˤꡢƥࡦ饹٤ƤΥ饹ǥñͭˤ뤳ȤǤޤ\fI\-enablesystemassertions\fRץϡ٤ƤΥƥࡦ饹ǥͭˤ̤Υå󶡤ޤ
+(\fI\-ea\fR)オプションは、すべてのクラス・ローダーおよびシステム・クラスに適用されます(システム・クラスにはクラス・ローダーはありません)。このルールには1つ例外があります。オプションの引数が指定されていない場合は、システム・クラスに適用されません。これにより、システム・クラスを除くすべてのクラスでアサーションを簡単に有効にすることができます。\fI\-enablesystemassertions\fRオプションは、すべてのシステム・クラスでアサーションを有効にする別のスイッチを提供します。
 .sp
-Υѥå䥯饹ǥŪ̵ˤˤϡ\fI\-disableassertions\fR
-(\fI\-da\fR)ץѤޤñ쥳ޥɤˤΥåΥ󥹥󥹤ʣꤷϡꤷå֤˽Ƥ饯饹ɤޤȤСѥå\fIcom\&.wombat\&.fruitbat\fR
-(ӤΥ֥ѥå)ǤΤߥͭˤơ饹\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRǤϥ̵ˤơ\fIMyClass\fRץꥱ¹ԤˤϡΥޥɤѤޤ
+特定のパッケージやクラスでアサーションを明示的に無効にするには、\fI\-disableassertions\fR
+(\fI\-da\fR)オプションを使用します。単一コマンドにこれらのスイッチのインスタンスを複数指定した場合は、指定したスイッチが順番に処理されてからクラスがロードされます。たとえば、パッケージ\fIcom\&.wombat\&.fruitbat\fR
+(およびそのサブパッケージ)でのみアサーションを有効にして、クラス\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRではアサーションを無効にして、\fIMyClass\fRアプリケーションを実行するには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -338,21 +338,21 @@
 .PP
 \-enablesystemassertions, \-esa
 .RS 4
-٤ƤΥƥࡦ饹ǥͭˤޤ
+すべてのシステム・クラス内でアサーションを有効にします。
 .RE
 .PP
 \-help, \-?
 .RS 4
-ºݤJVM¹Ԥˡ\fIjava\fRޥɤλѾɽޤ
+実際にJVMを実行せずに、\fIjava\fRコマンドの使用状況情報を表示します。
 .RE
 .PP
 \-jar \fIfilename\fR
 .RS 4
-JARե˥ץ벽줿ץ¹Ԥޤ\fIfilename\fRϡѤ륢ץꥱγȤƵǽ\fIpublic static void main(String[] args)\fR᥽åɤ롢\fIMain\-Class:\fR\fIclassname\fRȤ1Ԥޤޥ˥եȤJARե̾Ǥ
+JARファイルにカプセル化されたプログラムを実行します。\fIfilename\fR引数は、使用するアプリケーションの開始点として機能する\fIpublic static void main(String[] args)\fRメソッドを定義する、\fIMain\-Class:\fR\fIclassname\fRという形式の1行を含むマニフェストを持つJARファイルの名前です。
 .sp
-\fI\-jar\fRץѤȡꤷJARե뤬٤ƤΥ桼饹Υˤʤꡢ饹ѥ¾̵뤵ޤ
+\fI\-jar\fRオプションを使用すると、指定したJARファイルがすべてのユーザー・クラスのソースになり、クラス・パスの他の設定は無視されます。
 .sp
-JARեξܺ٤ϡΥ꥽򻲾ȤƤ
+JARファイルの詳細は、次のリソースを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -373,7 +373,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jar/index\&.htmlˤJava(JAR)եΥ
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jar/index\&.htmlにあるJavaアーカイブ(JAR)ファイルのガイド
 .RE
 .sp
 .RS 4
@@ -384,42 +384,42 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlˤ
-֥å: JARեΥץΥѥå
+http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlにある
+「レッスン: JARファイルのプログラムのパッケージ化」
 .RE
 .RE
 .PP
 \-javaagent:\fIjarpath\fR[=\fIoptions\fR]
 .RS 4
-ꤷJavaץߥ󥰸쥨ȤɤޤJavaץꥱΥ󥹥ȥȤξܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlˤJava APIɥȤ\fIjava\&.lang\&.instrument\fRѥå򻲾ȤƤ
+指定したJavaプログラミング言語エージェントをロードします。Javaアプリケーションのインストゥルメントの詳細は、http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlにあるJava APIドキュメントの\fIjava\&.lang\&.instrument\fRパッケージの説明を参照してください。
 .RE
 .PP
 \-jre\-restrict\-search
 .RS 4
-桼ץ饤١ȤJREС󸡺˴ޤޤ
+ユーザー・プライベートなJREをバージョン検索に含めます。
 .RE
 .PP
 \-no\-jre\-restrict\-search
 .RS 4
-桼ץ饤١ȤJREС󸡺ޤ
+ユーザー・プライベートなJREをバージョン検索から除外します。
 .RE
 .PP
 \-server
 .RS 4
-Java HotSpot Server VM򤷤ޤ64ӥåȡСJDKǤϡServer VMΤߤ򥵥ݡȤƤ뤿ᡢξ硢ΥץϰŪǤ
+Java HotSpot Server VMを選択します。64ビット・バージョンのJDKでは、Server VMのみをサポートしているため、その場合、このオプションは暗黙的です。
 .sp
-ǥեȤJVMϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlˤ
-С饹ޥθФ򻲾ȤƤ
+デフォルトのJVM選択は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlにある
+サーバークラス・マシンの検出を参照してください。
 .RE
 .PP
 \-showversion
 .RS 4
-Сɽץꥱμ¹Ԥ³ԤޤΥץ\fI\-version\fRץƱǤ\-versionϥСɽJVM˽λؼۤʤޤ
+バージョン情報を表示し、アプリケーションの実行を続行します。このオプションは\fI\-version\fRオプションと同等ですが、\-versionはバージョン情報の表示後にJVMに終了を指示する点が異なります。
 .RE
 .PP
 \-splash:\fIimgname\fR
 .RS 4
-\fIimgname\fRǻꤵ줿᡼ޤॹץå̤ɽޤȤСץꥱεư\fIimages\fRǥ쥯ȥ\fIsplash\&.gif\fRեɽˤϡΥץѤޤ
+\fIimgname\fRで指定されたイメージを含むスプラッシュ画面を表示します。たとえば、アプリケーションの起動時に\fIimages\fRディレクトリの\fIsplash\&.gif\fRファイルを表示するには、次のオプションを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -434,31 +434,31 @@
 .PP
 \-verbose:class
 .RS 4
-ɤ줿ƥ饹˴ؤɽޤ
+ロードされた各クラスに関する情報を表示します。
 .RE
 .PP
 \-verbose:gc
 .RS 4
-ƥ١쥯(GC)٥Ȥ˴ؤɽޤ
+各ガベージ・コレクション(GC)イベントに関する情報を表示します。
 .RE
 .PP
 \-verbose:jni
 .RS 4
-ͥƥ֡᥽åɤλѤӤ¾Java Native Interface (JNI)ƥӥƥ˴ؤɽޤ
+ネイティブ・メソッドの使用およびその他のJava Native Interface (JNI)アクティビティに関する情報を表示します。
 .RE
 .PP
 \-version
 .RS 4
-СɽƤ齪λޤΥץ\fI\-showversion\fRץƱǤ\-showversionϥСɽJVM˽λؼʤۤʤޤ
+バージョン情報を表示してから終了します。このオプションは\fI\-showversion\fRオプションと同等ですが、\-showversionはバージョン情報の表示後にJVMに終了を指示しない点が異なります。
 .RE
 .PP
 \-version:\fIrelease\fR
 .RS 4
-ץꥱμ¹Ԥ˻Ѥ꡼Сꤷޤ뤵줿\fIjava\fRޥɤΥС󤬤λƤŬڤʼƥǸĤäˤϡŬڤʼѤޤ
+アプリケーションの実行に使用するリリース・バージョンを指定します。コールされた\fIjava\fRコマンドのバージョンがこの指定内容を満たさず、かつ適切な実装がシステム上で見つかった場合には、その適切な実装が使用されます。
 .sp
-\fIrelease\fRϡΤʥСʸ󡢤ޤ϶Ƕڤ줿СʸȥСϰϤΥꥹȤꤷޤ\fIСʸ\fRϡηǡȯԤΥСֹꤷޤ:
+\fIrelease\fR引数は、正確なバージョン文字列、または空白で区切られたバージョン文字列とバージョン範囲のリストを指定します。\fIバージョン文字列\fRは、次の形式で、開発者のバージョン番号を指定します:
 \fI1\&.\fR\fIx\fR\fI\&.0_\fR\fIu\fR
-(\fIx\fRϥ᥸㡼Сֹ桢\fIu\fRϹСֹǤ)\fIСϰ\fRϡΥСʹߤꤹˤϥСʸθ˥ץ饹(\fI+\fR)³ΡޤϰפƬޤǤդΥСʸꤹˤϰΥСʸθ˥ꥹ(\fI*\fR)³Τǹޤ\fIOR\fRȹ礻ˤ϶2ĤΥСʸ/ϰϤ\fIAND\fRȹ礻ˤϥѥ(\fI&\fR)ѤơСʸȥСϰϤȤ߹礻뤳ȤǤޤȤС饹ޤJARեμ¹ԤJRE 6u13 (1\&.6\&.0_13)ޤ6u10 (1\&.6\&.0_10)ʹߤǤդJRE 6Τ줫ɬפȤ硢ꤷޤ
+(\fIx\fRはメジャー・バージョン番号、\fIu\fRは更新バージョン番号です)。\fIバージョン範囲\fRは、このバージョン以降を指定するにはバージョン文字列の後にプラス記号(\fI+\fR)を続けたもの、または一致する接頭辞を含む任意のバージョン文字列を指定するには一部のバージョン文字列の後にアスタリスク(\fI*\fR)を続けたもので構成されます。論理\fIOR\fRの組合せには空白、2つのバージョンの文字列/範囲の論理\fIAND\fRの組合せにはアンパサンド(\fI&\fR)を使用して、バージョン文字列とバージョン範囲を組み合せることができます。たとえば、クラスまたはJARファイルの実行にJRE 6u13 (1\&.6\&.0_13)または6u10 (1\&.6\&.0_10)以降の任意のJRE 6のいずれかを必要とする場合、次を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -469,99 +469,99 @@
 .if n \{\
 .RE
 .\}
-䤬ɬפʤΤϡ\fIrelease\fRѥ᡼˶򤬤ΤߤǤ
+引用符が必要なのは、\fIrelease\fRパラメータに空白がある場合のみです。
 .sp
-JARեξϡС׷򥳥ޥɥ饤˻ꤹ⡢JARեΥޥ˥ե˻ꤹ뤳Ȥ侩Ƥޤ
+JARファイルの場合は、バージョン要件をコマンドラインに指定するよりも、JARファイルのマニフェスト内に指定することが推奨されています。
 .RE
-.SS "ɸ४ץ"
+.SS "非標準オプション"
 .PP
-ΥץϡJava HotSpotۥޥ˸ͭѥץǤ
+これらのオプションは、Java HotSpot仮想マシンに固有の汎用オプションです。
 .PP
 \-X
 .RS 4
-Ѳǽʤ٤Ƥ\fI\-X\fRץΥإפɽޤ
+使用可能なすべての\fI\-X\fRオプションのヘルプを表示します。
 .RE
 .PP
 \-Xbatch
 .RS 4
-Хå饦ɡѥ̵ˤޤǥեȤǤϡJVMǤϡХå饦ɡѥ뤬λޤǡ᥽åɤХå饦ɡȤƥѥ뤷󥿥ץ꥿⡼ɤǥ᥽åɤ¹Ԥޤ\fI\-Xbatch\fRե饰ꤹȡХå饦ɡѥ뤬̵ˤʤꡢ٤ƤΥ᥽åɤΥѥ뤬λޤǥե饦ɡȤƽޤ
+バックグラウンド・コンパイルを無効にします。デフォルトでは、JVMでは、バックグラウンド・コンパイルが終了するまで、メソッドをバックグラウンド・タスクとしてコンパイルし、インタプリタ・モードでメソッドを実行します。\fI\-Xbatch\fRフラグを指定すると、バックグラウンド・コンパイルが無効になり、すべてのメソッドのコンパイルが完了するまでフォアグラウンド・タスクとして処理されます。
 .sp
-Υץ\fI\-XX:\-BackgroundCompilation\fRƱǤ
+このオプションは\fI\-XX:\-BackgroundCompilation\fRと同等です。
 .RE
 .PP
 \-Xbootclasspath:\fIpath\fR
 .RS 4
-֡ȡ饹ե򸡺ǥ쥯ȥꡢJARե뤪ZIP֤Ρ(:)Ƕڤ줿ꥹȤꤷޤϡJDK˴ޤޤ֡ȡ饹եΤ˻Ѥޤ
+ブート・クラス・ファイルを検索するディレクトリ、JARファイルおよびZIPアーカイブの、コロン(:)で区切られたリストを指定します。これらは、JDKに含まれるブート・クラス・ファイルのかわりに使用されます。
 .sp
-JREХʥꡦɡ饤󥹤˰ȿ뤿ᡢ\fIrt\&.jar\fRǥ饹򥪡С饤ɤŪǡΥץѤ륢ץꥱǥץʤǤ
+JREバイナリ・コード・ライセンスに違反するため、\fIrt\&.jar\fRでクラスをオーバーライドする目的で、このオプションを使用するアプリケーションをデプロイしないでください。
 .RE
 .PP
 \-Xbootclasspath/a:\fIpath\fR
 .RS 4
-ǥեȤΥ֡ȥȥåס饹ѥκǸɲäǥ쥯ȥꡢJARե뤪ZIP֤Ρ(:)Ƕڤ줿ꥹȤꤷޤ
+デフォルトのブートストラップ・クラス・パスの最後に追加するディレクトリ、JARファイルおよびZIPアーカイブの、コロン(:)で区切られたリストを指定します。
 .sp
-JREХʥꡦɡ饤󥹤˰ȿ뤿ᡢ\fIrt\&.jar\fRǥ饹򥪡С饤ɤŪǡΥץѤ륢ץꥱǥץʤǤ
+JREバイナリ・コード・ライセンスに違反するため、\fIrt\&.jar\fRでクラスをオーバーライドする目的で、このオプションを使用するアプリケーションをデプロイしないでください。
 .RE
 .PP
 \-Xbootclasspath/p:\fIpath\fR
 .RS 4
-ǥեȤΥ֡ȥȥåס饹ѥƬɲäǥ쥯ȥꡢJARե뤪ZIP֤Ρ(:)Ƕڤ줿ꥹȤꤷޤ
+デフォルトのブートストラップ・クラス・パスの先頭に追加するディレクトリ、JARファイルおよびZIPアーカイブの、コロン(:)で区切られたリストを指定します。
 .sp
-JREХʥꡦɡ饤󥹤˰ȿ뤿ᡢ\fIrt\&.jar\fRǥ饹򥪡С饤ɤŪǡΥץѤ륢ץꥱǥץʤǤ
+JREバイナリ・コード・ライセンスに違反するため、\fIrt\&.jar\fRでクラスをオーバーライドする目的で、このオプションを使用するアプリケーションをデプロイしないでください。
 .RE
 .PP
 \-Xboundthreads
 .RS 4
-桼٥Υåɤ򥫡ͥ롦åɤ˥Хɤޤ
+ユーザー・レベルのスレッドをカーネル・スレッドにバインドします。
 .RE
 .PP
 \-Xcheck:jni
 .RS 4
-Java Native Interface (JNI)ǽФɲååԤޤŪˤϡϡJNIꥯȤˡJNIؿϤѥ᡼ȼ¹ԴĶΥǡ򸡾ڤޤ̵ʥǡĤäϡͥƥ֡ɤ꤬뤳Ȥ򼨤Ƥ뤿ᡢJVMϥꥫХǽʥ顼ȯƽλޤΥץѤȡѥեޥ㲼ͽۤޤ
+Java Native Interface (JNI)機能に対して追加チェックを行います。具体的には、これは、JNIリクエストを処理する前に、JNI関数に渡されるパラメータと実行環境のデータを検証します。無効なデータが見つかった場合は、ネイティブ・コードに問題があることを示しているため、JVMはリカバリ不能なエラーを発生して終了します。このオプションを使用すると、パフォーマンス低下が予想されます。
 .RE
 .PP
 \-Xcomp
 .RS 4
-ǽθƽФJavaɤӥѥ롦᥽åɤβ̵ˤޤǥեȤǤϡJITѥϡ10,000βᤵ줿᥽åɸƽФ¹ԤơΨŪʥѥΤξޤΨˤƥѥΥѥեޥ󥹤夵ˤϡ\fI\-Xcomp\fRե饰Ѥơᤵ줿᥽åɸƽФ̵ˤޤ
+最初の呼出しでJavaコードおよびコンパイル・メソッドの解釈を無効にします。デフォルトでは、JITコンパイラは、10,000の解釈されたメソッド呼出しを実行して、効率的なコンパイルのための情報を収集します。効率を犠牲にしてコンパイルのパフォーマンスを向上させるには、\fI\-Xcomp\fRフラグを使用して、解釈されたメソッド呼出しを無効にします。
 .sp
-\fI\-XX:CompileThreshold\fRץѤơѥˡᤵ줿᥽åɸƽФοѹ뤳ȤǤޤ
+\fI\-XX:CompileThreshold\fRオプションを使用して、コンパイルの前に、解釈されたメソッド呼出しの数を変更することもできます。
 .RE
 .PP
 \-Xdebug
 .RS 4
-Ԥޤ󡣲̸ߴΤѰդƤޤ
+何も行いません。下位互換性のために用意されています。
 .RE
 .PP
 \-Xdiag
 .RS 4
-ɲäοǥåɽޤ
+追加の診断メッセージを表示します。
 .RE
 .PP
 \-Xfuture
 .RS 4
-饹եλͤؤν򶯲롢̩ʥ饹եΥåͭˤʤޤΥ꡼Ǥϡ긷̩ʥåǥեȤˤʤ뤿ᡢɤȯȤˤϡȯԤϤΥե饰Ѥ뤳Ȥᤷޤ
+クラス・ファイル形式の仕様への準拠を強化する、厳密なクラス・ファイル形式のチェックが有効になります。将来のリリースでは、より厳密なチェックがデフォルトになるため、新しいコードを開発するときには、開発者はこのフラグを使用することをお薦めします。
 .RE
 .PP
 \-Xincgc
 .RS 4
-ʬGCͭˤޤ
+増分GCを有効にします。
 .RE
 .PP
 \-Xint
 .RS 4
-󥿥ץ꥿ѥ⡼ɤǥץꥱ¹Ԥޤͥƥ֡ɤؤΥѥ̵ˤʤꡢ٤ƤΥХȥɤ󥿥ץ꥿ˤäƼ¹Ԥޤ㥹ȡ󡦥(JIT)ѥ餬󶡤ѥեޥ󥹾ϡΥ⡼ɤǤϼ¸ޤ
+インタプリタ専用モードでアプリケーションを実行します。ネイティブ・コードへのコンパイルは無効になり、すべてのバイトコードがインタプリタによって実行されます。ジャスト・イン・タイム(JIT)コンパイラが提供するパフォーマンス上の利点は、このモードでは実現されません。
 .RE
 .PP
 \-Xinternalversion
 .RS 4
-\fI\-version\fRץܺ٤JVMСɽƤ齪λޤ
+\fI\-version\fRオプションより詳細なJVMバージョン情報を表示してから終了します。
 .RE
 .PP
 \-Xloggc:\fIfilename\fR
 .RS 4
-ܺ٤GC٥ȾѤ˥쥯ȤեꤷޤΥե˽񤭹ޤϡϿ줿ƥ٥Ȥ˹ԤǽGC٥Ȱʹߤ˷вᤷ֤ꤷ\fI\-verbose:gc\fRνϤƤޤ\fI\-Xloggc\fRץ\fI\-verbose:gc\fR򥪡С饤ɤޤ(ξƱ\fIjava\fRޥɤǻꤵ줿)
+詳細なGCイベント情報をロギング用にリダイレクトするファイルを設定します。このファイルに書き込まれる情報は、記録された各イベントの前に行われる最初のGCイベント以降に経過した時間を指定した\fI\-verbose:gc\fRの出力と類似しています。\fI\-Xloggc\fRオプションは\fI\-verbose:gc\fRをオーバーライドします(これらの両方が同じ\fIjava\fRコマンドで指定された場合)。
 .sp
-:
+例:
 .sp
 .if n \{\
 .RS 4
@@ -576,7 +576,7 @@
 .PP
 \-Xmaxjitcodesize=\fIsize\fR
 .RS 4
-JITѥ뤵줿ɤκ祳ɡå塦(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡͤ48MBꤵƤޤ
+JITコンパイルされたコードの最大コード・キャッシュ・サイズ(バイト単位)を指定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、この値は48MBに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -587,21 +587,21 @@
 .if n \{\
 .RE
 .\}
-Υץ\fI\-XX:ReservedCodeCacheSize\fRƱǤ
+このオプションは\fI\-XX:ReservedCodeCacheSize\fRと同等です。
 .RE
 .PP
 \-Xmixed
 .RS 4
-ͥƥ֡ɤ˥ѥ뤵줿ۥåȡ᥽åɤ󥿥ץ꥿ˤäƤ٤ƤΥХȥɤ¹Ԥޤ
+ネイティブ・コードにコンパイルされたホット・メソッドを除き、インタプリタによってすべてのバイトコードを実行します。
 .RE
 .PP
 \-Xmn\fIsize\fR
 .RS 4
-㤤(ʡ)ΥҡפνӺ祵(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤ
+若い世代(ナーサリ)のヒープの初期サイズおよび最大サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。
 .sp
-ҡפμ㤤꡼Ͽ֥Ȥ˻ѤޤGCϡ¾Υ꡼ꤳΥ꡼ǡˤ˼¹Ԥޤ㤤Υ硢¿Υޥʡ١쥯󤬼¹Ԥޤ礭硢ե롦١쥯Τߤ¹ԤޤλޤǤ˻֤뤳Ȥޤ㤤ΥϡΤΥҡסȾʬ4ʬ1δ֤ˤƤȤᤷޤ
+ヒープの若い世代リージョンは新しいオブジェクトに使用されます。GCは、他のリージョンよりこのリージョンで、より頻繁に実行されます。若い世代のサイズが小さすぎる場合、多数のマイナー・ガベージ・コレクションが実行されます。サイズが大きすぎる場合、フル・ガベージ・コレクションのみが実行されますが、完了までに時間がかかることがあります。若い世代のサイズは、全体のヒープ・サイズの半分から4分の1の間にしておくことをお薦めします。
 .sp
-Ǥϡ㤤νӺ祵͡ñ̤Ѥ256MBꤹˡ򼨤ޤ
+次の例では、若い世代の初期サイズおよび最大サイズを様々な単位を使用して256MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -614,14 +614,14 @@
 .if n \{\
 .RE
 .\}
-㤤ΥҡפνȺ祵ξꤹ\fI\-Xmn\fRץΤˡˤ\fI\-XX:NewSize\fR򡢺祵ˤ\fI\-XX:MaxNewSize\fRѤǤޤ
+若い世代のヒープの初期サイズと最大サイズの両方を設定する\fI\-Xmn\fRオプションのかわりに、初期サイズの設定には\fI\-XX:NewSize\fRを、最大サイズの設定には\fI\-XX:MaxNewSize\fRを使用できます。
 .RE
 .PP
 \-Xms\fIsize\fR
 .RS 4
-ҡפν(Хñ)ꤷޤꤹͤϡ1MB礭1024ܿˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤ
+ヒープの初期サイズ(バイト単位)を設定します。指定する値は、1MBより大きい1024の倍数にする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。
 .sp
-ǤϡƤ줿꡼Υ͡ñ̤Ѥ6MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーのサイズを様々な単位を使用して6MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -634,14 +634,14 @@
 .if n \{\
 .RE
 .\}
-Υץꤷʤ硢ϡŤȼ㤤˳Ƥ줿ιפȤꤵޤ㤤Υҡפνϡ\fI\-Xmn\fRץޤ\fI\-XX:NewSize\fRץѤǤޤ
+このオプションを設定しない場合、初期サイズは、古い世代と若い世代に割り当てられたサイズの合計として設定されます。若い世代のヒープの初期サイズは、\fI\-Xmn\fRオプションまたは\fI\-XX:NewSize\fRオプションを使用して設定できます。
 .RE
 .PP
 \-Xmx\fIsize\fR
 .RS 4
-꡼ƥסκ祵(Хñ)ꤷޤꤹͤϡ2MB礭1024ܿˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϡ¹Ի˥ƥ๽˴Ť򤵤ޤСǥץȤǤϡ\fI\-Xms\fR\fI\-Xmx\fR̾Ʊͤꤵޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlˤ륬١쥯르Υߥå򻲾ȤƤ
+メモリー割当てプールの最大サイズ(バイト単位)を指定します。指定する値は、2MBより大きい1024の倍数にする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は、実行時にシステム構成に基づいて選択されます。サーバー・デプロイメントでは、\fI\-Xms\fRおよび\fI\-Xmx\fRは通常同じ値に設定されます。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlにあるガベージ・コレクタ・エルゴノミックを参照してください。
 .sp
-ǤϡƤ줿꡼εĤ祵͡ñ̤Ѥ80MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーの許可される最大サイズを様々な単位を使用して80MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -654,34 +654,34 @@
 .if n \{\
 .RE
 .\}
-\fI\-Xmx\fRץ\fI\-XX:MaxHeapSize\fRƱǤ
+\fI\-Xmx\fRオプションは\fI\-XX:MaxHeapSize\fRと同等です。
 .RE
 .PP
 \-Xnoclassgc
 .RS 4
-饹Υ١쥯(GC)̵ˤޤˤꡢGC֤Ǥץꥱ¹Ǥṳ̂ޤ
+クラスのガベージ・コレクション(GC)を無効にします。これにより、GC時間を節約でき、アプリケーション実行中の中断が短縮されます。
 .sp
-ư\fI\-Xnoclassgc\fRꤹȡץꥱΥ饹֥ȤϡGCδ֤ϤΤޤ޻Ĥꡢ˥饤֤ǤȤߤʤޤˤꡢ¿Υ꡼ʵפͭ뤳ȤˤʤꡢդƻѤʤȡ꡼­㳰ޤ
+起動時に\fI\-Xnoclassgc\fRを指定すると、アプリケーション内のクラス・オブジェクトは、GCの間はそのまま残り、常にライブであるとみなされます。これにより、より多くのメモリーが永久に占有されることになり、注意して使用しないと、メモリー不足の例外がスローされます。
 .RE
 .PP
 \-Xprof
 .RS 4
-¹ΥץΥץեץե롦ǡɸϤޤΥץϡץ೫ȯѤΥ桼ƥƥȤ󶡤ƤޤֲƯƥǤλѤŪȤΤǤϤޤ
+実行中のプログラムのプロファイルを生成し、プロファイル・データを標準出力に送信します。このオプションは、プログラム開発用のユーティリティとして提供されています。本番稼働システムでの使用を目的としたものではありません。
 .RE
 .PP
 \-Xrs
 .RS 4
-JVMˤ륪ڥ졼ƥ󥰡ƥࡦʥλѤ򸺤餷ޤ
+JVMによるオペレーティング・システム・シグナルの使用を減らします。
 .sp
-åȥ󡦥եåϡJVMλǤ⡢åȥ˥桼꡼󥢥åס(ǡ١³Υʤ)¹Ԥ뤳ȤˤäơJavaץꥱΥåȥ֤ͭˤޤ
+シャットダウン・フックは、JVMが突然終了した場合でも、シャットダウン時にユーザー・クリーンアップ・コード(データベース接続のクローズなど)を実行することによって、Javaアプリケーションのシャットダウンを順番に有効にします。
 .sp
-JVMϡͽʤλΥåȥ󡦥եå뤿˥ʥ򥭥åޤJVMϡ\fISIGHUP\fR\fISIGINT\fR\fISIGTERM\fRѤơåȥ󡦥եåμ¹Ԥ򳫻Ϥޤ
+JVMは、予期しない終了のシャットダウン・フックを実装するためにシグナルをキャッチします。JVMは、\fISIGHUP\fR、\fISIGINT\fRおよび\fISIGTERM\fRを使用して、シャットダウン・フックの実行を開始します。
 .sp
-JVMϡǥХåŪǥåɡåפȤǽ¸뤿ˡƱͤΥᥫ˥ѤޤJVMϡåɡפ¹Ԥ뤿\fISIGQUIT\fRѤޤ
+JVMは、デバッグの目的でスレッド・スタックをダンプするという機能を実現するために、同様のメカニズムを使用します。JVMは、スレッド・ダンプを実行するために\fISIGQUIT\fRを使用します。
 .sp
-JVMǤ륢ץꥱϡ\fISIGINT\fR\fISIGTERM\fRʤɤΥʥˤ˥ȥåפɬפꡢη̡JVMΥʥ롦ϥɥȾͤǽޤ\fI\-Xrs\fRץϡн褹뤿˻ѤǤޤ\fI\-Xrs\fRѤƤ硢\fISIGINT\fR\fISIGTERM\fR\fISIGHUP\fR\fISIGQUIT\fRΥʥ롦ޥJVMˤäѹ줺ΥʥΥʥ롦ϥɥϥ󥹥ȡ뤵ޤ
+JVMを埋め込んでいるアプリケーションは、\fISIGINT\fRや\fISIGTERM\fRなどのシグナルを頻繁にトラップする必要があり、その結果、JVMのシグナル・ハンドラと衝突する可能性があります。\fI\-Xrs\fRオプションは、この問題に対処するために使用できます。\fI\-Xrs\fRが使用されている場合、\fISIGINT\fR、\fISIGTERM\fR、\fISIGHUP\fRおよび\fISIGQUIT\fRのシグナル・マスクはJVMによって変更されず、これらのシグナルのシグナル・ハンドラはインストールされません。
 .sp
-\fI\-Xrs\fRꤹȡ2Ĥη̤ޤ:
+\fI\-Xrs\fRを指定すると、次の2つの結果が生じます:
 .sp
 .RS 4
 .ie n \{\
@@ -691,7 +691,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISIGQUIT\fRˤ륹åɡפϻѤǤޤ
+\fISIGQUIT\fRによるスレッド・ダンプは使用できません。
 .RE
 .sp
 .RS 4
@@ -702,63 +702,63 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åȥ󡦥եåμ¹ԤϡJVMλ褦ȤƤ\fISystem\&.exit()\fRƤӽФʤɤơ桼¦ǹԤɬפޤ
+シャットダウン・フック処理の実行は、JVMが終了しようとしている時点で\fISystem\&.exit()\fRを呼び出すなどして、ユーザー・コード側で行う必要があります。
 .RE
 .RE
 .PP
 \-Xshare:\fImode\fR
 .RS 4
-饹ǡͭ⡼ɤꤷޤΥץǻѲǽ\fImode\fRϼΤȤǤ
+クラス・データ共有モードを設定します。このオプションで使用可能な\fImode\fR引数は次のとおりです。
 .PP
 auto
 .RS 4
-ǽʾ硢ͭ饹ΥǡѤޤϡJava HotSpot 32\-Bit Client VMξΥǥեͤǤ
+可能な場合、共有クラスのデータを使用します。これは、Java HotSpot 32\-Bit Client VMの場合のデフォルト値です。
 .RE
 .PP
 on
 .RS 4
-饹ǡͭλѤɬפǤ饹ǡͭѤǤʤ硢顼åϤƽλޤ
+クラス・データ共有の使用が必要です。クラス・データ共有を使用できない場合、エラー・メッセージを出力して終了します。
 .RE
 .PP
 off
 .RS 4
-ͭ饹ǡѤޤ󡣤ϡJava HotSpot 32\-Bit Server VMJava HotSpot 64\-Bit Client VMJava HotSpot 64\-Bit Server VMξΥǥեͤǤ
+共有クラス・データを使用しません。これは、Java HotSpot 32\-Bit Server VM、Java HotSpot 64\-Bit Client VMおよびJava HotSpot 64\-Bit Server VMの場合のデフォルト値です。
 .RE
 .PP
 dump
 .RS 4
-饹ǡ֤ͭưޤ
+クラス・データ共有アーカイブを手動で生成します。
 .RE
 .RE
 .PP
 \-XshowSettings:\fIcategory\fR
 .RS 4
-ɽ³ԤޤΥץǻѲǽ\fIcategory\fRϼΤȤǤ
+設定を表示して続行します。このオプションで使用可能な\fIcategory\fR引数は次のとおりです。
 .PP
 all
 .RS 4
-Τ٤ƤΥƥɽޤ줬ǥեͤǤ
+設定のすべてのカテゴリを表示します。これがデフォルト値です。
 .RE
 .PP
 locale
 .RS 4
-˴Ϣɽޤ
+ロケールに関連する設定を表示します。
 .RE
 .PP
 properties
 .RS 4
-ƥࡦץѥƥ˴Ϣɽޤ
+システム・プロパティに関連する設定を表示します。
 .RE
 .PP
 vm
 .RS 4
-JVMɽޤ
+JVMの設定を表示します。
 .RE
 .RE
 .PP
 \-Xss\fIsize\fR
 .RS 4
-åɤΥå(Хñ)ꤷޤKB򼨤ʸ\fIk\fRޤ\fIK\fRMB򼨤ʸ\fIm\fRޤ\fIM\fRGB򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϥץåȥեˤäưۤʤޤ
+スレッドのスタック・サイズ(バイト単位)を設定します。KBを示す場合は文字\fIk\fRまたは\fIK\fR、MBを示す場合は文字\fIm\fRまたは\fIM\fR、GBを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値はプラットフォームによって異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -768,7 +768,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/ARM (32ӥå): 320KB
+Linux/ARM (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -779,7 +779,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/i386 (32ӥå): 320KB
+Linux/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -790,7 +790,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/x64 (64ӥå): 1024KB
+Linux/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -801,7 +801,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-OS X (64ӥå): 1024KB
+OS X (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -812,7 +812,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/i386 (32ӥå): 320KB
+Oracle Solaris/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -823,7 +823,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/x64 (64ӥå): 1024KB
+Oracle Solaris/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -834,10 +834,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Windows: ۥ꡼ˤäưۤʤޤ
+Windows: 仮想メモリーによって異なります。
 .RE
 .sp
-Ǥϡåɡåۤʤñ̤1024KBꤷޤ
+次の例では、スレッド・スタック・サイズを異なる単位で1024KBに設定します。
 .sp
 .if n \{\
 .RS 4
@@ -850,46 +850,46 @@
 .if n \{\
 .RE
 .\}
-Υץ\fI\-XX:ThreadStackSize\fRƱǤ
+このオプションは\fI\-XX:ThreadStackSize\fRと同等です。
 .RE
 .PP
 \-Xusealtsigs
 .RS 4
-JVMʥ\fISIGUSR1\fR\fISIGUSR2\fRΤˡإʥѤޤΥץ\fI\-XX:+UseAltSigs\fRƱǤ
+JVM内部シグナルの\fISIGUSR1\fRおよび\fISIGUSR2\fRのかわりに、代替シグナルを使用します。このオプションは\fI\-XX:+UseAltSigs\fRと同等です。
 .RE
 .PP
 \-Xverify:\fImode\fR
 .RS 4
-Хȥɡ٥եΥ⡼ɤꤷޤХȥɤθڤϰΥȥ֥륷塼ƥ󥰤Ωޤ¹ΥץꥱؤΥСإåɤ礵ޤΥץǻѲǽ\fImode\fRϼΤȤǤ
+バイトコード・ベリファイアのモードを設定します。バイトコードの検証は一部の問題のトラブルシューティングに役立ちますが、実行中のアプリケーションへのオーバーヘッドを増大させます。このオプションで使用可能な\fImode\fR引数は次のとおりです。
 .PP
 none
 .RS 4
-Хȥɤ򸡾ڤޤ󡣤ˤꡢư֤ṳ̂졢Javaˤä󶡤ݸڸޤ
+バイトコードを検証しません。これにより、起動時間が短縮され、Javaによって提供される保護も軽減されます。
 .RE
 .PP
 remote
 .RS 4
-ͥåȥ𤷤ƥ⡼Ȥǥɤ륯饹Τߤ򸡾ڤޤϡ\fI\-Xverify\fRץꤷʤΥǥեȤưǤ
+ネットワークを介してリモートでロードされるクラスのみを検証します。これは、\fI\-Xverify\fRオプションを指定しない場合のデフォルトの動作です。
 .RE
 .PP
 all
 .RS 4
-٤ƤΥ饹򸡾ڤޤ
+すべてのクラスを検証します。
 .RE
 .RE
-.SS "٤ʥ󥿥ࡦץ"
+.SS "高度なランタイム・オプション"
 .PP
-ΥץϡJava HotSpot VMμ¹Իư椷ޤ
+これらのオプションは、Java HotSpot VMの実行時の動作を制御します。
 .PP
 \-XX:+DisableAttachMechanism
 .RS 4
-JVM˥ġ򥢥åᥫ˥̵ˤ륪ץͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢϡåᥫ˥ͭˤȡ\fIjcmd\fR\fIjstack\fR\fIjmap\fR\fIjinfo\fRʤɤΥġѤǤ뤳Ȥ̣ޤ
+JVMにツールをアタッチするメカニズムを無効にするオプションを有効にします。デフォルトでは、このオプションは無効になっており、これは、アタッチ・メカニズムを有効にすると、\fIjcmd\fR、\fIjstack\fR、\fIjmap\fR、\fIjinfo\fRなどのツールを使用できることを意味します。
 .RE
 .PP
 \-XX:ErrorFile=\fIfilename\fR
 .RS 4
-ꥫХǽʥ顼ȯ˥顼ǡ񤭹ޤѥӥե̾ꤷޤǥեȤǤϡΥեϡߤκȥǥ쥯ȥ˺졢̾\fIhs_err_pid\fR\fIpid\fR\fI\&.log\fR
-(\fIpid\fRϥ顼θȤʤäץμ̻)ˤʤޤǤϡǥեȤΥեꤹˡ򼨤ޤ(ץμ̻Ҥ\fI%p\fRȤƻꤵޤ)
+リカバリ不能なエラーが発生した場合にエラー・データが書き込まれるパスおよびファイル名を指定します。デフォルトでは、このファイルは、現在の作業ディレクトリに作成され、名前は\fIhs_err_pid\fR\fIpid\fR\fI\&.log\fR
+(\fIpid\fRはエラーの原因となったプロセスの識別子)になります。次の例では、デフォルトのログ・ファイルを設定する方法を示します(プロセスの識別子は\fI%p\fRとして指定されます)。
 .sp
 .if n \{\
 .RS 4
@@ -900,7 +900,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ顼\fI/var/log/java/java_error\&.log\fRꤹˡ򼨤ޤ
+次の例では、エラー・ログを\fI/var/log/java/java_error\&.log\fRに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -911,14 +911,14 @@
 .if n \{\
 .RE
 .\}
-(ΰ­¤ޤ̤ˤ)ꤷǥ쥯ȥ˥եǤʤ硢եϥڥ졼ƥ󥰡ƥΰǥ쥯ȥ˺ޤǥ쥯ȥ\fI/tmp\fRǤ
+(領域不足、権限の問題または別の問題により)指定したディレクトリにファイルを作成できない場合、ファイルはオペレーティング・システムの一時ディレクトリに作成されます。一時ディレクトリは\fI/tmp\fRです。
 .RE
 .PP
 \-XX:LargePageSizeInBytes=\fIsize\fR
 .RS 4
-Javaҡפ˻Ѥ礭ڡκ祵(Хñ)ꤷޤ\fIsize\fRϡ2߾(24816\&.\&.\&.)ǤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡ0ꤵ졢ϡJVMǤ礭ڡΥưŪ򤵤Ƥ뤳Ȥ̣ޤ
+Javaヒープに使用される大きいページの最大サイズ(バイト単位)を設定します。\fIsize\fR引数は、2の累乗(2、4、8、16、\&.\&.\&.)である必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、サイズは0に設定され、これは、JVMでは大きいページのサイズが自動的に選択されていることを意味します。
 .sp
-Ǥϡ礭ڡΥ4ᥬХ(MB)ꤹˡ򼨤ޤ
+次の例では、大きいページのサイズを4メガバイト(MB)に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -933,9 +933,9 @@
 .PP
 \-XX:MaxDirectMemorySize=\fIsize\fR
 .RS 4
-I/O (\fIjava\&.nio\fRѥå)ľܥХåեƤκץ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡ0ꤵ졢ϡJVMǤNIOľܥХåեƤΥưŪ򤵤Ƥ뤳Ȥ̣ޤ
+新規I/O (\fIjava\&.nio\fRパッケージ)の直接バッファ割当ての最大合計サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、サイズは0に設定され、これは、JVMではNIOの直接バッファ割当てのサイズが自動的に選択されていることを意味します。
 .sp
-ǤϡNIOۤʤñ̤1024KBꤹˡ򼨤ޤ
+次の例では、NIOサイズを異なる単位で1024KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -952,30 +952,30 @@
 .PP
 \-XX:NativeMemoryTracking=\fImode\fR
 .RS 4
-JVMΥͥƥ֡꡼ѾΥȥå󥰤Υ⡼ɤꤷޤΥץǻѲǽ\fImode\fRϼΤȤǤ
+JVMのネイティブ・メモリー使用状況のトラッキングのモードを指定します。このオプションで使用可能な\fImode\fR引数は次のとおりです。
 .PP
 off
 .RS 4
-JVMΥͥƥ֡꡼Ѿפޤ󡣤ϡ\fI\-XX:NativeMemoryTracking\fRץꤷʤΥǥեȤưǤ
+JVMのネイティブ・メモリー使用状況を追跡しません。これは、\fI\-XX:NativeMemoryTracking\fRオプションを指定しない場合のデフォルトの動作です。
 .RE
 .PP
 summary
 .RS 4
-JVM֥ƥ(Javaҡס饹ɡåɤʤ)ˤ꡼ѾΤפޤ
+JVMサブシステム(Javaヒープ、クラス、コード、スレッドなど)によるメモリー使用状況のみ追跡します。
 .RE
 .PP
 detail
 .RS 4
-JVM֥ƥˤ꡼ѾΥȥå󥰤˲äơġ\fICallSite\fR
-(ġβۥ꡼꡼󤪤ӤΥߥåȺѥ꡼)ˤ꡼Ѿפޤ
+JVMサブシステムによるメモリー使用状況のトラッキングに加えて、個々の\fICallSite\fR
+(個々の仮想メモリー・リージョンおよびそのコミット済リージョン)によるメモリー使用状況を追跡します。
 .RE
 .RE
 .PP
 \-XX:OnError=\fIstring\fR
 .RS 4
-ꥫХǽʥ顼ȯȤ˼¹Ԥ롢ࡦޥɤޤϰϢΥߥڤΥޥɤꤷޤʸ˶򤬴ޤޤƤϡǰϤɬפޤ
+リカバリ不能なエラーが発生したときに実行する、カスタム・コマンドまたは一連のセミコロン区切りのコマンドを設定します。文字列に空白が含まれている場合は、引用符で囲む必要があります。
 .sp
-Ǥϡ\fI\-XX:OnError\fRץѤƥ᡼뤿\fIgcore\fRޥɤ¹ԤˡӥꥫХǽʥ顼ξ˥ǥХåưƥץ³ˡ򼨤ޤ(\fI%p\fRϸߤΥץꤷޤ)
+次の例では、\fI\-XX:OnError\fRオプションを使用してコア・イメージを作成するために\fIgcore\fRコマンドを実行する方法、およびリカバリ不能なエラーの場合にデバッガを起動してプロセスに接続する方法を示します(\fI%p\fRは現在のプロセスを指定します)。
 .sp
 .if n \{\
 .RS 4
@@ -990,27 +990,27 @@
 .PP
 \-XX:OnOutOfMemoryError=\fIstring\fR
 .RS 4
-\fIOutOfMemoryError\fR㳰ǽ˥줿Ȥ˼¹Ԥ롢ࡦޥɤޤϰϢΥߥڤΥޥɤꤷޤʸ˶򤬴ޤޤƤϡǰϤɬפޤޥʸϡ\fI\-XX:OnError\fRץ򻲾ȤƤ
+\fIOutOfMemoryError\fR例外が最初にスローされたときに実行する、カスタム・コマンドまたは一連のセミコロン区切りのコマンドを設定します。文字列に空白が含まれている場合は、引用符で囲む必要があります。コマンド文字列の例は、\fI\-XX:OnError\fRオプションの説明を参照してください。
 .RE
 .PP
 \-XX:+PrintCommandLineFlags
 .RS 4
-ޥɥ饤ɽ줿ʹֹŪ򤷤JVMե饰ΰͭˤޤϡҡΰ襵򤵤줿١쥯ʤɡJVMˤäꤵ줿르ΥߥåͤǧΩޤǥեȤǤϡΥץ̵Ǥꡢե饰ϰޤ
+コマンドラインに表示された、人間工学的に選択したJVMフラグの印刷を有効にします。これは、ヒープ領域サイズや選択されたガベージ・コレクタなど、JVMによって設定されたエルゴノミック値を確認する場合に役立ちます。デフォルトでは、このオプションは無効であり、フラグは印刷されません。
 .RE
 .PP
 \-XX:+PrintNMTStatistics
 .RS 4
-ͥƥ֡꡼Υȥå󥰤ͭʾˡJVMνλ˼줿ͥƥ֡꡼Υȥå󥰡ǡΰͭˤޤ(\fI\-XX:NativeMemoryTracking\fR򻲾ȤƤ)ǥեȤǤϡΥץ̵Ǥꡢͥƥ֡꡼Υȥå󥰡ǡϰޤ
+ネイティブ・メモリーのトラッキングが有効な場合に、JVMの終了時に収集されたネイティブ・メモリーのトラッキング・データの印刷を有効にします(\fI\-XX:NativeMemoryTracking\fRを参照してください)。デフォルトでは、このオプションは無効であり、ネイティブ・メモリーのトラッキング・データは印刷されません。
 .RE
 .PP
 \-XX:+ShowMessageBoxOnError
 .RS 4
-JVMǥꥫХǽʥ顼ȯ硢ܥåɽͭˤޤˤꡢJVM˥ǥХå³ƥ顼θĴǤ褦ˡJVMλʤ褦ˤơץ򥢥ƥ֤ʤޤޤˤޤǥեȤǤϡΥץ̵Ǥ
+JVMでリカバリ不能なエラーが発生した場合、ダイアログ・ボックスの表示を有効にします。これにより、JVMにデバッガを接続してエラーの原因を調査できるように、JVMを終了しないようにして、プロセスをアクティブなままにします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:ThreadStackSize=\fIsize\fR
 .RS 4
-åɤΥå(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϥץåȥեˤäưۤʤޤ
+スレッドのスタック・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値はプラットフォームによって異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -1020,7 +1020,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/ARM (32ӥå): 320KB
+Linux/ARM (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -1031,7 +1031,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/i386 (32ӥå): 320KB
+Linux/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -1042,7 +1042,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/x64 (64ӥå): 1024KB
+Linux/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -1053,7 +1053,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-OS X (64ӥå): 1024KB
+OS X (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -1064,7 +1064,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/i386 (32ӥå): 320KB
+Oracle Solaris/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -1075,7 +1075,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/x64 (64ӥå): 1024KB
+Oracle Solaris/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -1086,10 +1086,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Windows: ۥ꡼ˤäưۤʤޤ
+Windows: 仮想メモリーによって異なります。
 .RE
 .sp
-Ǥϡåɡåۤʤñ̤1024KBꤹˡ򼨤ޤ
+次の例では、スレッド・スタック・サイズを異なる単位で1024KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1102,86 +1102,86 @@
 .if n \{\
 .RE
 .\}
-Υץ\fI\-Xss\fRƱǤ
+このオプションは\fI\-Xss\fRと同等です。
 .RE
 .PP
 \-XX:+TraceClassLoading
 .RS 4
-饹ɤȤΥ饹Υȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢ饹ϥȥ졼ޤ
+クラスがロードされるときのクラスのトレースを有効にします。デフォルトでは、このオプションは無効であり、クラスはトレースされません。
 .RE
 .PP
 \-XX:+TraceClassLoadingPreorder
 .RS 4
-饹Ȥǡɤ줿٤ƤΥ饹Υȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢ饹ϥȥ졼ޤ
+クラスが参照される順序で、ロードされたすべてのクラスのトレースを有効にします。デフォルトでは、このオプションは無効であり、クラスはトレースされません。
 .RE
 .PP
 \-XX:+TraceClassResolution
 .RS 4
-סβΥȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢסβϥȥ졼ޤ
+定数プールの解決のトレースを有効にします。デフォルトでは、このオプションは無効であり、定数プールの解決はトレースされません。
 .RE
 .PP
 \-XX:+TraceClassUnloading
 .RS 4
-饹ɤȤΥ饹Υȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢ饹ϥȥ졼ޤ
+クラスがアンロードされるときのクラスのトレースを有効にします。デフォルトでは、このオプションは無効であり、クラスはトレースされません。
 .RE
 .PP
 \-XX:+TraceLoaderConstraints
 .RS 4
-εϿΥȥ졼ͭˤޤǥեȤǤϡΥץ̵ǤꡢεϿפޤ
+ローダー制約の記録のトレースを有効にします。デフォルトでは、このオプションは無効であり、ローダー制約の記録は追跡されません。
 .RE
 .PP
 \-XX:+UseAltSigs
 .RS 4
-JVMʥ\fISIGUSR1\fR\fISIGUSR2\fRΤˡإʥλѤͭˤޤǥեȤǤϡΥץ̵ǤꡢإʥϻѤޤ󡣤Υץ\fI\-Xusealtsigs\fRƱǤ
+JVM内部シグナルの\fISIGUSR1\fRおよび\fISIGUSR2\fRのかわりに、代替シグナルの使用を有効にします。デフォルトでは、このオプションは無効であり、代替シグナルは使用されません。このオプションは\fI\-Xusealtsigs\fRと同等です。
 .RE
 .PP
 \-XX:+UseBiasedLocking
 .RS 4
-ХåλѤͭˤޤʤ̤󶥹ƱΥץꥱϡΥե饰ͭˤʹ®¸ޤΥѥΥå륢ץꥱϡ®٤㲼뤳ȤޤХåˡξܺ٤ϡhttp://www\&.oracle\&.com/technetwork/java/tuning\-139912\&.html#section4\&.2\&.5ˤJava塼˥󥰤Υۥ磻ȡڡѡ򻲾ȤƤ
+バイアス・ロックの使用を有効にします。かなりの量の非競合の同期化がある一部のアプリケーションは、このフラグを有効にすると大幅な高速化が実現しますが、特定のパターンのロックがあるアプリケーションは、速度が低下することがあります。バイアス・ロックの方法の詳細は、http://www\&.oracle\&.com/technetwork/java/tuning\-139912\&.html#section4\&.2\&.5にあるJavaチューニングのホワイト・ペーパーの例を参照してください。
 .sp
-ǥեȤǤϡΥץ̵ǤꡢХåϻѤޤ
+デフォルトでは、このオプションは無効であり、バイアス・ロックは使用されません。
 .RE
 .PP
 \-XX:+UseCompressedOops
 .RS 4
-̤줿ݥ󥿤λѤͭˤޤΥץͭˤȡ֥ȻȤϡ64ӥåȤΥݥ󥿤ǤϤʤ32ӥåȤΥեåȤȤɽ졢ˤꡢ32GB꾮JavaҡסΥץꥱμ¹Իˡ̾ѥեޥ󥹤夷ޤΥץϡ64ӥåȤJVMǤΤߵǽޤ
+圧縮されたポインタの使用を有効にします。このオプションを有効にすると、オブジェクト参照は、64ビットのポインタではなく32ビットのオフセットとして表され、これにより、32GBより小さいJavaヒープ・サイズのアプリケーションの実行時に、通常、パフォーマンスが向上します。このオプションは、64ビットのJVMでのみ機能します。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢ̥ݥ󥿤ϻѤޤ
+デフォルトでは、このオプションは無効であり、圧縮ポインタは使用されません。
 .RE
 .PP
 \-XX:+UseLargePages
 .RS 4
-礭ڡΥ꡼λѤͭˤޤΥץϥǥեȤͭˤʤäƤޤ礭ڡΥ꡼λѤ̵ˤˤϡ\fI\-XX:\-UseLargePages\fRꤷޤ
+大きいページのメモリーの使用を有効にします。このオプションはデフォルトで有効になっています。大きいページのメモリーの使用を無効にするには、\fI\-XX:\-UseLargePages\fRを指定します。
 .sp
-ܺ٤ϡhttp://www\&.oracle\&.com/technetwork/java/javase/tech/largememory\-jsp\-137182\&.htmlˤ礭꡼ڡѤJavaݡȤ򻲾ȤƤ
+詳細は、http://www\&.oracle\&.com/technetwork/java/javase/tech/largememory\-jsp\-137182\&.htmlにある大きいメモリー・ページ用のJavaサポートを参照してください。
 .RE
 .PP
 \-XX:+UseMembar
 .RS 4
-åɤξ֤ܤǥСȯԤͭˤޤΥץϡͭˤʤäƤPower PCARMС٤ƤΥץåȥեǡǥեȤǤ̵ˤʤäƤޤPower PCARMΥåɾܤФСȯԤ̵ˤˤϡ\fI\-XX:\-UseMembar\fRꤷޤ
+スレッドの状態の遷移でメンバーの発行を有効にします。このオプションは、有効になっているPower PCおよびARMサーバーを除くすべてのプラットフォーム上で、デフォルトでは無効になっています。Power PCとARMのスレッド状態遷移に対するメンバーの発行を無効にするには、\fI\-XX:\-UseMembar\fRを指定します。
 .RE
 .PP
 \-XX:+UsePerfData
 .RS 4
-\fIperfdata\fRǽͭˤޤΥץϥǥեȤͭˤʤäƤꡢJVMΥ˥󥰤ӥѥեޥ󥹡ƥȤǽˤʤޤ̵ˤȡ\fIhsperfdata_userid\fRǥ쥯ȥκޤ\fIperfdata\fRǽ̵ˤˤϡ\fI\-XX:\-UsePerfData\fRꤷޤ
+\fIperfdata\fR機能を有効にします。このオプションはデフォルトで有効になっており、JVMのモニタリングおよびパフォーマンス・テストが可能になります。これを無効にすると、\fIhsperfdata_userid\fRディレクトリの作成を抑制します。\fIperfdata\fR機能を無効にするには、\fI\-XX:\-UsePerfData\fRを指定します。
 .RE
 .PP
 \-XX:+AllowUserSignalHandlers
 .RS 4
-ץꥱˤ륷ʥ롦ϥɥΥ󥹥ȡͭˤޤǥեȤǤϡΥץ̵Ǥꡢץꥱϥʥ롦ϥɥ򥤥󥹥ȡ뤹뤳ȤϵĤƤޤ
+アプリケーションによるシグナル・ハンドラのインストールを有効にします。デフォルトでは、このオプションは無効であり、アプリケーションはシグナル・ハンドラをインストールすることは許可されていません。
 .RE
-.SS "٤JITѥ顦ץ"
+.SS "高度なJITコンパイラ・オプション"
 .PP
-ΥץϡJava HotSpot VMǼ¹ԤưŪjust\-in\-time (JIT)ѥ椷ޤ
+これらのオプションは、Java HotSpot VMで実行される動的なjust\-in\-time (JIT)コンパイラを制御します。
 .PP
 \-XX:+AggressiveOpts
 .RS 4
-ѶŪʥѥեޥ󥹺ŬǽλѤͭˤޤϺΥ꡼ǥǥեȤˤʤͽǤǥեȤǤϡΥץ̵ǤꡢŪʥѥեޥ󥹵ǽϻѤޤ
+積極的なパフォーマンス最適化機能の使用を有効にします。これは今後のリリースでデフォルトになる予定です。デフォルトでは、このオプションは無効であり、試験的なパフォーマンス機能は使用されません。
 .RE
 .PP
 \-XX:AllocateInstancePrefetchLines=\fIlines\fR
 .RS 4
-󥹥󥹳ƥݥ󥿤˥ץեåԿꤷޤǥեȤǤϡץեåԿ1ꤵƤޤ
+インスタンス割当てポインタの前にプリフェッチする行数を設定します。デフォルトでは、プリフェッチする行数は1に設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1196,7 +1196,7 @@
 .PP
 \-XX:AllocatePrefetchInstr=\fIinstruction\fR
 .RS 4
-ƥݥ󥿤˥ץեåץեå̿ꤷޤѲǽͤ03ޤǤǤͤظˤºݤ̿ϡץåȥեˤäưۤʤޤǥեȤǤϡץեå̿0ꤵƤޤ
+割当てポインタの前にプリフェッチするプリフェッチ命令を設定します。使用可能な値は0から3までです。値の背後にある実際の命令は、プラットフォームによって異なります。デフォルトでは、プリフェッチ命令は0に設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1211,7 +1211,7 @@
 .PP
 \-XX:AllocatePrefetchStepSize=\fIsize\fR
 .RS 4
-缡ץեå̿Υƥåס(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡƥåס16ХȤꤵƤޤ
+順次プリフェッチ命令のステップ・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、ステップ・サイズは16バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1226,12 +1226,12 @@
 .PP
 \-XX:+BackgroundCompilation
 .RS 4
-Хå饦ɡѥͭˤޤΥץϥǥեȤͭˤʤäƤޤХå饦ɡѥ̵ˤˤϡ\fI\-XX:\-BackgroundCompilation\fRꤷޤ(\fI\-Xbatch\fRꤹΤƱǤ)
+バックグラウンド・コンパイルを有効にします。このオプションはデフォルトで有効になっています。バックグラウンド・コンパイルを無効にするには、\fI\-XX:\-BackgroundCompilation\fRを指定します(これは\fI\-Xbatch\fRを指定するのと同等です)。
 .RE
 .PP
 \-XX:CICompilerCount=\fIthreads\fR
 .RS 4
-ѥ˻Ѥ륳ѥ顦åɤοꤷޤǥեȤǤϡåɿϡСJVMξ2饤JVMξ1ꤵƤꡢإѥ뤬ѤƤ硢˹礻ޤǤϡåɤο2ꤹˡ򼨤ޤ
+コンパイルに使用するコンパイラ・スレッドの数を設定します。デフォルトでは、スレッド数は、サーバーJVMの場合は2、クライアントJVMの場合は1に設定されており、層コンパイルが使用されている場合、コア数に合せて増減します。次の例では、スレッドの数を2に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1246,7 +1246,7 @@
 .PP
 \-XX:CodeCacheMinimumFreeSpace=\fIsize\fR
 .RS 4
-ѥɬפʺǾΰ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǾΰ꾯ʤΰ褷ĤäƤʤ硢ѥߤޤǥեȤǤϡΥץ500KBꤵƤޤǤϡǾΰ1024MBꤹˡ򼨤ޤ
+コンパイルに必要な最小空き領域(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。最小空き領域より少ない領域しか残っていない場合、コンパイルは停止します。デフォルトでは、このオプションは500KBに設定されています。次の例では、最小空き領域を1024MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1261,7 +1261,7 @@
 .PP
 \-XX:CompileCommand=\fIcommand\fR,\fImethod\fR[,\fIoption\fR]
 .RS 4
-᥽åɤǼ¹Ԥ륳ޥɤꤷޤȤСѥ븵\fIString\fR饹\fIindexOf()\fR᥽åɤ¹ԤˤϡѤޤ
+メソッドで実行するコマンドを指定します。たとえば、コンパイル元から\fIString\fRクラスの\fIindexOf()\fRメソッドを実行するには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1272,7 +1272,7 @@
 .if n \{\
 .RE
 .\}
-å(\fI/\fR)Ƕڤ줿٤ƤΥѥåӥ֥ѥåޤࡢ饹̾ꤷޤڼŽդưפˤ뤿ˡ\fI\-XX:+PrintCompilation\fRץ󤪤\fI\-XX:+LogCompilation\fRץˤä᥽å̾ηѤ뤳ȤǤޤ
+スラッシュ(\fI/\fR)で区切られたすべてのパッケージおよびサブパッケージを含む、完全クラス名を指定します。切取りと貼付けの操作を容易にするために、\fI\-XX:+PrintCompilation\fRオプションおよび\fI\-XX:+LogCompilation\fRオプションによって生成されるメソッド名の形式を使用することもできます。
 .sp
 .if n \{\
 .RS 4
@@ -1283,7 +1283,7 @@
 .if n \{\
 .RE
 .\}
-̾ʤǥ᥽åɤꤹȡޥɤϻꤷ̾Ĥ٤ƤΥ᥽åɤŬѤޤ饹եǥ᥽åɤν̾ꤹ뤳ȤǤޤȤСѥ븵\fIString\fR饹\fIindexOf(String)\fR᥽åɤΤ߽ˤϡѤޤ
+署名なしでメソッドを指定すると、コマンドは指定した名前を持つすべてのメソッドに適用されます。ただし、クラス・ファイル形式でメソッドの署名を指定することもできます。たとえば、コンパイル元から\fIString\fRクラスの\fIindexOf(String)\fRメソッドのみ除外するには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1294,7 +1294,7 @@
 .if n \{\
 .RE
 .\}
-ޤ饹̾ӥ᥽å̾˥磻ɥɤȤƥꥹ(*)ѤǤޤȤСѥ븵餹٤ƤΥ饹Τ٤Ƥ\fIindexOf()\fR᥽åɤˤϡѤޤ
+また、クラス名およびメソッド名にワイルドカードとしてアスタリスク(*)を使用できます。たとえば、コンパイル元からすべてのクラスのすべての\fIindexOf()\fRメソッドを除外するには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1305,7 +1305,7 @@
 .if n \{\
 .RE
 .\}
-ޤȥԥꥪɤ϶̾ǡˤꡢ𤷤ƥѥ顦ޥɤϤȤưפˤʤޤǰϤळȤǡ򥻥ѥ졼ȤƻѤ\fI\-XX:CompileCommand\fR˰ϤȤǤޤ
+カンマとピリオドは空白の別名で、これにより、シェルを介してコンパイラ・コマンドを渡すことが容易になります。引数を引用符で囲むことで、空白をセパレータとして使用して\fI\-XX:CompileCommand\fRに引数を渡すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -1316,48 +1316,48 @@
 .if n \{\
 .RE
 .\}
-\fI\-XX:CompileCommand\fRץѤƥޥɥ饤Ϥ줿ޥɤϤˡJITѥ\fI\&.hotspot_compiler\fRե뤫饳ޥɤɤ߼ޤΥե˥ޥɤɲä뤫ޤ\fI\-XX:CompileCommandFile\fRץѤ̤Υեꤹ뤳ȤǤޤ
+\fI\-XX:CompileCommand\fRオプションを使用してコマンドラインで渡されたコマンドを解析した後に、JITコンパイラは\fI\&.hotspot_compiler\fRファイルからコマンドを読み取ります。このファイルにコマンドを追加するか、または\fI\-XX:CompileCommandFile\fRオプションを使用して別のファイルを指定することができます。
 .sp
-ʣΥޥɤɲäˤϡ\fI\-XX:CompileCommand\fRץʣꤹ뤫ޤϲԥѥ졼(\fI\en\fR)ѤƳưڤޤΥޥɤѤǤޤ
+複数のコマンドを追加するには、\fI\-XX:CompileCommand\fRオプションを複数回指定するか、または改行セパレータ(\fI\en\fR)を使用して各引数を区切ります。次のコマンドを使用できます。
 .PP
 break
 .RS 4
-ꤷ᥽åɤΥѥκǽߤ뤿ˡJVMΥǥХåΥ֥졼ݥȤꤷޤ
+指定したメソッドのコンパイルの最初に停止するために、JVMのデバッグ時のブレークポイントを設定します。
 .RE
 .PP
 compileonly
 .RS 4
-ꤷ᥽åɤ٤ƤΥ᥽åɤ򡢥ѥ뤫ޤ̤ˡȤơ\fI\-XX:CompileOnly\fRץѤʣΥ᥽åɤǤޤ
+指定したメソッドを除いたすべてのメソッドを、コンパイルから除外します。別の方法として、\fI\-XX:CompileOnly\fRオプションを使用して複数のメソッドを指定できます。
 .RE
 .PP
 dontinline
 .RS 4
-ꤷ᥽åɤ򥤥饤󲽤ʤ褦ˤޤ
+指定したメソッドをインライン化しないようにします。
 .RE
 .PP
 exclude
 .RS 4
-ꤷ᥽åɤ򥳥ѥ뤫ޤ
+指定したメソッドをコンパイルから除外します。
 .RE
 .PP
 help
 .RS 4
-\fI\-XX:CompileCommand\fRץΥإסåޤ
+\fI\-XX:CompileCommand\fRオプションのヘルプ・メッセージを印刷します。
 .RE
 .PP
 inline
 .RS 4
-ꤷ᥽åɤ򥤥饤󲽤褦Ȥޤ
+指定したメソッドをインライン化しようとします。
 .RE
 .PP
 log
 .RS 4
-ꤷ᥽åɤ٤ƤΥ᥽åɤФơ(\fI\-XX:+LogCompilation\fRץѤ)ѥ롦󥰤ޤǥեȤǤϡѥ뤵줿٤ƤΥ᥽åɤ˥󥰤¹Ԥޤ
+指定したメソッドを除くすべてのメソッドに対して、(\fI\-XX:+LogCompilation\fRオプションを使用して)コンパイル・ロギングを除外します。デフォルトでは、コンパイルされたすべてのメソッドにロギングが実行されます。
 .RE
 .PP
 option
 .RS 4
-ΥޥɤϡǸΰ(\fIoption\fR)Τˡꤷ᥽åɤJITѥ롦ץϤ˻ѤǤޤѥ롦ץϡ᥽å̾θꤵޤȤС\fIStringBuffer\fR饹\fIappend()\fR᥽åɤФ\fIBlockLayoutByFrequency\fRץͭˤˤϡѤޤ
+このコマンドは、最後の引数(\fIoption\fR)のかわりに、指定したメソッドにJITコンパイル・オプションを渡すために使用できます。コンパイル・オプションは、メソッド名の後の末尾に設定されます。たとえば、\fIStringBuffer\fRクラスの\fIappend()\fRメソッドに対して\fIBlockLayoutByFrequency\fRオプションを有効にするには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1368,17 +1368,17 @@
 .if n \{\
 .RE
 .\}
-ޤޤ϶ǶڤäơʣΥѥ롦ץǤޤ
+カンマまたは空白で区切って、複数のコンパイル・オプションを指定できます。
 .RE
 .PP
 print
 .RS 4
-ꤷ᥽åɤΥѥ줿֥顦ɤϤޤ
+指定したメソッドのコンパイル後に生成されたアセンブラ・コードを出力します。
 .RE
 .PP
 quiet
 .RS 4
-ѥ롦ޥɤϤޤ󡣥ǥեȤǤϡ\fI\-XX:CompileCommand\fRץѤƻꤷޥɤϤޤȤС\fIString\fR饹\fIindexOf()\fR᥽åɤΥѥ뤫硢ɸϤ˽Ϥޤ
+コンパイル・コマンドを出力しません。デフォルトでは、\fI\-XX:CompileCommand\fRオプションを使用して指定したコマンドが出力されます。たとえば、\fIString\fRクラスの\fIindexOf()\fRメソッドのコンパイルから除外する場合、次が標準出力に出力されます。
 .sp
 .if n \{\
 .RS 4
@@ -1389,15 +1389,15 @@
 .if n \{\
 .RE
 .\}
-¾\fI\-XX:CompileCommand\fRץ\fI\-XX:CompileCommand=quiet\fRץꤹ뤳ȤˤäơǤޤ
+他の\fI\-XX:CompileCommand\fRオプションの前に\fI\-XX:CompileCommand=quiet\fRオプションを指定することによって、これを抑制できます。
 .RE
 .RE
 .PP
 \-XX:CompileCommandFile=\fIfilename\fR
 .RS 4
-JITѥ顦ޥɤɼ긵ΥեꤷޤǥեȤǤϡJITѥˤäƼ¹Ԥ륳ޥɤǼ뤿ˡ\fI\&.hotspot_compiler\fRե뤬Ѥޤ
+JITコンパイラ・コマンドの読取り元のファイルを設定します。デフォルトでは、JITコンパイラによって実行されるコマンドを格納するために、\fI\&.hotspot_compiler\fRファイルが使用されます。
 .sp
-ޥɡեγƹԤϡޥɤѤ륳ޥɡ饹̾ӥ᥽å̾ɽޤȤСιԤϡ\fIString\fR饹\fItoString()\fR᥽åɤФƥ֥ꡦɤϤޤ
+コマンド・ファイルの各行は、コマンドが使用されるコマンド、クラス名およびメソッド名を表します。たとえば、次の行は、\fIString\fRクラスの\fItoString()\fRメソッドに対してアセンブリ・コードを出力します。
 .sp
 .if n \{\
 .RS 4
@@ -1408,12 +1408,12 @@
 .if n \{\
 .RE
 .\}
-᥽åɤǼ¹ԤJITѥΥޥɤλξܺ٤ϡ\fI\-XX:CompileCommand\fRץ򻲾ȤƤ
+メソッドで実行するJITコンパイラのコマンドの指定の詳細は、\fI\-XX:CompileCommand\fRオプションを参照してください。
 .RE
 .PP
 \-XX:CompileOnly=\fImethods\fR
 .RS 4
-ѥ¤(ޤǶڤ줿)᥽åɤΥꥹȤꤷޤꤷ᥽åɤΤߤѥ뤵ޤ饹̾(ѥåӥ֥ѥåޤ)dzƥ᥽åɤꤷޤȤС\fIString\fR饹\fIlength()\fR᥽åɤ\fIList\fR饹\fIsize()\fR᥽åɤΤߤ򥳥ѥ뤹ˤϡѤޤ
+コンパイルを制限する(カンマで区切られた)メソッドのリストを設定します。指定したメソッドのみがコンパイルされます。完全クラス名(パッケージおよびサブパッケージを含む)で各メソッドを指定します。たとえば、\fIString\fRクラスの\fIlength()\fRメソッドおよび\fIList\fRクラスの\fIsize()\fRメソッドのみをコンパイルするには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1424,7 +1424,7 @@
 .if n \{\
 .RE
 .\}
-å(\fI/\fR)Ƕڤ줿٤ƤΥѥåӥ֥ѥåޤࡢ饹̾ꤷޤڼŽդưפˤ뤿ˡ\fI\-XX:+PrintCompilation\fRץ󤪤\fI\-XX:+LogCompilation\fRץˤä᥽å̾ηѤ뤳ȤǤޤ
+スラッシュ(\fI/\fR)で区切られたすべてのパッケージおよびサブパッケージを含む、完全クラス名を指定します。切取りと貼付けの操作を容易にするために、\fI\-XX:+PrintCompilation\fRオプションおよび\fI\-XX:+LogCompilation\fRオプションによって生成されるメソッド名の形式を使用することもできます。
 .sp
 .if n \{\
 .RS 4
@@ -1435,7 +1435,7 @@
 .if n \{\
 .RE
 .\}
-磻ɥɤϥݡȤƤޤ󤬡饹̾ޤϥѥå̾ꤷƥ饹ޤϥѥåΤ٤ƤΥ᥽åɤ򥳥ѥ뤹뤳Ȥ⡢᥽åɤꤷǤդΥ饹Τ̾ĥ᥽åɤ򥳥ѥ뤹뤳ȤǤޤ
+ワイルドカードはサポートされていませんが、クラス名またはパッケージ名だけを指定してクラスまたはパッケージのすべてのメソッドをコンパイルすることも、メソッドだけを指定して任意のクラスのこの名前を持つメソッドをコンパイルすることもできます。
 .sp
 .if n \{\
 .RS 4
@@ -1452,7 +1452,7 @@
 .PP
 \-XX:CompileThreshold=\fIinvocations\fR
 .RS 4
-ѥ˲ᤵ줿᥽åɸƽФοꤷޤǥեȤǤϡСJVMǤϡJITѥϡ10,000βᤵ줿᥽åɸƽФ¹ԤơΨŪʥѥΤξޤ饤JVMξ硢ǥե1,500ƽФǤǤϡᤵ줿᥽åɸƽФο5,000ꤹˡ򼨤ޤ
+コンパイル前に解釈されたメソッド呼出しの数を設定します。デフォルトでは、サーバーJVMでは、JITコンパイラは、10,000の解釈されたメソッド呼出しを実行して、効率的なコンパイルのための情報を収集します。クライアントJVMの場合、デフォルト設定は1,500呼出しです。次の例では、解釈されたメソッド呼出しの数を5,000に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1463,22 +1463,22 @@
 .if n \{\
 .RE
 .\}
-\fI\-Xcomp\fRץꤷơѥˡJava᥽åɤβ̵ˤ뤳ȤǤޤ
+\fI\-Xcomp\fRオプションを指定して、コンパイルの前に、Javaメソッドの解釈を完全に無効にすることができます。
 .RE
 .PP
 \-XX:+DoEscapeAnalysis
 .RS 4
-ʬϤλѤͭˤޤΥץϥǥեȤͭˤʤäƤޤʬϤλѤ̵ˤˤϡ\fI\-XX:\-DoEscapeAnalysis\fRꤷޤ
+エスケープ分析の使用を有効にします。このオプションはデフォルトで有効になっています。エスケープ分析の使用を無効にするには、\fI\-XX:\-DoEscapeAnalysis\fRを指定します。
 .RE
 .PP
 \-XX:+FailOverToOldVerifier
 .RS 4
-סåԤΡŤ٥եؤμưե륪СͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢǶΥХȥɡСѤ饹ˤϡ̵뤵ޤ(Ĥޤꡢ̵Ȥƽޤ)ŤСΥХȥɤѤ饹ˤϡͭǤޤ
+新しいタイプ・チェッカが失敗した場合の、古いベリファイアへの自動フェイルオーバーを有効にします。デフォルトでは、このオプションは無効になっており、最近のバイトコード・バージョンを使用したクラスには、これは無視されます(つまり、無効として処理されます)。古いバージョンのバイトコードを使用したクラスには、これを有効化できます。
 .RE
 .PP
 \-XX:InitialCodeCacheSize=\fIsize\fR
 .RS 4
-ɡå塦(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤ500KBꤵƤޤǤϡɡå塦32KBꤹˡ򼨤ޤ
+初期コード・キャッシュ・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は500KBに設定されています。次の例では、初期コード・キャッシュ・サイズを32KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1493,12 +1493,12 @@
 .PP
 \-XX:+Inline
 .RS 4
-᥽åɤΥ饤󲽤ͭˤޤΥץϡѥեޥ󥹤夵뤿˥ǥեȤͭˤʤäƤޤ᥽åɤΥ饤󲽤̵ˤˤϡ\fI\-XX:\-Inline\fRꤷޤ
+メソッドのインライン化を有効にします。このオプションは、パフォーマンスを向上させるためにデフォルトで有効になっています。メソッドのインライン化を無効にするには、\fI\-XX:\-Inline\fRを指定します。
 .RE
 .PP
 \-XX:InlineSmallCode=\fIsize\fR
 .RS 4
-饤󲽤ɬפʥѥ뤵줿᥽åɤκ祳ɡ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤꤷ꾮Υѥ뤵줿᥽åɤΤߤ饤󲽤ޤǥեȤǤϡ祳ɡ1000ХȤꤵƤޤ
+インライン化が必要なコンパイルされたメソッドの最大コード・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。指定したサイズより小さいサイズのコンパイルされたメソッドのみが、インライン化されます。デフォルトでは、最大コード・サイズは1000バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1513,16 +1513,16 @@
 .PP
 \-XX:+LogCompilation
 .RS 4
-ߤκȥǥ쥯ȥˤ\fIhotspot\&.log\fRȤ̾ΥեؤΥѥ롦ƥӥƥΥ󥰤ͭˤޤ\fI\-XX:LogFile\fRץѤơۤʤե롦ѥ̾Ǥޤ
+現在の作業ディレクトリにある\fIhotspot\&.log\fRという名前のファイルへのコンパイル・アクティビティのロギングを有効にします。\fI\-XX:LogFile\fRオプションを使用して、異なるログ・ファイル・パスと名前を指定できます。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢѥ롦ƥӥƥϵϿޤ\fI\-XX:+LogCompilation\fRץϡJVMץΥå\fI\-XX:UnlockDiagnosticVMOptions\fRץȤȤ˻Ѥɬפޤ
+デフォルトでは、このオプションは無効であり、コンパイル・アクティビティは記録されません。\fI\-XX:+LogCompilation\fRオプションは、診断JVMオプションのロックを解除する\fI\-XX:UnlockDiagnosticVMOptions\fRオプションとともに使用する必要があります。
 .sp
-\fI\-XX:+PrintCompilation\fRץѤơ᥽åɤ򥳥ѥ뤹뤿Ӥˡ󥽡˽Ϥ줿åޤܺ٤ʿǽϤͭǤޤ
+\fI\-XX:+PrintCompilation\fRオプションを使用して、メソッドをコンパイルするたびに、コンソールに出力されたメッセージを含む詳細な診断出力を有効化できます。
 .RE
 .PP
 \-XX:MaxInlineSize=\fIsize\fR
 .RS 4
-饤󲽤᥽åɤκХȥɡ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡХȥɡ35ХȤꤵƤޤ
+インライン化するメソッドの最大バイトコード・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、最大バイトコード・サイズは35バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1537,7 +1537,7 @@
 .PP
 \-XX:MaxNodeLimit=\fInodes\fR
 .RS 4
-ñΥ᥽åɤΥѥ˻ѤΡɤκꤷޤǥեȤǤϡΡɤκ65,000ꤵƤޤ
+単一のメソッドのコンパイル時に使用されるノードの最大数を設定します。デフォルトでは、ノードの最大数は65,000に設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1552,7 +1552,7 @@
 .PP
 \-XX:MaxTrivialSize=\fIsize\fR
 .RS 4
-饤󲽤ñ᥽åɤκХȥɡ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡñ᥽åɤκХȥɡ6ХȤꤵƤޤ
+インライン化する単純メソッドの最大バイトコード・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、単純メソッドの最大バイトコード・サイズは6バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1567,77 +1567,77 @@
 .PP
 \-XX:+OptimizeStringConcat
 .RS 4
-\fIString\fRϢκŬͭˤޤΥץϥǥեȤͭˤʤäƤޤ\fIString\fRϢκŬ̵ˤˤϡ\fI\-XX:\-OptimizeStringConcat\fRꤷޤ
+\fIString\fR連結操作の最適化を有効にします。このオプションはデフォルトで有効になっています。\fIString\fR連結操作の最適化を無効にするには、\fI\-XX:\-OptimizeStringConcat\fRを指定します。
 .RE
 .PP
 \-XX:+PrintAssembly
 .RS 4
-\fIdisassembler\&.so\fR饤֥ѤơХȥɲ줿ͥƥ֤Υ᥽åɤΥ֥ꡦɤνϤͭˤޤˤꡢ줿ɤɽ뤳ȤǤѥեޥ󥹤οǤΩޤ
+外部の\fIdisassembler\&.so\fRライブラリを使用して、バイトコード化されたネイティブのメソッドのアセンブリ・コードの出力を有効にします。これにより、生成されたコードを表示することができ、パフォーマンスの問題の診断に役立ちます。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢ֥ꡦɤϰޤ\fI\-XX:+PrintAssembly\fRץϡJVMץΥå\fI\-XX:UnlockDiagnosticVMOptions\fRץȤȤ˻Ѥɬפޤ
+デフォルトでは、このオプションは無効であり、アセンブリ・コードは印刷されません。\fI\-XX:+PrintAssembly\fRオプションは、診断JVMオプションのロックを解除する\fI\-XX:UnlockDiagnosticVMOptions\fRオプションとともに使用する必要があります。
 .RE
 .PP
 \-XX:+PrintCompilation
 .RS 4
-᥽åɤ򥳥ѥ뤹뤿Ӥˡ󥽡˥åϤ뤳ȤˤäơJVMξܺ٤ʿǽϤͭˤޤˤꡢºݤ˥ѥ뤵᥽åɤǧǤޤǥեȤǤϡΥץ̵ǤꡢǽϤϰޤ
+メソッドをコンパイルするたびに、コンソールにメッセージを出力することによって、JVMからの詳細な診断出力を有効にします。これにより、実際にコンパイルされるメソッドを確認できます。デフォルトでは、このオプションは無効であり、診断出力は印刷されません。
 .sp
-\fI\-XX:+LogCompilation\fRץѤơѥ롦ƥӥƥե˵Ͽ뤳ȤǤޤ
+\fI\-XX:+LogCompilation\fRオプションを使用して、コンパイル・アクティビティをファイルに記録することもできます。
 .RE
 .PP
 \-XX:+PrintInlining
 .RS 4
-饤󲽤ηƤνϤͭˤޤˤꡢ饤󲽤᥽åɤǧǤޤ
+インライン化の決定内容の出力を有効にします。これにより、インライン化されるメソッドを確認できます。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢ饤󲽾ϽϤޤ\fI\-XX:+PrintInlining\fRץϡJVMץΥå\fI\-XX:+UnlockDiagnosticVMOptions\fRץȤȤ˻Ѥɬפޤ
+デフォルトでは、このオプションは無効であり、インライン化情報は出力されません。\fI\-XX:+PrintInlining\fRオプションは、診断JVMオプションのロックを解除する\fI\-XX:+UnlockDiagnosticVMOptions\fRオプションとともに使用する必要があります。
 .RE
 .PP
 \-XX:+RelaxAccessControlCheck
 .RS 4
-٥եΥå̤򸺤餷ޤǥեȤǤϡΥץ̵ˤʤäƤꡢǶΥХȥɡСѤ饹ˤϡ̵뤵ޤ(Ĥޤꡢ̵Ȥƽޤ)ŤСΥХȥɤѤ饹ˤϡͭǤޤ
+ベリファイア内のアクセス制御チェックの量を減らします。デフォルトでは、このオプションは無効になっており、最近のバイトコード・バージョンを使用したクラスには、これは無視されます(つまり、無効として処理されます)。古いバージョンのバイトコードを使用したクラスには、これを有効化できます。
 .RE
 .PP
 \-XX:ReservedCodeCacheSize=\fIsize\fR
 .RS 4
-JITѥ뤵줿ɤκ祳ɡå塦(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤΥץ\fI\-Xmaxjitcodesize\fRƱǤ
+JITコンパイルされたコードの最大コード・キャッシュ・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。このオプションは\fI\-Xmaxjitcodesize\fRと同等です。
 .RE
 .PP
 \-XX:+TieredCompilation
 .RS 4
-إѥλѤͭˤޤǥեȤǤϡΥץ̵ǤꡢإѥϻѤޤ
+層コンパイルの使用を有効にします。デフォルトでは、このオプションは無効であり、層コンパイルは使用されません。
 .RE
 .PP
 \-XX:+UseCodeCacheFlushing
 .RS 4
-ѥ򥷥åȥ󤹤ˡɡåΥեåͭˤޤΥץϥǥեȤͭˤʤäƤޤѥ򥷥åȥ󤹤˥ɡåΥեå̵ˤˤ\fI\-XX:\-UseCodeCacheFlushing\fRꤷޤ
+コンパイラをシャットダウンする前に、コード・キャッシュのフラッシュを有効にします。このオプションはデフォルトで有効になっています。コンパイラをシャットダウンする前にコード・キャッシュのフラッシュを無効にするには\fI\-XX:\-UseCodeCacheFlushing\fRを指定します。
 .RE
 .PP
 \-XX:+UseCondCardMark
 .RS 4
-ɽιˡɤǤ˥ޡƤ뤫ɤΥåͭˤޤΥץϡǥեȤǤ̵ˤʤäƤꡢʣΥåȤĥޥǤΤ߻ѤɬפޤˤꡢƱˤʤ¸ƤJavaץꥱΥѥեޥ󥹤夷ޤ
+カード表の更新前に、カードがすでにマークされているかどうかのチェックを有効にします。このオプションは、デフォルトでは無効になっており、複数のソケットを持つマシン上でのみ使用する必要があります。これにより、同時操作にかなり依存しているJavaアプリケーションのパフォーマンスが向上します。
 .RE
 .PP
 \-XX:+UseSuperWord
 .RS 4
-顼黻Υѡɱ黻ؤѴͭˤޤΥץϥǥեȤͭˤʤäƤޤ顼黻Υѡɱ黻ؤѴ̵ˤˤϡ\fI\-XX:\-UseSuperWord\fRꤷޤ
+スカラー演算のスーパーワード演算への変換を有効にします。このオプションはデフォルトで有効になっています。スカラー演算のスーパーワード演算への変換を無効にするには、\fI\-XX:\-UseSuperWord\fRを指定します。
 .RE
-.SS "٤ʥӥӥƥץ"
+.SS "高度なサービスアビリティ・オプション"
 .PP
-Υץϡƥܺ٤ʥǥХå¹Ԥ뵡ǽ󶡤ޤ
+これらのオプションは、システム情報を収集し、詳細なデバッグを実行する機能を提供します。
 .PP
 \-XX:+ExtendedDTraceProbes
 .RS 4
-ѥեޥ󥹤˱ƶͿɲä\fIdtrace\fRġ롦ץ֤ͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢ\fIdtrace\fRɸץ֤Τߤ¹Ԥޤ
+パフォーマンスに影響を与える追加の\fIdtrace\fRツール・プローブを有効にします。デフォルトでは、このオプションは無効になっており、\fIdtrace\fRは標準プローブのみを実行します。
 .RE
 .PP
 \-XX:+HeapDumpOnOutOfMemory
 .RS 4
-\fIjava\&.lang\&.OutOfMemoryError\fR㳰줿ˡҡסץե(HPROF)ѤơߤΥǥ쥯ȥΥեؤJavaҡפΥפͭˤޤ\fI\-XX:HeapDumpPath\fRץѤơҡססեΥѥ̾ŪǤޤǥեȤǤϡΥץ̵Ǥꡢ\fIOutOfMemoryError\fR㳰줿˥ҡפϥפޤ
+\fIjava\&.lang\&.OutOfMemoryError\fR例外がスローされた場合に、ヒープ・プロファイラ(HPROF)を使用して、現在のディレクトリ内のファイルへのJavaヒープのダンプを有効にします。\fI\-XX:HeapDumpPath\fRオプションを使用して、ヒープ・ダンプ・ファイルのパスおよび名前を明示的に設定できます。デフォルトでは、このオプションは無効であり、\fIOutOfMemoryError\fR例外がスローされた場合にヒープはダンプされません。
 .RE
 .PP
 \-XX:HeapDumpPath=\fIpath\fR
 .RS 4
-\fI\-XX:+HeapDumpOnOutOfMemoryError\fRץꤵƤ硢ҡסץե(HPROF)󶡤ҡספ񤭹ѥӥե̾ꤷޤǥեȤǤϡΥեϡߤκȥǥ쥯ȥ˺졢̾\fIjava_pid\fR\fIpid\fR\fI\&.hprof\fR
-(\fIpid\fRϥ顼θȤʤäץμ̻)ˤʤޤǤϡǥեȤΥեŪꤹˡ򼨤ޤ(\fI%p\fRϸߤΥץμ̻Ҥɽޤ)
+\fI\-XX:+HeapDumpOnOutOfMemoryError\fRオプションが設定されている場合、ヒープ・プロファイラ(HPROF)が提供するヒープ・ダンプを書き込むパスおよびファイル名を設定します。デフォルトでは、このファイルは、現在の作業ディレクトリに作成され、名前は\fIjava_pid\fR\fIpid\fR\fI\&.hprof\fR
+(\fIpid\fRはエラーの原因となったプロセスの識別子)になります。次の例では、デフォルトのファイルを明示的に設定する方法を示します(\fI%p\fRは現在のプロセスの識別子を表します)。
 .sp
 .if n \{\
 .RS 4
@@ -1648,7 +1648,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡҡססե\fI/var/log/java/java_heapdump\&.hprof\fRꤹˡ򼨤ޤ
+次の例では、ヒープ・ダンプ・ファイルを\fI/var/log/java/java_heapdump\&.hprof\fRに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1663,9 +1663,9 @@
 .PP
 \-XX:LogFile=\fIpath\fR
 .RS 4
-ǡ񤭹ޤѥӥե̾ꤷޤǥեȤǤϡեϸߤκȥǥ쥯ȥ˺졢̾\fIhotspot\&.log\fRǤ
+ログ・データが書き込まれるパスおよびファイル名を設定します。デフォルトでは、ファイルは現在の作業ディレクトリに作成され、名前は\fIhotspot\&.log\fRです。
 .sp
-Ǥϡե\fI/var/log/java/hotspot\&.log\fRꤹˡ򼨤ޤ
+次の例では、ログ・ファイルを\fI/var/log/java/hotspot\&.log\fRに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1680,39 +1680,39 @@
 .PP
 \-XX:+PrintClassHistogram
 .RS 4
-\fI[Control]+[C]\fR٥(\fISIGTERM\fR)˥饹󥹥󥹤ΥҥȥΰͭˤޤǥեȤǤϡΥץ̵Ǥ
+\fI[Control]+[C]\fRイベント(\fISIGTERM\fR)後にクラス・インスタンスのヒストグラムの印刷を有効にします。デフォルトでは、このオプションは無効です。
 .sp
-Υץꤹȡ\fIjmap \-histo\fRޥɡޤ\fIjcmd \fR\fIpid\fR\fI GC\&.class_histogram\fRޥ(\fIpid\fRϸߤJavaץμ̻)¹ԤƱˤʤޤ
+このオプションを設定すると、\fIjmap \-histo\fRコマンド、または\fIjcmd \fR\fIpid\fR\fI GC\&.class_histogram\fRコマンド(\fIpid\fRは現在のJavaプロセスの識別子)を実行する場合と同じになります。
 .RE
 .PP
 \-XX:+PrintConcurrentLocks
 .RS 4
 .sp
-\fI[Control]+[C]\fR٥(\fISIGTERM\fR)\fIjava\&.util\&.concurrent\fRåΰͭˤޤǥեȤǤϡΥץ̵Ǥ
+\fI[Control]+[C]\fRイベント(\fISIGTERM\fR)後に\fIjava\&.util\&.concurrent\fRロックの印刷を有効にします。デフォルトでは、このオプションは無効です。
 .sp
-Υץꤹȡ\fIjstack \-l\fRޥɡޤ\fIjcmd \fR\fIpid\fR\fI Thread\&.print \-l\fRޥ(\fIpid\fRϸߤJavaץμ̻)¹ԤƱˤʤޤ
+このオプションを設定すると、\fIjstack \-l\fRコマンド、または\fIjcmd \fR\fIpid\fR\fI Thread\&.print \-l\fRコマンド(\fIpid\fRは現在のJavaプロセスの識別子)を実行する場合と同じになります。
 .RE
 .PP
 \-XX:+UnlockDiagnosticVMOptions
 .RS 4
-JVMοǤŪȤץ򥢥åޤǥեȤǤϡΥץ̵ǤꡢǥץϻѤǤޤ
+JVMの診断を目的としたオプションをアンロックします。デフォルトでは、このオプションは無効であり、診断オプションは使用できません。
 .RE
-.SS "٤ʥ١쥯󡦥ץ"
+.SS "高度なガベージ・コレクション・オプション"
 .PP
-Υץϡ١쥯(GC)Java HotSpot VMˤäƤɤΤ褦˼¹Ԥ뤫椷ޤ
+これらのオプションは、ガベージ・コレクション(GC)がJava HotSpot VMによってどのように実行されるかを制御します。
 .PP
 \-XX:+AggressiveHeap
 .RS 4
-JavaҡפκŬͭˤޤˤꡢԥ塼ι(RAMCPU)˴Ťơ͡ʥѥ᡼꡼Ƥ椷Ĺּ¹ԥ֤˺Ŭˤʤ褦ꤵޤǥեȤǤϡΥץ̵ǤꡢҡפϺŬޤ
+Javaヒープの最適化を有効にします。これにより、コンピュータの構成(RAMおよびCPU)に基づいて、様々なパラメータが、メモリー割当てが集中した長時間実行ジョブに最適になるように設定されます。デフォルトでは、このオプションは無効であり、ヒープは最適化されません。
 .RE
 .PP
 \-XX:AllocatePrefetchDistance=\fIsize\fR
 .RS 4
-֥ȳƤΥץեåΥΥ(Хñ)ꤷޤ֥Ȥͤǽ񤭹⤦Ȥ꡼ϡǸ˳Ƥ줿֥ȤΥɥ쥹顢εΥޤǥץեåޤJavaåɤˤȼγƥݥȤޤ
+オブジェクト割当てのプリフェッチ距離のサイズ(バイト単位)を設定します。新規オブジェクトの値で書き込もうとするメモリーは、最後に割り当てられたオブジェクトのアドレスから、この距離までプリフェッチされます。各Javaスレッドには独自の割当てポイントがあります。
 .sp
-ͤϡץեåΥϥץåȥե˴Ť򤵤뤳Ȥ򼨤ޤͤϡץեåХȿǤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤ\-1ꤵƤޤ
+負の値は、プリフェッチ距離はプラットフォームに基づいて選択されることを示します。正の値は、プリフェッチするバイト数です。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は\-1に設定されています。
 .sp
-ǤϡץեåΥ1024ХȤꤹˡ򼨤ޤ
+次の例では、プリフェッチ距離を1024バイトに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1727,9 +1727,9 @@
 .PP
 \-XX:AllocatePrefetchLines=\fIlines\fR
 .RS 4
-ѥ뤵줿ɤץեå̿ѤơǸΥ֥ȳƸ˥ɤ륭åԿꤷޤǸ˳Ƥ줿֥Ȥ󥹥󥹤ξϡǥեͤ1ˤʤꡢξ3ˤʤޤ
+コンパイルされたコードで生成されるプリフェッチ命令を使用して、最後のオブジェクト割当て後にロードするキャッシュ行数を設定します。最後に割り当てられたオブジェクトがインスタンスの場合は、デフォルト値は1になり、配列の場合は3になります。
 .sp
-Ǥϡɤ륭åԿ5ꤹˡ򼨤ޤ
+次の例では、ロードされるキャッシュ行数を5に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1744,42 +1744,42 @@
 .PP
 \-XX:AllocatePrefetchStyle=\fIstyle\fR
 .RS 4
-ץեå̿륳ɡꤷޤ\fIstyle\fRϡ03ޤǤǤ
+プリフェッチ命令に生成されるコード・スタイルを設定します。\fIstyle\fR引数は、0から3までの整数です。
 .PP
 0
 .RS 4
-ץեå̿ޤ
+プリフェッチ命令を生成しません。
 .RE
 .PP
 1
 .RS 4
-ƳƤθǡץեå̿¹ԤޤϥǥեȤΥѥ᡼Ǥ
+各割当ての後で、プリフェッチ命令を実行します。これはデフォルトのパラメータです。
 .RE
 .PP
 2
 .RS 4
-åɡʳƥ֥å(TLAB)ޡݥ󥿤Ѥơץեå̿¹Ԥ륿ߥ󥰤ꤷޤ
+スレッド・ローカルな割当てブロック(TLAB)ウォーターマーク・ポインタを使用して、プリフェッチ命令を実行するタイミングを決定します。
 .RE
 .PP
 3
 .RS 4
-ƥץեåѤSPARCBIS̿Ѥޤ
+割当てプリフェッチ用のSPARCでBIS命令を使用します。
 .RE
 .RE
 .PP
 \-XX:+AlwaysPreTouch
 .RS 4
-JVMνJavaҡ׾Τ٤ƤΥڡΥåͭˤޤˤꡢ\fImain()\fR᥽åɤˡ٤ƤΥڡ꡼˼ޤΥץϡʪ꡼˥ޥåפ줿٤Ƥβۥ꡼ޤĹּ¹ԤΥƥ򥷥ߥ졼ȤƥȤǻѤǤޤǥեȤǤϡΥץ̵ˤʤäƤꡢJVMҡΰ褬äѤˤʤȡ٤ƤΥڡߥåȤޤ
+JVMの初期化中にJavaヒープ上のすべてのページのタッチを有効にします。これにより、\fImain()\fRメソッドの入力前に、すべてのページがメモリーに取得されます。このオプションは、物理メモリーにマップされたすべての仮想メモリーを含む長時間実行のシステムをシミュレートするテストで使用できます。デフォルトでは、このオプションは無効になっており、JVMヒープ領域がいっぱいになると、すべてのページがコミットされます。
 .RE
 .PP
 \-XX:+CMSClassUnloadingEnabled
 .RS 4
-¹ԥޡ(CMS)١쥯Ѥˡɤ륯饹ͭˤޤΥץϥǥեȤͭˤʤäƤޤCMS١쥯Υ饹ɤ̵ˤˤϡ\fI\-XX:\-CMSClassUnloadingEnabled\fRꤷޤ
+並行マークスイープ(CMS)ガベージ・コレクタを使用する場合に、アンロードするクラスを有効にします。このオプションはデフォルトで有効になっています。CMSガベージ・コレクタのクラス・アンロードを無効にするには、\fI\-XX:\-CMSClassUnloadingEnabled\fRを指定します。
 .RE
 .PP
 \-XX:CMSExpAvgFactor=\fIpercent\fR
 .RS 4
-¹ԥ쥯פλؿʿѤ׻ݤˡߤΥץŤդ뤿˻Ѥ֤γ(0100ޤ)ꤷޤǥեȤǤϡؿʿѷ25%ꤵƤޤǤϡ15%ꤹˡ򼨤ޤ
+並行コレクション統計の指数平均を計算する際に、現在のサンプルを重み付けするために使用される時間の割合(0から100まで)を設定します。デフォルトでは、指数平均係数は25%に設定されています。次の例では、係数を15%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1794,9 +1794,9 @@
 .PP
 \-XX:CMSIncrementalDutyCycle=\fIpercent\fR
 .RS 4
-¹ԥ쥯μ¹ԤĤƤޥʡ쥯֤λ֤γ(0100ޤ)ꤷޤ\fI\-XX:+CMSIncrementalPacing\fRͭʾ硢ǥ塼ƥ뤬ưŪꤵ졢ΥץϽͤΤߤꤷޤ
+並行コレクタの実行が許可されているマイナー・コレクション間の時間の割合(0から100まで)を設定します。\fI\-XX:+CMSIncrementalPacing\fRが有効な場合、デューティ・サイクルが自動的に設定され、このオプションは初期値のみを設定します。
 .sp
-ǥեȤǤϡǥ塼ƥ10%ꤵƤޤǤϡǥ塼ƥ20%ꤹˡ򼨤ޤ
+デフォルトでは、デューティ・サイクルは10%に設定されています。次の例では、デューティ・サイクルを20%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1811,7 +1811,7 @@
 .PP
 \-XX:CMSIncrementalDutyCycleMin=\fIpercent\fR
 .RS 4
-\fI\-XX:+CMSIncrementalPacing\fRͭʾ˥ǥ塼ƥβ¤Ǥޥʡ쥯֤λ֤γ(0100ޤ)ꤷޤǥեȤǤϡǥ塼ƥβ¤0%ꤵƤޤǤϡ¤10%ꤹˡ򼨤ޤ
+\fI\-XX:+CMSIncrementalPacing\fRが有効な場合にデューティ・サイクルの下限であるマイナー・コレクション間の時間の割合(0から100まで)を設定します。デフォルトでは、デューティ・サイクルの下限は0%に設定されています。次の例では、下限を10%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1826,12 +1826,12 @@
 .PP
 \-XX:+CMSIncrementalMode
 .RS 4
-CMS쥯ʬ⡼ɤͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ2İʲGCåɤĹˤΤͭˤɬפޤ\fICMSIncremental\fRǻϤޤ뤹٤ƤΥץϡΥץͭʾΤߡŬѤޤ
+CMSコレクタの増分モードを有効にします。このオプションはデフォルトで無効になっており、2つ以下のGCスレッドを持つ構成にのみ有効にする必要があります。\fICMSIncremental\fRで始まるすべてのオプションは、このオプションが有効な場合のみ、適用されます。
 .RE
 .PP
 \-XX:CMSIncrementalOffset=\fIpercent\fR
 .RS 4
-ʬ⡼ɤΥǥ塼ƥޥʡ쥯֤Ǵ˱˰ư֤γ(0100ޤ)ꤷޤǥեȤǤϡեåȤ0%ꤵƤޤǤϡǥ塼ƥΥեåȤ25%ꤹˡ򼨤ޤ
+増分モードのデューティ・サイクルをマイナー・コレクション間で期間内に右に移動する時間の割合(0から100まで)を設定します。デフォルトでは、オフセットは0%に設定されています。次の例では、デューティ・サイクルのオフセットを25%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1846,12 +1846,12 @@
 .PP
 \-XX:+CMSIncrementalPacing
 .RS 4
-JVMμ¹˼줿פ˴Ťơʬ⡼ɤΥǥ塼ƥμưĴͭˤޤΥץϥǥեȤͭˤʤäƤޤʬ⡼ɡǥ塼ƥμưĴ̵ˤˤϡ\fI\-XX:\-CMSIncrementalPacing\fRꤷޤ
+JVMの実行中に収集された統計に基づいて、増分モードのデューティ・サイクルの自動調整を有効にします。このオプションはデフォルトで有効になっています。増分モード・デューティ・サイクルの自動調整を無効にするには、\fI\-XX:\-CMSIncrementalPacing\fRを指定します。
 .RE
 .PP
 \-XX:CMSIncrementalSafetyFactor=\fIpercent\fR
 .RS 4
-ǥ塼ƥ׻ݤˡݼɲä뤿˻Ѥ֤γ(0100ޤ)ꤷޤǥեȤǤϡ10%ꤵƤޤǤϡ5%ꤹˡ򼨤ޤ
+デューティ・サイクルを計算する際に、保守を追加するために使用される時間の割合(0から100まで)を設定します。デフォルトでは、安全係数は10%に設定されています。次の例では、安全係数を5%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1866,9 +1866,9 @@
 .PP
 \-XX:CMSInitiatingOccupancyFraction=\fIpercent\fR
 .RS 4
-CMS򳫻ϤŤͭΨ(0100ޤ)ꤷޤǥեͤ\-1ꤵƤޤ(ǥեȤޤ)ϡ\fI\-XX:CMSTriggerRatio\fRͭΨͤ뤿˻Ѥ뤳Ȥ̣ޤ
+CMS収集サイクルを開始する古い世代の占有率(0から100まで)を設定します。デフォルト値は\-1に設定されています。負の値(デフォルトを含む)は、\fI\-XX:CMSTriggerRatio\fRが開始占有率の値を定義するために使用されることを意味します。
 .sp
-ǤϡͭΨ20%ꤹˡ򼨤ޤ
+次の例では、占有率を20%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1883,14 +1883,14 @@
 .PP
 \-XX:+CMSScavengeBeforeRemark
 .RS 4
-CMSȡƥåפ˥٥󥸤λԤͭˤޤǥեȤǤϡΥץ̵Ǥ
+CMSコメント・ステップの前にスカベンジの試行を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:CMSTriggerRatio=\fIpercent\fR
 .RS 4
-CMS뤬Ϥ˳Ƥ\fI\-XX:MinHeapFreeRatio\fRˤäƻꤵͤγ(0100ޤ)ꤷޤǥեͤ80%ꤵƤޤ
+CMS収集サイクルが開始する前に割り当てられる\fI\-XX:MinHeapFreeRatio\fRによって指定される値の割合(0から100まで)を設定します。デフォルト値は80%に設定されています。
 .sp
-ǤϡͭΨ75%ꤹˡ򼨤ޤ
+次の例では、占有率を75%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1905,9 +1905,9 @@
 .PP
 \-XX:ConcGCThreads=\fIthreads\fR
 .RS 4
-¹GC˻Ѥ륹åɤοꤷޤǥեͤϡJVM˻ѤǤCPUοˤäưۤʤޤ
+並行GCに使用されるスレッドの数を設定します。デフォルト値は、JVMに使用できるCPUの数によって異なります。
 .sp
-ȤС¹GCΥåɿ2ꤹˤϡΥץꤷޤ
+たとえば、並行GCのスレッド数を2に設定するには、次のオプションを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -1922,24 +1922,24 @@
 .PP
 \-XX:+DisableExplicitGC
 .RS 4
-\fISystem\&.gc()\fRθƽФν̵ˤ륪ץͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ\fISystem\&.gc()\fRؤθƽФ뤳Ȥ̣ޤ\fISystem\&.gc()\fRθƽФν̵ˤʤäƤ硢JVMɬפ˱GC¹Ԥޤ
+\fISystem\&.gc()\fRの呼出しの処理を無効にするオプションを有効にします。このオプションはデフォルトで無効になっており、これは\fISystem\&.gc()\fRへの呼出しが処理されることを意味します。\fISystem\&.gc()\fRの呼出しの処理が無効になっている場合、JVMは必要に応じてGCを実行します。
 .RE
 .PP
 \-XX:+ExplicitGCInvokesConcurrent
 .RS 4
-\fISystem\&.gc()\fRꥯȤѤ뤳Ȥˤäơ¹GCθƽФͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ\fI\-XX:+UseConcMarkSweepGC\fRץȤȤ˻ѤΤߡͭˤ뤳ȤǤޤ
+\fISystem\&.gc()\fRリクエストを使用することによって、並行GCの呼出しを有効にします。このオプションはデフォルトで無効になっており、\fI\-XX:+UseConcMarkSweepGC\fRオプションとともに使用する場合のみ、有効にすることができます。
 .RE
 .PP
 \-XX:+ExplicitGCInvokesConcurrentAndUnloadsClasses
 .RS 4
-\fISystem\&.gc()\fRꥯȤѤ¹GC˥饹򥢥ɤ뤳Ȥˤäơ¹GCθƽФͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ\fI\-XX:+UseConcMarkSweepGC\fRץȤȤ˻ѤΤߡͭˤ뤳ȤǤޤ
+\fISystem\&.gc()\fRリクエストを使用し、並行GCサイクル中にクラスをアンロードすることによって、並行GCの呼出しを有効にします。このオプションはデフォルトで無効になっており、\fI\-XX:+UseConcMarkSweepGC\fRオプションとともに使用する場合のみ、有効にすることができます。
 .RE
 .PP
 \-XX:G1HeapRegionSize=\fIsize\fR
 .RS 4
-١ե(G1)쥯ѤݤJavaҡפʬ꡼Υꤷޤͤˤϡ1MB32MBޤǤǤޤǥեȤΥ꡼󡦥ϡҡס˴ŤƿʹֹŪ˷ꤵޤ
+ガベージファースト(G1)コレクタを使用する際にJavaヒープを細分化するリージョンのサイズを設定します。値には、1MBから32MBまでを指定できます。デフォルトのリージョン・サイズは、ヒープ・サイズに基づいて人間工学的に決定されます。
 .sp
-Ǥϡʬ줿16MBꤹˡ򼨤ޤ
+次の例では、細分化されたサイズを16MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1954,14 +1954,14 @@
 .PP
 \-XX:+G1PrintHeapRegions
 .RS 4
-Ƥ줿꡼󤪤G1쥯ˤäƺ׵ᤵ줿Τ˴ؤΰͭˤޤǥեȤǤϡΥץ̵Ǥ
+割り当てられたリージョンおよびG1コレクタによって再要求されたものに関する情報の印刷を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:G1ReservePercent=\fIpercent\fR
 .RS 4
-G1쥯ξʤԤǽ򸺤餹falseξ¤Ȥͽ󤵤줿ҡפγ(050ޤ)ꤷޤǥեȤǤϡΥץ10%ꤵƤޤ
+G1コレクタの昇格が失敗する可能性を減らすためのfalseの上限として予約されたヒープの割合(0から50まで)を設定します。デフォルトでは、このオプションは10%に設定されています。
 .sp
-Ǥϡͽ󤵤줿ҡפ20%ꤹˡ򼨤ޤ
+次の例では、予約されたヒープを20%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1976,9 +1976,9 @@
 .PP
 \-XX:InitialHeapSize=\fIsize\fR
 .RS 4
-꡼ƥסν(Хñ)ꤷޤꤹͤϡ0ޤ1MB礭1024ܿΤ줫ˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϡ¹Ի˥ƥ๽˴Ť򤵤ޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlˤ륬١쥯르Υߥå򻲾ȤƤ
+メモリー割当てプールの初期サイズ(バイト単位)を設定します。指定する値は、0、または1MBより大きい1024の倍数のいずれかにする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は、実行時にシステム構成に基づいて選択されます。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlにあるガベージ・コレクタ・エルゴノミックを参照してください。
 .sp
-ǤϡƤ줿꡼Υ͡ñ̤Ѥ6MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーのサイズを様々な単位を使用して6MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1991,14 +1991,14 @@
 .if n \{\
 .RE
 .\}
-Υץ0ꤷ硢ϡŤȼ㤤˳Ƥ줿ιפȤꤵޤ㤤ΥҡפΥϡ\fI\-XX:NewSize\fRץѤǤޤ
+このオプションを0に設定した場合、初期サイズは、古い世代と若い世代に割り当てられたサイズの合計として設定されます。若い世代のヒープのサイズは、\fI\-XX:NewSize\fRオプションを使用して設定できます。
 .RE
 .PP
 \-XX:InitialSurvivorRatio=\fIratio\fR
 .RS 4
-롼ץåȡ١쥯Ѥ륵Хΰνꤷޤ(\fI\-XX:+UseParallelGC\fR/ޤ\fI\-XX:+UseParallelOldGC\fRץˤäͭˤʤޤ)\fI\-XX:+UseParallelGC\fRץ󤪤\fI\-XX:+UseParallelOldGC\fRץѤ뤳Ȥˤäơ롼ץåȡ١쥯ŬǥեȤͭˤޤͤϤơץꥱư˽äơХΰ褬ѹޤ(\fI\-XX:\-UseAdaptiveSizePolicy\fRץѤ)Ŭ̵ˤ硢\fI\-XX:SurvivorRatio\fRץѤơץꥱμ¹ΤΥХΰΥꤹɬפޤ
+スループット・ガベージ・コレクタが使用するサバイバ領域の初期比を設定します(\fI\-XX:+UseParallelGC\fRおよび/または\fI\-XX:+UseParallelOldGC\fRオプションによって有効になります)。\fI\-XX:+UseParallelGC\fRオプションおよび\fI\-XX:+UseParallelOldGC\fRオプションを使用することによって、スループット・ガベージ・コレクタで適応サイズ指定をデフォルトで有効にします。初期値から始めて、アプリケーションの動作に従って、サバイバ領域がサイズ変更されます。(\fI\-XX:\-UseAdaptiveSizePolicy\fRオプションを使用して)適応サイズ指定を無効にした場合、\fI\-XX:SurvivorRatio\fRオプションを使用して、アプリケーションの実行全体のサバイバ領域のサイズを設定する必要があります。
 .sp
-μѤơ㤤Υ(Y)ӥХΰν(R)˴ŤơХΰν(S)׻Ǥޤ
+次の式を使用して、若い世代のサイズ(Y)およびサバイバ領域の初期比(R)に基づいて、サバイバ領域の初期サイズ(S)を計算できます。
 .sp
 .if n \{\
 .RS 4
@@ -2009,11 +2009,11 @@
 .if n \{\
 .RE
 .\}
-2ϡ2ĤΥХΰ򼨤ޤХΰν˻ꤹͤ礭ȡХΰνϾʤޤ
+等式内の2は、2つのサバイバ領域を示します。サバイバ領域の初期比に指定する値を大きくすると、サバイバ領域の初期サイズは小さくなります。
 .sp
-ǥեȤǤϡХΰν8ꤵƤޤ㤤ΰ襵Υǥե(2MB)Ѥ硢Хΰν0\&.2MBˤʤޤ
+デフォルトでは、サバイバ領域の初期比は8に設定されています。若い世代の領域サイズのデフォルト値(2MB)を使用した場合、サバイバ領域の初期サイズは0\&.2MBになります。
 .sp
-ǤϡХΰν4ꤹˡ򼨤ޤ
+次の例では、サバイバ領域の初期比を4に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2028,9 +2028,9 @@
 .PP
 \-XX:InitiatingHeapOccupancyPercent=\fIpercent\fR
 .RS 4
-¹GC򳫻ϤҡͭΨ(0100ޤ)ꤷޤϡ1ĤΤ(ȤG1١쥯ʤ)ǤϤʤҡΤͭ˴Ť¹GCȥꥬ륬١쥯ˤäƻѤޤ
+並行GCサイクルを開始するヒープ占有率(0から100まで)を設定します。これは、1つの世代のみ(たとえばG1ガベージ・コレクタなど)ではなく、ヒープ全体の占有に基づいて並行GCサイクルをトリガーするガベージ・コレクタによって使用されます。
 .sp
-ǥեȤǤϡͤ45%ꤵƤޤ0ϡGC뤬ߤʤȤ̣ޤǤϡϥҡͭΨ75%ꤹˡ򼨤ޤ
+デフォルトでは、開始値は45%に設定されています。値0は、GCサイクルが停止しないことを意味します。次の例では、開始ヒープ占有率を75%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2045,9 +2045,9 @@
 .PP
 \-XX:MaxGCPauseMillis=\fItime\fR
 .RS 4
-GCٻ߻(ߥñ)ΥåȤꤷޤϥեȡΤᡢJVMϼ¸Τ˺Ϥ򤷤ޤǥեȤǤϡٻ߻֤κͤϤޤ
+最大GC休止時間(ミリ秒単位)のターゲットを設定します。これはソフト・ゴールのため、JVMは実現のために最善の努力をします。デフォルトでは、休止時間の最大値はありません。
 .sp
-Ǥϡ祿åȵٻ߻֤500ߥäꤹˡ򼨤ޤ
+次の例では、最大ターゲット休止時間を500ミリ秒に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2062,9 +2062,9 @@
 .PP
 \-XX:MaxHeapSize=\fIsize\fR
 .RS 4
-꡼ƥסκ祵(Хñ)ꤷޤꤹͤϡ2MB礭1024ܿˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϡ¹Ի˥ƥ๽˴Ť򤵤ޤСǥץȤǤϡ\fI\-XX:InitialHeapSize\fR\fI\-XX:MaxHeapSize\fR̾Ʊͤꤵޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlˤ륬١쥯르Υߥå򻲾ȤƤ
+メモリー割当てプールの最大サイズ(バイト単位)を設定します。指定する値は、2MBより大きい1024の倍数にする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は、実行時にシステム構成に基づいて選択されます。サーバー・デプロイメントでは、\fI\-XX:InitialHeapSize\fRおよび\fI\-XX:MaxHeapSize\fRは通常同じ値に設定されます。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlにあるガベージ・コレクタ・エルゴノミックを参照してください。
 .sp
-ǤϡƤ줿꡼εĤ祵͡ñ̤Ѥ80MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーの許可される最大サイズを様々な単位を使用して80MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2077,16 +2077,16 @@
 .if n \{\
 .RE
 .\}
-Oracle Solaris 7Oracle Solaris 8 SPARCץåȥեξΤͤξ¤ϡ褽4,000MB饪Сإåɤ̤ΤǤOracle Solaris 2\&.6x86ץåȥեξξ¤ϡ褽2,000MB饪Сإåɤ̤ΤǤLinuxץåȥեξξ¤ϡ褽2,000MB饪Сإåɤ̤ΤǤ
+Oracle Solaris 7およびOracle Solaris 8 SPARCプラットフォームの場合のこの値の上限は、およそ4,000MBからオーバーヘッドの量を引いたものです。Oracle Solaris 2\&.6およびx86プラットフォームの場合の上限は、およそ2,000MBからオーバーヘッドの量を引いたものです。Linuxプラットフォームの場合の上限は、およそ2,000MBからオーバーヘッドの量を引いたものです。
 .sp
-\fI\-XX:MaxHeapSize\fRץ\fI\-Xmx\fRƱǤ
+\fI\-XX:MaxHeapSize\fRオプションは\fI\-Xmx\fRと同等です。
 .RE
 .PP
 \-XX:MaxHeapFreeRatio=\fIpercent\fR
 .RS 4
-GC٥ȸζҡΰεĤƤγ(0100ޤ)ꤷޤҡΰ褬ͤĶƳ礷硢ΥҡפϽ̾ޤǥեȤǤϡͤ70%ꤵƤޤ
+GCイベント後の空きヒープ領域の許可されている最大の割合(0から100まで)を設定します。空きヒープ領域がこの値を超えて拡大した場合、そのヒープは縮小します。デフォルトでは、この値は70%に設定されています。
 .sp
-ǤϡҡפκΨ75%ꤹˡ򼨤ޤ
+次の例では、空きヒープの最大比率を75%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2101,9 +2101,9 @@
 .PP
 \-XX:MaxMetaspaceSize=\fIsize\fR
 .RS 4
-饹᥿ǡ˳Ƥ뤳ȤǤͥƥ֡꡼κ̤ꤷޤǥեȤǤϡΥ¤Ƥޤ󡣥ץꥱΥ᥿ǡ̤ϡץꥱΡ¾μ¹楢ץꥱ󡢤ӥƥǻѲǽʥ꡼̤ˤäưۤʤޤ
+クラス・メタデータに割り当てることができるネイティブ・メモリーの最大量を設定します。デフォルトでは、このサイズは制限されていません。アプリケーションのメタデータの量は、アプリケーション自体、他の実行中アプリケーション、およびシステムで使用可能なメモリーの量によって異なります。
 .sp
-Ǥϡ饹᥿ǡκ祵256MBꤹˡ򼨤ޤ
+次の例では、クラス・メタデータの最大サイズを256MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2118,14 +2118,14 @@
 .PP
 \-XX:MaxNewSize=\fIsize\fR
 .RS 4
-㤤(ʡ)Υҡפκ祵(Хñ)ꤷޤǥեͤϿʹֹŪꤵޤ
+若い世代(ナーサリ)のヒープの最大サイズ(バイト単位)を設定します。デフォルト値は人間工学的に設定されます。
 .RE
 .PP
 \-XX:MaxTenuringThreshold=\fIthreshold\fR
 .RS 4
-ŬGCǻѤƲꤷͤꤷޤͤ15Ǥǥեͤϡѥ(롼ץå)쥯ξ15CMS쥯ξ6Ǥ
+適応GCサイズ指定で使用する最大殿堂入りしきい値を設定します。最大値は15です。デフォルト値は、パラレル(スループット)コレクタの場合は15、CMSコレクタの場合は6です。
 .sp
-ǤϡƲꤷͤ10ꤹˡ򼨤ޤ
+次の例では、最大殿堂入りしきい値を10に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2140,14 +2140,14 @@
 .PP
 \-XX:MetaspaceSize=\fIsize\fR
 .RS 4
-ǽĶȤ˥١쥯ȥꥬ롢Ƥ줿饹᥿ǡΰΥꤷޤΥ١쥯ΤͤϡѤ᥿ǡ̤ˤääޤϸޤǥեȤΥϥץåȥեˤäưۤʤޤ
+最初に超えたときにガベージ・コレクションをトリガーする、割り当てられたクラス・メタデータ領域のサイズを設定します。このガベージ・コレクションのしきい値は、使用されるメタデータの量によって増加または減少します。デフォルトのサイズはプラットフォームによって異なります。
 .RE
 .PP
 \-XX:MinHeapFreeRatio=\fIpercent\fR
 .RS 4
-GC٥ȸζҡΰεĤƤǾγ(0100ޤ)ꤷޤҡΰ褬ͤ򲼲ä硢Υҡפϳ礷ޤǥեȤǤϡͤ40%ꤵƤޤ
+GCイベント後の空きヒープ領域の許可されている最小の割合(0から100まで)を設定します。空きヒープ領域がこの値を下回った場合、そのヒープは拡大します。デフォルトでは、この値は40%に設定されています。
 .sp
-ǤϡҡפκǾΨ25%ꤹˡ򼨤ޤ
+次の例では、空きヒープの最小比率を25%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2162,7 +2162,7 @@
 .PP
 \-XX:NewRatio=\fIratio\fR
 .RS 4
-㤤ΥȸŤΥȤΨꤷޤǥեȤǤϡΥץ2ꤵƤޤǤϡ㤤/ŤΨ1ꤹˡ򼨤ޤ
+若い世代のサイズと古い世代のサイズとの比率を設定します。デフォルトでは、このオプションは2に設定されています。次の例では、若い/古いの比率を1に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2177,11 +2177,11 @@
 .PP
 \-XX:NewSize=\fIsize\fR
 .RS 4
-㤤(ʡ)Υҡפν(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤ
+若い世代(ナーサリ)のヒープの初期サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。
 .sp
-ҡפμ㤤꡼Ͽ֥Ȥ˻ѤޤGCϡ¾Υ꡼ꤳΥ꡼ǡˤ˼¹Ԥޤ㤤Υ硢¿ΥޥʡGC¹Ԥޤ礭硢եGCΤߤ¹ԤޤλޤǤ˻֤뤳Ȥޤ㤤ΥϡΤΥҡסȾʬ4ʬ1δ֤ˤƤȤᤷޤ
+ヒープの若い世代リージョンは新しいオブジェクトに使用されます。GCは、他のリージョンよりこのリージョンで、より頻繁に実行されます。若い世代のサイズが小さすぎる場合、多数のマイナーGCが実行されます。サイズが大きすぎる場合、フルGCのみが実行されますが、完了までに時間がかかることがあります。若い世代のサイズは、全体のヒープ・サイズの半分から4分の1の間にしておくことをお薦めします。
 .sp
-Ǥϡ㤤ν͡ñ̤Ѥ256MBꤹˡ򼨤ޤ
+次の例では、若い世代の初期サイズを様々な単位を使用して256MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2194,14 +2194,14 @@
 .if n \{\
 .RE
 .\}
-\fI\-XX:NewSize\fRץ\fI\-Xmn\fRƱǤ
+\fI\-XX:NewSize\fRオプションは\fI\-Xmn\fRと同等です。
 .RE
 .PP
 \-XX:ParallelGCThreads=\fIthreads\fR
 .RS 4
-㤤ȸŤǥѥ롦١쥯˻Ѥ륹åɤοꤷޤǥեͤϡJVM˻ѤǤCPUοˤäưۤʤޤ
+若い世代と古い世代でパラレル・ガベージ・コレクションに使用するスレッドの数を設定します。デフォルト値は、JVMに使用できるCPUの数によって異なります。
 .sp
-ȤСѥGCΥåɿ2ꤹˤϡΥץꤷޤ
+たとえば、パラレルGCのスレッド数を2に設定するには、次のオプションを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -2216,52 +2216,52 @@
 .PP
 \-XX:+ParallelRefProcEnabled
 .RS 4
-ѥ뻲ȽͭˤޤǥեȤǤϡΥץ̵Ǥ
+パラレル参照処理を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintAdaptiveSizePolicy
 .RS 4
-Ŭ奵˴ؤνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+適応世代サイズ指定に関する情報の出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGC
 .RS 4
-GCȤΥåνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとのメッセージの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCApplicationConcurrentTime
 .RS 4
-Ǹεٻ(ȤGCٻߤʤ)ʹߤ˷вᤷ֤νϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+最後の休止(たとえばGC休止など)以降に経過した時間の出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCApplicationStoppedTime
 .RS 4
-ٻ(ȤGCٻߤʤ)³֤νϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+休止(たとえばGC休止など)が継続した時間の出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX+PrintGCDateStamp
 .RS 4
-GCȤեפνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとの日付スタンプの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCDetails
 .RS 4
-GCȤξܺ٥åνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとの詳細メッセージの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCTaskTimeStamps
 .RS 4
-ġGCåɡȤΥॹפνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+個々のGCワーカー・スレッド・タスクごとのタイムスタンプの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCTimeStamp
 .RS 4
-GCȤΥॹפνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとのタイムスタンプの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintTenuringDistribution
 .RS 4
-Ʋ־νϤͭˤޤˡϤ򼨤ޤ
+殿堂入り期間情報の出力を有効にします。次に、出力の例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2276,23 +2276,23 @@
 .if n \{\
 .RE
 .\}
-1֥ȤϡǤ㤤ХФǤ(Υ٥󥸤θ˺졢ǿΥ٥󥸤¸³Edenΰ褫饵Хΰ˰ưޤ)2֥Ȥϡ2ĤΥ٥󥸤¸³ޤ(2ܤΥ٥ˡ륵Хΰ褫鼡ΰ˥ԡޤ)Τ褦³ޤ
+期間1オブジェクトは、最も若いサバイバです(前のスカベンジの後に作成され、最新のスカベンジで存続し、Eden領域からサバイバ領域に移動しました)。期間2オブジェクトは、2つのスカベンジで存続します(2番目のスカベンジ中に、あるサバイバ領域から次の領域にコピーされました)。このように続きます。
 .sp
-ҤǤϡ28,992,024ХȤ1ĤΥ٥󥸤¸³Edenΰ褫饵Хΰ˥ԡޤ1,366,864ХȤϴ2֥ȤʤɤˤͭƤޤƹԤ3ܤͤϡnʲΥ֥ȤѥǤ
+前述の例では、28,992,024バイトが1つのスカベンジで存続し、Eden領域からサバイバ領域にコピーされました。1,366,864バイトは期間2オブジェクトなどにより占有されています。各行の3番目の値は、期間n以下のオブジェクトの累積サイズです。
 .sp
-ǥեȤǤϡΥץ̵Ǥ
+デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+ScavengeBeforeFullGC
 .RS 4
-줾ΥեGC˼㤤GCͭˤޤΥץϥǥեȤͭˤʤäƤޤեGC˼㤤Υ٥󥸤ԤȡŤΰ褫㤤ΰؤΥǽʥ֥Ȥο򸺤餹ȤǤ뤿ᡢ̵\fIʤ\fRȤᤷޤƥեGC˼㤤GC̵ˤˤϡ\fI\-XX:\-ScavengeBeforeFullGC\fRꤷޤ
+それぞれのフルGCの前に若い世代のGCを有効にします。このオプションはデフォルトで有効になっています。フルGCの前に若い世代のスカベンジを行うと、古い世代領域から若い世代領域へのアクセスが可能なオブジェクトの数を減らすことができるため、これを無効に\fIしない\fRことをお薦めします。各フルGCの前に若い世代のGCを無効にするには、\fI\-XX:\-ScavengeBeforeFullGC\fRを指定します。
 .RE
 .PP
 \-XX:SoftRefLRUPolicyMSPerMB=\fItime\fR
 .RS 4
-եȡǽʥ֥ȤǸ˻ȤƤҡ׾ǥƥ֤ʤޤޤˤʤäƤ(ߥñ)ꤷޤǥեͤϡҡζᥬХ1丳֤Ǥ\fI\-XX:SoftRefLRUPolicyMSPerMB\fRץϡߤΥҡס(Java HotSpot Client VM)ޤϺǽҡס(Java HotSpot Server VM)1ᥬХΥߥäɽͤޤΰ㤤ϡClient VMϡҡפ礭ΤǤϤʤեȻȤեå夹뷹ΤФServer VMϡեȻȤեå夹ΤǤϤʤҡפ礭뷹뤳Ȥ̣ޤԤξ硢\fI\-Xmx\fRץͤϡեȻȤɤΤ餤®˥١쥯󤵤뤫˽פʱƶڤܤޤ
+ソフト・アクセスが可能なオブジェクトが最後に参照されてからヒープ上でアクティブなままになっている時間(ミリ秒単位)を設定します。デフォルト値は、ヒープ内の空きメガバイト当たりで1秒の存続期間です。\fI\-XX:SoftRefLRUPolicyMSPerMB\fRオプションは、現在のヒープ・サイズ(Java HotSpot Client VM用)または最大可能ヒープ・サイズ(Java HotSpot Server VM用)の1メガバイト当たりのミリ秒を表す整数値を受け入れます。この違いは、Client VMは、ヒープを大きくするのではなく、ソフト参照をフラッシュする傾向があるのに対し、Server VMは、ソフト参照をフラッシュするのではなく、ヒープを大きくする傾向があることを意味します。後者の場合、\fI\-Xmx\fRオプションの値は、ソフト参照がどのくらい迅速にガベージ・コレクションされるかに重要な影響を及ぼします。
 .sp
-Ǥϡͤ2\&.5äꤹˡ򼨤ޤ
+次の例では、値を2\&.5秒に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2307,7 +2307,7 @@
 .PP
 \-XX:SurvivorRatio=\fIratio\fR
 .RS 4
-EdenΰΥȥХΰΥȤΨꤷޤǥեȤǤϡΥץ8ꤵƤޤǤϡEden/ХΰΨ4ꤹˡ򼨤ޤ
+Eden領域のサイズとサバイバ領域のサイズとの比率を設定します。デフォルトでは、このオプションは8に設定されています。次の例では、Eden/サバイバ領域の比率を4に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2322,9 +2322,9 @@
 .PP
 \-XX:TargetSurvivorRatio=\fIpercent\fR
 .RS 4
-㤤١쥯θ˻Ѥ륵ХΰŪγ(0100ޤ)ꤷޤǥեȤǤϡΥץ50%ꤵƤޤ
+若いガベージ・コレクションの後に使用されるサバイバ領域の目的の割合(0から100まで)を設定します。デフォルトでは、このオプションは50%に設定されています。
 .sp
-ǤϡåȤΥХΰΨ30%ꤹˡ򼨤ޤ
+次の例では、ターゲットのサバイバ領域の比率を30%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2339,9 +2339,9 @@
 .PP
 \-XX:TLABSize=\fIsize\fR
 .RS 4
-åɡʳƥХåե(TLAB)ν(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤΥץ0ꤵƤ硢JVMǤϽưŪ򤵤ޤ
+スレッド・ローカルな割当てバッファ(TLAB)の初期サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。このオプションが0に設定されている場合、JVMでは初期サイズが自動的に選択されます。
 .sp
-ǤϡTLABν512KBꤹˡ򼨤ޤ
+次の例では、TLABの初期サイズを512KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2356,102 +2356,102 @@
 .PP
 \-XX:+UseAdaptiveSizePolicy
 .RS 4
-Ŭ奵λѤͭˤޤΥץϥǥեȤͭˤʤäƤޤŬ奵̵ˤˤϡ\fI\-XX:\-UseAdaptiveSizePolicy\fRꤷ꡼ƥסΥŪꤷޤ(\fI\-XX:SurvivorRatio\fRץ򻲹ͤˤƤ)
+適応世代サイズ指定の使用を有効にします。このオプションはデフォルトで有効になっています。適応世代サイズ指定を無効にするには、\fI\-XX:\-UseAdaptiveSizePolicy\fRを指定し、メモリー割当てプールのサイズを明示的に設定します(\fI\-XX:SurvivorRatio\fRオプションを参考にしてください)。
 .RE
 .PP
 \-XX:+UseCMSInitiatingOccupancyOnly
 .RS 4
-CMS쥯γϤΤͣδȤƤͭͤλѤͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢ¾δबѤޤ
+CMSコレクタの開始のための唯一の基準としての占有値の使用を有効にします。デフォルトでは、このオプションは無効になっており、他の基準が使用されます。
 .RE
 .PP
 \-XX:+UseConcMarkSweepGC
 .RS 4
-ŤؤCMS١쥯λѤͭˤޤץꥱԵ֤׷򡢥롼ץå(\fI\-XX:+UseParallelGC\fR)١쥯ˤäȤǤʤ硢CMS١쥯Ѥ뤳ȤᤷޤG1١쥯(\fI\-XX:+UseG1GC\fR)̤ؤȤʤޤ
+古い世代へのCMSガベージ・コレクタの使用を有効にします。アプリケーションの待機時間の要件を、スループット(\fI\-XX:+UseParallelGC\fR)ガベージ・コレクタによって満たすことができない場合、CMSガベージ・コレクタを使用することをお薦めします。G1ガベージ・コレクタ(\fI\-XX:+UseG1GC\fR)は別の代替となります。
 .sp
-ǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤΥץͭˤȡ\fI\-XX:+UseParNewGC\fRץ󤬼ưŪꤵޤ
+デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。このオプションを有効にすると、\fI\-XX:+UseParNewGC\fRオプションが自動的に設定されます。
 .RE
 .PP
 \-XX:+UseG1GC
 .RS 4
-G1١쥯λѤͭˤޤϥСΥ١쥯ǡ̤RAMĥޥץåޥоݤȤƤޤ⤤ΨGCٻ߻֤ɸãƱŬڤʥ롼ץåȤݻޤG1쥯ϡGCԵ֤θꤵ줿׷(ꤷͽ¬ǽ0\&.5̤εٻ߻)ġ礭ҡ(6GBʾΥ)ɬפʥץꥱ˿侩ޤ
+G1ガベージ・コレクタの使用を有効にします。これはサーバー形式のガベージ・コレクタで、大量のRAMを持つマルチプロセッサ・マシンを対象としています。高い確率でGC休止時間の目標を達成し、同時に適切なスループットも維持します。G1コレクタは、GC待機時間の限定された要件(安定した予測可能な0\&.5秒未満の休止時間)を持つ、大きいヒープ(約6GB以上のサイズ)が必要なアプリケーションに推奨されます。
 .sp
-ǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤ
+デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。
 .RE
 .PP
 \-XX:+UseGCOverheadLimit
 .RS 4
-\fIOutOfMemoryError\fR㳰ޤǤˡGCJVMˤäפ֤γ¤ݥꥷλѤͭˤޤǥեȤǤϡΥץͭˤʤäƤꡢ١쥯˹׻֤98%¿䤵졢ҡפΥꥫХ꤬2%̤Ǥ硢ѥGCˤä\fIOutOfMemoryError\fRޤҡפ硢εǽϡץꥱĹ֤ۤȤɤޤϤޤäĽʤ¹ԤƤ֤򤹤뤿˻ѤǤޤΥץ̵ˤˤϡ\fI\-XX:\-UseGCOverheadLimit\fRꤷޤ
+\fIOutOfMemoryError\fR例外がスローされるまでに、GCでJVMによって要した時間の割合を制限するポリシーの使用を有効にします。デフォルトでは、このオプションは有効になっており、ガベージ・コレクションに合計時間の98%より多く費やされ、ヒープのリカバリが2%未満である場合、パラレルGCによって\fIOutOfMemoryError\fRがスローされます。ヒープが小さい場合、この機能は、アプリケーションが長期間ほとんどまたはまったく進捗なく実行している状態を回避するために使用できます。このオプションを無効にするには、\fI\-XX:\-UseGCOverheadLimit\fRを指定します。
 .RE
 .PP
 \-XX:+UseNUMA
 .RS 4
-ץꥱûԵ֤Υ꡼λѤä뤳ȤǡԶѰʥ꡼ƥ(NUMA)ѤޥΥץꥱΥѥեޥ󥹺ŬͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢNUMAФŬϹԤޤ󡣤Υץϡѥ롦١쥯(\fI\-XX:+UseParallelGC\fR)ѤƤΤ߻ѲǽǤ
+アプリケーションで短い待機時間のメモリーの使用を増加させることで、不均一なメモリー・アーキテクチャ(NUMA)を使用したマシン上のアプリケーションのパフォーマンス最適化を有効にします。デフォルトでは、このオプションは無効になっており、NUMAに対する最適化は行われません。このオプションは、パラレル・ガベージ・コレクタ(\fI\-XX:+UseParallelGC\fR)が使用されている場合のみ使用可能です。
 .RE
 .PP
 \-XX:+UseParallelGC
 .RS 4
-ʣΥץåѤƥץꥱΥѥեޥ󥹤夵롢ѥ롦٥󥸡١쥯(롼ץåȡ쥯ȤƤФ)λѤͭˤޤ
+複数のプロセッサを利用してアプリケーションのパフォーマンスを向上させる、パラレル・スカベンジ・ガベージ・コレクタ(スループット・コレクタとも呼ばれる)の使用を有効にします。
 .sp
-ǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤͭˤ硢Ū̵ˤʤꡢ\fI\-XX:+UseParallelOldGC\fRץ󤬼ưŪͭˤʤޤ
+デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。これを有効にした場合、明示的に無効にしないかぎり、\fI\-XX:+UseParallelOldGC\fRオプションが自動的に有効になります。
 .RE
 .PP
 \-XX:+UseParallelOldGC
 .RS 4
-եGCؤΥѥ롦١쥯λѤͭˤޤǥեȤǤϡΥץ̵Ǥͭˤȡ\fI\-XX:+UseParallelGC\fRץ󤬼ưŪͭˤʤޤ
+フルGCへのパラレル・ガベージ・コレクタの使用を有効にします。デフォルトでは、このオプションは無効です。これを有効にすると、\fI\-XX:+UseParallelGC\fRオプションが自動的に有効になります。
 .RE
 .PP
 \-XX:+UseParNewGC
 .RS 4
-㤤ǤΥ쥯ؤΥѥ롦åɤλѤͭˤޤǥեȤǤϡΥץ̵Ǥ\fI\-XX:+UseConcMarkSweepGC\fRץꤹȡϼưŪͭˤʤޤ
+若い世代でのコレクションへのパラレル・スレッドの使用を有効にします。デフォルトでは、このオプションは無効です。\fI\-XX:+UseConcMarkSweepGC\fRオプションを設定すると、これは自動的に有効になります。
 .RE
 .PP
 \-XX:+UseSerialGC
 .RS 4
-ꥢ롦١쥯λѤͭˤޤ١쥯󤫤̤ʵǽɬפȤʤϤñʥץꥱξˤϡϰ̤˺ŬǤǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤ
+シリアル・ガベージ・コレクタの使用を有効にします。ガベージ・コレクションから特別な機能を必要としない、小規模で単純なアプリケーションの場合には、これは一般に最適な選択です。デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。
 .RE
 .PP
 \-XX:+UseTLAB
 .RS 4
-㤤ΰǤΥåɡʳƥ֥å(TLAB)λѤͭˤޤΥץϥǥեȤͭˤʤäƤޤTLABλѤ̵ˤˤϡ\fI\-XX:\-UseTLAB\fRꤷޤ
+若い世代の領域でのスレッド・ローカルな割当てブロック(TLAB)の使用を有効にします。このオプションはデフォルトで有効になっています。TLABの使用を無効にするには、\fI\-XX:\-UseTLAB\fRを指定します。
 .RE
-.SS "侩Ǻ줿ץ"
+.SS "非推奨で削除されたオプション"
 .PP
-ΥץϡΥ꡼ˤϴޤޤƤޤʹߤפȤߤʤƤޤ
+これらのオプションは、以前のリリースには含まれていましたが、以降は不要とみなされています。
 .PP
 \-Xrun\fIlibname\fR
 .RS 4
-ꤷǥХå/ץեΥ饤֥ɤޤΥץϡ\fI\-agentlib\fRץ˼äޤ
+指定したデバッグ/プロファイルのライブラリをロードします。このオプションは、\fI\-agentlib\fRオプションに取って代わられました。
 .RE
 .PP
 \-XX:CMSInitiatingPermOccupancyFraction=\fIpercent\fR
 .RS 4
-GC򳫻ϤʵͭΨ(0100ޤ)ꤷޤΥץJDK 8Ǥ侩ǡΤϤޤ
+GCを開始する永久世代占有率(0から100まで)を設定します。このオプションはJDK 8では非推奨で、それに代わるものはありません。
 .RE
 .PP
 \-XX:MaxPermSize=\fIsize\fR
 .RS 4
-ʵΰκ祵(Хñ)ꤷޤΥץϡJDK 8侩ˤʤꡢ\fI\-XX:MaxMetaspaceSize\fRץ˼äޤ
+永久世代領域の最大サイズ(バイト単位)を設定します。このオプションは、JDK 8で非推奨になり、\fI\-XX:MaxMetaspaceSize\fRオプションに取って代わられました。
 .RE
 .PP
 \-XX:PermSize=\fIsize\fR
 .RS 4
-Ķˤϥ١쥯ȥꥬ롢ʵ˳Ƥ줿ΰ(Хñ)ꤷޤΥץϡJDK 8侩ˤʤꡢ\fI\-XX:MetaspaceSize\fRץ˼äޤ
+超えた場合にはガベージ・コレクションをトリガーする、永久世代に割り当てられた領域(バイト単位)を設定します。このオプションは、JDK 8で非推奨になり、\fI\-XX:MetaspaceSize\fRオプションに取って代わられました。
 .RE
 .PP
 \-XX:+UseSplitVerifier
 .RS 4
-ڥץʬͭˤޤǥեȤǤϡΥץϰΥ꡼ǤͭˤʤäƤꡢڤϡ׻(ѥˤäƼ¹)ȡסå(JVM󥿥ˤäƼ¹)2ĤΥեʬ䤵ƤޤΥץJDK 8侩ȤʤꡢڤϥǥեȤʬ䤵졢̵ˤˡϤޤ
+検証プロセスの分割を有効にします。デフォルトでは、このオプションは以前のリリースでは有効になっており、検証は、タイプ参照(コンパイラによって実行)と、タイプ・チェック(JVMランタイムによって実行)の2つのフェーズに分割されていました。このオプションはJDK 8で非推奨となり、検証はデフォルトで分割され、無効にする方法はありません。
 .RE
 .PP
 \-XX:+UseStringCache
 .RS 4
-̤˳Ƥ줿ʸΥå󥰤ͭˤޤΥץJDK 8졢ΤϤޤ
+一般に割り当てられた文字列のキャッシングを有効にします。このオプションはJDK 8から削除され、それに代わるものはありません。
 .RE
-.SH "ѥեޥ󥹡塼˥󥰤"
+.SH "パフォーマンス・チューニングの例"
 .PP
-Ǥϡ롼ץåȤκŬޤϥ쥹ݥ󥹻֤û̲Τ줫ԤΡŪʥ塼˥󥰡ե饰λˡ򼨤ޤ
+次の例では、スループットの最適化またはレスポンス時間の短縮化のいずれかを行うための、試験的なチューニング・フラグの使用方法を示します。
 .PP
-\fBExample 1\fR, 롼ץåȤ夹뤿Υ塼˥
+\fBExample 1\fR, スループットを向上するためのチューニング
 .RS 4
 .sp
 .if n \{\
@@ -2465,7 +2465,7 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, 쥹ݥ󥹻֤®뤿Υ塼˥
+\fBExample 2\fR, レスポンス時間を速くするためのチューニング
 .RS 4
 .sp
 .if n \{\
@@ -2478,9 +2478,9 @@
 .RE
 .\}
 .RE
-.SH "λơ"
+.SH "終了ステータス"
 .PP
-̾νλͤưġ뤫֤ΤϡưʰǸƤӽФ줿ʥ顼ȯ뤤JVMˤ㳰줿ǤJavaץꥱϡAPIƽФ\fISystem\&.exit(exitValue)\fRѤǤդ֤ͤȤ򤹤뤳ȤǤޤͤϼΤȤǤ
+通常、次の終了値が起動ツールから返されるのは、起動元が不正な引数で呼び出されたか、深刻なエラーが発生したか、あるいはJVMにより例外がスローされた場合です。ただし、Javaアプリケーションは、API呼出し\fISystem\&.exit(exitValue)\fRを使用して任意の値を返すことを選択することもできます。値は次のとおりです。
 .sp
 .RS 4
 .ie n \{\
@@ -2490,7 +2490,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI0\fR: ェλ
+\fI0\fR: 正常終了
 .RE
 .sp
 .RS 4
@@ -2501,9 +2501,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI>0\fR: 顼ȯ
+\fI>0\fR: エラー発生
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/javac.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/javac.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javac
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javac" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "javac" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javac \- Java饹ӥ󥿥եɤ߼ꡢХȥɤӥ饹ե˥ѥ뤷ޤ
-.SH ""
+javac \- Javaクラスおよびインタフェースの定義を読み取り、バイトコードおよびクラス・ファイルにコンパイルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -62,32 +62,32 @@
 .RE
 .\}
 .PP
-ꤹǤդǤ
+引数を指定する順序は任意です。
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIsourcefiles\fR
 .RS 4
-ѥ뤵1İʾΥե(\fIMyClass\&.java\fRʤ)
+コンパイルされる1つ以上のソース・ファイル(\fIMyClass\&.java\fRなど)。
 .RE
 .PP
 \fIclasses\fR
 .RS 4
-νоݤȤʤ1İʾΥ饹(\fIMyPackage\&.MyClass\fRʤ)
+注釈の処理対象となる1つ以上のクラス(\fIMyPackage\&.MyClass\fRなど)。
 .RE
 .PP
 \fI@argfiles\fR
 .RS 4
-ץȥեɽ1İʾΥե롣ΥեǤ\fI\-J\fRץϻǤޤ󡣥ޥɥ饤ե򻲾ȤƤ
+オプションとソース・ファイルを一覧表示する1つ以上のファイル。このファイルの中では\fI\-J\fRオプションは指定できません。コマンドライン引数ファイルを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjavac\fRޥɤϡJavaץߥ󥰸ǵҤ줿饹ȥ󥿥եɤ߼ꡢХȥɤΥ饹ե˥ѥ뤷ޤ\fIjavac\fRޥɤǤϡJavaե뤪ӥ饹νǤޤ
+\fIjavac\fRコマンドは、Javaプログラミング言語で記述されたクラスとインタフェースの定義を読み取り、バイトコードのクラス・ファイルにコンパイルします。\fIjavac\fRコマンドでは、Javaソース・ファイルおよびクラス内の注釈の処理もできます。
 .PP
-ɤΥե̾\fIjavac\fRϤˤϡ2Ĥˡޤ
+ソース・コードのファイル名を\fIjavac\fRに渡すには、2つの方法があります。
 .sp
 .RS 4
 .ie n \{\
@@ -97,7 +97,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-եοʤϡե̾򥳥ޥɥ饤ǻꤷޤ
+ソース・ファイルの数が少ない場合は、ファイル名をコマンドラインで指定します。
 .RE
 .sp
 .RS 4
@@ -108,19 +108,19 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-եο¿ϡեΥե̾ޤϲԤǶڤäƻꤷޤ\fIjavac\fRޥɤǡꥹȡե̾Ƭ˥åȥޡ(@)Ѥޤ
+ソース・ファイルの数が多い場合は、ファイル内のファイル名を空白または改行で区切って指定します。\fIjavac\fRコマンドで、リスト・ファイル名の先頭にアットマーク(@)を使用します。
 .RE
 .PP
-ɤΥե̾\&.javaĥҤ򡢥饹Υե̾\&.classĥҤäƤɬפޤޤեȥ饹եΤɤ⡢륯饹б롼̾äƤɬפޤȤС\fIMyClass\fRȤ̾Υ饹ϡ\fIMyClass\&.java\fRȤ̾Υե˵ҤޤΥեϡ\fIMyClass\&.class\fRȤ̾ΥХȥɡ饹ե˥ѥ뤵ޤ
+ソース・コードのファイル名は\&.java拡張子を、クラスのファイル名は\&.class拡張子を持っている必要があります。また、ソース・ファイルとクラス・ファイルのどちらも、該当するクラスに対応するルート名を持っている必要があります。たとえば、\fIMyClass\fRという名前のクラスは、\fIMyClass\&.java\fRという名前のソース・ファイルに記述されます。このソース・ファイルは、\fIMyClass\&.class\fRという名前のバイトコード・クラス・ファイルにコンパイルされます。
 .PP
-饹ƤȡɲäΥ饹ե뤬ޤΥ饹ե̾ϡ\fIMyClass$MyInnerClass\&.class\fRΤ褦ˡ饹̾ȳ饹̾Ȥ߹礻Τˤʤޤ
+内部クラスが定義されていると、追加のクラス・ファイルが生成されます。これらのクラス・ファイルの名前は、\fIMyClass$MyInnerClass\&.class\fRのように、内部クラス名と外部クラス名を組み合せたものになります。
 .PP
-եϡѥåĥ꡼ȿǤǥ쥯ȥꡦĥ꡼֤ޤȤС٤ƤΥե뤬\fI/workspace\fRˤ硢\fIcom\&.mysoft\&.mypack\&.MyClass\fRΥɤ\fI/workspace/com/mysoft/mypack/MyClass\&.java\fR˳Ǽޤ
+ソース・ファイルは、パッケージ・ツリーを反映したディレクトリ・ツリーに配置します。たとえば、すべてのソース・ファイルが\fI/workspace\fRにある場合、\fIcom\&.mysoft\&.mypack\&.MyClass\fRのソース・コードを、\fI/workspace/com/mysoft/mypack/MyClass\&.java\fRに格納します。
 .PP
-ǥեȤǤϡѥϡƥ饹եб륽եƱǥ쥯ȥ˳Ǽޤ\fI\-d\fRץѤơ̤νǥ쥯ȥǤޤ
-.SH "ץ"
+デフォルトでは、コンパイラは、各クラス・ファイルを対応するソース・ファイルと同じディレクトリに格納します。\fI\-d\fRオプションを使用して、別の出力先ディレクトリを指定できます。
+.SH "オプション"
 .PP
-ѥˤϡߤγȯĶǥݡȤɸ४ץΥåȤޤʳɸ४ץϡߤβۥޥ󤪤ӥѥμ˸ͭΥץǡ衢ѹǽޤɸ४ץϡ\fI\-X\fRץǻϤޤޤ
+コンパイラには、現在の開発環境でサポートされる標準オプションのセットがあります。これ以外の非標準オプションは、現在の仮想マシンおよびコンパイラの実装に固有のオプションで、将来、変更される可能性があります。非標準オプションは、\fI\-X\fRオプションで始まります。
 .sp
 .RS 4
 .ie n \{\
@@ -130,7 +130,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥ롦ץ򻲾ȤƤ
+クロスコンパイル・オプションを参照してください。
 .RE
 .sp
 .RS 4
@@ -141,230 +141,230 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ򻲾ȤƤ
+非標準オプションを参照してください。
 .RE
-.SS "ɸ४ץ"
+.SS "標準オプション"
 .PP
 \-A\fIkey\fR[\fI=value\fR]
 .RS 4
-ץåϤץꤷޤΥץϡ\fIjavac\fRľ᤹ܲΤǤϤʤ줾ΥץåǻѤǤ褦ˤʤޤ\fIkey\fRͤϡ1Ĥޤʣμ̻Ҥɥå(\&.)Ƕڤɬפޤ
+注釈プロセッサに渡すオプションを指定します。これらのオプションは、\fIjavac\fRが直接解釈するのではなく、それぞれのプロセッサで使用できるようになります。\fIkey\fRの値は、1つまたは複数の識別子をドット(\&.)で区切る必要があります。
 .RE
 .PP
 \-cp \fIpath\fR or \-classpath \fIpath\fR
 .RS 4
-桼饹ե롢(ץ)ץåȥե򸡺ꤷޤΥ饹ѥ\fICLASSPATH\fRĶѿΥ桼饹ѥ򥪡С饤ɤޤ\fICLASSPATH\fR\fI\-cp\fR\fI\-classpath\fRΤꤵƤʤ硢桼\fI饹ѥ\fRϡߤΥǥ쥯ȥˤʤޤSetting the Class Path 򻲾ȤƤ
+ユーザー・クラス・ファイル、および(オプションで)注釈プロセッサとソース・ファイルを検索する場所を指定します。このクラス・パスは\fICLASSPATH\fR環境変数のユーザー・クラス・パスをオーバーライドします。\fICLASSPATH\fR、\fI\-cp\fR、\fI\-classpath\fRのいずれも指定されていない場合、ユーザーの\fIクラス・パス\fRは、現在のディレクトリになります。Setting the Class Path を参照してください。
 .sp
-\fI\-sourcepath\fRץ󤬻ꤵƤʤ硢ե桼饹ѥ鸡ޤ
+\fI\-sourcepath\fRオプションが指定されていない場合、ソース・ファイルもユーザー・クラス・パスから検索されます。
 .sp
-\fI\-processorpath\fRץ󤬻ꤵƤʤ硢ץå⥯饹ѥ鸡ޤ
+\fI\-processorpath\fRオプションが指定されていない場合、注釈プロセッサもクラス・パスから検索されます。
 .RE
 .PP
 \-Djava\&.ext\&.dirs=\fIdirectories\fR
 .RS 4
-󥹥ȡѳĥǽΰ֤򥪡С饤ɤޤ
+インストール済拡張機能の位置をオーバーライドします。
 .RE
 .PP
 \-Djava\&.endorsed\&.dirs=\fIdirectories\fR
 .RS 4
-ǧ줿ɸѥΰ֤򥪡С饤ɤޤ
+承認された標準パスの位置をオーバーライドします。
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-饹եνǥ쥯ȥꤷޤΥǥ쥯ȥ\fIjavac\fRǤϺʤᡢǤ¸ߤƤɬפޤ饹ѥåΰǤ硢\fIjavac\fRϡѥå̾ȿǤ֥ǥ쥯ȥ˥饹եǼɬפ˱ƥǥ쥯ȥޤ
+クラス・ファイルの出力先ディレクトリを設定します。そのディレクトリは\fIjavac\fRでは作成されないため、すでに存在している必要があります。クラスがパッケージの一部である場合、\fIjavac\fRは、パッケージ名を反映したサブディレクトリ内にクラス・ファイルを格納し、必要に応じてディレクトリを作成します。
 .sp
 \fI\-d\fR
-\fI/home/myclasses\fRȻꤷ饹̾\fIcom\&.mypackage\&.MyClass\fRǤ硢饹ե\fI/home/myclasses/com/mypackage/MyClass\&.class\fRˤʤޤ
+\fI/home/myclasses\fRと指定し、クラスの名前が\fIcom\&.mypackage\&.MyClass\fRである場合、クラス・ファイルは\fI/home/myclasses/com/mypackage/MyClass\&.class\fRになります。
 .sp
-\fI\-d\fRץ󤬻ꤵʤä硢\fIjavac\fRϡƥ饹ե򡢤Ȥʤ륽եƱǥ쥯ȥ˳Ǽޤ
+\fI\-d\fRオプションが指定されなかった場合、\fIjavac\fRは、各クラス・ファイルを、その生成元となるソース・ファイルと同じディレクトリ内に格納します。
 .sp
-\fB:\fR
-\fI\-d\fRץˤäƻꤵ줿ǥ쥯ȥϡ桼饹ѥ˼ưŪɲäޤ
+\fB注意:\fR
+\fI\-d\fRオプションによって指定されたディレクトリは、ユーザー・クラス・パスに自動的に追加されません。
 .RE
 .PP
 \-deprecation
 .RS 4
-侩ΥСޤϥ饹ѤޤϥС饤ɤ뤿Ӥˡɽޤ\fI\-deprecation\fRץ󤬻ꤵƤʤ硢\fIjavac\fRϡ侩ΥСޤϥ饹ѤޤϥС饤ɤƤ륽եΥޥ꡼ɽޤ\fI\-deprecation\fRץϡ\fI\-Xlint:deprecation\fRξάɽǤ
+非推奨のメンバーまたはクラスが使用またはオーバーライドされるたびに、説明を表示します。\fI\-deprecation\fRオプションが指定されていない場合、\fIjavac\fRは、非推奨のメンバーまたはクラスを使用またはオーバーライドしているソース・ファイルのサマリーを表示します。\fI\-deprecation\fRオプションは、\fI\-Xlint:deprecation\fRの省略表記です。
 .RE
 .PP
 \-encoding \fIencoding\fR
 .RS 4
-եΥ󥳡ǥ̾(EUC\-JPUTF\-8ʤ)ꤷޤ\fI\-encoding\fRץ󤬻ꤵƤʤϡץåȥեΥǥեȡСѤޤ
+ソース・ファイルのエンコーディング名(EUC\-JPやUTF\-8など)を設定します。\fI\-encoding\fRオプションが指定されていない場合は、プラットフォームのデフォルト・コンバータが使用されます。
 .RE
 .PP
 \-endorseddirs \fIdirectories\fR
 .RS 4
-ǧ줿ɸѥΰ֤򥪡С饤ɤޤ
+承認された標準パスの位置をオーバーライドします。
 .RE
 .PP
 \-extdirs \fIdirectories\fR
 .RS 4
-\fIext\fRǥ쥯ȥΰ֤򥪡С饤ɤޤdirectoriesѿˤϡǶڤäǥ쥯ȥΥꥹȤꤷޤꤷǥ쥯ȥγJARե뤫顢饹ե뤬ޤФ줿٤ƤJARեϡ饹ѥΰˤʤޤ
+\fIext\fRディレクトリの位置をオーバーライドします。directories変数には、コロンで区切ったディレクトリのリストを指定します。指定したディレクトリ内の各JARファイルから、クラス・ファイルが検索されます。検出されたすべてのJARファイルは、クラス・パスの一部になります。
 .sp
-ѥ(ۤʤJavaץåȥե˼줿֡ȥȥåס饹ĥǽ饹ФƥѥԤ)¹Ԥ硢Υץˤϳĥǽ饹ޤǥ쥯ȥꤷޤܺ٤ϥѥ롦ץ򻲾ȤƤ
+クロスコンパイル(異なるJavaプラットフォームに実装されたブートストラップ・クラスや拡張機能クラスに対してコンパイルを行う)を実行する場合、このオプションには拡張機能クラスを含むディレクトリを指定します。詳細はクロスコンパイル・オプションを参照してください。
 .RE
 .PP
 \-g
 .RS 4
-ѿޤह٤ƤΥǥХåޤǥեȤǤϡֹ椪ӥեΤߤޤ
+ローカル変数を含むすべてのデバッグ情報を生成します。デフォルトでは、行番号およびソース・ファイル情報のみが生成されます。
 .RE
 .PP
 \-g:none
 .RS 4
-ǥХåޤ
+デバッグ情報を生成しません。
 .RE
 .PP
 \-g:[\fIkeyword list\fR]
 .RS 4
-ޤǶڤ줿ɡꥹȤˤꤵ줿μΥǥХåΤߤޤΥɤͭǤ
+カンマで区切られたキーワード・リストにより指定された、特定の種類のデバッグ情報のみを生成します。次のキーワードが有効です。
 .PP
 source
 .RS 4
-եΥǥХå
+ソース・ファイルのデバッグ情報。
 .RE
 .PP
 lines
 .RS 4
-ֹΥǥХå
+行番号のデバッグ情報。
 .RE
 .PP
 vars
 .RS 4
-ѿΥǥХå
+ローカル変数のデバッグ情報。
 .RE
 .RE
 .PP
 \-help
 .RS 4
-ɸ४ץγפϤޤ
+標準オプションの概要を出力します。
 .RE
 .PP
 \-implicit:[\fIclass, none\fR]
 .RS 4
-Ū˥ɤ줿եФ륯饹ե椷ޤ饹եưˤϡ\fI\-implicit:class\fRѤޤ饹եˤϡ\fI\-implicit:none\fRѤޤΥץ󤬻ꤵʤäΥǥեưϡ饹եμưˤʤޤξ硢Τ褦ʥ饹ե뤬줿¹Ԥȡѥ餫ٹȯԤޤ\fI\-implicit\fRץŪꤵ줿硢ٹȯԤޤ󡣷θ򻲾ȤƤ
+暗黙的にロードされたソース・ファイルに対するクラス・ファイルの生成を制御します。クラス・ファイルを自動生成するには、\fI\-implicit:class\fRを使用します。クラス・ファイルの生成を抑制するには、\fI\-implicit:none\fRを使用します。このオプションが指定されなかった場合のデフォルト動作は、クラス・ファイルの自動生成になります。その場合、そのようなクラス・ファイルが生成された時に注釈処理も実行されると、コンパイラから警告が発行されます。\fI\-implicit\fRオプションが明示的に設定された場合、警告は発行されません。型の検索を参照してください。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ(JVM)\fIoption\fRϤޤoptionˤϡJavaưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシン(JVM)に\fIoption\fRを渡します。optionには、Java起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .sp
-\fB:\fR
-\fICLASSPATH\fR\fI\-classpath\fR\fI\-bootclasspath\fR\fI\-extdirs\fRץϡ\fIjavac\fRμ¹Ԥ˻Ѥ륯饹ꤷޤ󡣤Υץ󤪤ѿѤƥѥμ򥫥ޥ褦Ȥȡꥹ⤯¿ξ硢ɬפʽ¹Ԥޤ󡣥ѥμ򥫥ޥɬפ硢\fI\-J\fRץѤơäȤʤJavaưġ˥ץϤޤ
+\fB注意:\fR
+\fICLASSPATH\fR、\fI\-classpath\fR、\fI\-bootclasspath\fRおよび\fI\-extdirs\fRオプションは、\fIjavac\fRの実行に使用されるクラスを指定しません。これらのオプションおよび変数を使用してコンパイラの実装をカスタマイズしようとすると、リスクが高く、多くの場合、必要な処理が実行されません。コンパイラの実装をカスタマイズする必要がある場合、\fI\-J\fRオプションを使用して、基礎となるJava起動ツールにオプションを渡します。
 .RE
 .PP
 \-nowarn
 .RS 4
-ٹå̵ˤޤΥץϡ\fI\-Xlint:none\fRץƱ褦ưޤ
+警告メッセージを無効にします。このオプションは、\fI\-Xlint:none\fRオプションと同じように動作します。
 .RE
 .PP
 \-parameters
 .RS 4
-ե쥯APIΥ᥽å\fIjava\&.lang\&.reflect\&.Executable\&.getParameters\fRǤ褦ˡ륯饹եΥ󥹥ȥ饯ȥ᥽åɤβѥ᡼̾Ǽޤ
+リフレクションAPIのメソッド\fIjava\&.lang\&.reflect\&.Executable\&.getParameters\fRが取得できるように、生成されるクラス・ファイル内のコンストラクタとメソッドの仮パラメータ名を格納します。
 .RE
 .PP
 \-proc: [\fInone\fR, \fIonly\fR]
 .RS 4
-ӥѥ¹Ԥ뤫椷ޤ\fI\-proc:none\fRϡʤǥѥ뤬¹Ԥ뤳Ȥ̣ޤ\fI\-proc:only\fRϡΤߤ¹Ԥ졢³ΥѥϤޤä¹ԤʤȤ̣ޤ
+注釈処理およびコンパイルを実行するかを制御します。\fI\-proc:none\fRは、注釈処理なしでコンパイルが実行されることを意味します。\fI\-proc:only\fRは、注釈処理のみが実行され、後続のコンパイルはまったく実行されないことを意味します。
 .RE
 .PP
 \-processor \fIclass1\fR [,\fIclass2\fR,\fIclass3\fR\&.\&.\&.]
 .RS 4
-¹Ԥץå̾ꤷ硢ǥեȤθϾάޤ
+実行する注釈プロセッサの名前。これを指定した場合、デフォルトの検索処理は省略されます。
 .RE
 .PP
 \-processorpath \fIpath\fR
 .RS 4
-ץå򸡺ꤷޤΥץ󤬻Ѥʤ硢饹ѥΥץåޤ
+注釈プロセッサを検索する場所を指定します。このオプションが使用されない場合、クラス・パスのプロセッサが検索されます。
 .RE
 .PP
 \-s \fIdir\fR
 .RS 4
-줿եγǼȤʤǥ쥯ȥꤷޤΥǥ쥯ȥ\fIjavac\fRǤϺʤᡢǤ¸ߤƤɬפޤ饹ѥåΰǤ硢ѥϡѥå̾ȿǤ֥ǥ쥯ȥ˥եǼɬפ˱ƥǥ쥯ȥޤ
+生成されたソース・ファイルの格納先となるディレクトリを指定します。そのディレクトリは\fIjavac\fRでは作成されないため、すでに存在している必要があります。クラスがパッケージの一部である場合、コンパイラは、パッケージ名を反映したサブディレクトリ内にソース・ファイルを格納し、必要に応じてディレクトリを作成します。
 .sp
-\fI\-s /home/mysrc\fRȻꤷ饹̾\fIcom\&.mypackage\&.MyClass\fRǤ硢ե\fI/home/mysrc/com/mypackage/MyClass\&.java\fR˳Ǽޤ
+\fI\-s /home/mysrc\fRと指定し、クラスの名前が\fIcom\&.mypackage\&.MyClass\fRである場合、ソース・ファイルは\fI/home/mysrc/com/mypackage/MyClass\&.java\fRに格納されます。
 .RE
 .PP
 \-source \fIrelease\fR
 .RS 4
-դ륽ɤΥСꤷޤ\fIrelease\fRˤϼͤǤޤ
+受け付けるソース・コードのバージョンを指定します。\fIrelease\fRには次の値を指定できます。
 .PP
 1\&.3
 .RS 4
-ΥѥǤϡJava SE 1\&.3ʹߤƳ줿Τޤ¾θ쵡ǽ򥵥ݡȤޤ
+このコンパイラでは、Java SE 1\&.3以降に導入されたアサーション、総称または他の言語機能をサポートしません。
 .RE
 .PP
 1\&.4
 .RS 4
-Java SE 1\&.4Ƴ줿ޤॳɤդޤ
+Java SE 1\&.4で導入された、アサーションを含むコードを受け付けます。
 .RE
 .PP
 1\&.5
 .RS 4
-Java SE 5Ƴ줿Τ¾θ쵡ǽޤɤդޤ
+Java SE 5で導入された総称および他の言語機能を含んだコードを受け付けます。
 .RE
 .PP
 5
 .RS 4
-1\&.5ƱǤ
+1\&.5と同義です。
 .RE
 .PP
 1\&.6
 .RS 4
-Java SE 6ǤϸФѹƳޤǤեΥ󥳡ǥ󥰡顼Java Platform, Standard EditionΰΥ꡼褦ʷٹǤϤʤ顼Ȥ𤵤褦ˤʤޤ
+Java SE 6では言語に対する変更は導入されませんでした。しかし、ソース・ファイル内のエンコーディング・エラーが、Java Platform, Standard Editionの以前のリリースような警告ではなく、エラーとして報告されるようになりました。
 .RE
 .PP
 6
 .RS 4
-1\&.6ƱǤ
+1\&.6と同義です。
 .RE
 .PP
 1\&.7
 .RS 4
-줬ǥեͤǤJava SE 7Ƴ줿ǽޤॳɤդޤ
+これがデフォルト値です。Java SE 7で導入された機能を含むコードを受け付けます。
 .RE
 .PP
 7
 .RS 4
-1\&.7ƱǤ
+1\&.7と同義です。
 .RE
 .RE
 .PP
 \-sourcepath \fIsourcepath\fR
 .RS 4
-饹ޤϥ󥿥ե򸡺륽ɡѥꤷޤ桼饹ѥƱͤˡѥΥȥϡOracle SolarisǤϥ(:)ǡWindowsǤϥߥǶڤꡢˤϡǥ쥯ȥꡢJAR֤ޤZIP֤ǤޤѥåѤƤϡǥ쥯ȥޤϥΥ롦ѥ̾ѥå̾ȿǤƤɬפޤ
+クラスまたはインタフェースの定義を検索するソース・コード・パスを指定します。ユーザー・クラス・パスと同様に、ソース・パスのエントリは、Oracle Solarisではコロン(:)で、Windowsではセミコロンで区切り、ここには、ディレクトリ、JARアーカイブまたはZIPアーカイブを指定できます。パッケージを使用している場合は、ディレクトリまたはアーカイブ内のローカル・パス名がパッケージ名を反映している必要があります。
 .sp
-\fB:\fR
-ե⸫Ĥä硢饹ѥˤ긫Ĥä饹Ϻƥѥ뤵ǽޤθ򻲾ȤƤ
+\fB注意:\fR
+ソース・ファイルも見つかった場合、クラス・パスにより見つかったクラスは再コンパイルされる可能性があります。型の検索を参照してください。
 .RE
 .PP
 \-verbose
 .RS 4
-ɤ륯饹ӥѥ뤵륽ե뤴Ȥξ󤬽Ϥ롢ܺٽϤѤޤ
+ロードされるクラスおよびコンパイルされるソース・ファイルごとの情報が出力される、詳細出力を使用します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-werror
 .RS 4
-ٹȯ˥ѥλޤ
+警告が発生した場合にコンパイルを終了します。
 .RE
 .PP
 \-X
 .RS 4
-ɸ४ץ˴ؤɽƽλޤ
+非標準オプションに関する情報を表示して終了します。
 .RE
-.SS "ѥ롦ץ"
+.SS "クロスコンパイル・オプション"
 .PP
-ǥեȤǤϡ饹Υѥϡ\fIjavac\fRźդƤץåȥեΥ֡ȥȥåס饹ӳĥǽ饹ФƹԤޤ\fIjavac\fRϡۤʤJavaץåȥե˼줿֡ȥȥåס饹ӳĥǽ饹ФƥѥԤѥ⥵ݡȤƤޤѥԤϡ\fI\-bootclasspath\fR\fI\-extdirs\fRץѤ뤳ȤפǤ
+デフォルトでは、クラスのコンパイルは、\fIjavac\fRが添付されているプラットフォームのブートストラップ・クラスおよび拡張機能クラスに対して行われます。ただし、\fIjavac\fRは、異なるJavaプラットフォームに実装されたブートストラップ・クラスおよび拡張機能クラスに対してコンパイルを行うクロスコンパイルもサポートしています。クロスコンパイルを行う場合は、\fI\-bootclasspath\fRおよび\fI\-extdirs\fRオプションを使用することが重要です。
 .PP
 \-target \fIversion\fR
 .RS 4
-ۥޥλꤵ줿꡼оݤȤ륯饹եޤ饹եϡꤵ줿åȰʹߤΥ꡼ǤưޤΥ꡼JVMǤưޤͭʥåȤϡ1\&.11\&.21\&.31\&.41\&.5 (5)1\&.6 (6)1\&.7 (7)Ǥ
+仮想マシンの指定されたリリースを対象とするクラス・ファイルを生成します。クラス・ファイルは、指定されたターゲット以降のリリースでは動作しますが、それより前のリリースのJVMでは動作しません。有効なターゲットは、1\&.1、1\&.2、1\&.3、1\&.4、1\&.5 (5も可)、1\&.6 (6も可)および1\&.7 (7も可)です。
 .sp
-\fI\-target\fRץΥǥեȤϡ\fI\-source\fRץͤˤäưۤʤޤ
+\fI\-target\fRオプションのデフォルトは、\fI\-source\fRオプションの値によって異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -374,7 +374,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ󤬻ꤵƤʤ硢\fI\-target\fRץͤ1\&.7Ǥ
+\fI\-source\fRオプションが指定されていない場合、\fI\-target\fRオプションの値は1\&.7です。
 .RE
 .sp
 .RS 4
@@ -385,7 +385,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.2ξ硢\fI\-target\fRץͤ1\&.4Ǥ
+\fI\-source\fRオプションが1\&.2の場合、\fI\-target\fRオプションの値は1\&.4です。
 .RE
 .sp
 .RS 4
@@ -396,7 +396,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.3ξ硢\fI\-target\fRץͤ1\&.4Ǥ
+\fI\-source\fRオプションが1\&.3の場合、\fI\-target\fRオプションの値は1\&.4です。
 .RE
 .sp
 .RS 4
@@ -407,7 +407,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.5ξ硢\fI\-target\fRץͤ1\&.7Ǥ
+\fI\-source\fRオプションが1\&.5の場合、\fI\-target\fRオプションの値は1\&.7です。
 .RE
 .sp
 .RS 4
@@ -418,7 +418,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.6ξ硢\fI\-target\fRץͤ1\&.7Ǥ
+\fI\-source\fRオプションが1\&.6の場合、\fI\-target\fRオプションの値は1\&.7です。
 .RE
 .sp
 .RS 4
@@ -429,23 +429,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ¾Τ٤Ƥͤξ硢\fI\-target\fRץͤϡ\fI\-source\fRץͤˤʤޤ
+\fI\-source\fRオプションの他のすべての値の場合、\fI\-target\fRオプションの値は、\fI\-source\fRオプションの値になります。
 .RE
 .RE
 .PP
 \-bootclasspath \fIbootclasspath\fR
 .RS 4
-ꤵ줿ϢΥ֡ȡ饹ФƥѥԤޤ桼饹ѥƱͤˡ֡ȡ饹ѥΥȥϥ(:)Ƕڤꡢˤϡǥ쥯ȥꡢJAR֤ޤZIP֤Ǥޤ
+指定された一連のブート・クラスに対してクロスコンパイルを行います。ユーザー・クラス・パスと同様に、ブート・クラス・パスのエントリはコロン(:)で区切り、ここには、ディレクトリ、JARアーカイブまたはZIPアーカイブを指定できます。
 .RE
-.SS "ѥȡץե롦ץ"
+.SS "コンパクト・プロファイル・オプション"
 .PP
-JDK 8ʹߤ顢\fIjavac\fRѥϥѥȡץե򥵥ݡȤޤѥȡץեѤȡJavaץåȥեΤɬפȤʤץꥱϡǥץǽǡեåȥץȤǼ¹ԤǤޤѥȡץե뵡ǽϡץꥱ󡦥ȥΥץꥱΥɻ֤ṳ̂Τ˻ѤǤޤεǽϡJREХɥ뤹JavaץꥱΡꥳѥȤʥǥץȤΩޤεǽϡǥХǤΩޤ
+JDK 8以降から、\fIjavac\fRコンパイラはコンパクト・プロファイルをサポートします。コンパクト・プロファイルを使用すると、Javaプラットフォーム全体を必要としないアプリケーションは、デプロイ可能で、小さいフットプリントで実行できます。コンパクト・プロファイル機能は、アプリケーション・ストアからのアプリケーションのダウンロード時間を短縮するのに使用できます。この機能は、JREをバンドルするJavaアプリケーションの、よりコンパクトなデプロイメントに役立ちます。この機能は、小さいデバイスでも役立ちます。
 .PP
-ݡȤƤץեͤϡ\fIcompact1\fR\fIcompact2\fR\fIcompact3\fRǤϡɲäΥ쥤䡼Ǥ礭ֹγƥѥȡץեˤϡֹ̾ΥץեΤ٤ƤAPIޤޤޤ
+サポートされているプロファイル値は、\fIcompact1\fR、\fIcompact2\fRおよび\fIcompact3\fRです。これらは、追加のレイヤーです。大きい番号の各コンパクト・プロファイルには、小さい番号の名前のプロファイル内のすべてのAPIが含まれます。
 .PP
 \-profile
 .RS 4
-ѥȡץեѤ硢Υץϡѥ˥ץե̾ꤷޤ򼨤ޤ
+コンパクト・プロファイルを使用する場合、このオプションは、コンパイル時にプロファイル名を指定します。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -456,7 +456,7 @@
 .if n \{\
 .RE
 .\}
-javacϡꤵ줿ץեˤʤǤդJava SE APIѤ륽ɤ򥳥ѥ뤷ޤ󡣤ϡΤ褦ʥɤ򥳥ѥ뤷褦Ȥ뤳Ȥˤä륨顼åǤ
+javacは、指定されたプロファイルにない任意のJava SE APIを使用するソース・コードをコンパイルしません。これは、そのようなソース・コードをコンパイルしようとすることによって生じるエラー・メッセージの例です。
 .sp
 .if n \{\
 .RS 4
@@ -470,32 +470,32 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ\fIApplet\fR饹Ѥʤ褦˥ѹ뤳Ȥˤäơ顼Ǥޤ\-profileץꤻ˥ѥ뤹뤳Ȥˤäơ顼뤳ȤǤޤѥϡJava SE APIδʥåȤФƼ¹Ԥޤ(ɤΥѥȡץեˤ⡢\fIApplet\fR饹ϴޤޤƤޤ)
+この例では、\fIApplet\fRクラスを使用しないようにソースを変更することによって、エラーを修正できます。\-profileオプションを指定せずにコンパイルすることによって、エラーを修正することもできます。コンパイルは、Java SE APIの完全なセットに対して実行されます。(どのコンパクト・プロファイルにも、\fIApplet\fRクラスは含まれていません。)
 .sp
-ѥȡץեѤƥѥ뤹뤿̤ˡȤơ\fI\-bootclasspath\fRץѤơץեΥ᡼ꤹ\fIrt\&.jar\fRեؤΥѥꤷޤ\fI\-profile\fRץѤȡץե롦᡼ϡѥ˥ƥ¸ߤɬפޤ󡣤ϡѥΩޤ
+コンパクト・プロファイルを使用してコンパイルするための別の方法として、\fI\-bootclasspath\fRオプションを使用して、プロファイルのイメージを指定する\fIrt\&.jar\fRファイルへのパスを指定します。かわりに\fI\-profile\fRオプションを使用すると、プロファイル・イメージは、コンパイル時にシステム上に存在する必要がありません。これは、クロスコンパイル時に役立ちます。
 .RE
-.SS "ɸ४ץ"
+.SS "非標準オプション"
 .PP
 \-Xbootclasspath/p:\fIpath\fR
 .RS 4
-֡ȥȥåס饹ѥɲäޤ
+ブートストラップ・クラス・パスに接尾辞を追加します。
 .RE
 .PP
 \-Xbootclasspath/a:\fIpath\fR
 .RS 4
-֡ȥȥåס饹ѥƬɲäޤ
+ブートストラップ・クラス・パスに接頭辞を追加します。
 .RE
 .PP
 \-Xbootclasspath/:\fIpath\fR
 .RS 4
-֡ȥȥåס饹եΰ֤򥪡С饤ɤޤ
+ブートストラップ・クラス・ファイルの位置をオーバーライドします。
 .RE
 .PP
 \-Xdoclint:[\-]\fIgroup\fR [\fI/access\fR]
 .RS 4
-\fIgroup\fRͤ\fIaccessibility\fR\fIsyntax\fR\fIreference\fR\fIhtml\fRޤ\fImissing\fRΤ줫ǤΥå롼פͭޤ̵ˤޤΥå롼פξܺ٤ϡ\fIjavadoc\fRޥɤ\fI\-Xdoclint\fRץ򻲾ȤƤ\fI\-Xdoclint\fRץϡ\fIjavac\fRޥɤǤϥǥեȤ̵ˤʤޤ
+\fIgroup\fRの値が\fIaccessibility\fR、\fIsyntax\fR、\fIreference\fR、\fIhtml\fRまたは\fImissing\fRのいずれかである特定のチェック・グループを有効または無効にします。これらのチェック・グループの詳細は、\fIjavadoc\fRコマンドの\fI\-Xdoclint\fRオプションを参照してください。\fI\-Xdoclint\fRオプションは、\fIjavac\fRコマンドではデフォルトで無効になります。
 .sp
-ѿ\fIaccess\fRϡ\fI\-Xdoclint\fRץ󤬥å륯饹ȥСκǾβĻ٥ꤷޤ\fIpublic\fR\fIprotected\fR\fIpackage\fR\fIprivate\fR(Ļι⤤)1ĤĤȤǤޤȤСΥץϡ(protectedpackagepublicޤ) protectedʾΥ٥ĥ饹ӥС(٤ƤΥå롼פ)åޤ
+変数\fIaccess\fRは、\fI\-Xdoclint\fRオプションがチェックするクラスとメンバーの最小の可視性レベルを指定します。\fIpublic\fR、\fIprotected\fR、\fIpackage\fRおよび\fIprivate\fRの値(可視性の高い順)の1つを持つことができます。たとえば、次のオプションは、(protected、package、publicを含む) protected以上のアクセス・レベルを持つクラスおよびメンバーを(すべてのチェック・グループで)チェックします。
 .sp
 .if n \{\
 .RS 4
@@ -506,7 +506,7 @@
 .if n \{\
 .RE
 .\}
-ΥץϡpackageʾΥ(packagepublicޤ)ĥ饹ӥСФHTML顼åʤȤ٤ƤΥ٥ФƤ٤ƤΥå롼פͭˤޤ
+次のオプションは、package以上のアクセス権(packageおよびpublicを含む)を持つクラスおよびメンバーに対するHTMLエラーをチェックしないことを除き、すべてのアクセス・レベルに対してすべてのチェック・グループを有効にします。
 .sp
 .if n \{\
 .RS 4
@@ -521,103 +521,103 @@
 .PP
 \-Xdoclint:none
 .RS 4
-٤ƤΥå롼פ̵ˤޤ
+すべてのチェック・グループを無効にします。
 .RE
 .PP
 \-Xdoclint:all[\fI/access\fR]
 .RS 4
-٤ƤΥå롼פͭˤޤ
+すべてのチェック・グループを有効にします。
 .RE
 .PP
 \-Xlint
 .RS 4
-侩뤹٤ƤηٹͭˤޤΥ꡼ǤϡѲǽʤ٤Ƥηٹͭˤ뤳Ȥᤷޤ
+推奨されるすべての警告を有効にします。このリリースでは、利用可能なすべての警告を有効にすることをお薦めします。
 .RE
 .PP
 \-Xlint:all
 .RS 4
-侩뤹٤ƤηٹͭˤޤΥ꡼ǤϡѲǽʤ٤Ƥηٹͭˤ뤳Ȥᤷޤ
+推奨されるすべての警告を有効にします。このリリースでは、利用可能なすべての警告を有効にすることをお薦めします。
 .RE
 .PP
 \-Xlint:none
 .RS 4
-٤Ƥηٹ̵ˤޤ
+すべての警告を無効にします。
 .RE
 .PP
 \-Xlint:\fIname\fR
 .RS 4
-ٹ̵̾ˤޤΥץ̵ˤǤٹΥꥹȤϡ\-XlintץѤٹͭޤ̵򻲾ȤƤ
+警告名を無効にします。このオプションで無効にできる警告のリストは、\-Xlintオプションを使用した警告の有効化または無効化を参照してください。
 .RE
 .PP
 \-Xlint:\fI\-name\fR
 .RS 4
-ٹ̵̾ˤޤΥץ̵ˤǤٹΥꥹȤˤϡ\-XlintץѤٹͭޤ̵\-Xlint\fIץѤ\fR򻲾ȤƤ
+警告名を無効にします。このオプションで無効にできる警告のリストを取得するには、\-Xlintオプションを使用した警告の有効化または無効化\-Xlint\fIオプションを使用した\fRを参照してください。
 .RE
 .PP
 \-Xmaxerrs \fInumber\fR
 .RS 4
-륨顼κꤷޤ
+印刷するエラーの最大数を設定します。
 .RE
 .PP
 \-Xmaxwarns \fInumber\fR
 .RS 4
-ٹκꤷޤ
+印刷する警告の最大数を設定します。
 .RE
 .PP
 \-Xstdout \fIfilename\fR
 .RS 4
-ѥΥå򡢻ꤵ줿եޤǥեȤǤϡѥΥå\fISystem\&.err\fRޤ
+コンパイラのメッセージを、指定されたファイルに送信します。デフォルトでは、コンパイラのメッセージは\fISystem\&.err\fRに送られます。
 .RE
 .PP
 \-Xprefer:[\fInewer,source\fR]
 .RS 4
-뷿Фƥեȥ饹եξĤä硢ΤɤΥեɤ߼뤫ꤷޤ(θ򻲾ȤƤ)\fI\-Xprefer:newer\fRץѤ硢뷿Ф륽եȥ饹եΤɤ߼ޤ(ǥե)\fI\-Xprefer:source\fRץѤ硢ե뤬ɤ߼ޤ\fISOURCE\fR¸ݥꥷѤ줿ǤդץåǤ褦ˤϡ\fI\-Xprefer:source\fRѤƤ
+ある型に対してソース・ファイルとクラス・ファイルの両方が見つかった場合、そのどちらのファイルを読み取るかを指定します。(型の検索を参照してください)。\fI\-Xprefer:newer\fRオプションを使用した場合、ある型に対するソース・ファイルとクラス・ファイルのうち新しい方が読み取られます(デフォルト)。\fI\-Xprefer:source\fRオプションを使用した場合、ソース・ファイルが読み取られます。\fISOURCE\fRの保存ポリシーを使用して宣言された注釈に任意の注釈プロセッサがアクセスできるようにする場合は、\fI\-Xprefer:source\fRを使用してください。
 .RE
 .PP
 \-Xpkginfo:[\fIalways\fR,\fIlegacy\fR,\fInonempty\fR]
 .RS 4
-javacpackage\-info\&.javaե뤫\fIpackage\-info\&.class\fRե뤫ɤ椷ޤΥץǻѲǽmodeϼΤȤǤ
+javacがpackage\-info\&.javaファイルから\fIpackage\-info\&.class\fRファイルを生成するかどうかを制御します。このオプションで使用可能なmode引数は次のとおりです。
 .PP
 always
 .RS 4
-٤Ƥ\fIpackage\-info\&.java\fRե\fIpackage\-info\&.class\fRեޤΥץϡ\fI\&.java\fRեб\fI\&.class\fRե뤬뤳ȤǧAntʤɤΥӥɡƥѤΩĤȤޤ
+すべての\fIpackage\-info\&.java\fRファイルの\fIpackage\-info\&.class\fRファイルを常に生成します。このオプションは、各\fI\&.java\fRファイルに対応する\fI\&.class\fRファイルがあることを確認するAntなどのビルド・システムを使用する場合に役立つことがあります。
 .RE
 .PP
 legacy
 .RS 4
-package\-info\&.java᤬ޤޤˤΤ\fIpackage\-info\&.class\fRեޤpackage\-info\&.java˥ȤΤߴޤޤ\fIpackage\-info\&.class\fRեޤ
+package\-info\&.javaに注釈が含まれる場合にのみ\fIpackage\-info\&.class\fRファイルを生成します。package\-info\&.javaにコメントのみ含まれる場合に\fIpackage\-info\&.class\fRファイルを生成しません。
 .sp
-\fB:\fR
-\fIpackage\-info\&.class\fRեǤޤpackage\-info\&.javaեΤ٤Ƥ\fIRetentionPolicy\&.SOURCE\fR϶ˤʤޤ
+\fB注意:\fR
+\fIpackage\-info\&.class\fRファイルは生成できますが、package\-info\&.javaファイル内のすべての注釈に\fIRetentionPolicy\&.SOURCE\fRがある場合は空になります。
 .RE
 .PP
 nonempty
 .RS 4
-package\-info\&.java\fIRetentionPolicy\&.CLASS\fRޤ\fIRetentionPolicy\&.RUNTIME\fRȤȤ᤬ޤޤˤΤ\fIpackage\-info\&.class\fRեޤ
+package\-info\&.javaに\fIRetentionPolicy\&.CLASS\fRまたは\fIRetentionPolicy\&.RUNTIME\fRとともに注釈が含まれる場合にのみ\fIpackage\-info\&.class\fRファイルを生成します。
 .RE
 .RE
 .PP
 \-Xprint
 .RS 4
-ǥХåŪǻꤷΥƥɽϤޤ⥳ѥ¹Ԥޤ󡣽Ϸѹǽޤ
+デバッグ目的で指定した型のテキスト表示を出力します。注釈処理もコンパイルも実行されません。出力形式は変更される可能性があります。
 .RE
 .PP
 \-XprintProcessorInfo
 .RS 4
-ΥץåꤵƤ˴ؤϤޤ
+ある特定のプロセッサが処理を依頼されている注釈に関する情報を出力します。
 .RE
 .PP
 \-XprintRounds
 .RS 4
-󤪤Ӹ³饦ɤ˴ؤϤޤ
+初回および後続の注釈処理ラウンドに関する情報を出力します。
 .RE
-.SH "-XLINTץѤٹͭޤ̵"
+.SH "-XLINTオプションを使用した警告の有効化または無効化"
 .PP
-\fI\-Xlint:name\fRץѤƷٹ\fIname\fRͭˤޤǡ\fIname\fRϼηٹ̾Τ줫ˤʤޤ\fI\-Xlint:\-name:\fRץѤơٹ̵Ǥޤ
+\fI\-Xlint:name\fRオプションを使用して警告\fIname\fRを有効にします。ここで、\fIname\fRは次の警告名のいずれかになります。\fI\-Xlint:\-name:\fRオプションを使用して、警告を無効化できます。
 .PP
 cast
 .RS 4
-פǾĹʥ㥹ȤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+不要で冗長なキャストについて警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -632,12 +632,12 @@
 .PP
 classfile
 .RS 4
-饹եƤ˴ϢˤĤƷٹ𤷤ޤ
+クラス・ファイルの内容に関連した問題について警告します。
 .RE
 .PP
 deprecation
 .RS 4
-侩ιܤλѤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+非推奨の項目の使用について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -649,13 +649,13 @@
 .if n \{\
 .RE
 .\}
-᥽å\fIjava\&.util\&.Date\&.getDay\fRJDK 1\&.1ʹߤ侩ˤʤޤ
+メソッド\fIjava\&.util\&.Date\&.getDay\fRはJDK 1\&.1以降は非推奨になりました。
 .RE
 .PP
 dep\-ann
 .RS 4
 \fI@deprecated\fR
-JavadocȤǥɥȲƤ뤬\fI@Deprecated\fR᤬դƤʤܤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+Javadocコメントでドキュメント化されているが、\fI@Deprecated\fR注釈が付いていない項目について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -674,7 +674,7 @@
 .PP
 divzero
 .RS 4
-0ǽ뤳ȤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+定整数0で除算されることについて警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -689,7 +689,7 @@
 .PP
 empty
 .RS 4
-\fIif \fRʸʹߤʸǤ뤳ȤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+\fIif \fR文以降が空の文であることについて警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -708,7 +708,7 @@
 .PP
 fallthrough
 .RS 4
-fall\-throughswitch֥ååФ줿ΤФƷٹåɽޤFall\-throughϡswitch֥åκǸΥǤΥɤˤbreakʸϴޤޤޤ󡣥ɤμ¹Ԥ򤽤Υ鼡ΥذưޤȤСswitch֥åcase 1٥³ɤϡbreakʸǽäƤޤ
+fall\-throughケースのswitchブロックをチェックし、検出されたものに対して警告メッセージを表示します。Fall\-throughケースは、switchブロック内の最後のケースを除くケースです。このコードにはbreak文は含まれません。コードの実行をそのケースから次のケースへ移動します。たとえば、このswitchブロック内のcase 1ラベルに続くコードは、break文で終わっていません。
 .sp
 .if n \{\
 .RS 4
@@ -725,12 +725,12 @@
 .if n \{\
 .RE
 .\}
-ΥɤΥѥ\fI\-Xlint:fallthrough\fRץ󤬻ѤƤ硢ѥϡˤʤäƤ륱ιֹȤȤˡcasefall\-throughǽ뤳Ȥ򼨤ٹȯԤޤ
+このコードのコンパイル時に\fI\-Xlint:fallthrough\fRオプションが使用されていた場合、コンパイラは、問題になっているケースの行番号とともに、caseにfall\-throughする可能性があることを示す警告を発行します。
 .RE
 .PP
 finally
 .RS 4
-˴λǤʤ\fIfinally\fRˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+正常に完了できない\fIfinally\fR句について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -750,17 +750,17 @@
 .if n \{\
 .RE
 .\}
-Ǥϡѥ\fIfinally\fR֥å˴ؤٹޤ\fIint\fR᥽åɤƤӽФȡ0֤ޤ\fIfinally\fR֥åϡ\fItry\fR֥åλȼ¹ԤޤǤϡ椬\fIcatch\fR֥å˰ܤ줿硢\fIint\fR᥽åɤϽλޤ\fIfinally\fR֥åϼ¹Ԥɬפ뤿ᡢ椬᥽åɤγ˰ܤƤƤ⡢Υ֥åϼ¹Ԥޤ
+この例では、コンパイラは\fIfinally\fRブロックに関する警告を生成します。\fIint\fRメソッドが呼び出されると、値0が返されます。\fIfinally\fRブロックは、\fItry\fRブロックが終了すると実行されます。この例では、制御が\fIcatch\fRブロックに移された場合、\fIint\fRメソッドは終了します。ただし、\fIfinally\fRブロックは実行される必要があるため、制御がメソッドの外部に移されていても、このブロックは実行されます。
 .RE
 .PP
 options
 .RS 4
-ޥɥ饤󡦥ץλѤ˴ؤˤĤƷٹ𤷤ޤѥ롦ץ򻲾ȤƤ
+コマンドライン・オプションの使用に関する問題について警告します。クロスコンパイル・オプションを参照してください。
 .RE
 .PP
 overrides
 .RS 4
-᥽åɤΥС饤ɤ˴ؤˤĤƷٹ𤷤ޤȤС2ĤΥ饹Ȥޤ
+メソッドのオーバーライドに関する問題について警告します。たとえば、次の2つのクラスがあるとします。
 .sp
 .if n \{\
 .RS 4
@@ -778,7 +778,7 @@
 .if n \{\
 .RE
 .\}
-ѥϡΤ褦ʷٹޤ
+コンパイラは、次のような警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -791,12 +791,12 @@
 .if n \{\
 .RE
 .\}
-ѥϡ\fIvarargs\fR᥽åɤ򸡽Фȡ\fIvarargs\fRβѥ᡼Ѵޤ᥽å\fIClassWithVarargsMethod\&.varargsMethod\fRǤϡѥ\fIvarargs\fRβѥ᡼\fIString\&.\&.\&. s\fR򲾥ѥ᡼\fIString[] s\fRѴޤϡ᥽å\fIClassWithOverridingMethod\&.varargsMethod\fRβѥ᡼бǤη̡Ǥϥѥ뤬Ԥޤ
+コンパイラは、\fIvarargs\fRメソッドを検出すると、\fIvarargs\fRの仮パラメータを配列に変換します。メソッド\fIClassWithVarargsMethod\&.varargsMethod\fRでは、コンパイラは\fIvarargs\fRの仮パラメータ\fIString\&.\&.\&. s\fRを仮パラメータ\fIString[] s\fRに変換します。これは、メソッド\fIClassWithOverridingMethod\&.varargsMethod\fRの仮パラメータに対応する配列です。その結果、この例ではコンパイルが行われます。
 .RE
 .PP
 path
 .RS 4
-ޥɥ饤Ǥ̵ʥѥǤ¸ߤʤѥǥ쥯ȥˤĤƷٹ𤷤ޤ(饹ѥѥʤɤΥѥϢ)Τ褦ʷٹ\fI@SuppressWarnings\fR뤳ȤϤǤޤ󡣤ȤСΤ褦ˤʤޤ
+コマンドラインでの無効なパス要素と存在しないパス・ディレクトリについて警告します(クラス・パス、ソース・パスなどのパス関連)。このような警告を\fI@SuppressWarnings\fR注釈で抑制することはできません。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -811,9 +811,9 @@
 .PP
 processing
 .RS 4
-˴ؤˤĤƷٹ𤷤ޤѥ餬ηٹΤϡޤ९饹ȤˡѤƤץåǤΥפ㳰ǤʤǤȤСñץå򼡤˼ޤ
+注釈処理に関する問題について警告します。コンパイラがこの警告を生成するのは、注釈を含むクラスがあるときに、使用している注釈プロセッサでそのタイプの例外を処理できない場合です。たとえば、単純な注釈プロセッサを次に示します。
 .sp
-\fBեAnnocProc\&.java\fR:
+\fBソース・ファイルAnnocProc\&.java\fR:
 .sp
 .if n \{\
 .RS 4
@@ -838,7 +838,7 @@
 .if n \{\
 .RE
 .\}
-\fBեAnnosWithoutProcessors\&.java\fR:
+\fBソース・ファイルAnnosWithoutProcessors\&.java\fR:
 .sp
 .if n \{\
 .RS 4
@@ -852,7 +852,7 @@
 .if n \{\
 .RE
 .\}
-Υޥɤϡץå\fIAnnoProc\fR򥳥ѥ뤷ץå򥽡ե\fIAnnosWithoutProcessors\&.java\fRФƼ¹Ԥޤ
+次のコマンドは、注釈プロセッサ\fIAnnoProc\fRをコンパイルし、この注釈プロセッサをソース・ファイル\fIAnnosWithoutProcessors\&.java\fRに対して実行します。
 .sp
 .if n \{\
 .RS 4
@@ -864,7 +864,7 @@
 .if n \{\
 .RE
 .\}
-ѥ餬ե\fIAnnosWithoutProcessors\&.java\fRФץå¹Ԥȡηٹޤ
+コンパイラがソース・ファイル\fIAnnosWithoutProcessors\&.java\fRに対して注釈プロセッサを実行すると、次の警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -876,12 +876,12 @@
 .if n \{\
 .RE
 .\}
-褹뤿ˡ饹\fIAnnosWithoutProcessors\fRӻѤ̾\fIAnno\fR\fINotAnno\fRѹǤޤ
+この問題を解決するために、クラス\fIAnnosWithoutProcessors\fRで定義および使用される注釈の名前を、\fIAnno\fRから\fINotAnno\fRに変更できます。
 .RE
 .PP
 rawtypes
 .RS 4
-rawФ̤ˤĤƷٹ𤷤ޤʸǤϡ\fIrawtypes\fRٹޤ
+raw型に対する未検査操作について警告します。次の文では、\fIrawtypes\fR警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -892,7 +892,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ\fIrawtypes\fRٹޤ
+次の例では、\fIrawtypes\fR警告は生成されません。
 .sp
 .if n \{\
 .RS 4
@@ -903,12 +903,12 @@
 .if n \{\
 .RE
 .\}
-\fIList\fRrawǤ\fIList<?>\fRϡХɷΥ磻ɥɤΥѥ᡼줿Ǥ\fIList\fRϥѥ᡼줿󥿥եǤ뤿ᡢˤηꤷޤǤϡ\fIList\fRβϥХɷΥ磻ɥ(\fI?\fR)ѤƤβѥ᡼ȤƻꤵޤĤޤꡢ\fIcountElements\fR᥽åɤ\fIList\fR󥿥եΤɤΥ󥹥󥹲դ뤳ȤǤޤ
+\fIList\fRはraw型です。ただし、\fIList<?>\fRは、アンバウンド形式のワイルドカードのパラメータ化された型です。\fIList\fRはパラメータ化されたインタフェースであるため、常にその型引数を指定します。この例では、\fIList\fRの仮引数はアンバウンド形式のワイルドカード(\fI?\fR)を使用してその仮型パラメータとして指定されます。つまり、\fIcountElements\fRメソッドは\fIList\fRインタフェースのどのインスタンス化も受け付けることができます。
 .RE
 .PP
 Serial
 .RS 4
-ľ󲽲ǽ饹\fIserialVersionUID\fRʤȤٹ𤷤ޤȤСΤ褦ˤʤޤ
+直列化可能クラスに\fIserialVersionUID\fR定義がないことを警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -930,7 +930,7 @@
 .if n \{\
 .RE
 .\}
-ѥϼηٹޤ
+コンパイラは次の警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -942,12 +942,12 @@
 .if n \{\
 .RE
 .\}
-ľ󲽲ǽ饹\fIserialVersionUID\fRȤ̾ΥեɤŪʤ硢ľ󲽥󥿥ĶǤϡJava֥ľ󲽻͡פƤ褦ˡ饹͡¦̤˴Ťơ饹\fIserialVersionUID\fRΥǥեͤ׻ޤ٤Ƥľ󲽲ǽ饹\fIserialVersionUID\fRͤŪ뤳Ȥ򶯤ᤷޤ ϡ\fIserialVersionUID\fRͤ׻ǥեȤΥץѥμˤäưۤʤǽΤ륯饹ξܺ٤ˤƱƶ䤹η̡ľͽʤ\fIInvalidClassExceptions\fRȯǽ뤿ǤJavaѥμۤʤäƤ\fIserialVersionUID\fRͤΰݤˤˤϡľ󲽲ǽ饹\fIserialVersionUID\fRͤŪɬפޤ
+直列化可能クラスが\fIserialVersionUID\fRという名前のフィールドを明示的に宣言しない場合、直列化ランタイム環境では、「Javaオブジェクト直列化仕様」で説明されているように、クラスの様々な側面に基づいて、クラスの\fIserialVersionUID\fRのデフォルト値を計算します。ただし、すべての直列化可能クラスが\fIserialVersionUID\fR値を明示的に宣言することを強くお薦めします。 これは、\fIserialVersionUID\fR値を計算するデフォルトのプロセスが、コンパイラの実装によって異なる可能性のあるクラスの詳細にきわめて影響を受けやすく、その結果、直列化復元中に予期しない\fIInvalidClassExceptions\fRが発生する可能性があるためです。Javaコンパイラの実装が異なっても\fIserialVersionUID\fR値の一貫性を確保にするには、直列化可能クラスが\fIserialVersionUID\fR値を明示的に宣言する必要があります。
 .RE
 .PP
 static
 .RS 4
-staticλѤ˴ؤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+staticの使用に関する問題について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -961,7 +961,7 @@
 .if n \{\
 .RE
 .\}
-ѥϼηٹޤ
+コンパイラは次の警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -973,7 +973,7 @@
 .if n \{\
 .RE
 .\}
-褹뤿ˡΤ褦\fIstatic\fR᥽å\fIm1\fRƤӽФȤǤޤ
+この問題を解決するために、次のように\fIstatic\fRメソッド\fIm1\fRを呼び出すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -984,12 +984,12 @@
 .if n \{\
 .RE
 .\}
-뤤ϡ\fIstatic\fRɤ᥽å\fIm1\fR뤳ȤǤޤ
+あるいは、\fIstatic\fRキーワードをメソッド\fIm1\fRの宣言から削除することもできます。
 .RE
 .PP
 try
 .RS 4
-try\-with\-resourcesʸޤࡢ\fItry\fR֥åλѤ˴ؤˤĤƷٹ𤷤ޤȤС\fItry\fR֥å줿꥽\fIac\fRѤʤˡʸФƷٹޤ
+try\-with\-resources文を含む、\fItry\fRブロックの使用に関する問題について警告します。たとえば、\fItry\fRブロックで宣言されたリソース\fIac\fRが使用されないために、次の文に対して警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -1004,7 +1004,7 @@
 .PP
 unchecked
 .RS 4
-JavaͤǻꤵƤ̤Ѵٹξܺ٤򼨤ޤȤСΤ褦ˤʤޤ
+Java言語仕様で指定されている未検査変換警告の詳細を示します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1016,19 +1016,19 @@
 .if n \{\
 .RE
 .\}
-ξõˡ\fIArrayList<Number>\fR\fIList<String>\fRϡ줾\fIArrayList\fR\fIList\fRˤʤޤ
+型の消去中に、型\fIArrayList<Number>\fRおよび\fIList<String>\fRは、それぞれ\fIArrayList\fRおよび\fIList\fRになります。
 .sp
-\fIls\fRޥɤˤϡѥ᡼줿\fIList<String>\fRꤵƤޤ\fIl\fRˤäƻȤ\fIList\fR\fIls\fR˳Ƥ줿硢ѥ̤ٹޤѥˡѥ餪JVMϡ\fIl\fR\fIList<String>\fR򻲾Ȥ뤫ɤȽ̤Ǥޤ󡣤ξ硢\fIl\fRϡ\fIList<String>\fR򻲾Ȥޤ󡣤η̡ҡױȯޤ
+\fIls\fRコマンドには、パラメータ化された型\fIList<String>\fRが指定されています。\fIl\fRによって参照される\fIList\fRが\fIls\fRに割り当てられた場合、コンパイラは未検査警告を生成します。コンパイル時に、コンパイラおよびJVMは、\fIl\fRが\fIList<String>\fR型を参照するかどうかを判別できません。この場合、\fIl\fRは、\fIList<String>\fR型を参照しません。その結果、ヒープ汚染が発生します。
 .sp
-ҡױ֤ȯΤϡ\fIList\fR֥\fIl\fR
-(static\fIList<Number>\fR)̤\fIList\fR֥\fIls\fR
-(ۤʤstatic\fIList<String>\fR)ǤѥǤϤ򤤤ޤ˵ĤƤޤΤ򥵥ݡȤʤJava SEΥ꡼Ȥβ̸ߴݤ뤿ˡĤɬפޤõˤꡢ\fIList<Number>\fR\fIList<String>\fRϡξȤ\fIList\fRˤʤޤη̡ѥϥ֥\fIl\fR
-(\fIList\fRȤraw)򥪥֥\fIls\fR뤳ȤĤޤ
+ヒープ汚染状態が発生するのは、\fIList\fRオブジェクト\fIl\fR
+(そのstatic型は\fIList<Number>\fR)が別の\fIList\fRオブジェクト\fIls\fR
+(異なるstatic型\fIList<String>\fRを持つ)に代入される場合です。しかし、コンパイラではこの代入をいまだに許可しています。総称をサポートしないJava SEのリリースとの下位互換性を確保するために、この代入を許可する必要があります。型消去により、\fIList<Number>\fRおよび\fIList<String>\fRは、両方とも\fIList\fRになります。その結果、コンパイラはオブジェクト\fIl\fR
+(\fIList\fRというraw型を持つ)をオブジェクト\fIls\fRに代入することを許可します。
 .RE
 .PP
 varargs
 .RS 4
-Ѱ(\fIvarargs\fR)᥽åɡäݲǽޤΤλѤǤʤȤٹ𤷤ޤȤСΤ褦ˤʤޤ
+可変引数(\fIvarargs\fR)メソッド、特に非具象化可能引数を含むものの使用が安全でないことを警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1045,10 +1045,10 @@
 .if n \{\
 .RE
 .\}
-\fB:\fR
-ݲǽϡ󤬼¹Ի˴˻ԲǽʷǤ
+\fB注意:\fR
+非具象化可能型は、型情報が実行時に完全に使用不可能な型です。
 .sp
-ѥϡ᥽å\fIArrayBuilder\&.addToList\fR˴ؤ뼡ηٹޤ
+コンパイラは、メソッド\fIArrayBuilder\&.addToList\fRの定義に関する次の警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1059,21 +1059,21 @@
 .if n \{\
 .RE
 .\}
-ѥϡvarargs᥽åɤ򸡽Фȡ\fIvarargs\fRβѥ᡼ѴޤJavaץߥ󥰸Ǥϡѥ᡼줿κĤƤޤ󡣥᥽å\fIArrayBuilder\&.addToList\fRǤϡѥ\fIvarargs\fRβѥ᡼\fIT\&.\&.\&.\fRǤ򲾥ѥ᡼\fIT[]\fR()Ѵޤõˤꡢѥ\fIvarargs\fRβѥ᡼\fIObject[]\fRǤѴޤη̡ҡױȯǽޤ
+コンパイラは、varargsメソッドを検出すると、\fIvarargs\fRの仮パラメータを配列に変換します。しかし、Javaプログラミング言語では、パラメータ化された型の配列の作成を許可していません。メソッド\fIArrayBuilder\&.addToList\fRでは、コンパイラは\fIvarargs\fRの仮パラメータ\fIT\&.\&.\&.\fR要素を仮パラメータ\fIT[]\fR要素(配列)に変換します。しかし、型消去により、コンパイラは\fIvarargs\fRの仮パラメータを\fIObject[]\fR要素に変換します。その結果、ヒープ汚染が発生する可能性があります。
 .RE
-.SH "ޥɥ饤ե"
+.SH "コマンドライン引数ファイル"
 .PP
-\fIjavac\fRޥɤûʷˤꤹ뤿ˡ\fIjavac\fRޥɤФ(\fI\-J\fRץ)ޤ1İʾΥեꤹ뤳ȤǤޤˤꡢɤΥڥ졼ƥ󥰡ƥǤ⡢ǤդĹ\fIjavac\fRޥɤǤޤ
+\fIjavac\fRコマンドを短くしたり簡潔にしたりするために、\fIjavac\fRコマンドに対する引数(\fI\-J\fRオプションを除く)を含む1つ以上のファイルを指定することができます。これにより、どのオペレーティング・システム上でも、任意の長さの\fIjavac\fRコマンドを作成できます。
 .PP
-եˤϡ\fIjavac\fRΥץȥե̾ͳȤ߹礻ƵҤǤޤեΰϡޤϲʸǶڤ뤳ȤǤޤե̾ޤ줿򤬤硢ե̾ΤŰǰϤߤޤ
+引数ファイルには、\fIjavac\fRのオプションとソース・ファイル名を自由に組み合せて記述できます。ファイル内の引数は、空白または改行文字で区切ることができます。ファイル名に埋め込まれた空白がある場合、ファイル名全体を二重引用符で囲みます。
 .PP
-եΥե̾ϡեΰ֤ǤϤʤߤΥǥ쥯ȥŪȤʤޤΥꥹȤǤϡ磻ɥ(*)ϻѤǤޤ(ȤС\fI*\&.java\fRȤϻǤޤ)åȥޡ(@)ѤեκƵŪʲϥݡȤƤޤ󡣤ޤ\fI\-J\fRץ⥵ݡȤƤޤ󡣤ΥץϵưġϤޤưġǤϰե򥵥ݡȤƤʤǤ
+引数ファイル内のファイル名は、引数ファイルの位置ではなく、現在のディレクトリに相対的となります。これらのリストでは、ワイルドカード(*)は使用できません(たとえば、\fI*\&.java\fRとは指定できません)。アットマーク(@)を使用したファイルの再帰的な解釈はサポートされていません。また、\fI\-J\fRオプションもサポートされていません。このオプションは起動ツールに渡されますが、起動ツールでは引数ファイルをサポートしていないからです。
 .PP
-\fIjavac\fRޥɤ¹ԤȤˡưեΥѥ̾Ƭ˥åȥޡ(@)ʸդϤޤ\fIjavac\fRޥɤϡåȥޡ(@)ǻϤޤ򸫤ĤȡΥեƤŸưꥹȤޤ
+\fIjavac\fRコマンドを実行するときに、各引数ファイルのパスと名前の先頭にアットマーク(@)文字を付けて渡します。\fIjavac\fRコマンドは、アットマーク(@)で始まる引数を見つけると、そのファイルの内容を展開して引数リストに挿入します。
 .PP
-\fBExample 1\fR, ñΰե
+\fBExample 1\fR, 単一の引数ファイル
 .RS 4
-\fIargfile\fRȤ̾ñΰեѤơ٤Ƥ\fIjavac\fRǼϡΤ褦˻ꤷޤ
+\fIargfile\fRという名前の単一の引数ファイルを使用して、すべての\fIjavac\fR引数を格納する場合は、次のように指定します。
 .sp
 .if n \{\
 .RS 4
@@ -1084,14 +1084,14 @@
 .if n \{\
 .RE
 .\}
-ΰեˤϡ2ǼƤξΥեƤ뤳ȤǤޤ
+この引数ファイルには、例2で示されている両方のファイルの内容を入れることができます。
 .RE
 .PP
-\fBExample 2\fR, 2Ĥΰե
+\fBExample 2\fR, 2つの引数ファイル
 .RS 4
-\fIjavac\fRץѤȥե̾Ѥˡ2ĤΰեǤޤΥꥹȤˤϡԤη³ʸϤޤ
+\fIjavac\fRオプション用とソース・ファイル名用に、2つの引数ファイルを作成できます。次のリストには、行の継続文字はありません。
 .sp
-ޤoptionsȤ̾Υեޤ
+次を含むoptionsという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -1113,7 +1113,7 @@
 .if n \{\
 .RE
 .\}
-ޤclassesȤ̾Υեޤ
+次を含むclassesという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -1126,7 +1126,7 @@
 .if n \{\
 .RE
 .\}
-줫顢Τ褦\fIjavac\fRޥɤ¹Ԥޤ
+それから、次のように\fIjavac\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -1139,9 +1139,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, ѥѤե
+\fBExample 3\fR, パスを使用した引数ファイル
 .RS 4
-եϥѥǤޤեΤ٤ƤΥե̾ϡ(\fIpath1\fR\fIpath2\fRǤϤʤ)Τ褦˸ߤκȥǥ쥯ȥŪȤʤޤ
+引数ファイルはパスを指定できますが、ファイル内のすべてのファイル名は、(\fIpath1\fRや\fIpath2\fRではなく)次のように現在の作業ディレクトリに相対的となります。
 .sp
 .if n \{\
 .RS 4
@@ -1153,46 +1153,46 @@
 .RE
 .\}
 .RE
-.SH ""
+.SH "注釈処理"
 .PP
-\fIjavac\fRޥɤľܥݡȤƤ뤿ᡢΩޥɤǤ\fIapt\fRѤɬפʤʤޤ
+\fIjavac\fRコマンドが注釈処理を直接サポートしているため、独立した注釈処理コマンドである\fIapt\fRを使用する必要がなくなりました。
 .PP
-ץåAPIϡ\fIjavax\&.annotation\&.processing\fR\fIjavax\&.lang\&.model\fRѥåȤΥ֥ѥåƤޤ
-.SS "Ԥˡ"
+注釈プロセッサのAPIは、\fIjavax\&.annotation\&.processing\fRおよび\fIjavax\&.lang\&.model\fRパッケージとそのサブパッケージ内に定義されています。
+.SS "注釈処理を行う方法"
 .PP
-\fI\-proc:none\fRץˤä̵ʤ¤ꡢѥϻѲǽʤ٤Ƥץå򸡺ޤѥϡ\fI\-processorpath\fRץѤƻǤޤѥꤷʤ硢桼饹ѥѤޤץåθϡѥ\fIMETA\-INF/services/javax\&.annotation\&.processing\fR\&.ProcessorȤ̾ΥӥץХե˴ŤƹԤޤΤ褦ʥեˤϡѤ뤹٤Ƥץå̾1Ԥ1ĤĴޤƤޤ̤ˡȤơ\fI\-processor\fRץѤƥץåŪ˻ꤹ뤳ȤǤޤ
+\fI\-proc:none\fRオプションによって注釈処理が無効化されない限り、コンパイラは使用可能なすべての注釈プロセッサを検索します。検索パスは、\fI\-processorpath\fRオプションを使用して指定できます。パスを指定しない場合、ユーザー・クラス・パスが使用されます。プロセッサの検索は、検索パス上の\fIMETA\-INF/services/javax\&.annotation\&.processing\fR\&.Processorという名前のサービス・プロバイダ構成ファイルに基づいて行われます。このようなファイルには、使用するすべての注釈プロセッサの名前を、1行に1つずつ含めてください。また、別の方法として、\fI\-processor\fRオプションを使用してプロセッサを明示的に指定することもできます。
 .PP
-ѥϡޥɥ饤Υե䥯饹뤳ȤǡɤΤ褦᤬¸ߤƤ뤫ǧȡץåФ礻ԤΥץåɤǤΤǧޤפΤĤä硢ΥץåƤӽФޤƥץåϡȤ׵Ǥޤξ硢Ф̤Υץå򸫤ĤߤϹԤޤ󡣤٤Ƥ᤬׵ᤵȡѥϤʾץåθԤޤ
+コンパイラは、コマンドラインのソース・ファイルやクラスを走査することで、どのような注釈が存在しているかを確認し終わると、プロセッサに対して問合せを行い、それらのプロセッサがどの注釈を処理できるのかを確認します。一致するものが見つかった場合、そのプロセッサが呼び出されます。各プロセッサは、自身が処理する注釈を要求できます。その場合、それらの注釈に対する別のプロセッサを見つける試みは行われません。すべての注釈が要求されると、コンパイラはそれ以上プロセッサの検索を行いません。
 .PP
-줫Υץåˤäƿե뤬ȡ2ܤΥ饦ɤϤޤ줿٤ƤΥե뤬󤵤졢Ʊͤ᤬ޤΥ饦ɤǸƤӽФ줿ץåϤ٤ơ³ΤɤΥ饦ɤǤƤӽФޤ줬ե뤬ʤʤޤ³ޤ
+いずれかのプロセッサによって新しいソース・ファイルが生成されると、注釈処理の2回目のラウンドが開始されます。新しく生成されたすべてのソース・ファイルがスキャンされ、前回と同様に注釈が処理されます。以前のラウンドで呼び出されたプロセッサはすべて、後続のどのラウンドでも呼び出されます。これが、新しいソース・ファイルが生成されなくなるまで続きます。
 .PP
-饦ɤǿե뤬ʤä硢ץå1Τ߸ƤӽФ졢Ĥν¹Ԥ뵡ͿޤǸˡ\fI\-proc:only\fRץ󤬻ѤʤꡢѥϡΥե줿٤ƤΥե򥳥ѥ뤷ޤ
-.SS "Ū˥ɤ줿ե"
+あるラウンドで新しいソース・ファイルが生成されなかった場合、注釈プロセッサがあと1回のみ呼び出され、残りの処理を実行する機会が与えられます。最後に、\fI\-proc:only\fRオプションが使用されないかぎり、コンパイラは、元のソース・ファイルと生成されたすべてのソース・ファイルをコンパイルします。
+.SS "暗黙的にロードされたソース・ファイル"
 .PP
-ѥϡϢΥե򥳥ѥ뤹ݤˡ̤ΥեŪ˥ɤ뤳Ȥɬפʾ礬ޤθ򻲾ȤƤΤ褦ʥեϡǤоݤˤʤޤ󡣥ǥեȤǤϡ¹Ԥ졢İŪ˥ɤ줿ǤդΥե뤬ѥ뤵줿硢ѥϷٹȯԤޤ\fI\-implicit\fRץǤϡٹˡ󶡤ޤ
-.SH "θ"
+コンパイラは、一連のソース・ファイルをコンパイルする際に、別のソース・ファイルを暗黙的にロードすることが必要な場合があります。型の検索を参照してください。そのようなファイルは、現時点では注釈処理の対象になりません。デフォルトでは、注釈処理が実行され、かつ暗黙的にロードされた任意のソース・ファイルがコンパイルされた場合、コンパイラは警告を発行します。\fI\-implicit\fRオプションでは、警告を抑制する方法が提供されます。
+.SH "型の検索"
 .PP
-ե򥳥ѥ뤹뤿ˡѥ̾˴ؤɬפȤޤηϥޥɥ饤ǻꤷեˤޤ󡣥ѥϡեǻѤƤ륯饹ޤϥ󥿥եĥƤ륯饹ޤϥ󥿥ե뤤ϼƤ륯饹ޤϥ󥿥ե٤ƤˤĤơξɬפȤޤˤϡեŪˤϸڤƤʤƤ⡢Ѿ̤ƾ󶡤륯饹ȥ󥿥եޤޤޤ
+ソース・ファイルをコンパイルするために、コンパイラは通常、型に関する情報を必要としますが、その型の定義はコマンドラインで指定したソース・ファイルにありません。コンパイラは、ソース・ファイルで使用されているクラスまたはインタフェース、拡張されているクラスまたはインタフェース、あるいは実装されているクラスまたはインタフェースすべてについて、型の情報を必要とします。これには、ソース・ファイルで明示的には言及されていなくても、継承を通じて情報を提供するクラスとインタフェースも含まれます。
 .PP
-ȤС֥饹\fIjava\&.applet\&.Applet\fRȡ\fIץå\fRΥ饹(\fIjava\&.awt\&.Panel\fR\fIjava\&.awt\&.Container\fR\fIjava\&.awt\&.Component\fR\fIjava\&.lang\&.Object\fR)ѤƤ뤳Ȥˤʤޤ
+たとえば、サブクラス\fIjava\&.applet\&.Applet\fRを作成すると、\fIアプレット\fRの祖先のクラス(\fIjava\&.awt\&.Panel\fR、\fIjava\&.awt\&.Container\fR、\fIjava\&.awt\&.Component\fRおよび\fIjava\&.lang\&.Object\fR)を使用していることにもなります。
 .PP
-ѥϡξɬפˤʤȡηƤ륽եޤϥ饹ե򸡺ޤޤ֡ȥȥåס饹ȳĥǽ饹򸡺³ƥ桼饹ѥ(ǥեȤǤϸߤΥǥ쥯ȥ)򸡺ޤ桼饹ѥϡ\fICLASSPATH\fRĶѿꤷ뤫ޤ\fI\-classpath\fRץѤޤ
+コンパイラは、型の情報が必要になると、その型を定義しているソース・ファイルまたはクラス・ファイルを検索します。まず、ブートストラップ・クラスと拡張機能クラスを検索し、続いてユーザー・クラス・パス(デフォルトでは現在のディレクトリ)を検索します。ユーザー・クラス・パスは、\fICLASSPATH\fR環境変数を設定して定義するか、または\fI\-classpath\fRオプションを使用して定義します。
 .PP
-\fI\-sourcepath\fRץꤵƤ硢ѥϡꤵ줿ѥ饽ե򸡺ޤʳξ硢ѥϡ桼饹ѥ饯饹եȥեξ򸡺ޤ
+\fI\-sourcepath\fRオプションが設定されている場合、コンパイラは、指定されたパスからソース・ファイルを検索します。それ以外の場合、コンパイラは、ユーザー・クラス・パスからクラス・ファイルとソース・ファイルの両方を検索します。
 .PP
-\fI\-bootclasspath\fRץ󤪤\fI\-extdirs\fRץѤơ̤Υ֡ȥȥåס饹ĥǽ饹Ǥޤѥ롦ץ򻲾ȤƤ
+\fI\-bootclasspath\fRオプションおよび\fI\-extdirs\fRオプションを使用して、別のブートストラップ・クラスや拡張機能クラスを指定できます。クロスコンパイル・オプションを参照してください。
 .PP
-θȤ̤ϡ饹ե롢ե롢ޤϤξǤ礬ޤξĤä硢ΤɤѤ뤫\fI\-Xprefer\fRץǥѥ˻ؼǤޤ\fInewer\fRꤵ줿硢ѥ2ĤΥեΤѤޤ\fIsource\fRꤵ줿硢ѥϥեѤޤǥեȤ\fInewer\fRǤ
+型の検索に成功したときに得られる結果は、クラス・ファイル、ソース・ファイル、またはその両方である場合があります。両方が見つかった場合、そのどちらを使用するかを\fI\-Xprefer\fRオプションでコンパイラに指示できます。\fInewer\fRが指定された場合、コンパイラは2つのファイルのうち新しい方を使用します。\fIsource\fRが指定された場合、コンパイラはソース・ファイルを使用します。デフォルトは\fInewer\fRです。
 .PP
-θΤˤäơޤ\fI\-Xprefer\fRץꤵ줿̤ȤɬפʷΥե뤬Ĥä硢ѥϤΥեɤ߼ꡢɬפʾޤǥեȤǤϡѥϥեΥѥԤޤ\fI\-implicit\fRץѤƤưǤޤ\fInone\fRꤵ줿硢եФƥ饹եޤ\fIclass\fRꤵ줿硢եФƥ饹ե뤬ޤ
+型の検索自体によって、または\fI\-Xprefer\fRオプションが設定された結果として必要な型のソース・ファイルが見つかった場合、コンパイラはそのソース・ファイルを読み取り、必要な情報を取得します。デフォルトでは、コンパイラはソース・ファイルのコンパイルも行います。\fI\-implicit\fRオプションを使用してその動作を指定できます。\fInone\fRが指定された場合、ソース・ファイルに対してクラス・ファイルは生成されません。\fIclass\fRが指定された場合、ソース・ファイルに対してクラス・ファイルが生成されます。
 .PP
-ѥϡλޤǡ뷿ɬǧʤ礬ޤ󤬥ե˸Ĥꡢ\fI\-implicit\fRץ󤬻ꤵƤʤ硢ѥˤäơΥե뤬оݤȤʤ餺˥ѥ뤵뤳Ȥٹ𤵤ޤηٹ̵ˤˤϡ(Υե뤬оݤȤʤ褦)Υե򥳥ޥɥ饤˻ꤹ뤫뤤ϤΤ褦ʥեФƥ饹եɬפ뤫ɤ\fI\-implicit\fRץѤƻꤷޤ
-.SH "ץޥƥå󥿥ե"
+コンパイラは、注釈処理が完了するまで、ある型情報の必要性を認識しない場合があります。型情報がソース・ファイル内に見つかり、かつ\fI\-implicit\fRオプションが指定されていない場合、コンパイラによって、そのファイルが注釈処理の対象とならずにコンパイルされることが警告されます。この警告を無効にするには、(そのファイルが注釈処理の対象となるように)そのファイルをコマンドラインに指定するか、あるいはそのようなソース・ファイルに対してクラス・ファイルを生成する必要があるかどうかを\fI\-implicit\fRオプションを使用して指定します。
+.SH "プログラマティック・インタフェース"
 .PP
-\fIjavac\fRޥɤϡ\fIjavax\&.tools\fRѥåΥ饹ȥ󥿥եˤä뿷Java Compiler API򥵥ݡȤޤ
-.SS ""
+\fIjavac\fRコマンドは、\fIjavax\&.tools\fRパッケージ内のクラスとインタフェースによって定義される新しいJava Compiler APIをサポートします。
+.SS "例"
 .PP
-ޥɥ饤ꤹ褦˥ѥ뤹ˤϡιʸѤޤ
+コマンドライン引数を指定するようにコンパイルするには、次の構文を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1205,15 +1205,15 @@
 .RE
 .\}
 .PP
-ǤϡǤɸϥȥ꡼˽񤭹ߡޥɥ饤󤫤θƽФ\fIjavac\fRꤹ뽪λɤ֤ޤ
+例では、診断を標準出力ストリームに書き込み、コマンドラインからの呼出し時に\fIjavac\fRが指定する終了コードを返します。
 .PP
-\fIjavax\&.tools\&.JavaCompiler\fR󥿥ե¾Υ᥽åɤѤȡǤνեɼ긵/ʤɤԤȤǤޤ
-.SS "켰Υ󥿥ե"
+\fIjavax\&.tools\&.JavaCompiler\fRインタフェースの他のメソッドを使用すると、診断の処理やファイルの読取り元/書込み先の制御などを行うことができます。
+.SS "旧式のインタフェース"
 .PP
-\fB:\fR
-APIϡ̸ߴΤˤΤݻƤޤ٤ƤοɤϡJava Compiler APIѤɬפޤ
+\fB注意:\fR
+このAPIは、下位互換性のためにのみ保持されています。すべての新しいコードは、新しいJava Compiler APIを使用する必要があります。
 .PP
-Τ褦ˡ\fIcom\&.sun\&.tools\&.javac\&.Main\fR饹ˤϡץफ饳ѥƤӽФstatic᥽åɤ2ѰդƤޤ
+次のように、\fIcom\&.sun\&.tools\&.javac\&.Main\fRクラスには、プログラムからコンパイラを呼び出すためのstaticメソッドが2つ用意されています。
 .sp
 .if n \{\
 .RS 4
@@ -1226,21 +1226,21 @@
 .RE
 .\}
 .PP
-\fIargs\fRѥ᡼ϡ̾拾ѥϤǤդΥޥɥ饤ɽƤޤ
+\fIargs\fRパラメータは、通常コンパイラに渡される任意のコマンドライン引数を表しています。
 .PP
-\fIout\fRѥ᡼ϡѥοǽϤΰ򼨤ޤ
+\fIout\fRパラメータは、コンパイラの診断出力の宛先を示します。
 .PP
-\fIreturn\fRͤϡ\fIjavac\fR\fIexit\fRͤƱǤ
+\fIreturn\fR値は、\fIjavac\fRの\fIexit\fR値と同じです。
 .PP
-\fB:\fR
-̾\fIcom\&.sun\&.tools\&.javac\fRǻϤޤѥå(\fIcom\&.sun\&.tools\&.javac\fRΥ֥ѥå)ǸФ¾Τ٤ƤΥ饹ӥ᥽åɤϡѤǤꡢĤǤѹǽޤ
-.SH ""
+\fB注意:\fR
+名前が\fIcom\&.sun\&.tools\&.javac\fRで始まるパッケージ(\fIcom\&.sun\&.tools\&.javac\fRのサブパッケージ)で検出される他のすべてのクラスおよびメソッドは、完全に内部用であり、いつでも変更される可能性があります。
+.SH "例"
 .PP
-\fBExample 1\fR, ñʥץΥѥ
+\fBExample 1\fR, 簡単なプログラムのコンパイル
 .RS 4
-Ǥϡgreetingsǥ쥯ȥ\fIHello\&.java\fRե򥳥ѥ뤹ˡ򼨤Ƥޤ\fIHello\&.java\fR줿饹ϡ\fIgreetings\&.Hello\fRȸƤФޤgreetingsǥ쥯ȥϡեȥ饹եξѥåǥ쥯ȥǡߤΥǥ쥯ȥΤˤޤˤꡢǥեȤΥ桼饹ѥѤǤ褦ˤʤޤޤ\fI\-d\fRץѤ̤νǥ쥯ȥꤹɬפ⤢ޤ
+この例では、greetingsディレクトリで\fIHello\&.java\fRソース・ファイルをコンパイルする方法を示しています。\fIHello\&.java\fRで定義されたクラスは、\fIgreetings\&.Hello\fRと呼ばれます。greetingsディレクトリは、ソース・ファイルとクラス・ファイルの両方があるパッケージ・ディレクトリで、現在のディレクトリのすぐ下にあります。これにより、デフォルトのユーザー・クラス・パスを使用できるようになります。また、\fI\-d\fRオプションを使用して別の出力先ディレクトリを指定する必要もありません。
 .sp
-\fIHello\&.java\fRΥɤϼΤȤǤ
+\fIHello\&.java\fR内のソース・コードは次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -1259,7 +1259,7 @@
 .if n \{\
 .RE
 .\}
-greetings\&.HelloΥѥ:
+greetings\&.Helloのコンパイル:
 .sp
 .if n \{\
 .RS 4
@@ -1270,7 +1270,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\&.Hello\fRμ¹:
+\fIgreetings\&.Hello\fRの実行:
 .sp
 .if n \{\
 .RS 4
@@ -1286,9 +1286,9 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ʣΥեΥѥ
+\fBExample 2\fR, 複数のソース・ファイルのコンパイル
 .RS 4
-Ǥϡ\fIgreetings\fRѥåΥե\fIAloha\&.java\fR\fIGutenTag\&.java\fR\fIHello\&.java\fR\fIHi\&.java\fR򥳥ѥ뤷ޤ
+この例では、\fIgreetings\fRパッケージのソース・ファイル\fIAloha\&.java\fR、\fIGutenTag\&.java\fR、\fIHello\&.java\fRおよび\fIHi\&.java\fRをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1304,9 +1304,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, 桼饹ѥλ
+\fBExample 3\fR, ユーザー・クラス・パスの指定
 .RS 4
-ҤΥեΤ1ĤѹˡΥեƥѥ뤷ޤ
+前述の例のソース・ファイルのうち1つを変更した後に、そのファイルを再コンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1319,7 +1319,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\&.Hi\fR\fIgreetings\fRѥå¾Υ饹򻲾ȤƤ뤿ᡢѥϤ¾Υ饹õɬפޤǥեȤΥ桼饹ѥϥѥåǥ쥯ȥޤǥ쥯ȥǤ뤿ᡢҤưޤߤΥǥ쥯ȥ򵤤ˤˤΥեƥѥ뤹硢\fICLASSPATH\fRꤷơ桼饹ѥΥǥ쥯ȥɲäޤǤϡ\fI\-classpath\fRץѤƤޤ
+\fIgreetings\&.Hi\fRは\fIgreetings\fRパッケージ内の他のクラスを参照しているため、コンパイラはこれらの他のクラスを探す必要があります。デフォルトのユーザー・クラス・パスはパッケージ・ディレクトリを含むディレクトリであるため、前述の例は動作します。現在のディレクトリを気にせずにこのファイルを再コンパイルする場合、\fICLASSPATH\fRを設定して、ユーザー・クラス・パスに例のディレクトリを追加します。この例では、\fI\-classpath\fRオプションを使用しています。
 .sp
 .if n \{\
 .RS 4
@@ -1330,7 +1330,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\&.Hi\fRѹƥХʡ桼ƥƥѤ褦ˤ硢 Υ桼ƥƥ桼饹ѥ̤ƥǤ褦ˤʤäƤɬפޤ
+\fIgreetings\&.Hi\fRを変更してバナー・ユーティリティを使用するようにした場合、 そのユーティリティもユーザー・クラス・パスを通じてアクセスできるようになっている必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1342,7 +1342,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\fRѥåǥ饹¹Ԥˤϡץ\fIgreetings\fRѥå\fIgreetings\fR饹Ѥ륯饹˥ɬפޤ
+\fIgreetings\fRパッケージでクラスを実行するには、プログラムは\fIgreetings\fRパッケージ、および\fIgreetings\fRクラスが使用するクラスにアクセスする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1355,9 +1355,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, եȥ饹եʬΥ
+\fBExample 4\fR, ソース・ファイルとクラス・ファイルの分離
 .RS 4
-Ǥϡ\fIjavac\fRѤơJVM 1\&.6Ǽ¹Ԥ륳ɤ򥳥ѥ뤷ޤ
+次の例では、\fIjavac\fRを使用して、JVM 1\&.6上で実行するコードをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1369,9 +1369,9 @@
 .if n \{\
 .RE
 .\}
-\fI\-source 1\&.6\fRץˤꡢ\fIOldCode\&.java\fRΥѥˤϥ꡼1\&.6(ޤ6)Javaץߥ󥰸줬Ѥޤ\fI\-target 1\&.6\fRץˤꡢJVM 1\&.6ȸߴΤ륯饹ե뤬ޤۤȤɤξ硢\fI\-target\fRץͤ\fI\-source\fRץͤˤʤޤǤϡ\fI\-target\fRץάǤޤ
+\fI\-source 1\&.6\fRオプションにより、\fIOldCode\&.java\fRのコンパイルにはリリース1\&.6(または6)のJavaプログラミング言語が使用されます。\fI\-target 1\&.6\fRオプションにより、JVM 1\&.6と互換性のあるクラス・ファイルが生成されます。ほとんどの場合、\fI\-target\fRオプションの値は\fI\-source\fRオプションの値になります。この例では、\fI\-target\fRオプションを省略できます。
 .sp
-\fI\-bootclasspath\fRץѤơŬڤʥСΥ֡ȥȥåס饹(\fIrt\&.jar\fR饤֥)ꤹɬפޤꤷʤϡѥˤäƼηٹޤ
+\fI\-bootclasspath\fRオプションを使用して、適切なバージョンのブートストラップ・クラス(\fIrt\&.jar\fRライブラリ)を指定する必要があります。指定しない場合は、コンパイラによって次の警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -1384,12 +1384,12 @@
 .if n \{\
 .RE
 .\}
-ŬڤʥСΥ֡ȥȥåס饹ꤷʤ硢ѥϸŤ(ǤϡС1\&.6Javaץߥ󥰸)򿷤֡ȥȥåס饹Ȥ߹礻ƻѤޤη̡¸ߤʤ᥽åɤؤλȤޤޤƤ뤳Ȥ뤿ᡢ饹ե뤬Ťץåȥե(ξJava SE 6)ưʤǽޤ
+適切なバージョンのブートストラップ・クラスを指定しない場合、コンパイラは古い言語仕様(この例では、バージョン1\&.6のJavaプログラミング言語)を新しいブートストラップ・クラスと組み合せて使用します。その結果、存在しないメソッドへの参照が含まれていることがあるため、クラス・ファイルが古いプラットフォーム(この場合はJava SE 6)で動作しない可能性があります。
 .RE
 .PP
-\fBExample 5\fR, ѥ
+\fBExample 5\fR, クロス・コンパイル
 .RS 4
-Ǥϡ\fIjavac\fRѤơJVM 1\&.6Ǽ¹Ԥ륳ɤ򥳥ѥ뤷ޤ
+この例では、\fIjavac\fRを使用して、JVM 1\&.6上で実行するコードをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1401,9 +1401,9 @@
 .if n \{\
 .RE
 .\}
-The\fI \-source 1\&.6\fRץˤꡢOldCode\&.javaΥѥˤϥ꡼1\&.6(ޤ6)Javaץߥ󥰸줬Ѥޤ\fI\-target 1\&.6\fRץˤꡢJVM 1\&.6ȸߴΤ륯饹ե뤬ޤۤȤɤξ硢\fI\-target\fRͤ\fI\-source\fRͤˤʤޤǤϡ\fI\-target\fRץϾάޤ
+The\fI \-source 1\&.6\fRオプションにより、OldCode\&.javaのコンパイルにはリリース1\&.6(または6)のJavaプログラミング言語が使用されます。\fI\-target 1\&.6\fRオプションにより、JVM 1\&.6と互換性のあるクラス・ファイルが生成されます。ほとんどの場合、\fI\-target\fRの値は\fI\-source\fRの値になります。この例では、\fI\-target\fRオプションは省略されます。
 .sp
-\fI\-bootclasspath\fRץѤơŬڤʥСΥ֡ȥȥåס饹(\fIrt\&.jar\fR饤֥)ꤹɬפޤꤷʤϡѥˤäƼηٹޤ
+\fI\-bootclasspath\fRオプションを使用して、適切なバージョンのブートストラップ・クラス(\fIrt\&.jar\fRライブラリ)を指定する必要があります。指定しない場合は、コンパイラによって次の警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -1415,9 +1415,9 @@
 .if n \{\
 .RE
 .\}
-ŬڤʥСΥ֡ȥȥåס饹ꤷʤ硢ѥϸŤͤ򿷤֡ȥȥåס饹Ȥ߹礻ƻѤޤȹ礻ϡ¸ߤʤ᥽åɤؤλȤޤޤƤ뤳Ȥ뤿ᡢ饹ե뤬Ťץåȥե(ξJava SE 6)ưʤǽޤǤϡѥJavaץߥ󥰸Υ꡼1\&.6Ѥޤ
+適切なバージョンのブートストラップ・クラスを指定しない場合、コンパイラは古い言語仕様を新しいブートストラップ・クラスと組み合せて使用します。この組合せは、存在しないメソッドへの参照が含まれていることがあるため、クラス・ファイルが古いプラットフォーム(この場合はJava SE 6)で動作しない可能性があります。この例では、コンパイラはJavaプログラミング言語のリリース1\&.6を使用します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/javadoc.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/javadoc.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javadoc
 .\" Language: English
-.\" Date: 2011ǯ510
-.\" SectDesc: ܥġ
+.\" Date: 2011年5月10日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javadoc" "1" "2011ǯ510" "JDK 8" "ܥġ"
+.TH "javadoc" "1" "2011年5月10日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javadoc \- Javaե뤫顢APIɥȤHTMLڡޤ
-.SH ""
+javadoc \- Javaソース・ファイルから、APIドキュメントのHTMLページを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,33 +64,33 @@
 .PP
 \fIpackages\fR
 .RS 4
-\fIjava\&.lang java\&.lang\&.reflect java\&.awt\fRʤɡǶڤäƥɥȲѥå֥̾ѥåɥȲϡ\fI\-subpackages\fRץѤƥѥåꤷޤ
-.sp
-ǥեȤǤϡ\fIjavadoc\fRϡߤΥǥ쥯ȥꤪӥ֥ǥ쥯ȥǻꤵ줿ѥåõޤ\fI\-sourcepath\fRץѤơѥåõǥ쥯ȥΥꥹȤꤷޤ
+\fIjava\&.lang java\&.lang\&.reflect java\&.awt\fRなど、空白で区切ってドキュメント化するパッケージの名前。サブパッケージもドキュメント化する場合は、\fI\-subpackages\fRオプションを使用してパッケージを指定します。
+.sp
+デフォルトでは、\fIjavadoc\fRは、現在のディレクトリおよびサブディレクトリで指定されたパッケージを探します。\fI\-sourcepath\fRオプションを使用して、パッケージを探すディレクトリのリストを指定します。
 .RE
 .PP
 \fIsource\-files\fR
 .RS 4
-\fIClass\&.java Object\&.java Button\&.java\fRΤ褦˶ǶڤäɥȲJavaե̾ǥեȤǤϡ\fIjavadoc\fRϡߤΥǥ쥯ȥǻꤵ줿饹õޤ\fI/home/src/java/awt/Graphics*\&.java\fRΤ褦ˡ饹եΥեѥꤷ磻ɥʸѤǤޤߤΥǥ쥯ȥ꤫ХѥǤޤ
+\fIClass\&.java Object\&.java Button\&.java\fRのように空白で区切った、ドキュメント化するJavaソース・ファイルの名前。デフォルトでは、\fIjavadoc\fRは、現在のディレクトリで指定されたクラスを探します。ただし、\fI/home/src/java/awt/Graphics*\&.java\fRのように、クラス・ファイルのフルパスを指定し、ワイルドカード文字を使用できます。現在のディレクトリからの相対パスも指定できます。
 .RE
 .PP
 \fIoptions\fR
 .RS 4
-Ƕڤ줿ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+空白で区切られたコマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fI@argfiles\fR
 .RS 4
-\fIjavadoc\fRޥɡץ󡢥ѥå̾ӥե̾ΥꥹȤǤդνǴޤե̾
-.RE
-.SH ""
+\fIjavadoc\fRコマンド・オプション、パッケージ名およびソース・ファイル名のリストを任意の順序で含むファイルの名前。
+.RE
+.SH "説明"
 .PP
-\fIjavadoc\fRޥɤϡϢJavaեˤӥɥơ󡦥ȤϤǥեȤǤϡpublic饹protected饹ͥȤ줿饹(ƿ̾饹Ͻ)󥿥ե󥹥ȥ饯᥽åɡӥեɤˤĤƵҤϢHTMLڡޤ\fIjavadoc\fRޥɤϡAPIɥȤ䡢ϢΥեμɥȤ˻ѤǤޤ
+\fIjavadoc\fRコマンドは、一連のJavaソース・ファイルにある宣言およびドキュメンテーション・コメントを解析し、デフォルトでは、publicクラス、protectedクラス、ネストされたクラス(匿名の内部クラスは除く)、インタフェース、コンストラクタ、メソッド、およびフィールドについて記述した一連のHTMLページを生成します。\fIjavadoc\fRコマンドは、APIドキュメントの生成や、一連のソース・ファイルの実装ドキュメントの生成に使用できます。
 .PP
-\fIjavadoc\fRޥɤϡѥåΡġΥե롢ޤϤξФƼ¹ԤǤޤѥåΤΥɥȲԤˤϡ\fI\-subpackages\fRץѤƥǥ쥯ȥꤪӤΥ֥ǥ쥯ȥƵŪˤɤ뤫ѥå̾ŪʥꥹȤϤޤġΥեɥȲˤϡJavaե̾ΥꥹȤϤޤñ򻲾ȤƤ
-.SS "եν"
+\fIjavadoc\fRコマンドは、パッケージ全体、個々のソース・ファイル、またはその両方に対して実行できます。パッケージ全体のドキュメント化を行うには、\fI\-subpackages\fRオプションを使用してディレクトリおよびそのサブディレクトリを再帰的にたどるか、パッケージ名の明示的なリストを渡します。個々のソース・ファイルをドキュメント化するには、Javaソース・ファイル名のリストを渡します。簡単な例を参照してください。
+.SS "ソース・ファイルの処理"
 .PP
-\fIjavadoc\fRޥɤϡǽե롢ӥեƤ뤽¾ΥեޤġΥե̾Ϥ\fIjavadoc\fR¹Ԥ硢ɤΥե뤫Τ˻Ǥޤ¿γȯԤϤˡǤϺȤޤ󡣥ѥå̾ϤۤñǤե̾Ū˻ꤷʤƤ⡢\fIjavadoc\fRޥɤ3ĤˡǼ¹ԤǤޤѥå̾Ϥ\fI\-subpackages\fRץѤ뤫ޤϥե̾˥磻ɥɤѤ뤳ȤǤޤξ硢\fIjavadoc\fRޥɤեνԤΤϡΥե뤬Τ٤Ƥ׷ΤߤǤ
+\fIjavadoc\fRコマンドは、ソースで終わるファイル、およびソース・ファイルで説明しているその他のファイルを処理します。個々のソース・ファイル名を渡して\fIjavadoc\fRを実行する場合、どのソース・ファイルを処理するかを正確に指定できます。ただし、多くの開発者はこの方法では作業しません。パッケージ名を渡すほうが簡単だからです。ソース・ファイル名を明示的に指定しなくても、\fIjavadoc\fRコマンドは3つの方法で実行できます。パッケージ名を渡し、\fI\-subpackages\fRオプションを使用するか、またはソース・ファイル名にワイルドカードを使用することができます。これらの場合、\fIjavadoc\fRコマンドがソース・ファイルの処理を行うのは、そのファイルが次のすべての要件を満たす場合のみです。
 .sp
 .RS 4
 .ie n \{\
@@ -100,7 +100,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ե̾Ƭ(\fI\&.java\fR)ͭʥ饹̾Ǥ롣
+ファイル名の接頭辞(\fI\&.java\fRを削除)が有効なクラス名である。
 .RE
 .sp
 .RS 4
@@ -111,7 +111,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ĥ꡼Υ롼ȤŪʥѥ̾ڤʸɥåȤѴȡͭʥѥå̾ˤʤ롣
+ソース・ツリーのルートからの相対的なパス名が、区切り文字をドットに変換すると、有効なパッケージ名になる。
 .RE
 .sp
 .RS 4
@@ -122,10 +122,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåʸͭʥѥå̾ޤޤƤ롣
-.RE
-󥯤ν.PP
-μ¹ˡ\fIjavadoc\fRޥɤϡμ¹ԤǥɥȲѥå饹ӥС̾Фơ߻ȥ󥯤ɲäޤ󥯤ϡξɽޤ@ˤĤƤϡjavadoc򻲾ȤƤ
+パッケージ文に有効なパッケージ名が含まれている。
+.RE
+リンクの処理.PP
+処理の実行中に、\fIjavadoc\fRコマンドは、その実行でドキュメント化されるパッケージ、クラス、およびメンバーの名前に対して、相互参照リンクを追加します。リンクは、次の場所に表示されます。@タグの説明については、javadocタグを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -135,7 +135,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-(ͤηηեɤη)
+宣言(戻り値の型、引数の型、フィールドの型)。
 .RE
 .sp
 .RS 4
@@ -146,7 +146,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI@see\fR줿\fIϢ\fRץ
+\fI@see\fRタグから生成された「\fI関連項目\fR」セクション。
 .RE
 .sp
 .RS 4
@@ -157,7 +157,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI{@link}\fR줿饤󡦥ƥȡ
+\fI{@link}\fRタグから生成されたインライン・テキスト。
 .RE
 .sp
 .RS 4
@@ -168,7 +168,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI@throws\fR줿㳰̾
+\fI@throws\fRタグから生成された例外の名前。
 .RE
 .sp
 .RS 4
@@ -179,7 +179,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-󥿥եΥСФ\fI\fRץ󥯤ȡ饹ΥСФ\fIС饤\fRץ󥯡᥽åɡȤηѾ򻲾ȤƤ
+インタフェースのメンバーに対する「\fI定義\fR」リンクと、クラスのメンバーに対する「\fIオーバーライド\fR」リンク。メソッド・コメントの継承を参照してください。
 .RE
 .sp
 .RS 4
@@ -190,7 +190,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥå饹ӥСꥹȤƤ륵ޥ꡼ɽ
+パッケージ、クラス、およびメンバーをリストしているサマリー表。
 .RE
 .sp
 .RS 4
@@ -201,7 +201,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåӥ饹ηѾĥ꡼
+パッケージおよびクラスの継承ツリー。
 .RE
 .sp
 .RS 4
@@ -212,42 +212,42 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-
+索引。
 .RE
 .PP
-ޥɥ饤ǻꤷʤä饹ˤĤƤδ¸Υƥ(̤ƥ)Фƥ󥯤ɲäˤϡ\fI\-link\fR\fI\-linkoffline\fRץѤǤޤ
-ξܺ.PP
-\fIjavadoc\fRޥɤϼ¹Ԥ뤿Ӥ1ĤδʥɥȤޤμ¹Ԥη̤ѹޤľܼࡢʬӥɤԤޤ󡣤\fIjavadoc\fRޥɤϡ¾μ¹Ԥη̤˥󥯤Ǥޤ
+コマンドラインで指定しなかったクラスについての既存のテキスト(別に生成したテキスト)に対してリンクを追加するには、\fI\-link\fRおよび\fI\-linkoffline\fRオプションを利用できます。
+処理の詳細.PP
+\fIjavadoc\fRコマンドは実行するたびに1つの完全なドキュメントを生成します。前の実行の結果を変更または直接取り込む、増分ビルドを行いません。ただし、\fIjavadoc\fRコマンドは、他の実行の結果にリンクできます。
 .PP
-\fIjavadoc\fRޥɤμˤJavaѥ餬ɬפǡJavaѥ˰¸Ƥޤ\fIjavadoc\fRޥɤ\fIjavac\fRޥɤΰƤӽФ򥳥ѥ뤷ơСμ̵뤷ޤ\fIjavadoc\fRޥɤϡ饹ؤޤ९饹˭٤ɽȥ饹Ρֻѡ״طۤHTMLޤˡJ\fIjavadoc\fRޥɤϡɤΥɥơ󡦥Ȥ顢桼󶡤ɥȤޤɥơ󡦥Ȥ򻲾ȤƤ
+\fIjavadoc\fRコマンドの実装にはJavaコンパイラが必要で、Javaコンパイラに依存しています。\fIjavadoc\fRコマンドは\fIjavac\fRコマンドの一部を呼び出し、宣言をコンパイルして、メンバーの実装を無視します。\fIjavadoc\fRコマンドは、クラス階層を含むクラスの豊富な内部表現とクラスの「使用」関係を構築し、HTMLを生成します。さらに、J\fIjavadoc\fRコマンドは、ソース・コードのドキュメンテーション・コメントから、ユーザーの提供したドキュメントも取得します。ドキュメンテーション・コメントを参照してください。
 .PP
-\fIjavadoc\fRޥɤϡ᥽åΤʤʥ֡եǤ륽եФƼ¹ԤǤޤäơAPIμ߷פᤤʳǡɥơ󡦥Ȥ򵭽Ҥ\fIjavadoc\fRȤ¹ԤǤޤ
+\fIjavadoc\fRコマンドは、メソッド本体を持たない純粋なスタブ・ファイルであるソース・ファイルに対して実行できます。したがって、APIの実装前の設計の早い段階で、ドキュメンテーション・コメントを記述して\fIjavadoc\fRコメントを実行できます。
 .PP
-ѥ˰¸뤳ȤˤäơHTMLϤϡºݤμΤбޤºݤμϡŪʥɤˤǤϤʤۤΥɤ˰¸礬ޤȤС\fIjavadoc\fRޥɤϡѥѥ饹եˤ¸ߤ뤬ɤˤ¸ߤʤǥեȡ󥹥ȥ饯ɥȲޤ
+コンパイラに依存することによって、HTML出力は、実際の実装に正確に対応します。実際の実装は、明示的なソース・コードにではなく、暗黙のソース・コードに依存する場合があります。たとえば、\fIjavadoc\fRコマンドは、コンパイル済クラス・ファイルには存在するがソース・コードには存在しないデフォルト・コンストラクタをドキュメント化します。
 .PP
-¿ξ硢\fIjavadoc\fRޥɤǤϡեΥɤԴޤϥ顼ޤǤǤɥȤǤޤ٤ƤΥǥХåȥ֥륷塼ƥ󥰤λ˥ɥȤǤޤ\fIjavadoc\fRޥɤϥɥơ󡦥ȤδŪʥåԤޤ
+多くの場合、\fIjavadoc\fRコマンドでは、ソース・ファイルのコードが不完全またはエラーを含んでいる場合でもドキュメントを生成できます。すべてのデバッグやトラブルシューティングを完了する前にドキュメントを生成できます。\fIjavadoc\fRコマンドはドキュメンテーション・コメントの基本的なチェックを行います。
 .PP
-\fIjavadoc\fRޥɤϡɥȤ¤ۤݡȥ饹򤹤٤ƥɤޤΤᡢ
-\fIjavadoc\fRޥɤϡ֡ȥȥåס饹ĥǽޤϥ桼饹ˤ餺٤Ƥλȥ饹򸡺Ǥɬפޤ饹θˡ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)򻲾ȤƤ
+\fIjavadoc\fRコマンドは、ドキュメントの内部構造を構築する際、参照クラスをすべてロードします。このため、
+\fIjavadoc\fRコマンドは、ブートストラップ・クラス、拡張機能、またはユーザー・クラスにかかわらず、すべての参照クラスを検索できる必要があります。クラスの検出方法
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)を参照してください
 .PP
-̾륯饹ϡĥ饹Ȥơޤ\fIjavadoc\fRޥɤΥ饹ѥǥɤɬפޤ
-.SS "JavadocΥɥåå"
+通常、作成するクラスは、拡張クラスとして、または\fIjavadoc\fRコマンドのクラス・パスでロードされる必要があります。
+.SS "Javadocのドックレット"
 .PP
-\fIjavadoc\fRޥɤνϤƤȷϡɥååȤѤƥޥǤޤ\fIjavadoc\fRޥɤˤϡɸɥååȤȸƤФǥեȤȹߥɥååȤޤɸɥååȤϡHTMLAPIɥȤޤɸɥååȤޤϥ֥饹뤳Ȥ䡢HTMLXMLMIFRTFʤɤιߤνϷȼΥɥååȤ򵭽Ҥ뤳ȤǽǤ
+\fIjavadoc\fRコマンドの出力の内容と形式は、ドックレットを使用してカスタマイズできます。\fIjavadoc\fRコマンドには、標準ドックレットと呼ばれるデフォルトの組込みドックレットがあります。標準ドックレットは、HTML形式のAPIドキュメントを生成します。標準ドックレットを修正またはサブクラスを作成することや、HTML、XML、MIF、RTFなどの好みの出力形式を生成する独自のドックレットを記述することも可能です。
 .PP
-\fI\-doclet\fRץǥࡦɥååȤꤵƤʤ硢\fIjavadoc\fRޥɤϡǥեȤɸɥååȤѤޤ\fIjavadoc\fRޥɤˤϡѤƤɥååȤ˴طʤѤǤ뤤ĤΥץ󤬤ޤɸɥååȤǤϡ¾ˡĤΥޥɥ饤󡦥ץɲäޤץ򻲾ȤƤ
-.SH "ե"
+\fI\-doclet\fRオプションでカスタム・ドックレットが指定されていない場合、\fIjavadoc\fRコマンドは、デフォルトの標準ドックレットを使用します。\fIjavadoc\fRコマンドには、使用されているドックレットに関係なく使用できるいくつかのオプションがあります。標準ドックレットでは、これらの他に、いくつかのコマンドライン・オプションが追加されます。オプションを参照してください。
+.SH "ソース・ファイル"
 .PP
-\fIjavadoc\fRޥɤϡΥפΥե뤫ϤޤΥեϡ饹Java쥽ե(\fI\&.java\fR)ѥåȡե롢ץȡե롢Ӥ¾̤ΥեǤǤϡɥȲʤĥ꡼¸ߤ礬ƥȡեƥץ졼ȡեˤĤƤޤ
-.SS "饹Υե"
+\fIjavadoc\fRコマンドは、次のタイプのソース・ファイルから出力を生成します。そのファイルは、クラスのJava言語ソース・ファイル(\fI\&.java\fR)、パッケージ・コメント・ファイル、概要コメント・ファイル、およびその他の未処理のファイルです。ここでは、ドキュメント化しないがソース・ツリーに存在する場合があるテスト・ファイルやテンプレート・ファイルについても説明します。
+.SS "クラスのソース・ファイル"
 .PP
-줾Υ饹ޤϥ󥿥եӤΥСϡȼΥɥơ󡦥ȤĤȤǤ򥽡եݻޤɥơ󡦥Ȥ򻲾ȤƤ
-.SS "ѥåȡե"
+それぞれのクラスまたはインタフェース、およびそのメンバーは、独自のドキュメンテーション・コメントを持つことができ、それをソース・ファイル内に保持します。ドキュメンテーション・コメントを参照してください。
+.SS "パッケージ・コメント・ファイル"
 .PP
-줾ΥѥåϡȼΥɥơ󡦥ȤĤȤǤѤΥեݻޤƤϡ\fIjavadoc\fRޥɤˤäѥåΥޥ꡼ڡȤ߹ޤޤΥȤˤϡ̾ΥѥåΤƤϤޤɥȤ򵭽Ҥޤ
+それぞれのパッケージは、独自のドキュメンテーション・コメントを持つことができ、それを専用のソース・ファイルに保持します。その内容は、\fIjavadoc\fRコマンドによって生成されるパッケージのサマリー・ページに組み込まれます。このコメントには、通常、そのパッケージ全体に当てはまるドキュメントを記述します。
 .PP
-ѥåȡեˤϡΤ줫Υե˥ȤǼǤޤ
+パッケージ・コメント・ファイルを作成するには、次のいずれかのファイルにコメントを格納できます。
 .sp
 .RS 4
 .ie n \{\
@@ -257,7 +257,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackage\-info\&.java\fRեˤϡѥåѥåᡢѥåȡJavadocǼǤޤΥե뤬ͥ褵ޤ
+\fIpackage\-info\&.java\fRファイルには、パッケージ宣言、パッケージ注釈、パッケージ・コメント、およびJavadocタグを格納できます。このファイルが優先されます。
 .RE
 .sp
 .RS 4
@@ -268,15 +268,15 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackage\&.html\fRեˤϡѥåȤJavadocΤߤǼǤޤѥåϳǼǤޤ
+\fIpackage\&.html\fRファイルには、パッケージ・コメントとJavadocタグのみを格納できます。パッケージ注釈は格納できません。
 .RE
 .PP
-ƥѥåϡ\fIpackage\&.html\fRեޤ\fIpackage\-info\&.java\fRեΤ줫1ĻĤȤǤޤξĤȤϤǤޤ󡣤Τɤ餫Υե򥽡եȤȤˡĥ꡼ΤΥѥåǥ쥯ȥ֤Ƥ
-package\-info\&.javaե.PP
-\fIpackage\-info\&.java\fRեˤϡι¤ΥѥåȤޤ뤳ȤǤޤȤϡѥå֤ޤ
+各パッケージは、\fIpackage\&.html\fRファイルまたは\fIpackage\-info\&.java\fRファイルのいずれかを1つ持つことができますが、その両方を持つことはできません。このどちらかのファイルをソース・ファイルとともに、ソース・ツリー内のそのパッケージ・ディレクトリ内に配置してください。
+package\-info\&.javaファイル.PP
+\fIpackage\-info\&.java\fRファイルには、次の構造のパッケージ・コメントを含めることができます。コメントは、パッケージ宣言の前に配置されます。
 .PP
-\fB:\fR
-ȶڤʸǤ\fI/**\fR\fI*/\fR¸ߤɬפޤ֤ιԤƬΥꥹϾάǽǤ
+\fB注意:\fR
+コメント区切り文字である\fI/**\fRおよび\fI*/\fRが存在する必要がありますが、中間の行の先頭のアスタリスクは省略可能です。
 .sp
 .if n \{\
 .RS 4
@@ -302,10 +302,10 @@
 .if n \{\
 .RE
 .\}
-package\&.htmlե.PP
-\fIpackage\&.html\fRեˤϡι¤ΥѥåȤޤ뤳ȤǤޤȤϡ\fI<body>\fRǤ֤ޤ
+package\&.htmlファイル.PP
+\fIpackage\&.html\fRファイルには、次の構造のパッケージ・コメントを含めることができます。コメントは、\fI<body>\fR要素に配置されます。
 .PP
-ե:
+ファイル:
 \fIjava/applet/package\&.html\fR
 .sp
 .if n \{\
@@ -332,9 +332,9 @@
 .RE
 .\}
 .PP
-\fIpackage\&.html\fRե̾HTMLեǤꡢѥåޤǤޤ󡣥ѥåȡեƤHTMLǵҤޤ㳰1ĤޤΥɥơ󡦥ȤˤϡȶڤʸǤ\fI/**\fR\fI*/\fRޤϹƬΥꥹޤʤȤǤȤ񤯾ϡǽʸѥåΥޥ꡼Ȥ\fI<body>\fRȺǽʸδ֤˥ȥ䤽¾ΥƥȤޤʤ褦ˤޤѥåޤ뤳ȤǤޤ٤ƤΥ֥åϡθ֤ɬפޤ\fI@see\fRѥåȡեɲäˤϡ̾Ѥɬפޤ
-ȡեν.PP
-\fIjavadoc\fRȤ¹Ԥȡѥåȡե뤬ޤѥåȡե뤬Ĥäϡ\fIjavadoc\fRޥɤϼμ¹Ԥޤ
+\fIpackage\&.html\fRファイルは通常のHTMLファイルであり、パッケージ宣言を含んでいません。パッケージ・コメント・ファイルの内容はHTMLで記述しますが、例外が1つあります。このドキュメンテーション・コメントには、コメント区切り文字である\fI/**\fRと\fI*/\fR、または行頭のアスタリスクを含めない、という点です。コメントを書く場合は、最初の文をパッケージのサマリーとし、\fI<body>\fRタグと最初の文の間にタイトルやその他のテキストを含めないようにします。パッケージ・タグを含めることができます。すべてのブロック・タグは、主説明の後に配置する必要があります。\fI@see\fRタグをパッケージ・コメント・ファイルに追加する場合には、完全修飾名を使用する必要があります。
+コメント・ファイルの処理.PP
+\fIjavadoc\fRコメントを実行すると、パッケージ・コメント・ファイルが検索されます。パッケージ・コメント・ファイルが見つかった場合は、\fIjavadoc\fRコマンドは次の手順を実行します。
 .sp
 .RS 4
 .ie n \{\
@@ -344,8 +344,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ǥ褦˥Ȥ򥳥ԡޤpackage\&.htmlξ硢\fIjavadoc\fRޥɤϡ\fI<body>\fR\fI</body>\fR
-HTML֤Τ٤ƤƤ򥳥ԡޤ\fI<head>\fRޤᡢ\fI<title>\fR䥽եҤʤɤξ֤뤳ȤǤޤ줿ɥȤˤϤϰɽޤ
+処理できるようにコメントをコピーします。package\&.htmlの場合、\fIjavadoc\fRコマンドは、\fI<body>\fRと\fI</body>\fR
+HTMLタグ間のすべての内容をコピーします。\fI<head>\fRセクションを含め、そこに\fI<title>\fRタグやソース・ファイルの著作権記述などの情報を配置することもできますが、生成されたドキュメントにはそれらは一切表示されません。
 .RE
 .sp
 .RS 4
@@ -356,7 +356,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåޤѥå򻲾ȤƤ
+パッケージ・タグを処理します。パッケージ・タグを参照してください。
 .RE
 .sp
 .RS 4
@@ -367,8 +367,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ƥȤ줿ѥåΥޥ꡼ڡβޤJavaץåȥեࡢStandard Edition APIͤγ
-(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)򻲾ȤƤ
+処理したテキストを生成されたパッケージのサマリー・ページの下部に挿入します。Javaプラットフォーム、Standard Edition API仕様の概要
+(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)を参照してください
 .RE
 .sp
 .RS 4
@@ -379,24 +379,24 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåΥޥ꡼ڡƬˡѥåȤκǽʸ򥳥ԡޤˡ\fIjavadoc\fRޥɤϡץڡΥѥåꥹȤˡѥå̾ȥѥåȤκǽʸɲäޤJavaץåȥեࡢStandard Edition APIͤγ
-(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)򻲾ȤƤ
-.sp
-ʸνϡ饹СμκǽʸνƱ롼ˤäȽǤޤ
-.RE
-.SS "ץȡե"
+パッケージのサマリー・ページの先頭に、パッケージ・コメントの最初の文をコピーします。さらに、\fIjavadoc\fRコマンドは、概要ページのパッケージ・リストに、パッケージ名とパッケージ・コメントの最初の文を追加します。Javaプラットフォーム、Standard Edition API仕様の概要
+(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)を参照してください
+.sp
+文の終わりは、クラスやメンバーの主説明の最初の文の終わりと同じルールによって判断されます。
+.RE
+.SS "概要コメント・ファイル"
 .PP
-ɥȲƥץꥱޤϥѥååȤϡȼγץɥơ󡦥ȤĤȤǤѤΥեݻޤƤϡ\fIjavadoc\fRޥɤˤä복ץڡȤ߹ޤޤΥȤˤϡ̾ץꥱޤϥѥååΤƤϤޤɥȤ򵭽Ҥޤ
+ドキュメント化する各アプリケーションまたはパッケージ・セットは、独自の概要ドキュメンテーション・コメントを持つことができ、それは専用のソース・ファイルに保持されます。その内容は、\fIjavadoc\fRコマンドによって生成される概要ページに組み込まれます。このコメントには、通常、アプリケーションまたはパッケージ・セット全体に当てはまるドキュメントを記述します。
 .PP
-Υեˤoverview\&.htmlʤɤ̾դ뤳ȤǤɤ֤Ƥ⤫ޤޤ󡣰Ūʾϡĥ꡼κǾǤ
+このファイルにはoverview\&.htmlなどの名前を付けることができ、どこに配置してもかまいません。一般的な場所は、ソース・ツリーの最上部です。
 .PP
-ȤС\fIjava\&.applet\fRѥåΥե뤬/home/user/src/java/appletǥ쥯ȥ˳ǼƤ硢ץȡե/home/user/src/overview\&.html˺Ǥޤ
+たとえば、\fIjava\&.applet\fRパッケージのソース・ファイルが/home/user/src/java/appletディレクトリに格納されている場合、概要コメント・ファイルは/home/user/src/overview\&.htmlに作成できます。
 .PP
-ۤʤѥåΥåȤФ\fIjavadoc\fRޥɤʣ¹ԤϡƱ1ĤΥեΥåȤФʣγץȡեǤޤȤСɥѤ\fI\-private\fRꤷ\fIjavadoc\fRޥɤ1¹Ԥ塢ɥѤˤΥץꤷʤǺټ¹Ԥ뤳ȤǤޤξ硢Ƴץȡե1ʸܤǡΥɥȤѤޤѤȤƵҤǤޤ
+異なるパッケージのセットに対して\fIjavadoc\fRコマンドを複数回実行する場合は、同じ1つのソース・ファイルのセットに対して複数の概要コメント・ファイルを作成できます。たとえば、内部ドキュメント用に\fI\-private\fRを指定して\fIjavadoc\fRコマンドを1回実行した後、公開ドキュメント用にそのオプションを指定しないで再度実行することができます。この場合、各概要コメント・ファイルの1文目で、そのドキュメントを公開用または内部用として記述できます。
 .PP
-ץȡեƤϡHTMLǵҤ줿1Ĥ礭ʥɥơ󡦥ȤǤǽʸϥץꥱޤϥѥåΥåȤΥޥ꡼Ȥޤ\fI<body>\fRȺǽʸδ֤˥ȥ䤽¾ΥƥȤޤʤ褦ˤޤ{\fI@link}\fRʤɤΥ饤󡦥٤ƤΥϡθ֤ɬפޤ\fI@see\fRɲäˤϡ̾Ѥɬפޤ
+概要コメント・ファイルの内容は、HTMLで記述された1つの大きなドキュメンテーション・コメントです。最初の文はアプリケーションまたはパッケージのセットのサマリーとします。\fI<body>\fRタグと最初の文の間にタイトルやその他のテキストを含めないようにします。{\fI@link}\fRなどのインライン・タグを除くすべてのタグは、主説明の後に配置する必要があります。\fI@see\fRタグを追加する場合には、完全修飾名を使用する必要があります。
 .PP
-\fIjavadoc\fRޥɤμ¹Իˡ\fI\-overview\fRץѤƳץȡե̾ꤷޤΥեϡѥåȡեƱ褦˽ޤ\fIjavadoc\fRޥɤϼμ¹Ԥޤ
+\fIjavadoc\fRコマンドの実行時に、\fI\-overview\fRオプションを使用して概要コメント・ファイル名を指定します。このファイルは、パッケージ・コメント・ファイルと同じように処理されます。\fIjavadoc\fRコマンドは次の手順を実行します。
 .sp
 .RS 4
 .ie n \{\
@@ -406,7 +406,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI<body>\fR\fI</body>\fRδ֤ˤƤ򤹤٤ƽоݤȤƥԡޤ
+\fI<body>\fRと\fI</body>\fRタグの間にある内容をすべて処理対象としてコピーします。
 .RE
 .sp
 .RS 4
@@ -417,7 +417,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץнޤץ򻲾ȤƤ
+概要タグがあれば処理します。概要タグを参照してください。
 .RE
 .sp
 .RS 4
@@ -428,8 +428,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ƥȤ줿ץڡβޤJavaץåȥեStandard Edition APIͤγ
-(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)򻲾ȤƤ
+処理したテキストを生成された概要ページの下部に挿入します。JavaプラットフォームStandard Edition API仕様の概要
+(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)を参照してください
 .RE
 .sp
 .RS 4
@@ -440,17 +440,17 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץޥ꡼ڡƬˡץȤκǽʸ򥳥ԡޤ
-.RE
-.SS "̤Υե"
+概要サマリー・ページの先頭に、概要コメントの最初の文をコピーします。
+.RE
+.SS "未処理のファイル"
 .PP
-եˤϡ\fIjavadoc\fRޥɤˤäưǥ쥯ȥ˥ԡ롢ǤդΥեޤ뤳ȤǤޤΤ褦ʥեˤϡ̾եåե롢ץJavaӥ饹ե롢ŪJavaեΥɥơ󡦥Ȥαƶʤ¿ƤޤΩHTMLեʤɤޤ
+ソース・ファイルには、\fIjavadoc\fRコマンドによって宛先ディレクトリにコピーされる、任意のファイルを含めることができます。このようなファイルには、通常、グラフィック・ファイル、サンプルのJavaソースおよびクラス・ファイル、一般的なJavaソース・ファイルのドキュメンテーション・コメントの影響を受けない多くの内容を含む独立したHTMLファイルなどがあります。
 .PP
-̤Υեޤˤϡdoc\-filesȤǥ쥯ȥ˥ե֤ޤdoc\-filesǥ쥯ȥϡեޤǤդΥѥåǥ쥯ȥΥ֥ǥ쥯ȥˤʤ뤳ȤǤޤdoc\-files֥ǥ쥯ȥϡѥåȤ1ѰդǤޤ
+未処理のファイルを含めるには、doc\-filesというディレクトリにファイルを配置します。doc\-filesディレクトリは、ソース・ファイルを含む任意のパッケージ・ディレクトリのサブディレクトリになることができます。doc\-filesサブディレクトリは、パッケージごとに1つ用意できます。
 .PP
-ȤСܥΥ᡼\fIjava\&.awt\&.Button\fR饹ΥɥȤ˴ޤˤϡΥ᡼ե/home/user/src/java/awt/doc\-files/ǥ쥯ȥ֤ޤdoc\-filesǥ쥯ȥ/home/user/src/java/doc\-files֤ʤǤjavaϥѥåǤϤʤǤեޤ뤳ȤǤޤ
+たとえば、ボタンのイメージを\fIjava\&.awt\&.Button\fRクラスのドキュメントに含める場合には、そのイメージ・ファイルを/home/user/src/java/awt/doc\-files/ディレクトリに置きます。doc\-filesディレクトリを/home/user/src/java/doc\-filesに置かないでください。javaはパッケージではないからです。ソース・ファイルを含めることもできません。
 .PP
-\fIjavadoc\fRޥɤϥե򻲾ȤʤΤǡ̤ΥեؤΤ٤ƤΥ󥯤ϡɤ˴ޤޤƤɬפޤ\fIjavadoc\fRޥɤϥǥ쥯ȥȤΤ٤ƤƤ˥ԡޤǤϡButton\&.javaɥơ󡦥ȤΥ󥯤ɤΤ褦˸뤫򼨤Ƥޤ
+\fIjavadoc\fRコマンドはファイルを参照しないので、未処理のファイルへのすべてのリンクは、コードに含まれている必要があります。\fIjavadoc\fRコマンドはディレクトリとそのすべての内容を宛先にコピーします。次の例では、Button\&.javaドキュメンテーション・コメントのリンクがどのように見えるかを示しています。
 .sp
 .if n \{\
 .RS 4
@@ -464,13 +464,13 @@
 .if n \{\
 .RE
 .\}
-.SS "ƥȤӥƥץ졼ȡե"
+.SS "テストおよびテンプレート・ファイル"
 .PP
-ĥ꡼ΥƥȤӥƥץ졼ȡե򡢥ե뤬¸ߤǥ쥯ȥޤϥ֥ǥ쥯ȥƱǥ쥯ȥ˳ǼǤޤƥȤӥƥץ졼ȡե뤬Τɤˤϡ\fIjavadoc\fRޥɤ¹ԤŪ˸̤Υե̾Ϥޤ
+ソース・ツリーのテストおよびテンプレート・ファイルを、ソース・ファイルが存在するディレクトリまたはサブディレクトリと同じディレクトリに格納できます。テストおよびテンプレート・ファイルが処理されるのを防ぐには、\fIjavadoc\fRコマンドを実行し、明示的に個別のソース・ファイル名を渡します。
 .PP
-ƥȡեϡͭʡѥǽʥեǤƥץ졼ȡեϡͭʡߴΤ륽եǤϤޤ󤬡¿ξ硢\fI\&.java\fRäƤޤ
-ƥȡե.PP
-ƥȡե̾ʤѥå䡢ե뤬¸ߤѥåȤ̤Υѥå°褦ˤ硢ƥȡե򥽡եβΥ֥ǥ쥯ȥ֤Υǥ쥯ȥ̵̾դޤƥȡե򥽡Ʊǥ쥯ȥ֤ѥå̾򼨤ޥɥ饤ꤷ\fIjavadoc\fRޥɤƤӽФȡƥȡեϷٹޤϥ顼ޤե뤬̵̾ĥ֥ǥ쥯ȥ¸ߤ硢ƥȡե롦ǥ쥯ȥϥåפ졢顼ޤϷٹȯԤޤ󡣤ȤСեΥƥȡեcom\&.package1ɲäˤϡ̵ʥѥå̾Υ֥ǥ쥯ȥ֤ޤΥǥ쥯ȥ̾ˤϥϥե󤬴ޤޤƤ뤿̵Ǥ
+テスト・ファイルは、有効な、コンパイル可能なソース・ファイルです。テンプレート・ファイルは、有効な、互換性のあるソース・ファイルではありませんが、多くの場合、\fI\&.java\fR接尾辞を持っています。
+テスト・ファイル.PP
+テスト・ファイルを、名前なしパッケージや、ソース・ファイルが存在するパッケージとは別のパッケージに属するようにする場合、テスト・ファイルをソース・ファイルの下のサブディレクトリに配置し、そのディレクトリに無効な名前を付けます。テスト・ファイルをソースと同じディレクトリに配置し、パッケージ名を示すコマンドライン引数を指定して\fIjavadoc\fRコマンドを呼び出すと、テスト・ファイルは警告またはエラーを引き起こします。ファイルが無効な名前を持つサブディレクトリ内に存在する場合、テスト・ファイル・ディレクトリはスキップされ、エラーまたは警告は発行されません。たとえば、ソース・ファイルのテスト・ファイルをcom\&.package1に追加するには、無効なパッケージ名のサブディレクトリに配置します。次のディレクトリ名にはハイフンが含まれているため無効です。
 .sp
 .if n \{\
 .RS 4
@@ -482,13 +482,13 @@
 .RE
 .\}
 .PP
-ƥȡե˥ɥơ󡦥Ȥޤޤ硢\fIjavadoc\fRޥɤθ̤μ¹Ԥǡ磻ɥɤޤƥȡե̾(\fIcom/package1/test\-files/*\&.java\fRʤ)ϤơƥȡեΥɥȤ褦Ǥޤ
-ƥץ졼ȡե.PP
-ƥץ졼ȡե򥽡ǥ쥯ȥ֤뤬\fIjavadoc\fRޥɤ¹ԤȤ˥顼ʤ硢ե\fIBuffer\-Template\&.java\fRʤɤ̵̾դơʤ褦ˤޤ\fIjavadoc\fRޥɤϡ\fI\&.java\fRͭʥ饹̾ˤʤ̾ĥեΤߤޤ
-.SH "ե"
+テスト・ファイルにドキュメンテーション・コメントが含まれる場合、\fIjavadoc\fRコマンドの個別の実行で、ワイルドカードを含んだテスト・ソース・ファイル名(\fIcom/package1/test\-files/*\&.java\fRなど)を渡して、テスト・ファイルのドキュメントを生成するように設定できます。
+テンプレート・ファイル.PP
+テンプレート・ファイルをソース・ディレクトリに配置するが、\fIjavadoc\fRコマンドを実行するときにエラーを生成しない場合、ファイルに\fIBuffer\-Template\&.java\fRなどの無効な名前を付けて、処理させないようにします。\fIjavadoc\fRコマンドは、接尾辞の\fI\&.java\fRが削除されると有効なクラス名になる名前を持つソース・ファイルのみを処理します。
+.SH "生成されるファイル"
 .PP
-ǥեȤǤϡ\fIjavadoc\fRޥɤϡHTMLΥɥȤɸɥååȤѤޤɸɥååȤϡ롢ƥڡ߻ȥڡݡȡڡޤHTMLڡϸ̤Υեбޤ\fIjavadoc\fRޥɤϡ2ĤΥפΥեޤǽΥפˤϡ饹ӥ󥿥ե˱̾դޤ2ܤΥפˤϡǽΥפΥեȤζɤˡϥե󤬴ޤޤޤ(package\-summary\&.htmlʤ)
-.SS "ƥڡ"
+デフォルトでは、\fIjavadoc\fRコマンドは、HTML形式のドキュメントを生成する標準ドックレットを使用します。標準ドックレットは、ここで説明する、基本内容ページ、相互参照ページ、サポート・ページを生成します。各HTMLページは個別のファイルに対応します。\fIjavadoc\fRコマンドは、2つのタイプのファイルを生成します。最初のタイプには、クラスおよびインタフェースに応じた名前が付けられます。2番目のタイプには、最初のタイプのファイルとの競合を防ぐために、ハイフンが含まれます(package\-summary\&.htmlなど)。
+.SS "基本内容ページ"
 .sp
 .RS 4
 .ie n \{\
@@ -498,7 +498,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ܤƤ륯饹ޤϥ󥿥եȤ1ĤΥ饹ޤϥ󥿥եڡ(classname\&.html)
+記載されているクラスまたはインタフェースごとに1つのクラスまたはインタフェース・ページ(classname\&.html)。
 .RE
 .sp
 .RS 4
@@ -509,7 +509,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ܤƤѥåȤ1ĤΥѥåڡ(package\-summary\&.html)\fIjavadoc\fRޥɤϡĥ꡼Υѥåǥ쥯ȥˤpackage\&.htmlޤpackage\-info\&.javaȤ̾ΥեHTMLƥȤ򤹤٤Ȥޤ
+記載されているパッケージごとに1つのパッケージ・ページ(package\-summary\&.html)。\fIjavadoc\fRコマンドは、ソース・ツリーのパッケージ・ディレクトリ内にあるpackage\&.htmlまたはpackage\-info\&.javaという名前のファイル内のHTMLテキストをすべて組み入れます。
 .RE
 .sp
 .RS 4
@@ -520,9 +520,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåΥåΤФ1Ĥγץڡ(overview\-summary\&.html)ץڡϡɥȤƬڡˤʤޤ\fIjavadoc\fRޥɤϡ\fI\-overview\fRץǻꤵ줿եHTMLƥȤ򤹤٤ȤޤץڡΤϡ\fIjavadoc\fRޥɤʣΥѥå̾ϤΤߤǤHTMLե졼पӥץ򻲾ȤƤ
-.RE
-.SS "߻ȥڡ"
+パッケージのセット全体に対して1つの概要ページ(overview\-summary\&.html)。概要ページは、生成ドキュメントの先頭ページになります。\fIjavadoc\fRコマンドは、\fI\-overview\fRオプションで指定されたファイル内のHTMLテキストをすべて組み入れます。概要ページが作成されるのは、\fIjavadoc\fRコマンドに複数のパッケージ名を渡した場合のみです。HTMLフレームおよびオプションを参照してください。
+.RE
+.SS "相互参照ページ"
 .sp
 .RS 4
 .ie n \{\
@@ -532,7 +532,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåΥåΤФ1ĤΥ饹إڡ(overview\-tree\&.html)إڡɽˤϡʥӥ󡦥СΡֳספ򥯥åƤ顢ֳإĥ꡼פ򥯥åޤ
+パッケージのセット全体に対して1つのクラス階層ページ(overview\-tree\&.html)。階層ページを表示するには、ナビゲーション・バーの「概要」をクリックしてから、「階層ツリー」をクリックします。
 .RE
 .sp
 .RS 4
@@ -543,7 +543,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåȤ1ĤΥ饹إڡ(package\-tree\&.html)إڡɽˤϡΥѥå饹ޤϥ󥿥եΥڡ˰ưֳإĥ꡼פ򥯥åƤΥѥåγؤɽޤ
+パッケージごとに1つのクラス階層ページ(package\-tree\&.html)。階層ページを表示するには、特定のパッケージ、クラス、またはインタフェースのページに移動し、「階層ツリー」をクリックしてそのパッケージの階層を表示します。
 .RE
 .sp
 .RS 4
@@ -554,7 +554,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåȤ1Ĥλѥڡ(package\-use\&.html)ȡ饹ӥ󥿥եȤ1ĤĤλѥڡ(class\-use/classname\&.html)ѥڡǤϡꤷ饹󥿥եޤϥѥåΰѤƤѥå饹᥽åɡ󥹥ȥ饯ӥեɤˤĤƵҤޤȤС饹ޤϥ󥿥եAˤȡλѥڡˤϡAΥ֥饹AȤ줿եɡA֤᥽åɡAΥѥ᡼ĥ᥽åɤӥ󥹥ȥ饯Ȥ߹ޤޤѥڡɽˤϡѥå饹ޤϥ󥿥ե˰ưʥӥ󡦥СΡֻѡץ󥯤򥯥åޤ
+パッケージごとに1つの使用ページ(package\-use\&.html)と、クラスおよびインタフェースごとに1つずつの使用ページ(class\-use/classname\&.html)。使用ページでは、指定したクラス、インタフェース、またはパッケージの一部を使用しているパッケージ、クラス、メソッド、コンストラクタ、およびフィールドについて記述されます。たとえば、クラスまたはインタフェースAを例にすると、その使用ページには、Aのサブクラス、Aとして宣言されたフィールド、Aを返すメソッド、A型のパラメータを持つメソッドおよびコンストラクタが組み込まれます。使用ページを表示するには、パッケージ、クラス、またはインタフェースに移動し、ナビゲーション・バーの「使用」リンクをクリックします。
 .RE
 .sp
 .RS 4
@@ -565,7 +565,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤Ƥ侩APIȤο侩ؤꥹȤ侩APIڡ(deprecated\-list\&.html)侩APIϾμǺǽΤǻѤʤǤ
+すべての非推奨APIとその推奨する代替をリストする非推奨APIページ(deprecated\-list\&.html)。非推奨APIは将来の実装で削除される可能性があるので使用しないでください。
 .RE
 .sp
 .RS 4
@@ -576,7 +576,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-եɤѤեͥڡ(constant\-values\&.html)
+定数フィールドの値用の定数フィールド値ページ(constant\-values\&.html)。
 .RE
 .sp
 .RS 4
@@ -587,9 +587,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ľ󲽤줿ڡ(serialized\-form\&.html)եɤӥ᥽åɤޤࡢľ󲽲ǽijǽʥ饹˴ؤѤΥڡǤΥڡξϡAPIѤ볫ȯԤǤϤʤƼԤɬפʾǤľ󲽤줿ڡإˤϡľ󲽤줿饹˰ươΥ饹ȤˤִϢܡץǡľ󲽤줿פ򥯥åޤɸɥååȤľ󲽤줿ڡޤΥڡˤϡSerializable뤹٤ƤΥ饹(publicޤpublic)\fIreadObject\fR\fIwriteObject\fR᥽åɡľ󲽤줿եɡ\fI@serial\fR\fI@serialField\fR\fI@serialData\fRΥɥơ󡦥ȤȤȤ˥ꥹȤޤľ󲽲ǽpublic饹ˤϡΥ饹(ޤϤΥѥå)\fI@serial\fR
-excludeǥޡޤľ󲽲ǽpackage\-private饹ޤˤϡΥ饹(ޤϤΥѥå)\fI@serial\fR
-includeǥޡޤ꡼1\&.4Ǥϡ\fI\-private\fRץꤻ\fIjavadoc\fRޥɤ¹Ԥ뤳Ȥˤꡢpublic饹private饹δľ󲽤줿Ǥޤץ򻲾ȤƤ
+直列化された形式ページ(serialized\-form\&.html)。フィールドおよびメソッドの説明を含む、直列化可能かつ外部化可能なクラスに関する情報用のページです。このページ内の情報は、APIを使用する開発者ではなく、再実装者に必要な情報です。直列化された形式ページへアクセスするには、直列化されたクラスに移動して、そのクラス・コメントにある「関連項目」セクションで「直列化された形式」をクリックします。標準ドックレットは直列化された形式ページを生成します。このページには、Serializableを実装するすべてのクラス(publicまたは非public)が、その\fIreadObject\fRや\fIwriteObject\fRメソッド、直列化されたフィールド、および\fI@serial\fR、\fI@serialField\fR、\fI@serialData\fRタグからのドキュメンテーション・コメントとともにリストされます。直列化可能なpublicクラスを除外するには、そのクラス(またはそのパッケージ)を\fI@serial\fR
+excludeでマークします。直列化可能なpackage\-privateクラスを含めるには、そのクラス(またはそのパッケージ)を\fI@serial\fR
+includeでマークします。リリース1\&.4では、\fI\-private\fRオプションを指定せずに\fIjavadoc\fRコマンドを実行することにより、publicクラスおよびprivateクラスの完全に直列化された形式を生成できます。オプションを参照してください。
 .RE
 .sp
 .RS 4
@@ -600,9 +600,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ڡ(\fIindex\-*\&.html\fR)٤ƤΥ饹̾󥿥ե̾󥹥ȥ饯̾ե̾ӥ᥽å̾ե٥åȽ¤ǤޤڡϡUnicode򰷤褦˹ݲƤޤ1ĤΥեȤ뤳Ȥ⡢Ƭʸ(ѸξA\(enZ)Ȥ̡ΥեȤ뤳ȤǤޤ
-.RE
-.SS "ݡȡڡ"
+索引ページ(\fIindex\-*\&.html\fR)。すべてのクラス名、インタフェース名、コンストラクタ名、フィールド名、およびメソッド名がアルファベット順に並んでいます。索引ページは、Unicodeを扱えるように国際化されています。1つのファイルとして生成することも、先頭文字(英語の場合A\(enZ)ごとに別々のファイルとして生成することもできます。
+.RE
+.SS "サポート・ページ"
 .sp
 .RS 4
 .ie n \{\
@@ -612,7 +612,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-إסڡ(help\-doc\&.html)ʥӥ󡦥СҤγƥڡ˴ؤܤƤޤǥեȤΥإסեȼΥࡦإסեǥС饤ɤˤϡ\fI\-helpfile\fRѤޤ
+ヘルプ・ページ(help\-doc\&.html)。ナビゲーション・バーや前述の各ページに関する説明が記載されています。デフォルトのヘルプ・ファイルを独自のカスタム・ヘルプ・ファイルでオーバーライドするには、\fI\-helpfile\fRを使用します。
 .RE
 .sp
 .RS 4
@@ -623,7 +623,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɽѤHTMLե졼1Ĥindex\&.htmlե롣ե졼դƬڡɽˤϤΥեɤޤindex\&.htmlեˤϡƥȡƥĤϴޤޤƤޤ
+表示用のHTMLフレームを作成する1つのindex\&.htmlファイル。フレーム付きの先頭ページを表示するにはこのファイルをロードします。index\&.htmlファイルには、テキスト・コンテンツは含まれていません。
 .RE
 .sp
 .RS 4
@@ -634,7 +634,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ʣΥե졼ࡦե(\fI*\-frame\&.html\fR)ѥå饹ӥ󥿥եΥꥹȤޤޤƤޤե졼ࡦեHTMLե졼ɽޤ
+複数のフレーム・ファイル(\fI*\-frame\&.html\fR)。パッケージ、クラス、およびインタフェースのリストが含まれています。フレーム・ファイルはHTMLフレームを表示します。
 .RE
 .sp
 .RS 4
@@ -645,7 +645,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåꥹȡե(package\-list)\fI\-link\fR\fI\-linkoffline\fRץǻѤޤѥåꥹȡեϥƥȡեǤꡢɤΥ󥯤⥢Ǥޤ
+パッケージ・リスト・ファイル(package\-list)。\fI\-link\fRおよび\fI\-linkoffline\fRオプションで使用されます。パッケージ・リスト・ファイルはテキスト・ファイルであり、どのリンクからもアクセスできません。
 .RE
 .sp
 .RS 4
@@ -656,7 +656,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-륷ȡե(stylesheet\&.css)ڡΰǤˤĤƿեȡեߥꡢեȡեȡ롢֤椷ޤ
+スタイルシート・ファイル(stylesheet\&.css)。生成されるページの一部の要素について色、フォント・ファミリ、フォント・サイズ、フォント・スタイル、および配置を制御します。
 .RE
 .sp
 .RS 4
@@ -667,22 +667,22 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-doc\-filesǥ쥯ȥꡣǥ쥯ȥ˥ԡ륤᡼ץ롦ɡɤʤɤΥե뤬ǼޤΥեϡ\fIjavadoc\fRޥɤˤäƽޤ󡣤Υǥ쥯ȥϡĥ꡼¸ߤˤΤ߽ޤ
+doc\-filesディレクトリ。宛先ディレクトリにコピーするイメージ、サンプル・コード、ソース・コードなどのファイルが格納されます。これらのファイルは、\fIjavadoc\fRコマンドによって処理されません。このディレクトリは、ソース・ツリーの中に存在する場合にのみ処理されます。
 .RE
 .PP
-ץ򻲾ȤƤ
-.SS "HTMLե졼"
+オプションを参照してください。
+.SS "HTMLフレーム"
 .PP
-\fIjavadoc\fRޥɤϡޥɤϤ줿ͤ˴ŤǾɬפʿ(2ޤ3)Υե졼ޤ\fIjavadoc\fRޥɤ˰Ȥ1ĤΥѥå̾ޤ1ĤΥѥå˴ޤޤ륽եϤϡѥåΥꥹȤάޤΤˡ\fIjavadoc\fRޥɤϺ¦1ĤΥե졼饹ΥꥹȤɽޤʣΥѥå̾Ϥϡ\fIjavadoc\fRޥɤϡ٤ƤΥѥåꥹȤ3Υե졼ȳץڡ(overview\-summary\&.html)ޤե졼άˤϡ֥ե졼ʤץ󥯤򥯥å뤫overview\-summary\&.htmlڡڡåȤɽޤ
-.SS "եι¤"
+\fIjavadoc\fRコマンドは、コマンドに渡された値に基づき、最小限必要な数(2または3)のフレームを生成します。\fIjavadoc\fRコマンドに引数として1つのパッケージ名または1つのパッケージに含まれるソース・ファイルを渡す場合は、パッケージのリストが省略されます。そのかわりに、\fIjavadoc\fRコマンドは左側の列に1つのフレームを作成し、クラスのリストを表示します。複数のパッケージ名を渡した場合は、\fIjavadoc\fRコマンドは、すべてのパッケージをリストする第3のフレームと概要ページ(overview\-summary\&.html)を作成します。フレームを省略するには、「フレームなし」リンクをクリックするか、overview\-summary\&.htmlページからページ・セットを表示します。
+.SS "生成されるファイルの構造"
 .PP
-륯饹ե뤪ӥ󥿥եեϡJavaե뤪ӥ饹եƱǥ쥯ȥ곬ؤޤ1ĤΥ֥ѥåˤĤ1ĤΥǥ쥯ȥꡢȤ¤ˤʤޤ
+生成されるクラス・ファイルおよびインタフェース・ファイルは、Javaソース・ファイルおよびクラス・ファイルと同じディレクトリ階層に編成されます。1つのサブパッケージにつき1つのディレクトリ、という構造になります。
 .PP
-ȤС\fIjava\&.applet\&.Applet\fR饹ѤɥȤϡjava/applet/Applet\&.html˳Ǽޤ
+たとえば、\fIjava\&.applet\&.Applet\fRクラス用に生成されるドキュメントは、java/applet/Applet\&.htmlに格納されます。
 .PP
-ǥ쥯ȥ̾\fIapidocs\fRȤȡ\fIjava\&.applet\fRѥåΥեι¤ϡΤȤǤҤΤ褦ˡ\fIframe\fRȤ̾˴ޤեϡ٤ƺޤϺΥե졼ɽޤʳHTMLեϡ٤Ʊ¦Υե졼ɽޤ
+生成先ディレクトリの名前が\fIapidocs\fRだとすると、\fIjava\&.applet\fRパッケージのファイルの構造は、次のとおりです。前述のように、\fIframe\fRという語を名前に含むファイルは、すべて左上または左下のフレームに表示されます。それ以外のHTMLファイルは、すべて右側のフレームに表示されます。
 .PP
-ǥ쥯ȥǤꥹ(*)ϡ\fIjavadoc\fRޥɤؤΰѥå̾ǤϤʤե̾Ǥ˾άե뤪ӥǥ쥯ȥ򼨤Ƥޤե̾ξ硢ΥѥåꥹȤޤdoc\-filesǥ쥯ȥϡĥ꡼¸ߤˤΤߡ˺ޤե򻲾ȤƤ
+ディレクトリは太字です。アスタリスク(*)は、\fIjavadoc\fRコマンドへの引数がパッケージ名ではなくソース・ファイル名である場合に省略されるファイルおよびディレクトリを示しています。引数がソース・ファイル名の場合、空のパッケージ・リストが作成されます。doc\-filesディレクトリは、ソース・ツリー内に存在する場合にのみ、生成先に作成されます。生成されるファイルを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -692,7 +692,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBapidocs\fR: Ǿ̥٥롦ǥ쥯ȥ
+\fBapidocs\fR: 最上位レベル・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -702,7 +702,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-index\&.html: HTMLե졼ꤹڡ
+index\&.html: HTMLフレームを設定する初期ページ
 .RE
 .sp
 .RS 4
@@ -713,7 +713,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-*overview\-summary\&.html: ѥåꥹȤȥޥ꡼
+*overview\-summary\&.html: パッケージ・リストとサマリー
 .RE
 .sp
 .RS 4
@@ -724,7 +724,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-overview\-tree\&.html: ٤ƤΥѥåΥ饹
+overview\-tree\&.html: すべてのパッケージのクラス階層
 .RE
 .sp
 .RS 4
@@ -735,7 +735,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-deprecated\-list\&.html: ٤ƤΥѥå侩API
+deprecated\-list\&.html: すべてのパッケージの非推奨API
 .RE
 .sp
 .RS 4
@@ -746,7 +746,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-constant\-values\&.html: ٤ƤΥѥåŪե
+constant\-values\&.html: すべてのパッケージの静的フィールド値
 .RE
 .sp
 .RS 4
@@ -757,7 +757,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-serialized\-form\&.html: ٤ƤΥѥåľ󲽤줿ե
+serialized\-form\&.html: すべてのパッケージの直列化されたフォーム
 .RE
 .sp
 .RS 4
@@ -768,7 +768,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-*overview\-frame\&.html: Υե졼ɽ뤹٤ƤΥѥå
+*overview\-frame\&.html: 左上のフレームに表示するすべてのパッケージ
 .RE
 .sp
 .RS 4
@@ -779,7 +779,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-allclasses\-frame\&.html: Υե졼ɽ뤹٤ƤΥ饹
+allclasses\-frame\&.html: 左下のフレームに表示するすべてのクラス
 .RE
 .sp
 .RS 4
@@ -790,7 +790,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-help\-doc\&.html: Javadocڡ˴ؤإ
+help\-doc\&.html: Javadocページの編成に関するヘルプ
 .RE
 .sp
 .RS 4
@@ -802,7 +802,7 @@
 .IP \(bu 2.3
 .\}
 index\-all\&.html:
-\fI\-splitindex\fRץʤǺ줿ǥեȤκ
+\fI\-splitindex\fRオプションなしで作成されたデフォルトの索引
 .RE
 .sp
 .RS 4
@@ -814,7 +814,7 @@
 .IP \(bu 2.3
 .\}
 \fBindex\-files\fR:
-\fI\-splitindex\fRץꤷƺ줿ǥ쥯ȥ
+\fI\-splitindex\fRオプションを指定して作成されたディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -825,7 +825,7 @@
 .IP \(bu 2.3
 .\}
 index\-<number>\&.html:
-\fI\-splitindex\fRץꤷƺ줿ե
+\fI\-splitindex\fRオプションを指定して作成された索引ファイル
 .RE
 .RE
 .sp
@@ -837,7 +837,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-list: Ȥ褹뤿Υѥå̾
+package\-list: 外部参照を解決するためのパッケージ名
 .RE
 .sp
 .RS 4
@@ -848,7 +848,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-stylesheet\&.css: եȡ֤ʤɤޤ
+stylesheet\&.css: フォント、色、位置などを定義します
 .RE
 .RE
 .sp
@@ -860,7 +860,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBjava\fR: ѥåǥ쥯ȥ
+\fBjava\fR: パッケージ・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -870,7 +870,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBapplet\fR: ֥ѥåǥ쥯ȥ
+\fBapplet\fR: サブパッケージ・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -881,7 +881,7 @@
 .IP \(bu 2.3
 .\}
 Applet\&.html:
-\fIApplet\fR饹ڡ
+\fIApplet\fRクラス・ページ
 .RE
 .sp
 .RS 4
@@ -893,7 +893,7 @@
 .IP \(bu 2.3
 .\}
 AppletContext\&.html:
-\fIAppletContext\fR󥿥ե
+\fIAppletContext\fRインタフェース
 .RE
 .sp
 .RS 4
@@ -905,7 +905,7 @@
 .IP \(bu 2.3
 .\}
 AppletStub\&.html:
-\fIAppletStub\fR󥿥ե
+\fIAppletStub\fRインタフェース
 .RE
 .sp
 .RS 4
@@ -917,7 +917,7 @@
 .IP \(bu 2.3
 .\}
 AudioClip\&.html:
-\fIAudioClip\fR󥿥ե
+\fIAudioClip\fRインタフェース
 .RE
 .sp
 .RS 4
@@ -928,7 +928,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-summary\&.html: 饹ȥޥ꡼
+package\-summary\&.html: クラスとサマリー
 .RE
 .sp
 .RS 4
@@ -939,7 +939,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-frame\&.html: Υե졼ɽѥå饹
+package\-frame\&.html: 左下のフレームに表示するパッケージ・クラス
 .RE
 .sp
 .RS 4
@@ -950,7 +950,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-tree\&.html: ΥѥåΥ饹
+package\-tree\&.html: このパッケージのクラス階層
 .RE
 .sp
 .RS 4
@@ -961,7 +961,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-use\&.html: ΥѥåѤ
+package\-use\&.html: このパッケージが使用される場所
 .RE
 .sp
 .RS 4
@@ -972,7 +972,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBdoc\-files\fR: ᡼ӥץ롦եΥǥ쥯ȥ
+\fBdoc\-files\fR: イメージおよびサンプル・ファイルのディレクトリ
 .RE
 .sp
 .RS 4
@@ -983,18 +983,18 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBclass\-use\fR: ᡼ӥץ롦եξ
-.sp
-\- Applet\&.html: Applet饹λ
+\fBclass\-use\fR: イメージおよびサンプル・ファイルの場所
+.sp
+\- Applet\&.html: Appletクラスの使用
 .sp
 \- AppletContext\&.html:
-\fIAppletContext\fR󥿥եλ
+\fIAppletContext\fRインタフェースの使用
 .sp
 \- AppletStub\&.html:
-\fIAppletStub\fR󥿥եλ
+\fIAppletStub\fRインタフェースの使用
 .sp
 \- AudioClip\&.html:
-\fIAudioClip\fR󥿥եλ
+\fIAudioClip\fRインタフェースの使用
 .RE
 .RE
 .RE
@@ -1007,7 +1007,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBsrc\-html\fR: ɡǥ쥯ȥ
+\fBsrc\-html\fR: ソース・コード・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -1017,7 +1017,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBjava\fR: ѥåǥ쥯ȥ
+\fBjava\fR: パッケージ・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -1027,24 +1027,24 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBapplet\fR: ֥ѥåǥ쥯ȥ
-.sp
-\- Applet\&.html: Applet
+\fBapplet\fR: サブパッケージ・ディレクトリ
+.sp
+\- Applet\&.html: Appletソース・コード
 .sp
 \- AppletContext\&.html:
-\fIAppletContext\fR
+\fIAppletContext\fRソース・コード
 .sp
 \- AppletStub\&.html:
-\fIAppletStub\fR
+\fIAppletStub\fRソース・コード
 .sp
 \- AudioClip\&.html:
-\fIAudioClip\fR
-.RE
-.RE
-.RE
-.SS "API"
+\fIAudioClip\fRソース・コード
+.RE
+.RE
+.RE
+.SS "生成されるAPI宣言"
 .PP
-\fIjavadoc\fRޥɤϡ줾Υ饹󥿥եեɡ󥹥ȥ饯ӥ᥽åɤεҤκǽˡAPIѤޤȤС\fIBoolean\fR饹ϡΤ褦ˤʤޤ
+\fIjavadoc\fRコマンドは、それぞれのクラス、インタフェース、フィールド、コンストラクタ、およびメソッドの記述の最初に、そのAPI用の宣言を生成します。たとえば、\fIBoolean\fRクラスの宣言は、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1058,7 +1058,7 @@
 .RE
 .\}
 .PP
-\fIBoolean\&.valueOf\fR᥽åɤϼΤȤǤ
+\fIBoolean\&.valueOf\fRメソッドの宣言は次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -1070,15 +1070,15 @@
 .RE
 .\}
 .PP
-\fIjavadoc\fRޥɤϡ\fIpublic\fR\fIprotected\fR\fIprivate\fR\fIabstract\fR\fIfinal\fR\fIstatic\fR\fItransient\fR\fIvolatile\fRޤ뤳ȤǤޤ\fIsynchronized\fR\fInative\fRϤǤޤ\fIsynchronized\fR\fInative\fRҤϡξܺ٤ȤߤʤƤ뤿ᡢAPIͤˤϴޤޤޤ
+\fIjavadoc\fRコマンドは、修飾子\fIpublic\fR、\fIprotected\fR、\fIprivate\fR、\fIabstract\fR、\fIfinal\fR、\fIstatic\fR、\fItransient\fR、および\fIvolatile\fRを含めることができますが、\fIsynchronized\fRおよび\fInative\fRはできません。\fIsynchronized\fRおよび\fInative\fR修飾子は、実装の詳細とみなされているため、API仕様には含まれません。
 .PP
-APIǤϡ¹ޥƥˤĤơ\fIsynchronized\fR˰¸ΤǤϤʤȤμȤƥɥȲɬפޤȤС1ĤenumerationʣΥåɤ¹ԤƻѤ뤳ȤϤǤʤפΤ褦˵ҤޤɥȤˤϡΥޥƥ¸ˡ򵭽ҤʤǤȤС\fIHashtable\fRץϥåɥդǤɬפޤ֥ݡȤ뤹٤ƤΥ᥽åɤƱƤ¸פΤ褦˻ꤹ뺬Ϥޤ󡣤٤¹ΤˡХåȡ٥ŪƱ븢¤ͭƤȤᤷޤ
-.SH "ɥơ󡦥"
+APIでは、並行性セマンティクスについて、キーワード\fIsynchronized\fRに依存するのではなく、コメントの主説明としてドキュメント化する必要があります。たとえば、「1つのenumerationを複数のスレッドから並行して使用することはできない」のように記述します。ドキュメントには、これらのセマンティクスを実現する方法を記述しないでください。たとえば、\fIHashtable\fRオプションはスレッドセーフである必要がありますが、「エクスポートされるすべてのメソッドを同期化してそれを実現する」のように指定する根拠はありません。より高度な並行性のために、バケット・レベルで内部的に同期化する権限を保有しておくことをお薦めします。
+.SH "ドキュメンテーション・コメント"
 .PP
-ΥǤϡɤΥȤȥȤηѾˤĤޤ
-.SS "ɡ"
+このセクションでは、ソース・コードのコメントとコメントの継承について説明します。
+.SS "ソース・コード・コメント"
 .PP
-ɤǤդΥ饹󥿥ե᥽åɡ󥹥ȥ饯ޤϥեɤˡɥơ󡦥Ȥ򵭽Ҥ뤳ȤǤޤƥѥåˤɥơ󡦥ȤǤޤʸϼ㴳ۤʤޤפˤɥơ󡦥ȤǤޤɥơ󡦥Ȥϡ\fI/**\fRȡɽ\fI*/\fRδ֤ˤʸ鹽ޤƬΥꥹϳƹԤǻѤǤιǾܤޤȤΥƥȤϡʣԤˤ錄äƵҤǤޤ
+ソース・コードの任意のクラス、インタフェース、メソッド、コンストラクタ、またはフィールドの宣言の前に、ドキュメンテーション・コメントを記述することができます。各パッケージにもドキュメンテーション・コメントを作成できます。構文は若干異なりますが、概要にもドキュメンテーション・コメントを作成できます。ドキュメンテーション・コメントは、\fI/**\fRと、終わりを表す\fI*/\fRの間にある文字から構成されます。先頭のアスタリスクは各行で使用でき、次の項で詳しく説明します。コメントのテキストは、複数行にわたって記述できます。
 .sp
 .if n \{\
 .RS 4
@@ -1093,7 +1093,7 @@
 .RE
 .\}
 .PP
-ڡ󤹤ˤϡȤ1Ԥޤ
+スペースを節約するには、コメントを1行に入れます。
 .sp
 .if n \{\
 .RS 4
@@ -1104,10 +1104,10 @@
 .if n \{\
 .RE
 .\}
-Ȥ.PP
-ɥơ󡦥Ȥϡ饹󥿥ե󥹥ȥ饯᥽åɡޤϥեľ֤ˤΤǧޤ᥽åɤΤ֤Ƥɥơ󡦥Ȥ̵뤵ޤ\fIjavadoc\fRޥɤϡʸȤ1ĤΥɥơ󡦥Ȥǧޤ󡣥ѤǤ򻲾ȤƤ
+コメントの配置.PP
+ドキュメンテーション・コメントは、クラス、インタフェース、コンストラクタ、メソッド、またはフィールド宣言の直前に配置される場合にのみ認識されます。メソッドの本体に置かれているドキュメンテーション・コメントは無視されます。\fIjavadoc\fRコマンドは、宣言文ごとに1つのドキュメンテーション・コメントしか認識しません。タグを使用できる場所を参照してください。
 .PP
-褯ְ㤤ϡ饹Ȥȥ饹δ֤\fIimport\fRʸ֤ƤޤȤǤ\fIjavadoc\fRޥɤϥ饹Ȥ̵뤹Τǡ\fIimport\fRʸ򤳤ξ֤ʤǤ
+よくある間違いは、クラス・コメントとクラス宣言の間に\fIimport\fR文を置いてしまうことです。\fIjavadoc\fRコマンドはクラス・コメントを無視するので、\fIimport\fR文をこの場所に配置しないでください。
 .sp
 .if n \{\
 .RS 4
@@ -1124,8 +1124,8 @@
 .if n \{\
 .RE
 .\}
-ȤΥѡ.PP
-ɥơ󡦥ȤˤϡȤθ³󤬴ޤޤޤϡ϶ڤʸ\fI/**\fRǻϤޤꡢޤ³ޤϡƬʸ\fI@\fRιԤǽΥ֥åϤޤޤ(ƬΥꥹʸƬζڤʸ\fI/**\fRϽ)򵭽ҤΤߤΥȤ򵭽Ҥ뤳ȤǤޤϡʹߤ³뤳ȤϤǤޤ󡣥ΰϡʣԤˤ錄äƵҤǤޤο¤Ϥޤ󡣲⵭ҤǤ륿ȡ1󤷤ҤǤʤޤȤС\fI@see\fR饿ϻϤޤޤ
+コメントのパーツ.PP
+ドキュメンテーション・コメントには、主説明とその後に続くタグ・セクションが含まれます。主説明は、開始区切り文字\fI/**\fRで始まり、タグ・セクションまで続きます。タグ・セクションは、先頭文字が\fI@\fRの行で定義される最初のブロック・タグから始まります(先頭のアスタリスク、空白文字、先頭の区切り文字\fI/**\fRは除く)。主説明を記述せず、タグ・セクションのみのコメントを記述することもできます。主説明は、タグ・セクション以降に続けることはできません。タグの引数は、複数行にわたって記述できます。タグの数に制限はありません。何回も記述できるタグと、1回しか記述できないタグがあります。たとえば、次の\fI@see\fRタグからタグ・セクションは始まります。
 .sp
 .if n \{\
 .RS 4
@@ -1139,8 +1139,8 @@
 .if n \{\
 .RE
 .\}
-֥åӥ饤󡦥.PP
-ϡ\fIjavadoc\fRޥɤɥơ󡦥üʥɤǤˤ2ĤΥפޤ1Ĥ\fI@tag\fRΤ褦ɽ֥å(ɥ󡦥ȤƤФ)⤦1Ĥ\fI{@tag}\fRΤ褦楫åǰϤɽ륤饤󡦥Ǥ֥åᤵˤϡƬΥꥹʸڤʸ(\fI/**\fR)ơԤƬ֤ɬפޤϡ\fI@\fRʸƥ̤ξǻѤƤ⡢γϤȤƲᤵʤȤ̣Ƥޤ\fI@\fRʸѤƹԤ򳫻ϤƤ⡢줬ᤵʤ褦ˤˤϡHTMLƥƥ\fI&#064;\fRѤޤ줾Υ֥åˤϡϢդ줿ƥȤޤΥƥȤϡθ夫顢Υޤϥɥơ󡦥ȤκǸޤǤδ֤˵Ҥ줿ƥȤǤ(ޤϥȶڤʸ)δϢƥȤϡʣԤˤ錄äƵҤǤޤ饤󡦥ϡƥȤ򵭽ҤǤǤФɤˤǤ֤ȤǤᤵޤˤϥ֥å\fI@deprecated\fRȥ饤󡦥\fI{@link}\fRޤޤƤޤjavadoc򻲾ȤƤ
+ブロックおよびインライン・タグ.PP
+タグは、\fIjavadoc\fRコマンドが処理するドキュメンテーション・コメント内の特殊なキーワードです。タグには2つのタイプがあります。1つは\fI@tag\fRタグのように表記されるブロック・タグ(スタンドアロン・タグとも呼ばれる)、もう1つは\fI{@tag}\fRタグのように中カッコで囲んで表記されるインライン・タグです。ブロック・タグが解釈されるには、行頭のアスタリスク、空白文字、区切り文字(\fI/**\fR)を除いて、行の先頭に置く必要があります。これは、\fI@\fR文字をテキスト内の別の場所で使用しても、タグの開始として解釈されないことを意味しています。\fI@\fR文字を使用して行を開始しても、それが解釈されないようにするには、HTMLエンティティ\fI&#064;\fRを使用します。それぞれのブロック・タグには、関連付けられたテキストがあります。このテキストは、タグの後から、次のタグの前、またはドキュメンテーション・コメントの最後までの間に記述されたテキストです(タグまたはコメント区切り文字を除く)。この関連テキストは、複数行にわたって記述できます。インライン・タグは、テキストを記述できる場所であればどこにでも置くことができ、解釈されます。次の例にはブロック・タグ\fI@deprecated\fRとインライン・タグ\fI{@link}\fRが含まれています。javadocタグを参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -1153,10 +1153,10 @@
 .if n \{\
 .RE
 .\}
-HTMLǤΥȤε.PP
-ƥȤHTMLƥƥHTMLѤHTMLǵҤɬפޤѤ֥饦ݡȤǤդHTMLΥСѤǤޤɸɥååȤϡǥ󥰡롦Ȥӥե졼ޤᡢɥơ󡦥ȰʳʬHTML 3\&.2˽򤷤ɤޤե졼ࡦåȤΤᡢ줿եˤHTML 4\&.0侩ޤ
+HTMLでのコメントの記述.PP
+テキストはHTMLエンティティとHTMLタグを使用してHTMLで記述される必要があります。使用するブラウザがサポートする任意のHTMLのバージョンを使用できます。標準ドックレットは、カスケーディング・スタイル・シートおよびフレームを含め、ドキュメンテーション・コメント以外の部分でHTML 3\&.2に準拠したコードを生成します。フレーム・セットのため、生成されたファイルにはHTML 4\&.0が推奨されます。
 .PP
-ȤС꾮(<)Ӥ礭(>)Υƥƥϡ\fI&lt;\fR\fI&gt;\fRȵҤɬפޤƱͤˡѥ(&)\fI&amp;\fRȵҤɬפޤǤϡHTML\fI<b>\fRѤƤޤ
+たとえば、より小さい記号(<)およびより大きい記号(>)のエンティティは、\fI&lt;\fRおよび\fI&gt;\fRと記述する必要があります。同様に、アンパサンド(&)は\fI&amp;\fRと記述する必要があります。次の例では、太字のHTMLタグ\fI<b>\fRを使用しています。
 .sp
 .if n \{\
 .RS 4
@@ -1170,12 +1170,12 @@
 .if n \{\
 .RE
 .\}
-ƬΥꥹ.PP
-\fIjavadoc\fRޥɤˤɥơ󡦥ȤβϻˡƹԤƬˤ륢ꥹ(*)ʸ˴ޤǽΥꥹ(*)ʸˤ䥿֤˴ޤƬΥꥹά硢ǥȤݻޤޤǥץ롦ɤ\fI<PRE>\fRΥɥơ󡦥ȤľŽդ褦ˡƬζʸϺʤʤޤ֥饦ϡʸ򥿥֤Χ˲ᤷޤǥȤε(ڤʸ\fI/**\fRޤ\fI<PRE>\fRǤϤʤ)ޡˤʤޤ
-ǽʸ.PP
-ƥɥơ󡦥ȤκǽʸϡƤ륨ƥƥ˴ؤʷ餫Ĵʥޥ꡼ʸǤɬפޤʸϡ򡢥֡ޤϹԽλʸ³ǽΥԥꥪɡޤϺǽΥ֥å֤ǽޤǽʸϡ\fIjavadoc\fRޥɤˤäHTMLڡƬˤСΥޥ꡼ʬ˥ԡޤ
-ʣեɤ.PP
-JavaץåȥեǤϡ1ĤʸʣΥեɤǤޤʸˤϡ1ĤΥɥơ󡦥ȤҤǤޤ󡣤ΥȤ٤ƤΥեɤФƥԡޤեɤȤ˥ɥơ󡦥Ȥ򵭽Ҥɬפϡƥեɤ̡ʸɬפޤȤСΥɥơ󡦥Ȥϡ1ĤȤƵҤŬڤǤξϡ2Ĥʬ뤳Ȥᤷޤ
+先頭のアスタリスク.PP
+\fIjavadoc\fRコマンドによるドキュメンテーション・コメントの解析時に、各行の先頭にあるアスタリスク(*)文字は破棄されます。最初のアスタリスク(*)文字より前にある空白やタブも破棄されます。行頭のアスタリスクを省略した場合、インデントを保持したままでサンプル・コードを\fI<PRE>\fRタグ内のドキュメンテーション・コメントに直接貼り付けられるように、先頭の空白文字は削除されなくなります。ブラウザは、空白文字をタブよりも一律に解釈します。インデントの起点は(区切り文字\fI/**\fRまたは\fI<PRE>\fRタグではなく)左マージンになります。
+最初の文.PP
+各ドキュメンテーション・コメントの最初の文は、宣言されているエンティティに関する簡潔かつ完全なサマリー文である必要があります。この文は、空白、タブ、または行終了文字が続く最初のピリオド、または最初のブロック・タグがある位置で終わります。最初の文は、\fIjavadoc\fRコマンドによってHTMLページの先頭にあるメンバーのサマリーの部分にコピーされます。
+複数フィールドの宣言.PP
+Javaプラットフォームでは、1つの文で複数のフィールドを宣言できます。ただし、この文には、1つのドキュメンテーション・コメントしか記述できません。そのコメントが、すべてのフィールドに対してコピーされます。フィールドごとにドキュメンテーション・コメントを記述する必要がある場合は、各フィールドを別々の文で宣言する必要があります。たとえば、次のドキュメンテーション・コメントは、1つの宣言として記述すると不適切です。この場合は、宣言を2つに分けることをお薦めします。
 .sp
 .if n \{\
 .RS 4
@@ -1191,7 +1191,7 @@
 .RE
 .\}
 .PP
-\fIjavadoc\fRޥɤϡΥɤ鼡Τ褦ʥɥȤޤ
+\fIjavadoc\fRコマンドは、上のコードから次のようなドキュメントを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1216,27 +1216,27 @@
 .\}
 .PP
 The horizontal and vertical distances of point (x, y)\&.
-إåλ.PP
-СФƥɥơ󡦥Ȥ򵭽ҤȤˤϡ\fI<H1>\fR\fI<H2>\fRʤɤHTMLФѤʤȤᤷޤ\fIjavadoc\fRޥɤϡʹ¤ɥȤΤǡΤ褦ʹ¤ѤƤȡɥȤηƶ뤳Ȥޤ饹ѥåΥȤǤϡθФѤȼι¤ꤷƤޤޤ
-.SS "᥽åɡȤηѾ"
+ヘッダー・タグの使用.PP
+メンバーに対してドキュメンテーション・コメントを記述するときには、\fI<H1>\fRや\fI<H2>\fRなどのHTML見出しタグを使用しないことをお薦めします。\fIjavadoc\fRコマンドは、完全な構造化ドキュメントを作成するので、このような構造化タグが使用されていると、生成ドキュメントの形式が悪影響を受けることがあります。ただし、クラスやパッケージのコメントでは、これらの見出しを使用して独自の構造を指定してかまいません。
+.SS "メソッド・コメントの継承"
 .PP
-\fIjavadoc\fRޥɤǤϡ饹ӥ󥿥եǥ᥽åɡȤѾơƥȤϤꡢŪ˥᥽åɡȤѾ뤳ȤǤޤ󥹥ȥ饯եɡӥͥȤ줿饹ϡɥơ󡦥ȤѾޤ
+\fIjavadoc\fRコマンドでは、クラスおよびインタフェースでメソッド・コメントを継承して、欠落したテキストを入力したり、明示的にメソッド・コメントを継承することができます。コンストラクタ、フィールド、およびネストされたクラスは、ドキュメンテーション・コメントを継承しません。
 .PP
-\fB:\fR
-ɥơ󡦥Ȥ򥳥ԡѤˤϡѾ᥽åɤΥե뤬\fI\-sourcepath\fRץǻꤷѥΤߤ֤Ƥɬפޤޥɥ饤ǡ饹ѥåϤɬפϤޤ󡣤ϥ꡼1\&.3\&.\fIn\fRȤоŪǤޤǤϡ饹ɥȲ륯饹Ǥ뤳ȤɬפǤ
-ƥȤ.PP
-ޤ\fI@return\fR\fI@param\fR\fI@throws\fR᥽åɡȤƤ硢\fIjavadoc\fRޥɤϡбޤϥȤ򡢤줬С饤ɤޤϼƤ᥽å()饳ԡޤ᥽åɡȤηѾ򻲾ȤƤ
+\fB注意:\fR
+ドキュメンテーション・コメントをコピーに利用するには、継承したメソッドのソース・ファイルが\fI\-sourcepath\fRオプションで指定したパスのみに置かれている必要があります。コマンドラインで、クラスもパッケージも渡す必要はありません。この点はリリース1\&.3\&.\fIn\fR以前とは対照的です。これまでは、クラスがドキュメント化されるクラスであることが必要でした。
+欠落テキストの入力.PP
+主説明、または\fI@return\fR、\fI@param\fR、\fI@throws\fRタグがメソッド・コメントから欠落している場合、\fIjavadoc\fRコマンドは、対応する主説明またはタグ・コメントを、それがオーバーライドまたは実装しているメソッド(ある場合)からコピーします。メソッド・コメントの継承を参照してください。
 .PP
-Υѥ᡼\fI@param\fRĤʤ硢Υѥ᡼ΥȤ̤ηѾؤΥ᥽åɤ饳ԡޤ㳰\fI@throws\fRĤʤ硢㳰Ƥˤꡢ\fI@throws\fRԡޤ
+特定のパラメータの\fI@param\fRタグが見つからない場合、そのパラメータのコメントが、上位の継承階層のメソッドからコピーされます。特定の例外の\fI@throws\fRタグが見つからない場合、その例外が宣言されている場合にかぎり、\fI@throws\fRタグがコピーされます。
 .PP
-ưϥ꡼1\&.3ưȤоŪǤޤǤΥСǤϡޤϥ¸ߤСȤϰڷѾޤǤ
+この動作はリリース1\&.3以前の動作とは対照的です。これまでのバージョンでは、主説明またはタグが存在すれば、コメントは一切継承されませんでした。
 .PP
-javadocӥץ򻲾ȤƤ
-ŪʷѾ.PP
-\fI{@inheritDoc}\fR饤󡦥᥽åɤμޤ\fI@return\fR\fI@param\fR\fI@throws\fRȤޤбѾ줿ޤϥȤϡξ˥ԡޤ
-.SS "饹ӥ󥿥եηѾ"
+javadocタグおよびオプションを参照してください。
+明示的な継承.PP
+\fI{@inheritDoc}\fRインライン・タグをメソッドの主説明または\fI@return\fR、\fI@param\fR、\fI@throws\fRタグ・コメントに挿入します。対応する継承された主説明またはタグ・コメントは、その場所にコピーされます。
+.SS "クラスおよびインタフェースの継承"
 .PP
-ȤηѾϡ饹ӥ󥿥եηѾΡͤ뤹٤Ƥξȯޤ
+コメントの継承は、クラスおよびインタフェースからの継承の、考えられるすべての場合に発生します。
 .sp
 .RS 4
 .ie n \{\
@@ -1246,7 +1246,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饹Υ᥽åɤѡ饹Υ᥽åɤ򥪡С饤ɤƤ
+クラスのメソッドがスーパークラスのメソッドをオーバーライドしている場合
 .RE
 .sp
 .RS 4
@@ -1257,7 +1257,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-󥿥եΥ᥽åɤѡ󥿥եΥ᥽åɤ򥪡С饤ɤƤ
+インタフェースのメソッドがスーパーインタフェースのメソッドをオーバーライドしている場合
 .RE
 .sp
 .RS 4
@@ -1268,15 +1268,15 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饹Υ᥽åɤ󥿥եΥ᥽åɤƤ
+クラスのメソッドがインタフェースのメソッドを実装している場合
 .RE
 .PP
-ǽ2ĤΥǤϡ\fIjavadoc\fRޥɤϡС饤ɤƤ᥽åɤΥɥ\fI֥С饤ɡ\fRȤФޤȤѾƤ뤫ɤˤ餺С饤ɤƤ᥽åɤؤΥ󥯤ޤޤޤ
+最初の2つのケースでは、\fIjavadoc\fRコマンドは、オーバーライドしているメソッドのドキュメント内に\fI「オーバーライド」\fRという小見出しを生成します。コメントが継承されているかどうかにかかわらず、オーバーライドされているメソッドへのリンクが含まれます。
 .PP
-3ܤΥ(Υ饹Υ᥽åɤ󥿥եΥ᥽åɤƤ)Ǥϡ\fIjavadoc\fRޥɤϡС饤ɤƤ᥽åɤΥɥ\fI\fRȤФޤȤѾƤ뤫ɤˤ餺Ƥ᥽åɤؤΥ󥯤ޤޤޤ
-.SS "᥽åɡȤΥ르ꥺ"
+3つ目のケース(特定のクラスのメソッドがインタフェースのメソッドを実装している場合)では、\fIjavadoc\fRコマンドは、オーバーライドしているメソッドのドキュメント内に\fI「定義」\fRという小見出しを生成します。コメントが継承されているかどうかにかかわらず、実装されているメソッドへのリンクが含まれます。
+.SS "メソッド・コメントのアルゴリズム"
 .PP
-᥽åɤ˥ɥơ󡦥Ȥʤޤ\fI{@inheritDoc}\fR硢\fIjavadoc\fRޥɤϼΥ르ꥺѤŬѤǤ륳Ȥ򸡺ޤ르ꥺϡǤꤵŬѲǽʥɥơ󡦥Ȥõѡ饹⥤󥿥եͥ褹褦߷פƤޤ
+メソッドにドキュメンテーション・コメントがない、または\fI{@inheritDoc}\fRタグがある場合、\fIjavadoc\fRコマンドは次のアルゴリズムを使用して適用できるコメントを検索します。アルゴリズムは、最も特定される適用可能なドキュメンテーション・コメントを探し、スーパークラスよりもインタフェースを優先するように設計されています。
 .sp
 .RS 4
 .ie n \{\
@@ -1286,7 +1286,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ľܤ˼Ƥ(ޤϡĥƤ)󥿥ե򡢥᥽åɤ\fIimplements\fR(ޤ\fIextends\fR)Ȥθ˽иǡ1ĤĴ٤ޤΥ᥽åɤˤĤƺǽ˸Ĥäɥơ󡦥ȤѤޤ
+直接に実装されている(または、拡張されている)インタフェースを、メソッドの宣言で\fIimplements\fR(または\fIextends\fR)という語の後に出現する順序で、1つずつ調べます。このメソッドについて最初に見つかったドキュメンテーション・コメントを採用します。
 .RE
 .sp
 .RS 4
@@ -1297,7 +1297,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-1ǥɥơ󡦥ȤĤʤäϡľܼƤ(ޤϡĥƤ)󥿥եΤ줾ФơΥ르ꥺΤƵŪŬѤޤ(κݤνϡ1ǥ󥿥եĴ٤ȤνƱ)
+手順1でドキュメンテーション・コメントが見つからなかった場合は、直接実装されている(または、拡張されている)インタフェースのそれぞれに対して、このアルゴリズム全体を再帰的に適用します(その際の順序は、手順1でインタフェースを調べたときの順序と同じ)。
 .RE
 .sp
 .RS 4
@@ -1308,7 +1308,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-2ǥɥơ󡦥ȤĤʤäǡΥ饹\fIObject\fRʳΥ饹Ǥ뤬󥿥եǤϤʤϡΤ褦˽ޤ
+手順2でドキュメンテーション・コメントが見つからなかった場合で、このクラスが\fIObject\fR以外のクラスであるが、インタフェースではない場合は、次のように処理します。
 .sp
 .RS 4
 .ie n \{\
@@ -1318,7 +1318,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ѡ饹ˤΥ᥽åɤˤĤƤΥɥơ󡦥ȤҤƤϡΥȤѤޤ
+スーパークラスにこのメソッドについてのドキュメンテーション・コメントが記述されている場合は、そのコメントを採用します。
 .RE
 .sp
 .RS 4
@@ -1329,14 +1329,14 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-3aǥɥơ󡦥ȤĤʤäϡѡ饹ФơΥ르ꥺΤƵŪŬѤޤ
-.RE
-.RE
-.SH "JAVADOC"
+手順3aでドキュメンテーション・コメントが見つからなかった場合は、スーパークラスに対して、このアルゴリズム全体を再帰的に適用します。
+.RE
+.RE
+.SH "JAVADOCタグ"
 .PP
-\fIjavadoc\fRޥɤϡJavaΥɥơ󡦥ޤ줿̤ʥϤޤ\fIjavadoc\fRѤȡAPI򥽡ɤ鼫ưŪǤޤϥåȥޡ(\fI@\fR)ǻϤޤꡢʸȾʸ̤ޤΥϡɽƤȤʸȾʸѤϤɬפޤϡԤƬ(ƬζʸȾάǽʥꥹθ)֤ɬפޤʤȡƥȤȤưޤȤơƱ̾Υ1սˤޤȤޤȤС\fI@see\fRʣϡ٤ƱˤޤȤ֤ޤܺ٤ϡѤǤ򻲾ȤƤ
+\fIjavadoc\fRコマンドは、Javaのドキュメンテーション・コメント内に埋め込まれた特別なタグを解析します。\fIjavadoc\fRタグを使用すると、完全な整形式のAPIをソース・コードから自動的に生成できます。タグはアットマーク記号(\fI@\fR)で始まり、大文字と小文字が区別されます。これらのタグは、表示されているとおりに大文字と小文字を使用して入力する必要があります。タグは、行の先頭(先頭の空白文字と省略可能なアスタリスクの後)に置く必要があります。そうしないと、テキストとして扱われます。慣例として、同じ名前のタグは1箇所にまとめます。たとえば、\fI@see\fRタグが複数ある場合は、すべて同じ場所にまとめて配置します。詳細は、タグを使用できる場所を参照してください。
 .PP
-ˤϡΥפޤ
+タグには、次のタイプがあります。
 .sp
 .RS 4
 .ie n \{\
@@ -1346,7 +1346,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-֥å: ֥åϼ³ˤΤ֤ޤ֥åϡ\fI@tag\fRηȤޤ
+ブロック・タグ: ブロック・タグは主説明に続くタグ・セクション内にのみ配置します。ブロック・タグは、\fI@tag\fRの形式をとります。
 .RE
 .sp
 .RS 4
@@ -1357,52 +1357,52 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饤󡦥: 饤󡦥ϼޤϥ֥åΥǤդξ֤ޤ饤󡦥\fI{@tag}\fRΤ褦楫åǰϤߤޤ
+インライン・タグ: インライン・タグは主説明内またはブロック・タグのコメント内の任意の場所に配置します。インライン・タグは\fI{@tag}\fRのように中カッコで囲みます。
 .RE
 .PP
-ࡦˤĤƤϡ\-tag tagname:Xaoptcmf:"taghead"򻲾ȤƤѤǤ⻲ȤƤ
-.SS ""
+カスタム・タグについては、\-tag tagname:Xaoptcmf:"taghead"を参照してください。タグを使用できる場所も参照してください。
+.SS "タグの説明"
 .PP
 @author \fIname\-text\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fI\-author\fRץ󤬻ѤƤ硢ꤷ̾ΥƥȤκԥȥɥȤɲäޤ1ĤΥɥơ󡦥Ȥʣ\fI@author\fRޤ뤳ȤǤޤ1Ĥ\fI@author\fR1Ĥ̾ꤹ뤳Ȥ⡢ʣ̾ꤹ뤳ȤǤޤԤξϡ\fIjavadoc\fRޥɤˤä̾̾δ֤˥(,)ȶʸޤԤξϡƥΤϤ뤳ȤʤɥȤ˥ԡޤäơޤǤϤʤƸб̾ڤʸѤɬפȤˡ1Ԥʣ̾ǤޤJavadocġǤDocȤεˡ@author˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@author)򻲾ȤƤ
+JDK 1\&.0で導入
+.sp
+\fI\-author\fRオプションが使用されている場合、指定した名前のテキストの作成者エントリを生成されるドキュメントに追加します。1つのドキュメンテーション・コメントに複数の\fI@author\fRタグを含めることができます。1つの\fI@author\fRタグに1つの名前を指定することも、複数の名前を指定することもできます。前者の場合は、\fIjavadoc\fRコマンドによって名前と名前の間にカンマ(,)と空白文字が挿入されます。後者の場合は、テキスト全体が解析されることなく、生成ドキュメントにコピーされます。したがって、カンマではなく、各言語に対応した名前区切り文字を使用する必要があるときに、1行に複数の名前を指定できます。JavadocツールでのDocコメントの記述方法の@authorに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@author)を参照してください。
 .RE
 .PP
 {@code \fItext\fR}
 .RS 4
-JDK 1\&.5Ƴ
-.sp
-\fI<code>{@literal}</code>\fRƱǤ
-.sp
-ƥȤHTMLޡåפޤϥͥȤ줿JavadocȤƲ᤻ˡtext򥳡ɡեȤɽޤˤꡢɥơ󡦥ȤǤϡѥ᡼η(\fI<Object>\fR)(\fI3 < 4\fR)(\fI<\-\fR)ʤɤǡ̾λå(<>)HTMLƥƥ(\fI&lt;\fR\fI&gt;\fR)Τ˻ѤǤޤȤСɥơ󡦥\fI{@code A<B>C}\fR\fIA<B>C\fRȤѹ줺줿HTMLڡɽޤĤޤꡢ\fI<B>\fRȤƲᤵ줺ΥեȤϥɡեȤˤʤޤɡեȤʤƱǽ¸ˤϡ\fI{@literal}\fRѤޤ
+JDK 1\&.5で導入
+.sp
+\fI<code>{@literal}</code>\fRと同等です。
+.sp
+テキストをHTMLマークアップまたはネストされたJavadocタグとして解釈せずに、textをコード・フォントで表示します。これにより、ドキュメンテーション・コメントでは、パラメータの型(\fI<Object>\fR)、不等号(\fI3 < 4\fR)、矢印(\fI<\-\fR)などで、通常の山カッコ(<および>)をHTMLエンティティ(\fI&lt;\fRおよび\fI&gt;\fR)のかわりに使用できます。たとえば、ドキュメンテーション・コメント\fI{@code A<B>C}\fRは\fIA<B>C\fRとして変更されずに生成されたHTMLページに表示されます。つまり、\fI<B>\fRが太字として解釈されず、そのフォントはコード・フォントになります。コード・フォントなしで同じ機能を実現するには、\fI{@literal}\fRタグを使用します。
 .RE
 .PP
 @deprecated \fIdeprecated\-text\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-APIư³ޤAPIѤʤȤ륳Ȥɲäޤ\fIjavadoc\fRޥɤϡ\fIdeprecated\-text\fR˰ưƥåˤηٹֿ侩Ƥޤ󡣡פɲäޤΥϡ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡӥեɤͭǤ
-.sp
-侩ƥȤκǽʸǤϡAPI侩ʤʤäȡؤȤƻѤAPI桼󼨤ɬפޤ\fIjavadoc\fRޥɤϡκǽʸ򡢥ޥ꡼Ⱥ˥ԡޤθʸ侩ˤʤäͳ뤳ȤǤޤAPIؤ\fI{@link}\fR(Javadoc 1\&.2ʹߤξ)ޤɬפޤ
-.sp
-\fI@deprecated annotation\fRѤƥץǤ侩ˤޤAPI侩ˤˡȻ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/deprecation/deprecation\&.html)򻲾ȤƤ
-.sp
-JavadocġǤDocȤεˡ@deprecated˴ؤ
+JDK 1\&.0で導入
+.sp
+このAPIは動作し続けますが、このAPIを使用しないことを薦めるコメントを追加します。\fIjavadoc\fRコマンドは、\fIdeprecated\-text\fRを主説明の前に移動してイタリックにし、その前に太字の警告「推奨されていません。」を追加します。このタグは、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、およびフィールドで有効です。
+.sp
+非推奨テキストの最初の文では、そのAPIが推奨されなくなった時期と、代替として使用するAPIをユーザーに提示する必要があります。\fIjavadoc\fRコマンドは、この最初の文を、サマリー・セクションと索引にコピーします。その後の文で非推奨になった理由を説明することもできます。代替APIを指し示す\fI{@link}\fRタグ(Javadoc 1\&.2以降の場合)を含める必要があります。
+.sp
+\fI@deprecated annotation\fRタグを使用してプログラム要素を非推奨にします。APIを非推奨にする方法と時期
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/deprecation/deprecation\&.html)を参照してください。
+.sp
+JavadocツールでのDocコメントの記述方法の@deprecatedに関する項
 
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@deprecated)⻲ȤƤ
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@deprecated)も参照してください。
 .RE
 .PP
 {@docRoot}
 .RS 4
-JDK 1\&.3Ƴ
-.sp
-ڡΡɥȤ()롼ȡǥ쥯ȥؤХѥɽޤΥϡΥڡҤΥʤɡ뤹٤ƤΥڡ黲ȤեȤ߹ȤǤ̾ϡƥڡκDzΥڡ˥󥯤ޤ
-.sp
-\fI{@docRoot}\fRϡޥɥ饤Ǥɥơ󡦥ǤѤǤޤΥϡǤդΥ(\fI@return\fR\fI@param\fR\fI@deprecated\fRʤ)Υƥʬޤࡢ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡӥեɤͭǤ
+JDK 1\&.3で導入
+.sp
+生成されるページからの、生成ドキュメントの(生成先)ルート・ディレクトリへの相対パスを表します。このタグは、著作権のページや会社のロゴなど、生成されるすべてのページから参照するファイルを組み込むときに便利です。通常は、各ページの最下部から著作権のページにリンクします。
+.sp
+この\fI{@docRoot}\fRタグは、コマンドラインでもドキュメンテーション・コメント内でも使用できます。このタグは、任意のタグ(\fI@return\fR、\fI@param\fRおよび\fI@deprecated\fRタグなど)のテキスト部分を含む、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、およびフィールドで有効です。
 .sp
 .RS 4
 .ie n \{\
@@ -1412,9 +1412,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥɥ饤ǡإåեåޤϺDzΤ褦ޤ\fIjavadoc \-bottom \*(Aq<a href="{@docRoot}/copyright\&.html">Copyright</a>\*(Aq\fR
-.sp
-\fI{@docRoot}\fRmakefileǤΤ褦Ѥ硢\fImakefile\fRץǤϡ楫å\fI{}\fRʸ̤˥פɬפޤȤСInprise MAKEС5\&.2WindowsǼ¹Ԥϡ\fI{{@docRoot}}\fRΤ褦ˡ楫åŤˤɬפޤ\fI\-bottom\fRץʤɤΥץؤΰϤΤˡ(ŤǤϤʤ)ɬפǤ(\fIhref\fRϤϾά)
+コマンドラインで、ヘッダー、フッターまたは最下部が次のように定義されます。\fIjavadoc \-bottom \*(Aq<a href="{@docRoot}/copyright\&.html">Copyright</a>\*(Aq\fR
+.sp
+\fI{@docRoot}\fRタグをmakefile内でこのように利用する場合、一部の\fImakefile\fRプログラムでは、中カッコ\fI{}\fR文字を特別にエスケープする必要があります。たとえば、Inprise MAKEバージョン5\&.2をWindows上で実行する場合は、\fI{{@docRoot}}\fRのように、中カッコを二重にする必要があります。\fI\-bottom\fRオプションなどのオプションへの引数を囲むのに、二重(一重ではなく)引用符も必要です(\fIhref\fR引数を囲む引用符は省略)。
 .RE
 .sp
 .RS 4
@@ -1425,7 +1425,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɥơ󡦥ȤǤ
+ドキュメンテーション・コメントでは
 .sp
 .if n \{\
 .RS 4
@@ -1438,24 +1438,24 @@
 .if n \{\
 .RE
 .\}
-ΥɬפͳϡɥȤ֥ѥåƱijع¤Υǥ쥯ȥ˳Ǽ뤫Ǥ\fI<a href="{@docRoot}/copyright\&.html">\fRϡ\fIjava/lang/Object\&.java\fRФƤ\fI<a href="\&.\&./\&.\&./copyright\&.html">\fR˲褵졢\fIjava/lang/ref/Reference\&.java\fRФƤ\fI<a href="\&.\&./\&.\&./\&.\&./copyright\&.html">\fR˲褵ޤ
+このタグが必要な理由は、生成ドキュメントが、サブパッケージと同じ深さを持つ階層構造のディレクトリに格納されるからです。式\fI<a href="{@docRoot}/copyright\&.html">\fRは、\fIjava/lang/Object\&.java\fRに対しては\fI<a href="\&.\&./\&.\&./copyright\&.html">\fRに解決され、\fIjava/lang/ref/Reference\&.java\fRに対しては\fI<a href="\&.\&./\&.\&./\&.\&./copyright\&.html">\fRに解決されます。
 .RE
 .RE
 .PP
 @exception \fIclass\-name description\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fI@throws\fRƱǤ@throws class\-name description򻲾ȤƤ
+JDK 1\&.0で導入
+.sp
+\fI@throws\fRタグと同じです。@throws class\-name descriptionを参照してください。
 .RE
 .PP
 {@inheritDoc}
 .RS 4
-JDK 1\&.4Ƴ
-.sp
-ǤᤤѾǽʥ饹ޤϼǽʥ󥿥ե顢Υΰ֤ˤ븽ߤΥɥơ󡦥ȤˡɥȤѾ(ԡ)ޤˤꡢŪʥȤѾĥ꡼ξ̤˵ҤԡƥȤѤƵҤ뤳ȤǤޤ
-.sp
-Υϡɥơ󡦥Ȥμΰ֤ǤΤͭǤ
+JDK 1\&.4で導入
+.sp
+最も近い継承可能なクラスまたは実装可能なインタフェースから、このタグの位置にある現在のドキュメンテーション・コメントに、ドキュメントを継承(コピー)します。これにより、より汎用的なコメントを継承ツリーの上位に記述し、コピーしたテキストを使用して記述することができます。
+.sp
+このタグは、ドキュメンテーション・コメントの次の位置でのみ有効です。
 .sp
 .RS 4
 .ie n \{\
@@ -1465,7 +1465,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-᥽åɤμ֥å⡣ξ硢ϡ̳ؤΥ饹ޤϥ󥿥ե饳ԡޤ
+メソッドの主説明ブロック内。この場合、主説明は、上位階層のクラスまたはインタフェースからコピーされます。
 .RE
 .sp
 .RS 4
@@ -1476,24 +1476,24 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-᥽åɤ\fI@return\fR\fI@param\fR\fI@throws\fRΥƥȰ⡣ξ硢ƥȤϡ̳ؤб륿饳ԡޤ
-.RE
-.sp
-ѾؤǥȤ򸫤Ĥˡ˴ؤϡ᥽åɡȤηѾ򻲾ȤƤΥĤʤ硢Ȥϡι롼˱ơưŪ˷Ѿ뤫ɤޤޤ
+メソッドの\fI@return\fR、\fI@param\fR、\fI@throws\fRタグのテキスト引数内。この場合、タグ・テキストは、上位階層の対応するタグからコピーされます。
+.RE
+.sp
+継承階層でコメントを見つける方法に関する説明は、メソッド・コメントの継承を参照してください。このタグが見つからない場合、コメントは、この項で説明するルールに応じて、自動的に継承されるかどうかが決まります。
 .RE
 .PP
 {@link \fIpackage\&.class#member label\fR}
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-ɽƥlabelȤȤ˥饤󡦥󥯤ޤlabelϡȥ饹λꤵ줿ѥå饹ޤϥС̾ΥɥȤؤޤΥϡ\fI@return\fR\fI@param\fR\fI@deprecated\fRʤɤǤդΥΥƥʬޤࡢ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡӥեɤͭǤJavadocġǤDocȤεˡ@link˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#{@link)򻲾ȤƤ
-.sp
-Υ\fI@see\fR˻ƤޤɤΥ⡢\fIpackage\&.class#member\fR\fIlabel\fRλˡȡͭʹʸƱǤʰ㤤ϡ\fI{@link}\fRǤϡִϢܡץ˥󥯤֤뤫ˡ饤󡦥󥯤ȤǤ饤󡦥ƥȤ¾ʬȶ̤뤿ˡ\fI{@link}\fRκǽȺǸ楫å򵭽Ҥޤ٥DZ楫å(\fI}\fR)Ѥɬפ硢HTMLƥƥˡ\fI&#125;\fRѤޤ
-.sp
-1ʸǻѤǤ\fI{@link}\fRο¤Ϥޤ󡣤Υϡɥơ󡦥Ȥμʬޤ\fI@deprecated\fR\fI@return\fR\fI@param\fRʤɤǤդΥΥƥʬǻѤǤޤ
-.sp
-ȤСΥȤǤ\fIgetComponentAt(int,int)\fR᥽åɤ򻲾ȤƤޤ
+JDK 1\&.2で導入
+.sp
+表示テキストlabelとともにインライン・リンクを挿入します。labelは、参照クラスの指定されたパッケージ、クラス、またはメンバーの名前のドキュメントを指し示します。このタグは、\fI@return\fR、\fI@param\fRおよび\fI@deprecated\fRタグなどの任意のタグのテキスト部分を含む、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、およびフィールドで有効です。JavadocツールでのDocコメントの記述方法の@linkに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#{@link)を参照してください。
+.sp
+このタグは\fI@see\fRタグに似ています。どちらのタグも、\fIpackage\&.class#member\fRと\fIlabel\fRの参照方法と、有効な構文が同じです。主な違いは、\fI{@link}\fRタグでは、「関連項目」セクションにリンクが配置されるかわりに、インライン・リンクが生成されるという点です。インライン・テキストの他の部分と区別するために、\fI{@link}\fRタグの最初と最後に中カッコを記述します。ラベル内で右中カッコ(\fI}\fR)を使用する必要がある場合、HTMLエンティティ記法\fI&#125;\fRを使用します。
+.sp
+1つ文の中で使用できる\fI{@link}\fRタグの数に制限はありません。このタグは、ドキュメンテーション・コメントの主説明部分、または\fI@deprecated\fR、\fI@return\fR、\fI@param\fRタグなどの任意のタグのテキスト部分で使用できます。
+.sp
+たとえば、次のコメントでは\fIgetComponentAt(int,int)\fRメソッドを参照しています。
 .sp
 .if n \{\
 .RS 4
@@ -1504,7 +1504,7 @@
 .if n \{\
 .RE
 .\}
-ɸɥååȤǤϡΥɤ鼡HTMLޤ(ΥȤƱѥå̤Υ饹򻲾ȤƤ)
+標準ドックレットでは、このコードから次のHTMLが生成されます(このコメントが同じパッケージの別のクラスを参照している場合)。
 .sp
 .if n \{\
 .RS 4
@@ -1515,7 +1515,7 @@
 .if n \{\
 .RE
 .\}
-ιԤϡΤ褦Webڡɽޤ
+前の行は、次のようにWebページに表示されます。
 .sp
 .if n \{\
 .RS 4
@@ -1530,28 +1530,28 @@
 .PP
 {@linkplain \fIpackage\&.class#member label\fR}
 .RS 4
-JDK 1\&.4Ƴ
-.sp
-\fI{@link}\fRƱư򤷤ޤ󥯡٥뤬ɡեȤǤϤʤץ졼󡦥ƥȤɽۤʤޤ٥뤬ץ졼󡦥ƥȤǵҤƤǤȤС\fIRefer to {@linkplain add() the overridden method}\fR\&.פϡRefer to the overridden methodפɽޤ
+JDK 1\&.4で導入
+.sp
+\fI{@link}\fRタグと同じ動作をしますが、リンク・ラベルがコード・フォントではなくプレーン・テキストで表示される点が異なります。ラベルがプレーン・テキストで記述されていると便利です。たとえば、「\fIRefer to {@linkplain add() the overridden method}\fR\&.」は「Refer to the overridden method」と表示されます。
 .RE
 .PP
 {@literal \fItext\fR}
 .RS 4
-JDK 1\&.5Ƴ
-.sp
-ƥȤHTMLޡåפޤϥͥȤ줿JavadocȤƲ᤻ˡtextɽޤˤꡢɥơ󡦥ȤǤϡѥ᡼η(\fI<Object>\fR)(\fI3 < 4\fR)(<\-)ʤɤǡå(\fI<>\fR)HTMLƥƥ(\fI&lt;\fR\fI&gt;\fR)Τ˻ѤǤޤȤСɥơ󡦥ȤΥƥ\fI{@literal A<B>C}\fR\fIA<B>C\fRȤơ֥饦줿HTMLڡѹ줺ɽޤ\fI<B>\fRȤƲᤵޤ(ɡեȤˤʤޤ)ɡեȤƱǽ¸ˤϡ\fI{@code}\fRѤޤ
+JDK 1\&.5で導入
+.sp
+テキストをHTMLマークアップまたはネストされたJavadocタグとして解釈せずに、textを表示します。これにより、ドキュメンテーション・コメントでは、パラメータの型(\fI<Object>\fR)、不等号(\fI3 < 4\fR)、矢印(<\-)などで、山カッコ(\fI<および>\fR)をHTMLエンティティ(\fI&lt;\fRおよび\fI&gt;\fR)のかわりに使用できます。たとえば、ドキュメンテーション・コメントのテキスト\fI{@literal A<B>C}\fRは\fIA<B>C\fRとして、ブラウザの生成されたHTMLページに変更されずに表示されます。\fI<B>\fRは太字として解釈されません(コード・フォントになりません)。コード・フォントで同じ機能を実現するには、\fI{@code}\fRタグを使用します。
 .RE
 .PP
 @param \fIparameter\-name description\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-֥ѥ᡼ץˡꤵ줿\fIparameter\-name\fRθ˻ꤵ줿description³ƥѥ᡼ɲäޤɥơ󡦥Ȥ򵭽ҤȤˤϡdescriptionʣԤˤ錄äƵҤ뤳ȤǤޤΥϡ᥽åɡ󥹥ȥ饯ޤϥ饹Υɥơ󡦥ǤΤͭǤJavadocġǤDocȤεˡ@param˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@param)򻲾ȤƤ
-.sp
-\fIparameter\-name\fRϡ᥽åɤޤϥ󥹥ȥ饯ǤΥѥ᡼̾饹᥽åɤޤϥ󥹥ȥ饯ηѥ᡼̾ˤʤޤåǤΥѥ᡼̾Ϥߡѥ᡼Ѥ뤳Ȥꤷޤ
-.sp
-饹ηѥ᡼:
+JDK 1\&.0で導入
+.sp
+「パラメータ」セクションに、指定された\fIparameter\-name\fRの後に指定されたdescriptionを続けてパラメータを追加します。ドキュメンテーション・コメントを記述するときには、descriptionを複数行にわたって記述することもできます。このタグは、メソッド、コンストラクタ、またはクラスのドキュメンテーション・コメント内でのみ有効です。JavadocツールでのDocコメントの記述方法の@paramに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@param)を参照してください。
+.sp
+\fIparameter\-name\fRは、メソッドまたはコンストラクタでのパラメータの名前か、クラス、メソッドまたはコンストラクタの型パラメータの名前になります。山カッコでこのパラメータ名を囲み、型パラメータを使用することを指定します。
+.sp
+クラスの型パラメータの例:
 .sp
 .if n \{\
 .RS 4
@@ -1566,7 +1566,7 @@
 .if n \{\
 .RE
 .\}
-᥽åɤηѥ᡼:
+メソッドの型パラメータの例:
 .sp
 .if n \{\
 .RS 4
@@ -1588,35 +1588,35 @@
 .PP
 @return \fIdescription\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-͡ץɲäơdescriptionΥƥȤ񤭹ߤޤΥƥȤǤϡͤηȡͤϰϤˤĤƵҤɬפޤΥϡ᥽åɤΥɥơ󡦥ȤǤΤͭǤJavadocġǤDocȤεˡ@return˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@return)򻲾ȤƤ
+JDK 1\&.0で導入
+.sp
+「戻り値」セクションを追加して、descriptionのテキストを書き込みます。このテキストでは、戻り値の型と、取り得る値の範囲について記述する必要があります。このタグは、メソッドのドキュメンテーション・コメントでのみ有効です。JavadocツールでのDocコメントの記述方法の@returnに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@return)を参照してください。
 .RE
 .PP
 @see \fIreference\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fIִϢܡ\fRФɲäơreferenceؤ󥯡ޤϥƥȡȥ񤭹ߤޤ1ĤΥɥơ󡦥ȤˤǤդο\fI@see\fRޤ뤳ȤǤޤϤ٤ƱФβ˥롼ײޤ\fI@see\fRˤϡ3ĤΥפηޤηǤŪǤΥϡ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡޤϥեɤͭǤѥå饹ޤϥСФ륤饤󡦥󥯤ʸˡϡ\fI{@link}\fR򻲾ȤƤ
-.sp
-\fB1\fR@see
-\fIstring\fRϡ\fIstring\fRΥƥȡȥɲäޤ󥯤ޤstringϡҤޤURLǤϥǤʤλǤ\fIjavadoc\fRޥɤϡǽʸȤŰ(")򸡺ơηҤηȶ̤ޤȤС\fI@see "The Java Programming Language"\fRϼΥƥȤޤ
-.sp
-\fBϢ\fR:
+JDK 1\&.0で導入
+.sp
+\fI「関連項目」\fR見出しを追加して、referenceを指すリンク、またはテキスト・エントリを書き込みます。1つのドキュメンテーション・コメントには任意の数の\fI@see\fRタグを含めることができますが、それらはすべて同じ見出しの下にグループ化されます。\fI@see\fRタグには、3つのタイプの形式があります。この形式が最も一般的です。このタグは、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、またはフィールドで有効です。パッケージ、クラス、またはメンバーに対するインライン・リンクを文中に挿入する方法は、\fI{@link}\fRを参照してください。
+.sp
+\fB形式1\fR。@see
+\fIstring\fRタグ形式は、\fIstring\fRのテキスト・エントリを追加します。リンクは生成されません。stringは、書籍またはURLではアクセスできない情報の参照先です。\fIjavadoc\fRコマンドは、最初の文字として二重引用符(")を検索して、この形式を前述の形式と区別します。たとえば、\fI@see "The Java Programming Language"\fRは次のテキストを生成します。
+.sp
+\fB関連項目\fR:
 .sp
 "The Java Programming Language"
 .sp
-\fB2\fR\fI@see <a href="URL#value">label</a>\fRϡ\fIURL#value\fRˤ줿󥯤ɲäޤ\fIURL#value\fRѥ᡼ϡURLޤURLǤ\fIjavadoc\fRޥɤϡǽʸȤơ֤꾮׵(\fI<\fR)򸡺ơη¾ηȶ̤ޤȤС\fI@see <a href="spec\&.html#section">Java Spec</a>\fRϼΥ󥯤ޤ
-.sp
-\fBϢ\fR:
+\fB形式2\fR。\fI@see <a href="URL#value">label</a>\fR形式は、\fIURL#value\fRにより定義されたリンクを追加します。\fIURL#value\fRパラメータは、相対URLまたは絶対URLです。\fIjavadoc\fRコマンドは、最初の文字として「より小さい」記号(\fI<\fR)を検索して、この形式を他の形式と区別します。たとえば、\fI@see <a href="spec\&.html#section">Java Spec</a>\fRは次のリンクを生成します。
+.sp
+\fB関連項目\fR:
 .sp
 Java Spec
 .sp
-\fB3\fR\fI@see package\&.class#member label\fRϡɽƥȡ٥ȤȤ˥󥯤ɲäޤΥ٥ϻȤƤJavaλꤵ줿̾ΥɥȤؤޤ٥ϥץǤ٥άϡɽƥȤΤˡ̾Ŭڤṳ̂ɽޤ\fI\-noqualifier\fRץѤȡɽƥȤѥå̾Ū˺ޤ٥ϡưɽƥȤȤϰۤʤɽƥȤˤ˻Ѥޤ̾ɽˡפ򻲾ȤƤ
-.sp
-Java SE 1\&.2ϡ٥ǤϤʤ̾\fI<code>\fR
-HTML˼ưŪɽޤJava SE 1\&.2\&.2ϡ٥Ѥ뤫ʤˤ餺\fI<code>\fRϾɽƥȤϤफǴޤޤޤ
+\fB形式3\fR。\fI@see package\&.class#member label\fR形式は、表示テキスト・ラベルとともにリンクを追加します。このラベルは参照されているJava言語の指定された名前のドキュメントを指し示します。ラベルはオプションです。ラベルを省略した場合は、表示テキストのかわりに、名前が適切に短縮されて表示されます。\fI\-noqualifier\fRオプションを使用すると、この表示テキストからパッケージ名が全体的に削除されます。ラベルは、自動生成される表示テキストとは異なる表示テキストにする場合に使用します。「名前が表示される方法」を参照してください。
+.sp
+Java SE 1\&.2だけは、ラベルではなく名前が\fI<code>\fR
+HTMLタグ内に自動的に表示されます。Java SE 1\&.2\&.2からは、ラベルを使用するかしないかにかかわらず、\fI<code>\fRタグは常に表示テキストを囲むかたちで含まれます。
 .sp
 .RS 4
 .ie n \{\
@@ -1626,10 +1626,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackage\&.class#member\fRˤϡȤƤǤդͭʥץǤ̾ꤷޤĤޤꡢѥå饹󥿥ե󥹥ȥ饯᥽åɡޤϥեɤ̾ǤС̾ʸϡ㡼׵(\fI#\fR)ˤɬפޤclassϡǤդΥȥåץ٥ޤϥͥȤ줿饹󥿥եɽޤmemberϡǤդΥ󥹥ȥ饯᥽åɤޤϥեɤɽޤ(ͥȤ줿饹ޤϥ󥿥եǤϤޤ)̾ɥȲ륯饹˴ޤޤƤ硢\fIjavadoc\fRޥɤϡ̾ؤΥ󥯤ޤȥ饹ؤΥ󥯤ˤϡ\fI\-link\fRץѤޤȥ饹°Ƥʤ̾ΥɥȤ򻲾Ȥˤϡ¾2Ĥ\fI@see\fRΤɤ餫Ѥޤ̾λפ򻲾ȤƤ
-.sp
-\fB:\fR
-ȥ饹ϡޥɥ饤\fIjavadoc\fRޥɤϤʤ饹Ǥɥdzȥ饹˥󥯤ƤսϡȤޤϳ󥯤ȸƤФޤȤС\fIjava\&.awt package\fRФƤΤ\fIjavadoc\fRޥɤ¹Ԥ硢\fIObject\fRʤɤ\fIjava\&.lang\fRΤ٤ƤΥ饹ȥ饹ˤʤޤ\fI\-link\fR\fI\-linkoffline\fRץѤơȥ饹إ󥯤ޤȥ饹ΥȤ\fIjavadoc\fRޥɤμ¹ԤˤϻѤǤޤ
+\fIpackage\&.class#member\fRには、参照されている任意の有効なプログラム要素の名前を指定します。つまり、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、またはフィールドの名前です。ただし、メンバー名の前の文字は、シャープ記号(\fI#\fR)にする必要があります。classは、任意のトップレベルまたはネストされたクラスか、インタフェースを表します。memberは、任意のコンストラクタ、メソッドまたはフィールドを表します(ネストされたクラスまたはインタフェースではありません)。この名前が、ドキュメント化されるクラスに含まれている場合、\fIjavadoc\fRコマンドは、その名前へのリンクを作成します。外部参照クラスへのリンクを作成するには、\fI\-link\fRオプションを使用します。参照クラスに属していない名前のドキュメントを参照するには、他の2つの\fI@see\fRタグ形式のどちらかを使用します。「名前の指定」を参照してください。
+.sp
+\fB注意:\fR
+外部参照クラスは、コマンドラインで\fIjavadoc\fRコマンドに渡されないクラスです。生成ドキュメント内で外部参照クラスにリンクしている箇所は、外部参照または外部リンクと呼ばれます。たとえば、\fIjava\&.awt package\fRに対してのみ\fIjavadoc\fRコマンドを実行した場合、\fIObject\fRなどの\fIjava\&.lang\fR内のすべてのクラスが外部参照クラスになります。\fI\-link\fRおよび\fI\-linkoffline\fRオプションを使用して、外部参照クラスへリンクします。外部参照クラスのソース・コメントは\fIjavadoc\fRコマンドの実行には使用できません。
 .RE
 .sp
 .RS 4
@@ -1640,7 +1640,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIlabel\fRϡάǽʥƥȤǡ󥯤Υ٥Ȥɽޤ٥ˤ϶ޤ뤳ȤǤޤ\fIlabel\fRάȡ\fIpackage\&.class\&.member\fRߤΥ饹ӥѥå˱Ŭڤṳ̂ɽޤ̾ɽˡפ򻲾ȤƤ
+\fIlabel\fRは、省略可能なテキストで、リンクのラベルとして表示されます。ラベルには空白を含めることができます。\fIlabel\fRを省略すると、\fIpackage\&.class\&.member\fRが、現在のクラスおよびパッケージに応じて適切に短縮されて表示されます。「名前が表示される方法」を参照してください。
 .RE
 .sp
 .RS 4
@@ -1651,10 +1651,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ʸ\fIpackage\&.class#member\fR\fIlabel\fRδ֤ζڤʸˤʤޤå¦ζʸϥ٥ƬȤϲᤵʤᡢ᥽åɤΥѥ᡼֤˶ʸƤ⤫ޤޤ
-.RE
-.sp
-Ǥϡ\fI@see\fR(\fICharacter\fR饹)\fIString\fR饹equals᥽åɤ򻲾ȤƤޤˤϡ̾\fIString#equals(Object)\fRȥ٥\fIequals\fRξΰޤޤƤޤ
+空白文字が、\fIpackage\&.class#member\fRと\fIlabel\fRの間の区切り文字になります。カッコの内側の空白文字はラベルの先頭とは解釈されないため、メソッドのパラメータ間に空白文字を入れてもかまいません。
+.RE
+.sp
+この例では、\fI@see\fRタグ(\fICharacter\fRクラス内)が、\fIString\fRクラスのequalsメソッドを参照しています。タグには、名前\fIString#equals(Object)\fRとラベル\fIequals\fRの両方の引数が含まれています。
 .sp
 .if n \{\
 .RS 4
@@ -1667,7 +1667,7 @@
 .if n \{\
 .RE
 .\}
-ɸɥååȤϡΤ褦HTMLޤ
+標準ドックレットは、次のようなHTMLを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1681,14 +1681,14 @@
 .if n \{\
 .RE
 .\}
-ҤΥɤϡ֥饦˼Τ褦ɽ졢٥ɽ󥯡ƥȤˤʤäƤޤ
-.sp
-\fBϢ\fR:
+前述のコードは、ブラウザに次のように表示され、ラベルは表示リンク・テキストになっています。
+.sp
+\fB関連項目\fR:
 .sp
 equals
 .RE
-̾λ.PP
-\fIpackage\&.class#member\fRȤ̾ϡ\fIjava\&.lang\&.String#toUpperCase()\fRΤ褦ʴ̾ˤ뤳Ȥ⡢\fIString#toUpperCase()\fR\fI#toUpperCase()\fRΤ褦̾ˤ뤳ȤǤޤ̾ûϡ\fIjavadoc\fRޥɤϡɸJavaѥθѤõޤ@seeθפ򻲾ȤƤ̾ϡ᥽åɰδ֤ʤɡåΥڡޤ뤳ȤǤޤʬŪ˽û̾ꤹ뤳ȤϡϤʸ뤳Ȥ䡢ɤɤߤ䤹ʤ뤳ȤǤΥꥹȤ͡ʷ̾򼨤ޤǡ\fIClass\fRˤϥ饹ޤϥ󥿥եTypeˤϥ饹󥿥ե󡢤ޤϥץߥƥ֤methodˤϥ᥽åɤޤϥ󥹥ȥ饯򡢤줾Ǥޤ
+名前の指定.PP
+この\fIpackage\&.class#member\fRという名前は、\fIjava\&.lang\&.String#toUpperCase()\fRのような完全修飾名にすることも、\fIString#toUpperCase()\fRや\fI#toUpperCase()\fRのような非完全修飾名にすることもできます。名前が完全修飾より短い場合は、\fIjavadoc\fRコマンドは、標準のJavaコンパイラの検索順序を使用して探します。「@seeタグの検索順序」を参照してください。名前は、メソッド引数の間など、カッコ内のスペースを含めることができます。部分的に修飾した短い名前を指定することの利点は、入力する文字数が減ることや、ソース・コードが読みやすくなることです。次のリストに様々な形式の名前を示します。ここで、\fIClass\fRにはクラスまたはインタフェースを、Typeにはクラス、インタフェース、配列、またはプリミティブを、methodにはメソッドまたはコンストラクタを、それぞれ指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -1725,7 +1725,7 @@
 .RE
 .\}
 .PP
-ΥꥹȤ˴ؤ:
+前のリストに関するメモ:
 .sp
 .RS 4
 .ie n \{\
@@ -1735,7 +1735,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǽΥפη(ѥåȥ饹ά)ξ硢\fIjavadoc\fRޥɤϡߤΥ饹γؤΤߤ򸡺ޤĤޤꡢߤΥ饹󥿥եΥѡ饹ѡ󥿥եޤϤγ¦ϤǤ륯饹󥿥եС򸡺ޤ(1\(en3)ߤΥѥå¾ʬ䡢¾Υѥåϸޤ(4\(en5)@seeθפ򻲾ȤƤ
+最初のタイプの形式(パッケージとクラスを省略)の場合、\fIjavadoc\fRコマンドは、現在のクラスの階層のみを検索します。つまり、現在のクラスかインタフェース、そのスーパークラスかスーパーインタフェース、またはその外側を囲んでいるクラスかインタフェースからメンバーを検索します(検索項目1\(en3)。現在のパッケージの他の部分や、他のパッケージは検索しません(検索項目4\(en5)。「@seeタグの検索順序」を参照してください。
 .RE
 .sp
 .RS 4
@@ -1746,7 +1746,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-᥽åɤޤϥ󥹥ȥ饯ϻˡ\fIgetValue\fRΤ褦˥åʤ̾Ѥ硢Ʊ̾Υեɤ¸ߤƤʤС\fIjavadoc\fRޥɤϤΥ᥽åɤؤΥ󥯤ޤΥ᥽åɤСɤƤ硢\fIjavadoc\fRޥɤϡǺǽ˸Ĥä᥽åɤ˥󥯤ޤ̤äǤޤ
+メソッドまたはコンストラクタの入力時に、\fIgetValue\fRのようにカッコなしの名前を使用した場合、同じ名前のフィールドが存在していなければ、\fIjavadoc\fRコマンドはそのメソッドへのリンクを作成します。このメソッドがオーバーロードされている場合、\fIjavadoc\fRコマンドは、検索で最初に見つかったメソッドにリンクします。結果は前もって特定できません。
 .RE
 .sp
 .RS 4
@@ -1757,7 +1757,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ͥȤ줿饹ϡ٤ƤηˤĤơ\fIouter\&.inner\fRȤƻꤹɬפޤñ\fIinner\fRȤϤʤǤ
+ネストされたクラスは、すべての形式について、\fIouter\&.inner\fRとして指定する必要があります。単純に\fIinner\fRとはしないでください。
 .RE
 .sp
 .RS 4
@@ -1768,12 +1768,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ǥ˽Ҥ٤褦ˡ饹ȥСȤδ֤ζڤʸȤƤϡɥå(\fI\&.\fR)ǤϤʤ㡼׵(\fI#\fR)ѤޤΤ褦˻ꤹȡ\fIjavadoc\fRޥɤϡޤǤޤɥåȤϡ饹ͥȤ줿饹ѥåӥ֥ѥåڤ뤿ˤѤ뤫Ǥ\fIjavadoc\fRޥɤǤϡޤʤХɥåȤϤޤٹɽޤ
-.RE
-@seeθ.PP
-\fIjavadoc\fRޥɤϡե롢ѥåե롢ץեɽ\fI@see\fRޤԤ2ĤΥեǤϡ̾\fI@see\fR˻ꤹɬפޤեǤϡ̾ޤʬ̾Ǥޤ
+すでに述べたように、クラスとメンバーとの間の区切り文字としては、ドット(\fI\&.\fR)ではなくシャープ記号(\fI#\fR)を使用します。このように指定すると、\fIjavadoc\fRコマンドは、あいまいさを解決できます。ドットは、クラス、ネストされたクラス、パッケージ、およびサブパッケージを区切るためにも使用されるからです。ただし、\fIjavadoc\fRコマンドでは、あいまいさがなければドットは正しく解析されますが、警告は表示されます。
+.RE
+@seeタグの検索順序.PP
+\fIjavadoc\fRコマンドは、ソース・ファイル、パッケージ・ファイル、概要ファイルに表示される\fI@see\fRタグを処理します。後者の2つのファイルでは、完全修飾の名前を\fI@see\fRタグに指定する必要があります。ソース・ファイルでは、完全修飾の名前、または部分修飾の名前を指定できます。
 .PP
-ˡ\fI@see\fRθ򼨤ޤ
+次に、\fI@see\fRタグの検索順序を示します。
 .sp
 .RS 4
 .ie n \{\
@@ -1783,7 +1783,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ߤΥ饹ޤϥ󥿥ե
+現在のクラスまたはインタフェース。
 .RE
 .sp
 .RS 4
@@ -1794,7 +1794,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-¦ϤǤ륯饹ȥ󥿥ե(ǤᤤΤ鸡)
+外側を囲んでいるクラスとインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1805,7 +1805,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-ѡ饹ȥѡ󥿥ե(ǤᤤΤ鸡)
+スーパークラスとスーパーインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1816,7 +1816,7 @@
 .sp -1
 .IP "  4." 4.2
 .\}
-ߤΥѥå
+現在のパッケージ。
 .RE
 .sp
 .RS 4
@@ -1827,12 +1827,12 @@
 .sp -1
 .IP "  5." 4.2
 .\}
-ݡȤƤѥå饹ӥ󥿥ե(\fIimport\fRʸν˽äƸ)
+インポートされているパッケージ、クラス、およびインタフェース(\fIimport\fR文の順序に従って検索)。
 .RE
 .PP
-\fIjavadoc\fRޥɤϡƥ饹ˤĤƹ1\-3ƵŪŬѤʤ顢פ̾ĤޤǸ³ޤĤޤꡢޤߤΥ饹򸡺ˤγ¦ϤǤ륯饹E򸡺塢EΥѡ饹򸡺Ƥ顢EϤǤ륯饹򸡺ޤ45Ǥϡ\fIjavadoc\fRޥɤ1ĤΥѥåΥ饹ޤϥ󥿥ե򸡺ϷޤäƤޤ(νϡġΥѥˤäưۤʤޤ)5Ǥϡ\fIjavadoc\fRޥɤϡ\fIjava\&.lang\fR򸡺ޤΥѥåϡ٤ƤΥץ˼ưŪ˥ݡȤ뤫Ǥ
+\fIjavadoc\fRコマンドは、各クラスについて項目1\-3を再帰的に適用しながら、一致する名前が見つかるまで検索を続けます。つまり、まず現在のクラスを検索し、次にその外側を囲んでいるクラスEを検索した後、Eのスーパークラスを検索してから、Eを囲んでいるクラスを検索します。項目4と5では、\fIjavadoc\fRコマンドが1つのパッケージ内のクラスまたはインタフェースを検索する順序は決まっていません(その順序は、個々のコンパイラによって異なります)。項目5では、\fIjavadoc\fRコマンドは、\fIjava\&.lang\fRを検索します。このパッケージは、すべてのプログラムに自動的にインポートされるからです。
 .PP
-\fIjavadoc\fRޥɤϡǤʤե\fI@see\fR򸫤ĤȡJavaѥƱǻꤵ줿̾򸡺ޤ(\fIjavadoc\fRޥɤϡ֤̾Τޤ򸡽Фޤ󡣤ϡɤˤΥ顼¸ߤƤʤȤȤƤ뤿Ǥ)θϡJavaͤƤޤ\fIjavadoc\fRޥɤϡϢ륯饹ȥѥåӥݡȤ줿饹ȥѥåΤ٤Ƥ餽̾򸡺ޤŪˤϡνǸޤ
+\fIjavadoc\fRコマンドは、完全修飾でないソース・ファイルで\fI@see\fRタグを見つけると、Javaコンパイラと同じ順序で指定された名前を検索します(ただし、\fIjavadoc\fRコマンドは、特定の名前空間のあいまいさを検出しません。これは、ソース・コードにこれらのエラーが存在していないことを前提としているためです)。この検索順序は、Java言語仕様で正式に定義されています。\fIjavadoc\fRコマンドは、関連するクラスとパッケージ、およびインポートされたクラスとパッケージのすべてからその名前を検索します。具体的には、次の順序で検索します。
 .sp
 .RS 4
 .ie n \{\
@@ -1842,7 +1842,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ߤΥ饹ޤϥ󥿥ե
+現在のクラスまたはインタフェース。
 .RE
 .sp
 .RS 4
@@ -1853,7 +1853,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-¦ϤǤ륯饹ȥ󥿥ե(ǤᤤΤ鸡)
+外側を囲んでいるクラスとインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1864,7 +1864,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-ѡ饹ȥѡ󥿥ե(ǤᤤΤ鸡)
+スーパークラスとスーパーインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1875,7 +1875,7 @@
 .sp -1
 .IP "  4." 4.2
 .\}
-ߤΥѥå
+現在のパッケージ。
 .RE
 .sp
 .RS 4
@@ -1886,48 +1886,48 @@
 .sp -1
 .IP "  5." 4.2
 .\}
-ݡȤƤѥå饹ӥ󥿥ե(\fIimport\fRʸν˽äƸ)
+インポートされているパッケージ、クラス、およびインタフェース(\fIimport\fR文の順序に従って検索)。
 .RE
 .PP
-\fIjavadoc\fRޥɤϡɬ⥵֥饹򸡺Ȥϸ¤ޤ󡣤ޤ¹¾ΥѥåΥɥȤǤ⡢¾Υѥå򸡺ޤ󡣤ȤС\fI@see\fR\fIjava\&.awt\&.event\&.KeyEvent\fR饹˴ޤޤƤơ\fIjava\&.awt package\fRΤ̾򻲾ȤƤƤ⡢Υ饹ݡȤʤ\fIjavadoc\fRޥɤϤΥѥå򸡺ޤ
-̾ɽˡ.PP
-\fIlabel\fRάȡ\fIpackage\&.class\&.member\fRɽޤ̤ˡϸߤΥ饹ӥѥå˱Ŭڤṳ̂ޤṳ̂Ȥϡ\fIjavadoc\fRޥɤˤɬ׺Ǿ¤̾ΤߤɽȤȤǤȤС\fIString\&.toUpperCase()\fR᥽åɤˡƱ饹ΥСؤλȤ¾Υ饹ΥСؤλȤޤޤƤ硢饹̾ɽΤϸԤΥΤߤǤ(ΥꥹȤ򻲾)ѥå̾Ū˺ˤϡ\fI\-noqualifier\fRץѤޤ
-.RS 4
-\fBȤΥ\fR: \fI@see\fRƱ饹ƱѥåΥС򻲾Ȥޤ
-.RE
-.RS 4
-\fB\fR: \fI@see String#toLowerCase()\fR
-.RE
-.RS 4
-\fBɽ\fR: \fItoLowerCase()\fR \- ѥåӥ饹̾άޤ
-.RE
-.RS 4
-.RE
-.RS 4
-\fBȤΥ\fR: \fI@see\fR̤Υ饹ƱѥåΥС򻲾Ȥޤ
-.RE
-.RS 4
-\fB\fR: \fI@see Character#toLowerCase(char)\fR
-.RE
-.RS 4
-\fBɽ\fR: \fICharacter\&.toLowerCase(char)\fR \- ѥå̾ά饹̾ޤߤޤ
-.RE
-.RS 4
-.RE
-.RS 4
-\fBȤΥ\fR: \fI@see\fRϰۤʤ륯饹ۤʤѥåΥС򻲾Ȥޤ
-.RE
-.RS 4
-\fB\fR: \fI@see java\&.io\&.File#exists()\fR
-.RE
-.RS 4
-\fBɽ\fR: \fIjava\&.io\&.File\&.exists()\fR \- ѥåӥ饹̾ޤߤޤ
-.RE
-.RS 4
-.RE
-@see.PP
-¦ΥȤϡ\fI@see\fR\fIjava\&.applet\&.Applet\fRʤɤ̤ΥѥåΥ饹ˤˡ̾ɤΤ褦ɽ뤫򼨤ƤޤJavadocġǤDocȤεˡ@see˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@see)򻲾ȤƤ
+\fIjavadoc\fRコマンドは、必ずしもサブクラスを検索するとは限りません。また、実行中に他のパッケージのドキュメントが生成される場合でも、他のパッケージを検索しません。たとえば、\fI@see\fRタグが\fIjava\&.awt\&.event\&.KeyEvent\fRクラス内に含まれていて、\fIjava\&.awt package\fR内のある名前を参照していても、そのクラスがインポートしないかぎり\fIjavadoc\fRコマンドはそのパッケージを検索しません。
+名前が表示される方法.PP
+\fIlabel\fRを省略すると、\fIpackage\&.class\&.member\fRが表示されます。一般に、これは現在のクラスおよびパッケージに応じて適切に短縮されます。短縮されるとは、\fIjavadoc\fRコマンドにより必要最小限の名前のみが表示されるということです。たとえば、\fIString\&.toUpperCase()\fRメソッドに、同じクラスのメンバーへの参照と他のクラスのメンバーへの参照が含まれている場合、クラス名が表示されるのは後者のケースのみです(次のリストを参照)。パッケージ名を全体的に削除するには、\fI\-noqualifier\fRオプションを使用します。
+.RS 4
+\fB参照のタイプ\fR: \fI@see\fRタグは同じクラス、同じパッケージのメンバーを参照します
+.RE
+.RS 4
+\fB例\fR: \fI@see String#toLowerCase()\fR
+.RE
+.RS 4
+\fB表示\fR: \fItoLowerCase()\fR \- パッケージおよびクラス名を省略します
+.RE
+.RS 4
+.RE
+.RS 4
+\fB参照のタイプ\fR: \fI@see\fRタグは別のクラス、同じパッケージのメンバーを参照します
+.RE
+.RS 4
+\fB例\fR: \fI@see Character#toLowerCase(char)\fR
+.RE
+.RS 4
+\fB表示\fR: \fICharacter\&.toLowerCase(char)\fR \- パッケージ名を省略し、クラス名を含みます
+.RE
+.RS 4
+.RE
+.RS 4
+\fB参照のタイプ\fR: \fI@see\fRタグは異なるクラス、異なるパッケージのメンバーを参照します
+.RE
+.RS 4
+\fB例\fR: \fI@see java\&.io\&.File#exists()\fR
+.RE
+.RS 4
+\fB表示\fR: \fIjava\&.io\&.File\&.exists()\fR \- パッケージおよびクラス名を含みます
+.RE
+.RS 4
+.RE
+@seeタグの例.PP
+右側のコメントは、\fI@see\fRタグが\fIjava\&.applet\&.Applet\fRなどの別のパッケージのクラス内にある場合に、名前がどのように表示されるかを示しています。JavadocツールでのDocコメントの記述方法の@seeに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@see)を参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -1948,24 +1948,24 @@
 .RE
 .\}
 .PP
-\fB:\fR
-\fI@se\fR\fIe\fRĥƥɥȲʤ饹˥󥯤ˤϡ\fI\-link\fRץѤޤ
+\fB注意:\fR
+\fI@se\fR\fIe\fRタグを拡張してドキュメント化されないクラスにリンクするには、\fI\-link\fRオプションを使用します。
 .PP
 @serial \fIfield\-description\fR | include | exclude
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-ǥեȤľ󲽲ǽեɤΥɥơ󡦥ȤǻѤޤ饹ľ󲽲ǽʥեɤӥǡʸ
-(http://docs\&.oracle\&.com/javase/8/docs/platform/serialization/spec/serial\-arch\&.html#5251)򻲾ȤƤ
-.sp
-Oracleľ󲽤줿λͤ˥饹ޤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/serialized\-criteria\-137781\&.html)⻲ȤƤ
-.sp
-\fIfield\-description\fR(άǽ)Ǥϡեɤΰ̣ͤΥꥹȤ򼨤ɬפޤɬפʾϡʣιԤϤä򵭽ҤǤޤɸɥååȤϡξľ󲽤줿ڡɲäޤ߻ȥڡ򻲾ȤƤ
-.sp
-饹ľ󲽤ľ󲽲ǽեɤ򥯥饹ɲä硢ˡɲäС̤ʸɲäɬפޤ
-.sp
-\fIinclude\fR\fIexclude\fRϡľ󲽤줿ڡ˥饹ޤϥѥåޤ뤫뤫򼨤ޤΤ褦˵ǽޤ
+JDK 1\&.2で導入
+.sp
+デフォルトの直列化可能フィールドのドキュメンテーション・コメントで使用します。クラスの直列化可能なフィールドおよびデータの文書化
+(http://docs\&.oracle\&.com/javase/8/docs/platform/serialization/spec/serial\-arch\&.html#5251)を参照してください
+.sp
+Oracleの直列化された形式の仕様にクラスを含める基準
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/serialized\-criteria\-137781\&.html)も参照してください
+.sp
+\fIfield\-description\fR(省略可能)では、フィールドの意味を説明し、取り得る値のリストを示す必要があります。必要な場合は、複数の行に渡って説明を記述できます。標準ドックレットは、この情報を、直列化された形式ページに追加します。相互参照ページを参照してください。
+.sp
+クラスを直列化した後に直列化可能フィールドをクラスに追加した場合、主説明に、追加したバージョンを識別する文を追加する必要があります。
+.sp
+\fIinclude\fRおよび\fIexclude\fR引数は、直列化された形式ページにクラスまたはパッケージを含めるか除外するかを示します。次のように機能します。
 .sp
 .RS 4
 .ie n \{\
@@ -1975,7 +1975,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISerializable\fRƤpublicޤprotected饹ϡΥ饹(ޤϤΥ饹°ѥå)\fI@serial exclude\fRǥޡƤʤꡢޤޤ
+\fISerializable\fRを実装しているpublicまたはprotectedクラスは、そのクラス(またはそのクラスが属するパッケージ)が\fI@serial exclude\fRタグでマークされていないかぎり、含められます。
 .RE
 .sp
 .RS 4
@@ -1986,59 +1986,59 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISerializable\fRƤprivateޤpackage\-private饹ϡΥ饹(ޤϤΥ饹°ѥå)\fI@serial include\fRǥޡƤʤꡢޤ
-.RE
-.sp
-ȤС\fIjavax\&.swing\fRѥåpackage\&.htmlޤpackage\-info\&.java\fI@serial\fR
-\fIexclude\fRǥޡƤޤpublic饹\fIjava\&.security\&.BasicPermission\fR\fI@serial exclude\fRǥޡƤޤpackage\-private饹\fIjava\&.util\&.PropertyPermissionCollection\fR\fI@serial include\fRǥޡƤޤ
-.sp
-饹٥\fI@serial\fRϥѥå٥\fI@serial\fR򥪡С饤ɤޤ
+\fISerializable\fRを実装しているprivateまたはpackage\-privateクラスは、そのクラス(またはそのクラスが属するパッケージ)が\fI@serial include\fRタグでマークされていないかぎり、除外されます。
+.RE
+.sp
+たとえば、\fIjavax\&.swing\fRパッケージはpackage\&.htmlまたはpackage\-info\&.java内で\fI@serial\fR
+\fIexclude\fRタグでマークされています。publicクラス\fIjava\&.security\&.BasicPermission\fRは\fI@serial exclude\fRタグでマークされています。package\-privateクラス\fIjava\&.util\&.PropertyPermissionCollection\fRは\fI@serial include\fRタグでマークされています。
+.sp
+クラス・レベルの\fI@serial\fRタグはパッケージ・レベルの\fI@serial\fRタグをオーバーライドします。
 .RE
 .PP
 @serialData \fIdata\-description\fR
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-ǡͤѤơľ󲽤줿ǤΥǡηȽɥȲޤΥǡˤϡ\fIwriteObject\fR᥽åɤˤäƽ񤭹ޤάǽʥǡ\fIExternalizable\&.writeExternal\fR᥽åɤˤäƽ񤭹ޤ뤹٤ƤΥǡ(١饹ޤ)ޤޤޤ
-.sp
-\fI@serialData\fRϡ\fIwriteObject\fR\fIreadObject\fR\fIwriteExternal\fR\fIreadExternal\fR\fIwriteReplace\fR\fIreadResolve\fR᥽åɤΥɥơ󡦥ȤǻѤǤޤ
+JDK 1\&.2で導入
+.sp
+データの説明値を使用して、直列化された形式でのデータの型と順序をドキュメント化します。このデータには、\fIwriteObject\fRメソッドによって書き込まれる省略可能なデータ、および\fIExternalizable\&.writeExternal\fRメソッドによって書き込まれるすべてのデータ(ベース・クラスを含む)が含まれます。
+.sp
+\fI@serialData\fRタグは、\fIwriteObject\fR、\fIreadObject\fR、\fIwriteExternal\fR、\fIreadExternal\fR、\fIwriteReplace\fRおよび\fIreadResolve\fRメソッドのドキュメンテーション・コメントで使用できます。
 .RE
 .PP
 @serialField \fIfield\-name\fR \fIfield\-type\fR \fIfield\-description\fR
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-\fISerializable\fR饹\fIserialPersistentFields\fRС\fIObjectStreamField\fRݡͥȤɥȲޤ\fIObjectStreamField\fRݡͥȤȤ1Ĥ\fI@serialField\fRѤޤ
+JDK 1\&.2で導入
+.sp
+\fISerializable\fRクラスの\fIserialPersistentFields\fRメンバーの\fIObjectStreamField\fRコンポーネントをドキュメント化します。\fIObjectStreamField\fRコンポーネントごとに1つの\fI@serialField\fRタグを使用します。
 .RE
 .PP
 @since \fIsince\-text\fR
 .RS 4
-JDK 1\&.1Ƴ
-.sp
-ɥȤˡꤵ줿\fIsince\-text\fRͤ\fIƳ줿С\fRФɲäޤΥƥȤˤϡ̤¤Ϥޤ󡣤Υϡ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡޤϥեɤͭǤΥϡѹޤϵǽ\fIsince\-text\fRͤˤäƻꤵ줿եȥ꡼ʹߡ¸ߤƤ뤳Ȥ̣ޤȤС\fI@since 1\&.5\fRǤ
-.sp
-JavaץåȥեΥɤξ硢\fI@since\fRϡJavaץåȥեAPIͤΥС򼨤ޤɤե󥹼ɲä줿򼨤Ȥϸ¤ޤʣ\fI@since\fRѤǤʣ\fI@author\fRΤ褦˰ޤץǤʣAPIǻѤ硢ʣΥѤǤޤ
+JDK 1\&.1で導入
+.sp
+生成ドキュメントに、指定された\fIsince\-text\fRの値の\fI「導入されたバージョン」\fR見出しを追加します。このテキストには、特別な内部構造はありません。このタグは、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、またはフィールドで有効です。このタグは、特定の変更または機能が、\fIsince\-text\fRの値によって指定されたソフトウェア・リリース以降、存在していることを意味します。たとえば、\fI@since 1\&.5\fRです。
+.sp
+Javaプラットフォームのソース・コードの場合、\fI@since\fRタグは、JavaプラットフォームAPI仕様のバージョンを示します。ソース・コードがリファレンス実装に追加された時期を示すとは限りません。複数の\fI@since\fRタグを使用でき、複数の\fI@author\fRタグのように扱われます。プログラム要素が複数のAPIで使用される場合、複数のタグを使用できます。
 .RE
 .PP
 @throws \fIclass\-name\fR \fIdescription\fR
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-\fI@exception\fRƱư򤷤ޤJavadocġǤDocȤεˡ@throws˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@exception)򻲾ȤƤ
-.sp
-\fI@throws\fRϡɥȤ\fIThrows\fRФɲäơ\fIclass\-name\fR\fIdescription\fRƥȤ񤭹ߤޤ\fIclass\-name\fRϡΥ᥽åɤ饹ǽΤ㳰̾ǤΥϡ᥽åɡ󥹥ȥ饯Υɥơ󡦥ǤΤͭǤΥ饹̾ǵҤƤʤ硢\fIjavadoc\fRޥɤϡ˽äƥ饹õޤʣ\fI@throws\fRƱ㳰ޤϰ㤦㳰λꤷɥơ󡦥ȤǻѤǤޤ@seeθפ򻲾ȤƤ
-.sp
-٤ƤΥå㳰ɥȲ褦ˤ뤿ˡ\fI@throws\fRthrows㳰Ѥ¸ߤʤϡ\fI@throws\fRǥɥȲ줿Τ褦ˡ\fIjavadoc\fRޥɤˤä㳰HTMLϤʤɲäޤ
-.sp
-С饤ɤ᥽å㳰ŪƤΤߡ\fI@throws\fRΥɥȤΥ᥽åɤ饵֥饹˥ԡޤ󥿥ե᥽åɤ᥽åɤ˥ԡƱͤǤ\fI{@inheritDoc}\fRѤơ\fI@throws\fRɥơѾ褦˶Ǥޤ
+JDK 1\&.2で導入
+.sp
+\fI@exception\fRタグと同じ動作をします。JavadocツールでのDocコメントの記述方法の@throwsに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@exception)を参照してください
+.sp
+\fI@throws\fRタグは、生成ドキュメントに\fIThrows\fR小見出しを追加して、\fIclass\-name\fRおよび\fIdescription\fRテキストを書き込みます。\fIclass\-name\fRは、そのメソッドからスローされる可能性のある例外の名前です。このタグは、メソッド、コンストラクタのドキュメンテーション・コメント内でのみ有効です。このクラスが完全指定の名前で記述されていない場合、\fIjavadoc\fRコマンドは、検索順序に従ってクラスを探します。複数の\fI@throws\fRタグを、同じ例外または違う例外の指定したドキュメンテーション・コメントで使用できます。「@seeタグの検索順序」を参照してください。
+.sp
+すべてのチェック済例外がドキュメント化されるようにするために、\fI@throws\fRタグがthrows節内の例外用に存在しない場合は、\fI@throws\fRタグでドキュメント化されたかのように、\fIjavadoc\fRコマンドによって例外がHTML出力に説明なしで追加されます。
+.sp
+オーバーライドされるメソッド内で例外が明示的に宣言されている場合のみ、\fI@throws\fRのドキュメントがそのメソッドからサブクラスにコピーされます。インタフェース・メソッドから実装メソッドにコピーされる場合も同様です。\fI{@inheritDoc}\fRタグを使用して、\fI@throws\fRタグがドキュメンテーションを継承するように強制できます。
 .RE
 .PP
 {@value \fIpackage\&.class#field\fR}
 .RS 4
-JDK 1\&.4Ƴ
-.sp
-ͤɽޤ\fI{@value}\fRŪեɤΥɥơ󡦥ȤǰʤǻѤƤ硢ͤɽޤ
+JDK 1\&.4で導入
+.sp
+定数の値を表示します。\fI{@value}\fRタグが静的フィールドのドキュメンテーション・コメントで引数なしで使用されている場合、その定数の値を表示します。
 .sp
 .if n \{\
 .RS 4
@@ -2052,7 +2052,7 @@
 .if n \{\
 .RE
 .\}
-ǤդΥɥơ󡦥ǰ\fIpackage\&.class#field\fRǻѤ줿硢\fI{@value}\fRϻꤵ줿ͤɽޤ
+任意のドキュメンテーション・コメント内で引数\fIpackage\&.class#field\fRありで使用された場合、\fI{@value}\fRタグは指定された定数の値を表示します。
 .sp
 .if n \{\
 .RS 4
@@ -2066,48 +2066,48 @@
 .if n \{\
 .RE
 .\}
-\fIpackage\&.class#field\fRϡ\fI@see\fRƱηˤʤޤСŪեɤǤɬפޤ
-.sp
-ͤϡե͡
-(http://docs\&.oracle\&.com/javase/8/docs/api/constant\-values\&.html)ˤɽޤ
+引数\fIpackage\&.class#field\fRは、\fI@see\fRタグ引数と同一の形式になります。ただし、メンバーは静的フィールドである必要があります。
+.sp
+これらの定数の値は「定数フィールド値」
+(http://docs\&.oracle\&.com/javase/8/docs/api/constant\-values\&.html)にも表示されます
 .RE
 .PP
 @version \fIversion\-text\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fI\-version\fRץ󤬻ѤƤ硢ɥȤ\fI֥С\fRФɲäơꤵ줿\fIversion\-text\fRͤ񤭹ߤޤΥϤΥɤޤޤ륽եȥθߤΥ꡼ֹݻ뤿ΤΤǤΤФ\fI@since\fRϡΥɤƳ줿꡼ֹݻޤ\fIversion\-text\fRͤˤϡ̤¤ϤޤJavadocġǤDocȤεˡ@version˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@version)򻲾ȤƤ
-.sp
-1ĤΥɥơ󡦥Ȥʣ\fI@version\fRޤ뤳ȤǤޤɬפ˱ơ1Ĥ\fI@version\fR1ĤΥ꡼ֹꤹ뤳Ȥ⡢ʣΥ꡼ֹꤹ뤳ȤǤޤԤξϡ\fIjavadoc\fRޥɤˤä̾̾δ֤˥(,)ȶʸޤԤξϡƥΤϤ뤳ȤʤɥȤ˥ԡޤäơޤǤϤʤƸб̾ڤʸѤɬפȤˡ1Ԥʣ̾Ǥޤ
-.RE
-.SH "ѤǤ"
+JDK 1\&.0で導入
+.sp
+\fI\-version\fRオプションが使用されている場合、生成ドキュメントに\fI「バージョン」\fR小見出しを追加して、指定された\fIversion\-text\fRの値を書き込みます。このタグはこのコードが含まれるソフトウェアの現在のリリース番号を保持するためのものであるのに対し、\fI@since\fRタグは、このコードが導入されたリリース番号を保持します。\fIversion\-text\fRの値には、特別な内部構造はありません。JavadocツールでのDocコメントの記述方法の@versionに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@version)を参照してください
+.sp
+1つのドキュメンテーション・コメントに複数の\fI@version\fRタグを含めることができます。必要に応じて、1つの\fI@version\fRタグに1つのリリース番号を指定することも、複数のリリース番号を指定することもできます。前者の場合は、\fIjavadoc\fRコマンドによって名前と名前の間にカンマ(,)と空白文字が挿入されます。後者の場合は、テキスト全体が解析されることなく、生成ドキュメントにコピーされます。したがって、カンマではなく、各言語に対応した名前区切り文字を使用する必要があるときに、1行に複数の名前を指定できます。
+.RE
+.SH "タグを使用できる場所"
 .PP
-ǤϡѤǤˤĤޤΥ٤ƤΥɥơ󡦥ȤǻѤǤޤ\fI@see\fR\fI@since\fR\fI@deprecated\fR\fI{@link}\fR\fI{@linkplain}\fR\fI{@docroot}\fR
-.SS "ץ"
+ここでは、タグを使用できる場所について説明します。次のタグがすべてのドキュメンテーション・コメントで使用できます。\fI@see\fR、\fI@since\fR、\fI@deprecated\fR、\fI{@link}\fR、\fI{@linkplain}\fRおよび\fI{@docroot}\fR。
+.SS "概要タグ"
 .PP
-ץϡץڡΥɥơ󡦥ȤǻѤǤ륿Ǥ(Υɥơ󡦥Ȥϡ̾overview\&.htmlȤ̾Υեˤޤ)¾Υɥơ󡦥ȤξƱͤˡΥϡθǻѤɬפޤ
+概要タグは、概要ページのドキュメンテーション・コメントで使用できるタグです(このドキュメンテーション・コメントは、通常overview\&.htmlという名前のソース・ファイル内にあります)。他のドキュメンテーション・コメントの場合と同様に、これらのタグは、主説明の後で使用する必要があります。
 .PP
-\fB:\fR
-Java SE 1\&.2Ǥϡץɥ\fI{@link}\fRԶ礬ޤƥȤɽޤ󥯤ꤵޤ󡣸ߤΤȤ\fI{@docRoot}\fRϡץɥǤϵǽޤ
+\fB注意:\fR
+Java SE 1\&.2では、概要ドキュメント内の\fI{@link}\fRタグに不具合があります。テキストは正しく表示されますが、リンクが設定されません。現在のところ、\fI{@docRoot}\fRタグは、概要ドキュメント内では機能しません。
 .PP
-ץϡΤȤǤ
+概要タグは、次のとおりです。
 .PP
 @see reference || @since since\-text || @serialField field\-name field\-type field\-description || @author name\-text || @version version\-text || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} ||
-.SS "ѥå"
+.SS "パッケージ・タグ"
 .PP
-ѥåϡѥåΥɥơ󡦥ȤǻѤǤ륿ǡɥơ󡦥Ȥpackage\&.htmlޤpackage\-info\&.javaȤ̾ΥեˤޤǻѤǤ\fI@serial\fRϡ\fIinclude\fRޤ\fIexclude\fRꤷΤΤߤǤ
+パッケージ・タグは、パッケージのドキュメンテーション・コメントで使用できるタグで、ドキュメンテーション・コメントはpackage\&.htmlまたはpackage\-info\&.javaという名前のソース・ファイル内にあります。ここで使用できる\fI@serial\fRタグは、\fIinclude\fRまたは\fIexclude\fR引数を指定したもののみです。
 .PP
-ѥåϡΤȤǤ
+パッケージ・タグは、次のとおりです。
 .PP
 @see reference || @since since\-text || @serial field\-description | include | exclude || @author name\-text || @version version\-text || {@linkplain package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} ||
-.SS "饹ӥ󥿥ե"
+.SS "クラスおよびインタフェース・タグ"
 .PP
-ˡ饹ޤϥ󥿥եΥɥơ󡦥ȤǻѤǤ륿򼨤ޤ\fI@serial\fRϡ\fIinclude\fRޤ\fIexclude\fRꤷơ饹ޤϥ󥿥եΥɥơǤΤ߻ѤǤޤ
+次に、クラスまたはインタフェースのドキュメンテーション・コメントで使用できるタグを示します。\fI@serial\fRタグは、\fIinclude\fRまたは\fIexclude\fR引数を指定して、クラスまたはインタフェースのドキュメンテーション内でのみ使用できます。
 .PP
 @see reference || @since since\-text || @deprecated deprecated\-text || @serial field\-description | include | exclude || @author name\-text || @version version\-text || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} ||
 .PP
-饹Ȥ:
+クラス・コメントの例:
 .sp
 .if n \{\
 .RS 4
@@ -2133,13 +2133,13 @@
 .if n \{\
 .RE
 .\}
-.SS "եɡ"
+.SS "フィールド・タグ"
 .PP
-ΥϡեɤɽǤޤ
+これらのタグは、フィールドに表示できます。
 .PP
 @see reference || @since since\-text || @deprecated deprecated\-text || @serial field\-description | include | exclude || @serialField field\-name field\-type field\-description || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} || {@value package\&.class#field}
 .PP
-եɡȤ:
+フィールド・コメントの例:
 .sp
 .if n \{\
 .RS 4
@@ -2155,17 +2155,17 @@
 .if n \{\
 .RE
 .\}
-.SS "󥹥ȥ饯ȥ᥽åɡ"
+.SS "コンストラクタとメソッド・タグ"
 .PP
-ˡ󥹥ȥ饯ޤϥ᥽åɤΥɥơ󡦥ȤǻѤǤ륿򼨤ޤ\fI@return\fRϥ󥹥ȥ饯ǤϻѤǤ
-\fI{@inheritDoc}\fRˤ¤ޤ
+次に、コンストラクタまたはメソッドのドキュメンテーション・コメントで使用できるタグを示します。ただし、\fI@return\fRはコンストラクタでは使用できず、
+\fI{@inheritDoc}\fRには制限があります。
 .PP
 @see reference || @since since\-text || @deprecated deprecated\-text || @param parameter\-name description || @return description || @throws class\-name description || @exception class\-name description || @serialData data\-description || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@inheritDoc} || {@docRoot}
 .PP
-\fB:\fR
-\fI@serialData\fRϡ\fIwriteObject\fR\fIreadObject\fR\fIwriteExternal\fR\fIreadExternal\fR\fIwriteReplace\fR\fIreadResolve\fR᥽åɤΥɥơ󡦥ȤǤΤ߻ѤǤޤ
+\fB注意:\fR
+\fI@serialData\fRタグは、\fIwriteObject\fR、\fIreadObject\fR、\fIwriteExternal\fR、\fIreadExternal\fR、\fIwriteReplace\fRおよび\fIreadResolve\fRメソッドのドキュメンテーション・コメントでのみ使用できます。
 .PP
-᥽åɡȤ:
+メソッド・コメントの例:
 .sp
 .if n \{\
 .RS 4
@@ -2189,9 +2189,9 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
-\fIjavadoc\fRޥɤϡɥååȤѤƽϤꤷޤ\fIjavadoc\fRޥɤϡ\fI\-doclet\fRץǥࡦɥååȤꤵƤʳϡǥեȤɸɥååȤѤޤ\fIjavadoc\fRޥɤˤϡǤդΥɥååȤȤȤ˻ѤǤ륳ޥɥ饤󡦥ץ󤬤ޤΥץˤĤƤϡJavadocץޤɸɥååȤǤϡ¾ˡĤɲäΥޥɥ饤󡦥ץ󶡤ޤΥץˤĤƤϡɸɥååȤΥץޤɤΥץ̾⡢ʸȾʸ̤ޤ󡣤ץΰǤϡʸȾʸ̤ޤ
+\fIjavadoc\fRコマンドは、ドックレットを使用して出力を決定します。\fIjavadoc\fRコマンドは、\fI\-doclet\fRオプションでカスタム・ドックレットが指定されている場合以外は、デフォルトの標準ドックレットを使用します。\fIjavadoc\fRコマンドには、任意のドックレットとともに使用できるコマンドライン・オプションがあります。これらのオプションについては、Javadocオプションで説明します。標準ドックレットでは、この他に、いくつかの追加のコマンドライン・オプションが提供されます。これらのオプションについては、標準ドックレットのオプションで説明します。どのオプション名も、大文字と小文字が区別されません。ただし、オプションの引数では、大文字と小文字が区別されます。
 .sp
 .RS 4
 .ie n \{\
@@ -2201,7 +2201,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Javadocץ⻲ȤƤ
+Javadocオプションも参照してください
 .RE
 .sp
 .RS 4
@@ -2212,45 +2212,45 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸɥååȤΥץ⻲ȤƤ
+標準ドックレットのオプションも参照してください
 .RE
 .PP
-ץϼΤȤǤ
+オプションは次のとおりです。
 .PP
 \-1\&.1 || \-author || \-bootclasspath classpathlist || \-bottom text || \-breakiterator || \-charset name || \-classpath classpathlist || \-d directory || \-docencoding name || \-docfilesubdirs || \-doclet class || \-docletpath classpathlist || \-doctitle title || \-encoding || \-exclude packagename1:packagename2:\&.\&.\&. || \-excludedocfilessubdir name1:name2 || \-extdirs dirist || \-footer footer || \-group groupheading packagepattern:packagepattern || \-header header || \-help || \-helpfile path\efilename || \-Jflag || \-keywords || \-link extdocURL || \-linkoffline extdocURL packagelistLoc || \-linksource || \-locale language_country_variant || \-nocomment || \-nodeprecated || \-nodeprecatedlist || \-nohelp || \-noindex || \-nonavbar || \-noqualifier all | packagename1:packagename2\&.\&.\&. || \-nosince || \-notimestamp || \-notree ||
 \fI\-overview path/filename || \fR\-package || \-private || \-protected || \-public || \-quiet || \-serialwarn || \-source release || \-sourcepath sourcepathlist || \-sourcetab tablength || \-splitindex ||
 \fI\-stylesheet path/filename || \fR\-subpackages package1:package2:\&.\&.\&. || \-tag tagname:Xaoptcmf:"taghead" || \-taglet class || \-tagletpath tagletpathlist || \-title title || \-top || \-use || \-verbose || \-version || \-windowtitle title
 .PP
-Υץϡ٤ƤΥɥååȤ˻ѲǽʥJavadocץǤɸɥååȤǤϡɥååȤ¾ʬ󶡤ޤ\fI\-bootclasspath\fR\fI\-breakiterator\fR\fI\-classpath\fR\fI\-doclet\fR\fI\-docletpath\fR\fI\-encoding\fR\-\fIexclude\fR\fI\-extdirs\fR\fI\-help\fR\fI\-locale\fR\fI\-\fR\fIoverview\fR\fI\-package\fR\fI\-private\fR\fI\-protected\fR\fI\-public\fR\fI\-quiet\fR\fI\-source\fR\fI\-sourcepath\fR\fI\-subpackages\fR\fI\-verbose\fR
-.SS "Javadocץ"
+次のオプションは、すべてのドックレットに使用可能なコアのJavadocオプションです。標準ドックレットでは、ドックレットの他の部分を提供します。\fI\-bootclasspath\fR、\fI\-breakiterator\fR、\fI\-classpath\fR、\fI\-doclet\fR、\fI\-docletpath\fR、\fI\-encoding\fR、\-\fIexclude\fR、\fI\-extdirs\fR、\fI\-help\fR、\fI\-locale\fR、\fI\-\fR\fIoverview\fR、\fI\-package\fR、\fI\-private\fR、\fI\-protected\fR、\fI\-public\fR、\fI\-quiet\fR、\fI\-source\fR、\fI\-sourcepath\fR、\fI\-subpackages\fRおよび\fI\-verbose\fR。
+.SS "Javadocオプション"
 .PP
 \-overview \fIpath/filename \fR
 .RS 4
 
-\fIjavadoc\fRޥɤФơ\fIpath/filename \fRǻꤵ줿ե뤫鳵ץɥѤΥƥȤΥƥȤץڡ(overview\-summary\&.html)֤褦˻ꤷޤ\fIpath/filename\fRϡߤΥǥ쥯ȥ꤫ХѥǤ
-.sp
-\fIfilename\fRͤǤդ̾ѤpathǤդǤޤ̾overview\&.htmlȤ̾դĥ꡼κǾ̥ѥåǥ쥯ȥޤǥ쥯ȥ֤ޤξ֤ȡѥåɥȲȤpathꤹɬפʤʤޤϡ\fI\-sourcepath\fRץˤäƤΥե뤬ؤ뤫Ǥ
-.sp
-ȤС\fIjava\&.lang\fRѥåΥĥ꡼/src/classes/java/lang/ξ硢ץե/src/classes/overview\&.html֤Ǥޤ
-.sp
-ºݤ򻲾ȤƤ
-.sp
-\fIpath/filename\fRǻꤹեˤĤƤϡץȡե򻲾ȤƤ
-.sp
-ץڡΤϡ\fIjavadoc\fRޥɤʣΥѥå̾ϤΤߤǤܺ٤ϡHTMLե졼򻲾ȤƤץڡΥȥϡ\fI\-doctitle\fRˤäꤵޤ
+\fIjavadoc\fRコマンドに対して、\fIpath/filename \fRで指定されたソース・ファイルから概要ドキュメント用のテキストを取得し、そのテキストを概要ページ(overview\-summary\&.html)に配置するように指定します。\fIpath/filename\fRは、現在のディレクトリからの相対パスです。
+.sp
+\fIfilename\fRの値で任意の名前を使用し、pathで任意の配置先を指定できますが、通常はoverview\&.htmlという名前を付け、ソース・ツリー内の最上位パッケージ・ディレクトリを含むディレクトリに配置します。この場所に配置すると、パッケージをドキュメント化するときにpathを指定する必要がなくなります。これは、\fI\-sourcepath\fRオプションによってこのファイルが指し示されるからです。
+.sp
+たとえば、\fIjava\&.lang\fRパッケージのソース・ツリーが/src/classes/java/lang/の場合、概要ファイルを/src/classes/overview\&.htmlに配置できます
+.sp
+実際の例を参照してください。
+.sp
+\fIpath/filename\fRで指定するファイルについては、概要コメント・ファイルを参照してください。
+.sp
+概要ページが作成されるのは、\fIjavadoc\fRコマンドに複数のパッケージ名を渡した場合のみです。詳細は、HTMLフレームを参照してください。概要ページのタイトルは、\fI\-doctitle\fRによって設定されます。
 .RE
 .PP
 \-Xdoclint:(all|none|[\-]\fI<group>\fR)
 .RS 4
-ʻȡӥƥηJavadocȤ­ηٹݡȤ̵Javadocʸ­ƤHTMLΥ顼ݡȤޤ
-.sp
-Υץˤꡢ\fIjavadoc\fRޥɤ줿Ϥ˴ޤޤ뤹٤ƤΥɥȡȤåޤ̾ɤꡢɸ४ץ\fI\-public\fR\fI\-protected\fR\fI\-package\fR\fI\-private\fR줿Ϥ˴ޤܤǤޤ
-.sp
-\fI\-Xdoclint\fRͭˤʤäƤϡ\fIjavac\fRޥɤƱͤ˥å꤬ݡȤޤ\fIjavadoc\fRޥɤϡåեΥԡӥ顼Ф줿Τʰ֤ؤåȤϤޤåϡ١줿ɥȤХǡѤƼ¹Ԥ줿˥顼ȯǽ˱ơٹޤϥ顼ˤʤޤȤСʻȤޤJavadocȤηϡ\fIjavadoc\fRޥɤ̵HTML븶ˤʤʤᡢϷٹȤƥݡȤޤʸ顼ޤHTMLληϡ\fIjavadoc\fRޥɤ̵HTML븶ˤʤ뤿ᡢϥ顼ȤƥݡȤޤ
-.sp
-ǥեȤǤϡ\fI\-Xdoclint\fRץͭˤʤäƤޤץ\fI\-Xdoclint:none\fR̵ˤޤ
-.sp
-\fI\-Xdoclint\fRץǥݡȤƤϼΥץѹޤ
+不正な参照、アクセシビリティの欠落およびJavadocコメントの不足の警告をレポートし、無効なJavadoc構文および不足しているHTMLタグのエラーをレポートします。
+.sp
+このオプションにより、\fIjavadoc\fRコマンドは生成された出力に含まれるすべてのドキュメント・コメントをチェックします。通常どおり、標準オプション\fI\-public\fR、\fI\-protected\fR、\fI\-package\fRおよび\fI\-private\fRで生成された出力に含む項目を選択できます。
+.sp
+\fI\-Xdoclint\fRが有効になっている場合は、\fIjavac\fRコマンドと同様にメッセージで問題がレポートされます。\fIjavadoc\fRコマンドは、メッセージ、ソース・ファイルのコピーおよびエラーが検出された正確な位置を指すキャレットを出力します。メッセージは、重大度、および生成されたドキュメントがバリデータを使用して実行された場合にエラーが発生する可能性に応じて、警告またはエラーになります。たとえば、不正な参照またはJavadocコメントの欠落は、\fIjavadoc\fRコマンドが無効なHTMLを生成する原因にならないため、これらの問題は警告としてレポートされます。構文エラーまたはHTML終了タグの欠落は、\fIjavadoc\fRコマンドが無効なHTMLを生成する原因になるため、これらの問題はエラーとしてレポートされます。
+.sp
+デフォルトでは、\fI\-Xdoclint\fRオプションは有効になっています。オプション\fI\-Xdoclint:none\fRで無効にします。
+.sp
+\fI\-Xdoclint\fRオプションでレポートされる内容は次のオプションで変更します。
 .sp
 .RS 4
 .ie n \{\
@@ -2261,7 +2261,7 @@
 .IP \(bu 2.3
 .\}
 \fI\-Xdoclint\fR\fI\fR\fI none\fR:
-\fI\-Xdoclint\fRץ̵ˤޤ
+\fI\-Xdoclint\fRオプションを無効にします。
 .RE
 .sp
 .RS 4
@@ -2273,7 +2273,7 @@
 .IP \(bu 2.3
 .\}
 \fI\-Xdoclint\fR\fI\fR\fI \fR\fIgroup\fR:
-\fIgroup\fRåͭˤޤ
+\fIgroup\fRチェックを有効にします。
 .RE
 .sp
 .RS 4
@@ -2284,7 +2284,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-Xdoclint\fR\fI\fR\fI all\fR: ٤ƤΥå롼פͭˤޤ
+\fI\-Xdoclint\fR\fI\fR\fI all\fR: すべてのチェック・グループを有効にします。
 .RE
 .sp
 .RS 4
@@ -2296,10 +2296,10 @@
 .IP \(bu 2.3
 .\}
 \fI\-Xdoclint\fR\fI\fR\fI all,\fR\fI\-group\fR:
-\fIgroup\fRåʳΤ٤Ƥͭˤޤ
-.RE
-.sp
-ѿ\fIgroup\fRϼΤ줫ͤޤ
+\fIgroup\fRチェック以外のすべてを有効にします。
+.RE
+.sp
+変数\fIgroup\fRは次のいずれかの値を持ちます。
 .sp
 .RS 4
 .ie n \{\
@@ -2309,7 +2309,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIaccessibility\fR: ӥƥåǸФåޤ(ȤС\fI<table>\fRǻꤵno captionޤsummary°)
+\fIaccessibility\fR: アクセシビリティ・チェッカで検出する問題をチェックします(たとえば、\fI<table>\fRタグで指定されるno captionまたはsummary属性)。
 .RE
 .sp
 .RS 4
@@ -2320,7 +2320,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIhtml\fR: 饤ǤؤΥ֥åǤ佪λɬפȤǤλʤʤɡ̥٥HTML򸡽Фޤ롼ϡHTML 4\&.01ͤƳФޤΥפΥåϡ\fIjavadoc\fRޥɤͭˤơ֥饦ǽΤHTML򸡽Фޤ
+\fIhtml\fR: インライン要素へのブロック要素の挿入や終了タグを必要とする要素を終了しないなど、上位レベルHTMLの問題を検出します。ルールは、HTML 4\&.01仕様から導出されます。このタイプのチェックは、\fIjavadoc\fRコマンドを有効にして、ブラウザが受け入れる可能性のあるHTMLの問題を検出します。
 .RE
 .sp
 .RS 4
@@ -2331,7 +2331,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fImissing\fR: ƤJavadocȤޤϥåޤ(ȤСƤ륳Ȥ䥯饹ޤϷƤ\fI@return\fR᥽åɾƱͤΥ)
+\fImissing\fR: 欠落しているJavadocコメントまたはタグをチェックします(たとえば、欠落しているコメントやクラス、または欠落している\fI@return\fRタグやメソッド上の同様のタグ)。
 .RE
 .sp
 .RS 4
@@ -2342,7 +2342,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIreference\fR: JavadocJava APIǤλȤ˴Ϣåޤ(ȤС\fI@see\fRǸĤʤܡޤ\fI@param\fRθ̾)
+\fIreference\fR: JavadocタグのJava API要素の参照に関連する問題をチェックします(たとえば、\fI@see\fRで見つからない項目、または\fI@param\fRの後の不正な名前)。
 .RE
 .sp
 .RS 4
@@ -2353,10 +2353,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIsyntax\fR: פƤʤå(\fI<\fR\fI>\fR)䥢ѥ(\fI&\fR)̵Javadocʤɤβ̥٥ǧޤ
-.RE
-.sp
-\fI\-Xdoclint\fRץʣꤷơʣΥƥΥ顼ȷٹå륪ץͭˤǤޤޤϡΥץѤơʣΥ顼ӷٹ𥫥ƥǤޤȤСΥޥɤΤ줫Ѥơ\fIfilename\fRեHTMLʸӥӥƥåޤ
+\fIsyntax\fR: エスケープされていない山カッコ(\fI<\fRおよび\fI>\fR)やアンパサンド(\fI&\fR)、無効なJavadocタグなどの下位レベルの問題を確認します。
+.RE
+.sp
+\fI\-Xdoclint\fRオプションを複数回指定して、複数のカテゴリのエラーと警告をチェックするオプションを有効にできます。または、前のオプションを使用して、複数のエラーおよび警告カテゴリを指定できます。たとえば、次のコマンドのいずれかを使用して、\fIfilename\fRファイル内のHTML、構文およびアクセシビリティの問題をチェックします。
 .sp
 .if n \{\
 .RS 4
@@ -2368,57 +2368,57 @@
 .if n \{\
 .RE
 .\}
-\fB:\fR
-\fIjavadoc\fRޥɤǤϡΥåδݾڤޤ󡣶ŪˤϡHTMLץ饤󥹡åǤϤޤ\-\fIXdoclint\fRץŪϡ\fIjavadoc\fRޥɤͭˤưŪʥ顼ȾݡȤ뤳ȤǤ
-.sp
-\fIjavadoc\fRޥɤϡ̵ϤνԤݡȤΤ߹Ԥޤ
+\fB注意:\fR
+\fIjavadoc\fRコマンドでは、これらのチェックの完全性は保証されません。具体的には、完全なHTMLコンプライアンス・チェッカではありません。\-\fIXdoclint\fRオプションの目的は、\fIjavadoc\fRコマンドを有効にして一般的なエラーの大半をレポートすることです。
+.sp
+\fIjavadoc\fRコマンドは、無効な入力の修正を試行せず、レポートのみ行います。
 .RE
 .PP
 \-public
 .RS 4
-public饹ӥСΤɽޤ
+publicクラスおよびメンバーのみ表示します。
 .RE
 .PP
 \-protected
 .RS 4
-protectedpublicΥ饹ȥСΤߤɽޤ줬ǥեȤǤ
+protectedおよびpublicのクラスとメンバーのみを表示します。これがデフォルトです。
 .RE
 .PP
 \-package
 .RS 4
-packageprotectedpublicΥ饹ȥСΤɽޤ
+package、protected、およびpublicのクラスとメンバーのみ表示します。
 .RE
 .PP
 \-private
 .RS 4
-٤ƤΥ饹ȥСɽޤ
+すべてのクラスとメンバーを表示します。
 .RE
 .PP
 \-help
 .RS 4
-饤󡦥إפɽޤ\fIjavadoc\fR\fIɥåå\fRΥޥɥ饤󡦥ץ󤬥ꥹȤޤ
+オンライン・ヘルプを表示します。\fIjavadoc\fRと\fIドックレット\fRのコマンドライン・オプションがリストされます。
 .RE
 .PP
 \-doclet \fIclass\fR
 .RS 4
-ɥȤ˻ѤɥååȤư뤿Υ饹եꤷޤ̾ѤޤΥɥååȤˤꡢϤƤȷޤ\fI\-doclet\fRץ󤬻ѤƤʤ硢\fIjavadoc\fRޥɤϡɸɥååȤѤƥǥեȤHTMLޤΥ饹ˤ\fIstart(Root)\fR᥽åɤޤޤƤɬפޤεư饹ؤΥѥ\fI\-docletpath\fRץˤäޤɥååȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)򻲾ȤƤ
+ドキュメントの生成に使用するドックレットを起動するためのクラス・ファイルを指定します。完全修飾名を使用します。このドックレットにより、出力の内容と形式が定義されます。\fI\-doclet\fRオプションが使用されていない場合、\fIjavadoc\fRコマンドは、標準ドックレットを使用してデフォルトのHTML形式を生成します。このクラスには\fIstart(Root)\fRメソッドが含まれている必要があります。この起動クラスへのパスは\fI\-docletpath\fRオプションによって定義されます。ドックレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)を参照してください
 .RE
 .PP
 \-docletpath \fIclasspathlist\fR
 .RS 4
-\fI\-doclet\fRץǻꤵ줿ɥååȳϥ饹ե롢ӤΥ饹¸뤹٤ƤJARեؤΥѥꤷޤϥ饹ե뤬JARեˤ硢ΥץJARեؤΥѥꤷޤХѥޤϸߤΥǥ쥯ȥ꤫ХѥǤޤ\fIclasspathlist\fRʣΥѥJARե뤬ޤޤˤϡSolarisξϥ(:)ǡWindowsξϥߥ(;)Ǥ줾ڤޤŪΥɥååȳϥ饹Ǥ˸ѥˤϡΥץפǤɥååȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)򻲾ȤƤ
+\fI\-doclet\fRオプションで指定されたドックレット開始クラス・ファイル、およびそのクラスが依存するすべてのJARファイルへのパスを指定します。開始クラス・ファイルがJARファイル内にある場合、このオプションでJARファイルへのパスを指定します。絶対パスまたは現在のディレクトリからの相対パスを指定できます。\fIclasspathlist\fRに複数のパスやJARファイルが含まれる場合には、それらをSolarisの場合はコロン(:)で、Windowsの場合はセミコロン(;)でそれぞれ区切ります。目的のドックレット開始クラスがすでに検索パス内にある場合は、このオプションは不要です。ドックレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)を参照してください
 .RE
 .PP
 \-1\&.1
 .RS 4
-Javadoc 1\&.4졢ؤϤޤ󡣤ΥץϡJavadoc 1\&.1ˤäΤƱȵǽĥɥȤ뤿ΤΤǤ(ͥȤ줿饹ϥݡȤƤޤ)ΥץɬפʾϡJavadoc 1\&.2ޤ1\&.3򤫤˻ѤƤ
+Javadoc 1\&.4から削除され、代替はありません。このオプションは、Javadoc 1\&.1によって生成されるのと同じ外見と機能を持つドキュメントを作成するためのものでした(ネストされたクラスはサポートされていません)。このオプションが必要な場合は、Javadoc 1\&.2または1\&.3をかわりに使用してください。
 .RE
 .PP
 \-source \fIrelease\fR
 .RS 4
-դ륽ɤΥ꡼ꤷޤ\fIrelease\fRѥ᡼ˤϼͤǤޤ\fIjavac\fRޥɤǥɤ򥳥ѥ뤹Ȥ˻Ѥͤб\fI꡼\fRͤѤޤ
+受け付けるソース・コードのリリースを指定します。\fIrelease\fRパラメータには次の値を指定できます。\fIjavac\fRコマンドでコードをコンパイルするときに使用する値に対応する\fIリリース\fRの値を使用します。
 .sp
 .RS 4
 .ie n \{\
@@ -2428,7 +2428,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB꡼: 1\&.5\fR\fIjavadoc\fRޥɤϡJDK 1\&.5Ƴ줿Τ¾θ쵡ǽޤॳɤդޤ\fI\-source\fRץ󤬻ѤʤäΥѥΥǥեưϡ1\&.5ΤΤˤʤޤ
+\fBリリース値: 1\&.5\fR。\fIjavadoc\fRコマンドは、JDK 1\&.5で導入された総称および他の言語機能を含むコードを受け付けます。\fI\-source\fRオプションが使用されなかった場合のコンパイラのデフォルト動作は、1\&.5のものになります。
 .RE
 .sp
 .RS 4
@@ -2439,7 +2439,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB꡼: 1\&.4\fR\fIjavadoc\fRޥɤϡJDK 1\&.4Ƴ줿ޤॳɤդޤ
+\fBリリース値: 1\&.4\fR。\fIjavadoc\fRコマンドは、JDK 1\&.4で導入されたアサーションを含むコードを受け付けます。
 .RE
 .sp
 .RS 4
@@ -2450,20 +2450,20 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB꡼: 1\&.3\fR\fIjavadoc\fRޥɤϡJDK 1\&.3ʹߤƳ줿Ρޤ¾θ쵡ǽ򥵥ݡȤޤ
+\fBリリース値: 1\&.3\fR。\fIjavadoc\fRコマンドは、JDK 1\&.3以降に導入されたアサーション、総称、または他の言語機能をサポートしません。
 .RE
 .RE
 .PP
 \-sourcepath \fIsourcepathlist\fR
 .RS 4
-ѥå̾ޤ\fI\-subpackages\fRץ\fIjavadoc\fRޥɤϤȤˡե򸫤Ĥ뤿θѥꤷޤ
-\fIʣΥѥϥ(:)Ƕڤޤ\fR\fIjavadoc\fRޥɤϡꤵ줿ѥʲΤ٤ƤΥ֥ǥ쥯ȥ򸡺ޤΥץѤơɥȲ륽եΰ֤ΤߤǤʤ켫ΤϥɥȲʤɥȲ륽ե뤫Ѿ줿Ȥĥեΰ֤ǧǤޤ
-.sp
-\fI\-sourcepath\fRץѤǤΤϡ\fIjavadoc\fRޥɤ˥ѥå̾ϤΤߤǤ\fIjavadoc\fRޥɤϤ륽եϸޤ󡣥եꤹˤϡΥǥ쥯ȥ˰ư뤫1İʾΥ饹ΥɥȲפ˼褦˳ƥե˥ѥޤޤ\fI\-sourcepath\fRά줿硢\fIjavadoc\fRޥɤϡ饹ѥѤƥե򸡺ޤ(\fI\-classpath\fR򻲾)ǥեȤ\fI\-sourcepath\fRϡ饹ѥͤǤ\fI\-classpath\fRάƥѥå̾\fIjavadoc\fRޥɤϤȡ\fIjavadoc\fRޥɤϸߤΥǥ쥯ȥ(ӤΥ֥ǥ쥯ȥ)饽ե򸡺ޤ
-.sp
-\fIsourcepathlist\fRˤϡɥȲѥåΥĥ꡼Υ롼ȡǥ쥯ȥꤷޤ
-.sp
-ȤС\fIcom\&.mypackage\fRȤ̾ΥѥåɥȲˡΥե뤬/home/user/src/com/mypackage/*\&.javaˤȤޤѥcom\emypackageޤޤǥ쥯ȥ/home/user/src˻ꤷƤ顢Τ褦ˡѥå̾ꤷޤ
+パッケージ名または\fI\-subpackages\fRオプションを\fIjavadoc\fRコマンドに渡すときに、ソース・ファイルを見つけるための検索パスを指定します。
+\fI複数のパスはコロン(:)で区切ります。\fR\fIjavadoc\fRコマンドは、指定されたパス以下のすべてのサブディレクトリを検索します。このオプションを使用して、ドキュメント化されるソース・ファイルの位置のみでなく、それ自体はドキュメント化されないがドキュメント化されるソース・ファイルから継承されたコメントを持つソース・ファイルの位置も確認できます。
+.sp
+\fI\-sourcepath\fRオプションを使用できるのは、\fIjavadoc\fRコマンドにパッケージ名を渡す場合のみです。\fIjavadoc\fRコマンドに渡されるソース・ファイルは検索されません。ソース・ファイルを特定するには、そのディレクトリに移動するか、「1つ以上のクラスのドキュメント化」に示すように各ファイルの前にパスを含めます。\fI\-sourcepath\fRが省略された場合、\fIjavadoc\fRコマンドは、クラス・パスを使用してソース・ファイルを検索します(\fI\-classpath\fRを参照)。デフォルトの\fI\-sourcepath\fRは、クラス・パスの値です。\fI\-classpath\fRを省略してパッケージ名を\fIjavadoc\fRコマンドに渡すと、\fIjavadoc\fRコマンドは現在のディレクトリ(およびそのサブディレクトリ)からソース・ファイルを検索します。
+.sp
+\fIsourcepathlist\fRには、ドキュメント化するパッケージのソース・ツリーのルート・ディレクトリを設定します。
+.sp
+たとえば、\fIcom\&.mypackage\fRという名前のパッケージをドキュメント化する場合に、そのソース・ファイルが/home/user/src/com/mypackage/*\&.javaにあるとします。ソース・パスをcom\emypackageが含まれるディレクトリ/home/user/srcに指定してから、次のように、パッケージ名を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -2474,11 +2474,11 @@
 .if n \{\
 .RE
 .\}
-ѥͤȥѥå̾Ϣ뤷ơɥåȤ򥹥å(/)ѹȡΤ褦ˡѥåΥեѥˤʤޤ
+ソース・パスの値とパッケージ名を連結して、ドットをスラッシュ(/)に変更すると、次のように、パッケージのフルパスになります。
 .sp
 /home/user/src/com/mypackage
 .sp
-2ĤΥѥꤹˤϡΤ褦ˤޤ
+2つのソース・パスを設定するには、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -2493,12 +2493,12 @@
 .PP
 \-classpath \fIclasspathlist\fR
 .RS 4
-\fIjavadoc\fRޥɤȥ饹θԤȤ˻Ѥѥꤷޤȥ饹ȤϡɥȲ륯饹ȡΥ饹ˤäƻȤ뤹٤ƤΥ饹ΤȤǤ
-\fIʣΥѥϥ(:)Ƕڤޤ\fR\fIjavadoc\fRޥɤϡꤵ줿ѥʲΤ٤ƤΥ֥ǥ쥯ȥ򸡺ޤ\fIclasspathlist\fRͤꤹȤϡ饹ѥΥɥȤˤؼ˽äƤ
-.sp
-\fI\-sourcepath\fRά줿硢\fIjavadoc\fRޥɤ\fI\-classpath\fRѤơե뤪ӥ饹ե򸡺ޤ(̸ߴΤ)եȥ饹ե̡Υѥ鸡ɬפϡ\fI\-sourcepath\fR\fI\-classpath\fRξѤޤ
-.sp
-ȤС\fIcom\&.mypackage\fRɥȲˡΥե뤬ǥ쥯ȥ/home/user/src/com/mypackageˤꡢΥѥå/home/user/libthenΥ饤֥˰¸ƤȤΤ褦˻ꤷޤ
+\fIjavadoc\fRコマンドが参照クラスの検索を行うときに使用するパスを指定します。参照クラスとは、ドキュメント化されるクラスと、それらのクラスによって参照されるすべてのクラスのことです。
+\fI複数のパスはコロン(:)で区切ります。\fR\fIjavadoc\fRコマンドは、指定されたパス以下のすべてのサブディレクトリを検索します。\fIclasspathlist\fRの値を指定するときは、クラス・パスのドキュメントにある指示に従ってください。
+.sp
+\fI\-sourcepath\fRが省略された場合、\fIjavadoc\fRコマンドは\fI\-classpath\fRを使用して、ソース・ファイルおよびクラス・ファイルを検索します(下位互換性のため)。ソース・ファイルとクラス・ファイルを別々のパスから検索する必要がある場合は、\fI\-sourcepath\fRと\fI\-classpath\fRの両方を使用します。
+.sp
+たとえば、\fIcom\&.mypackage\fRをドキュメント化する場合に、そのソース・ファイルがディレクトリ/home/user/src/com/mypackageにあり、このパッケージが/home/user/libthen内のライブラリに依存しているとき、次のように指定します。
 .sp
 .if n \{\
 .RS 4
@@ -2509,21 +2509,21 @@
 .if n \{\
 .RE
 .\}
-¾ΥġƱͤˡ\fI\-classpath\fRꤵƤʤ硢\fICLASSPATH\fRĶѿꤵƤС\fIjavadoc\fRޥɤϤδĶѿѤޤɤꤵƤʤ硢\fIjavadoc\fRޥɤϸߤΥǥ쥯ȥ꤫饯饹򸡺ޤ
-.sp
-\fIjavadoc\fRޥɤ\fI\-classpath\fRѤƥ桼饹򸡺ˡˤĤƤΡĥǽ饹֡ȥȥåס饹˴Ϣܺ٤ϡ饹θˡ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)򻲾ȤƤ
-.sp
-*Υ١̾ޤ९饹ѥǤϡ\fI\&.jar\fRޤ\fI\&.JAR\fRĥҤ˻ĥǥ쥯ȥΤ٤ƤΥեΥꥹȤꤹΤƱȤߤʤޤ
-.sp
-ȤСǥ쥯ȥ\fImydir\fR\fIa\&.jar\fR\fIb\&.JA\fRRޤޤƤ硢饹ѥ\fIfoo/*\fR\fIA\&.jar:b\&.JAR\fRŸޤJARեν֤̤ȤʤޤɽΥեޤࡢꤷǥ쥯ȥΤ٤ƤJARե뤬ꥹȤ˴ޤޤޤ*ʤ륯饹ѥȥϡߤΥǥ쥯ȥΤ٤ƤJARեΥꥹȤŸޤ\fICLASSPATH\fRĶѿƱͤŸޤ饹ѥΥ磻ɥɤŸϡJavaۥޥ(JVM)γ˹ԤޤJavaץϡSystem\&.getenv(\fI"CLASSPATH"\fR)θƤӽФˤäƤʤɡĶ䤤礻ŸƤʤ磻ɥɤ򻲾Ȥޤ
+他のツールと同様に、\fI\-classpath\fRが指定されていない場合、\fICLASSPATH\fR環境変数が設定されていれば、\fIjavadoc\fRコマンドはその環境変数を使用します。どちらも設定されていない場合、\fIjavadoc\fRコマンドは現在のディレクトリからクラスを検索します。
+.sp
+\fIjavadoc\fRコマンドが\fI\-classpath\fRを使用してユーザー・クラスを検索する方法についての、拡張機能クラスやブートストラップ・クラスに関連した詳細は、クラスの検索方法
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)を参照してください。
+.sp
+*のベース名を含むクラス・パス要素は、\fI\&.jar\fRまたは\fI\&.JAR\fRを拡張子に持つディレクトリ内のすべてのファイルのリストを指定するのと同等とみなされます。
+.sp
+たとえば、ディレクトリ\fImydir\fRに\fIa\&.jar\fRと\fIb\&.JA\fRRが含まれている場合、クラス・パス要素\fIfoo/*\fRは\fIA\&.jar:b\&.JAR\fRに展開されますが、JARファイルの順番は未指定となります。非表示のファイルを含む、指定したディレクトリ内のすべてのJARファイルがリストに含まれます。*からなるクラス・パス・エントリは、現在のディレクトリ内のすべてのJARファイルのリストに展開されます。\fICLASSPATH\fR環境変数も同様に展開されます。クラス・パスのワイルドカードの展開は、Java仮想マシン(JVM)の開始前に行われます。Javaプログラムは、System\&.getenv(\fI"CLASSPATH"\fR)の呼び出しによってなど、環境を問い合せる場合を除き、展開されていないワイルドカードを参照しません。
 .RE
 .PP
 \-subpackages \fIpackage1:package2:\&.\&.\&.\fR
 .RS 4
-ե뤫ꤵ줿ѥåӤΥ֥ѥå˺ƵŪ˥ɥȤޤΥץϡɤ˿֥ѥåɲäݤǤ֥ѥåưŪȤ߹ޤ뤫ǤpackageϡǤդκǾ̥֥ѥå(\fIjava\fRʤ)ޤϴѥå(\fIjavax\&.swing\fRʤ)ˤʤޤեޤɬפϤޤ󡣰ϡ٤ƤΥڥ졼ƥ󥰡ƥǡǶڤޤ磻ɥɤϻѤǤޤ󡣥ѥåθꤹˤϡ\fI\-sourcepath\fRѤޤΥץǤϡĥ꡼¸ߤ뤬ѥå˴ޤޤʤեޤ󡣥եν򻲾ȤƤ
-.sp
-ȤСΥޥɤϡ\fIjava\fR\fIjavax\&.swing\fRȤ̾ΥѥåȤΥ֥ѥåΥɥȤޤ
+ソース・ファイルから指定されたパッケージおよびそのサブパッケージ内に再帰的にドキュメントを生成します。このオプションは、ソース・コードに新しいサブパッケージを追加する際に便利です。新しいサブパッケージが自動的に組み込まれるからです。各package引数は、任意の最上位サブパッケージ(\fIjava\fRなど)または完全修飾パッケージ(\fIjavax\&.swing\fRなど)になります。ソース・ファイルを含める必要はありません。引数は、すべてのオペレーティング・システムで、コロンで区切られます。ワイルドカードは使用できません。パッケージの検索場所を指定するには、\fI\-sourcepath\fRを使用します。このオプションでは、ソース・ツリー内に存在するがパッケージに含まれないソース・ファイルを処理しません。ソース・ファイルの処理を参照してください。
+.sp
+たとえば、次のコマンドは、\fIjava\fRおよび\fIjavax\&.swing\fRという名前のパッケージとこれらのサブパッケージ全部のドキュメントを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -2538,9 +2538,9 @@
 .PP
 \-exclude \fIpackagename1:packagename2:\&.\&.\&.\fR
 .RS 4
-ꤵ줿ѥåȤΥ֥ѥå\fI\-subpackages\fRˤäƺ줿ꥹȤ̵˽ޤޤϾ\fI\-subpackages\fRץλˤäȤ߹ޤѥåоݤȤʤޤ
-.sp
-Ǥϡ\fIjava\&.io\fR\fIjava\&.util\fR\fIjava\&.math\fRʤɤȤ߹ޤޤ\fIjava\&.net\fR\fIjava\&.lang\fR롼Ȥ˻ĥѥåϽޤ\fIjava\&.lang\fRΥ֥ѥåǤ\fIjava\&.lang\&.ref\fRդƤ
+指定されたパッケージとそのサブパッケージを\fI\-subpackages\fRによって作成されたリストから無条件に除外します。過去または将来の\fI\-subpackages\fRオプションの指定によって組み込まれるパッケージも除外の対象となります。
+.sp
+次の例では、\fIjava\&.io\fR、\fIjava\&.util\fR、\fIjava\&.math\fRなどは組み込まれますが、\fIjava\&.net\fRと\fIjava\&.lang\fRをルートに持つパッケージは除外されます。\fIjava\&.lang\fRのサブパッケージである\fIjava\&.lang\&.ref\fRが除外される点に注意してください。
 .sp
 .if n \{\
 .RS 4
@@ -2556,30 +2556,30 @@
 .PP
 \-bootclasspath \fIclasspathlist\fR
 .RS 4
-֡ȡ饹¸ߤѥꤷޤ֡ȡ饹Ȥϡ̾Javaץåȥեࡦ饹ΤȤǤ\fIbootclasspath\fRϡ\fIjavadoc\fRޥɤեȥ饹եõȤ˻Ѥ븡ѥΰǤܺ٤ϡ饹θˡ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)򻲾ȤƤ
-.sp
-\fIclasspathlist\fRѥ᡼Υǥ쥯ȥϡߥ(;)Ƕڤ(Windowsξ)(:)Ƕڤޤ(Oracle Solarisξ)
+ブート・クラスが存在するパスを指定します。ブート・クラスとは、通常、Javaプラットフォーム・クラスのことです。\fIbootclasspath\fRは、\fIjavadoc\fRコマンドがソース・ファイルとクラス・ファイルを探すときに使用する検索パスの一部です。詳細は、クラスの検出方法
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)を参照してください
+.sp
+\fIclasspathlist\fRパラメータ内のディレクトリは、セミコロン(;)で区切る(Windowsの場合)か、コロン(:)で区切ります(Oracle Solarisの場合)。
 .RE
 .PP
 \-extdirs \fIdirist\fR
 .RS 4
-ĥǽ饹¸ߤǥ쥯ȥꤷޤĥǽ饹ȤϡJavaĥǽѤ뤹٤ƤΥ饹Ǥ\fIextdirs\fRץϡ\fIjavadoc\fRޥɤեȥ饹եõȤ˻Ѥ븡ѥΰǤܺ٤ϡ\fI\-classpath\fRץ򻲾ȤƤ\fIdirlist\fRΥǥ쥯ȥϡߥ(;)Ƕڤ(Windowsξ)(:)Ƕڤޤ(Oracle Solarisξ)
+拡張機能クラスが存在するディレクトリを指定します。拡張機能クラスとは、Java拡張機能機構を使用するすべてのクラスです。\fIextdirs\fRオプションは、\fIjavadoc\fRコマンドがソース・ファイルとクラス・ファイルを探すときに使用する検索パスの一部です。詳細は、\fI\-classpath\fRオプションを参照してください。\fIdirlist\fR内のディレクトリは、セミコロン(;)で区切る(Windowsの場合)か、コロン(:)で区切ります(Oracle Solarisの場合)。
 .RE
 .PP
 \-verbose
 .RS 4
-\fIjavadoc\fRޥɤμ¹˾ܺ٤ʥåɽޤ\fIverbose\fRץꤷʤȡեΥɻɥȤ(ե뤴Ȥ1ĤΥå)ӥȻ˥åɽޤverboseץꤹȡJavaեβϤפ(ߥñ)򼨤ɲäΥåɽޤ
+\fIjavadoc\fRコマンドの実行中に詳細なメッセージを表示します。\fIverbose\fRオプションを指定しないと、ソース・ファイルのロード時、ドキュメントの生成時(ソース・ファイルごとに1つのメッセージ)、およびソート時にメッセージが表示されます。verboseオプションを指定すると、各Javaソース・ファイルの解析に要した時間(ミリ秒単位)を示す追加のメッセージが表示されます。
 .RE
 .PP
 \-quiet
 .RS 4
-åٹȥ顼Τߤɽ褦ˤơǧ䤹ޤ\fIversion\fRʸ޻ߤޤ
+メッセージを抑制し、警告とエラーのみが表示されるようにして、これらを確認しやすくします。\fIversion\fR文字列も抑止します。
 .RE
 .PP
 \-breakiterator
 .RS 4
-Ѹξ硢ѥå饹ޤϥСμκǽʸνȽǤݤˡ\fIjava\&.text\&.BreakIterator\fRιݲ줿ʸѤޤ¾Τ٤ƤΥϡѸȤͭΥ르ꥺǤϤʤǤ\fIBreakIterator\fR饹ѤƤޤǽʸϡѥå饹ޤϥСΥޥ꡼˥ԡ졢ե٥åȽκ˥ԡޤJDK 1\&.2ʹߡ\fIBreakIterator\fR饹ϡѸ٤ƤθʸνȽǤ뤿ˡǤ˻ѤƤޤäơ\fI\-breakiterator\fRץϡ1\&.2ʹߤǤϱʸʳˤϸ̤ޤ󡣱ʸˤϡΤ褦ȼΥǥեȤΥ르ꥺबޤ
+英語の場合、パッケージ、クラスまたはメンバーの主説明の最初の文の終わりを判断する際に、\fIjava\&.text\&.BreakIterator\fRの国際化された文境界を使用します。他のすべてのロケールは、英語言語というロケール固有のアルゴリズムではなく、すでに\fIBreakIterator\fRクラスを使用しています。最初の文は、パッケージ、クラス、またはメンバーのサマリーにコピーされ、アルファベット順の索引にコピーされます。JDK 1\&.2以降、\fIBreakIterator\fRクラスは、英語を除くすべての言語の文の終わりを判断するために、すでに使用されています。したがって、\fI\-breakiterator\fRオプションは、1\&.2以降では英文以外には効果がありません。英文には、次のような独自のデフォルトのアルゴリズムがあります。
 .sp
 .RS 4
 .ie n \{\
@@ -2589,7 +2589,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ʸΥǥեȤʸڤꥢ르ꥺࡣʸޤHTML֥å(\fI<P>\fRʤ)³ԥꥪɤߤޤ
+英文のデフォルトの文区切りアルゴリズム。空白文字またはHTMLブロック・タグ(\fI<P>\fRなど)が続くピリオドで停止します。
 .RE
 .sp
 .RS 4
@@ -2600,36 +2600,36 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-breakiteratorʸڤꥢ르ꥺࡣθ줬ʸǻϤޤ硢ʸ³ԥꥪɡ䡢ޤϴòߤޤΥ르ꥺǤϡThe serial no\&. is validפʤɡۤȤɤξάɽޤMr\&. SmithפϽޤ\fI\-breakiterator\fRץǤϡHTML䡢ޤϵǻϤޤʸǤߤޤHTMLޤƤǤ⡢\&.\&./filenameפκǸΥԥꥪɤߤޤ
-.RE
-.sp
-Java SE 1\&.5Ǥ\fI\-breakiterator\fRٹå졢ǥեȤʸڤꥢ르ꥺѹƤޤ󡣥ɤѹSE 1\&.4\&.xǤ\fI\-breakiterator\fRץηٹƤʤǤ⡢⤹ɬפϤޤJava SE 1\&.5\&.0ϷٹϾǤƤޤ
+breakiterator文区切りアルゴリズム。次の語が大文字で始まる場合、空白文字が続くピリオド、疑問符、または感嘆符で停止します。このアルゴリズムでは「The serial no\&. is valid」など、ほとんどの省略表記が処理されますが、「Mr\&. Smith」は処理されません。\fI\-breakiterator\fRオプションでは、HTMLタグや、数字または記号で始まる文では停止しません。HTMLタグに埋め込まれている場合でも、「\&.\&./filename」の最後のピリオドで停止します。
+.RE
+.sp
+Java SE 1\&.5では\fI\-breakiterator\fR警告メッセージが削除され、デフォルトの文区切りアルゴリズムは変更されていません。ソース・コードを変更せず、SE 1\&.4\&.xでの\fI\-breakiterator\fRオプションの警告を除去していない場合でも、何もする必要はありません。Java SE 1\&.5\&.0からは警告は消滅しています。
 .RE
 .PP
 \-locale \fIlanguage_country_variant\fR
 .RS 4
-\fIjavadoc\fRޥɤɥȤȤ˻Ѥꤷޤΰϡ\fIj\fR\fIava\&.util\&.Locale\fRɥȤƤ褦ˡ\fIen_US\fR
-(Ѹ졢ƹ)ޤ\fIen_US_WIN\fR
-(WindowsХꥢ)ʤɤΥ̾Ǥ
-.sp
-\fB:\fR
-\fI\-locale\fRץϡɸɥååȤ󶡤뤹٤ƤΥץ󡢤ޤϤ¾ǤդΥɥååȤ󶡤뤹٤ƤΥץ(¦)˻ꤹɬפޤʤȡʥӥ󡦥СѸɽޤΥޥɥ饤󡦥ץΤߡꤹ˰¸ޤɸɥååȤΥץ򻲾ȤƤ
-.sp
-ꤹȡꤷΥ꥽ե뤬\fIjavadoc\fRޥɤˤä򤵤ơå(ʥӥ󡦥СꥹȤɽθФإסեܼstylesheet\&.cssΥȤʤɤʸ)Τ˻Ѥޤޤե٥åȽ˥ȤꥹȤΥȽ硢ӺǽʸνȽǤ뤿ʸζڤʸ⡢ꤷˤäƷޤޤ\fI\-locale\fRץϡɥȲ륯饹ΥեǻꤵƤɥơ󡦥ȤΥƥȤΥꤹΤǤϤޤ
+\fIjavadoc\fRコマンドがドキュメントを生成するときに使用するロケールを指定します。この引数は、\fIj\fR\fIava\&.util\&.Locale\fRドキュメントで説明しているように、\fIen_US\fR
+(英語、米国)または\fIen_US_WIN\fR
+(Windowsバリアント)などのロケールの名前です。
+.sp
+\fB注意:\fR
+\fI\-locale\fRオプションは、標準ドックレットが提供するすべてのオプション、またはその他の任意のドックレットが提供するすべてのオプションより前(左側)に指定する必要があります。そうしないと、ナビゲーション・バーが英語で表示されます。このコマンドライン・オプションのみ、指定する順序に依存します。標準ドックレットのオプションを参照してください。
+.sp
+ロケールを指定すると、指定したロケールのリソース・ファイルが\fIjavadoc\fRコマンドによって選択されて、メッセージ(ナビゲーション・バー、リストと表の見出し、ヘルプ・ファイルの目次、stylesheet\&.cssのコメントなどの文字列)のために使用されます。また、アルファベット順にソートされるリストのソート順、および最初の文の終わりを判断するための文の区切り文字も、指定したロケールによって決まります。\fI\-locale\fRオプションは、ドキュメント化されるクラスのソース・ファイル内で指定されているドキュメンテーション・コメントのテキストのロケールを決定するものではありません。
 .RE
 .PP
 \-encoding
 .RS 4
-եΥ󥳡ǥ󥰤̾(\fIEUCJIS/SJIS\fRʤ)ꤷޤΥץ󤬻ꤵƤʤϡץåȥեΥǥեȡСѤޤӥץ⻲ȤƤ
+ソース・ファイルのエンコーディングの名前(\fIEUCJIS/SJIS\fRなど)を指定します。このオプションが指定されていない場合は、プラットフォームのデフォルト・コンバータが使用されます。およびオプションも参照してください。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjavadoc\fRޥɤ¹ԤJava Runtime Environment (JRE)ˡ\fIflag\fRľϤޤȤСɥȤ뤿˥ƥ32MBΥ꡼ݤƤɬפϡ\fI\-Xmx\fRץ򼡤Τ褦˸ƤӽФޤ\fIjavadoc \-J\-Xmx32m \-J\-Xms32m com\&.mypackage\fR\fI\-Xms\fRϾάǽǡϽ꡼ΥꤹΤߤΥץǡɬפʥ꡼κǾ̤狼äƤǤ
-.sp
-\fIJ\fR\fIflag\fRδ֤˶ʸϤޤ
-.sp
-ѤƤ\fIjavadoc\fRޥɤΥСǧˤ\fI\-version\fRץѤޤϥȥ꡼ˤɸɥååȤΥСֹ椬ޤޤޤJavadocޥɤμ¹Ԥ򻲾ȤƤ
+\fIjavadoc\fRコマンドを実行するJava Runtime Environment (JRE)に、\fIflag\fRを直接渡します。たとえば、生成ドキュメントを処理するためにシステムで32MBのメモリーを確保しておく必要がある場合は、\fI\-Xmx\fRオプションを次のように呼び出します。\fIjavadoc \-J\-Xmx32m \-J\-Xms32m com\&.mypackage\fR。\fI\-Xms\fRは省略可能で、これは初期メモリーのサイズを設定するのみのオプションで、必要なメモリーの最小量がわかっている場合に便利です。
+.sp
+\fIJ\fRと\fIflag\fRの間に空白文字はありません。
+.sp
+使用している\fIjavadoc\fRコマンドのバージョンを確認するには\fI\-version\fRオプションを使用します。出力ストリームには標準ドックレットのバージョン番号が含まれます。Javadocコマンドの実行を参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -2644,76 +2644,76 @@
 .RE
 .\}
 .RE
-.SS "ɸɥååȤΥץ"
+.SS "標準ドックレットのオプション"
 .PP
 \-d \fIdirectory\fR
 .RS 4
-\fIjavadoc\fRޥɤ줿HTMLե¸ǥ쥯ȥꤷޤ\fI\-d\fRץάȡեϸߤΥǥ쥯ȥ¸ޤ\fIdirectory\fRͤˤϡХǥ쥯ȥꡢޤϸߤκȥǥ쥯ȥ꤫Хǥ쥯ȥǤޤJava SE 1\&.4Ǥϡ\fIjavadoc\fRޥɤ¹Ԥǥ쥯ȥ꤬ưŪ˺ޤ
-.sp
-ȤСǤϡ\fIcom\&.mypackage\fRѥåΥɥȤ졢η̤\fI/user/doc/ \fRǥ쥯ȥ¸ޤ\fIjavadoc \-d \fR\fI/user/doc/ \fR\fIcom\&.mypackage\fR
+\fIjavadoc\fRコマンドが生成されたHTMLファイルを保存する生成先ディレクトリを指定します。\fI\-d\fRオプションを省略すると、ファイルは現在のディレクトリに保存されます。\fIdirectory\fRの値には、絶対ディレクトリ、または現在の作業ディレクトリからの相対ディレクトリを指定できます。Java SE 1\&.4では、\fIjavadoc\fRコマンドを実行すると生成先ディレクトリが自動的に作成されます。
+.sp
+たとえば、次の例では、\fIcom\&.mypackage\fRパッケージのドキュメントが生成され、その結果が\fI/user/doc/ \fRディレクトリに保存されます。\fIjavadoc \-d \fR\fI/user/doc/ \fR\fIcom\&.mypackage\fR
 .RE
 .PP
 \-use
 .RS 4
-ɥȲ륯饹ӥѥåȤ1ĤλѥڡȤ߹ߤޤΥڡˤϡΥ饹ޤϥѥåAPIѤƤѥå饹᥽åɡ󥹥ȥ饯ӥեɤҤޤȤС饹CˤȤȡ饹CѤƤΤȤƤϡCΥ֥饹CȤƤեɡC֤᥽åɡӷCΥѥ᡼ĥ᥽åɤȥ󥹥ȥ饯ޤȤС\fIString\fRѤλѥڡɽǤޤ\fIjava\&.awt\&.Font\fR饹\fIgetName\fR᥽åɤ\fIString\fR᤹Τǡ\fIgetName\fR᥽åɤ\fIString\fRѤ\fIgetName\fR᥽åɤ\fIString\fRѤλѥڡɽޤϼǤϤʤAPIλѤΤߤɥȲޤ᥽åɤμ\fIString\fRѤ뤬Ȥʸʤޤʸ֤ʤ硢\fIString\fRλѤȤϤߤʤޤ줿ѥڡ˥ˤϡ饹ޤϥѥå˰ưʥӥ󡦥С\fB󥯤λ\fR򥯥åޤ
+ドキュメント化されるクラスおよびパッケージごとに1つの使用ページを組み込みます。このページには、その特定のクラスまたはパッケージのAPIを使用しているパッケージ、クラス、メソッド、コンストラクタ、およびフィールドが記述されます。たとえば、クラスCを例にとると、クラスCを使用しているものとしては、Cのサブクラス、Cとして宣言されているフィールド、Cを返すメソッド、および型Cのパラメータを持つメソッドとコンストラクタがあります。たとえば、\fIString\fR型用の使用ページを表示できます。\fIjava\&.awt\&.Font\fRクラスの\fIgetName\fRメソッドは\fIString\fR型を戻すので、\fIgetName\fRメソッドは\fIString\fRを使用し、\fIgetName\fRメソッドが\fIString\fR用の使用ページに表示されます。これは実装ではなくAPIの使用のみをドキュメント化します。メソッドがその実装で\fIString\fRを使用するが、引数として文字列を取らない、または文字列を返さない場合、それは\fIString\fRの使用とはみなされません。生成された使用ページにアクセスするには、クラスまたはパッケージに移動し、ナビゲーション・バーの\fBリンクの使用\fRをクリックします。
 .RE
 .PP
 \-version
 .RS 4
-ɥȤˡ@versionΥƥȤȤ߹ߤޤΥƥȤϡǥեȤǤϾάޤѤƤ\fIjavadoc\fRޥɤΥСǧˤ\fI\-J\-version\fRץѤޤ
+生成ドキュメントに、@versionのテキストを組み込みます。このテキストは、デフォルトでは省略されます。使用している\fIjavadoc\fRコマンドのバージョンを確認するには\fI\-J\-version\fRオプションを使用します。
 .RE
 .PP
 \-author
 .RS 4
-ɥȤˡ\fI@author\fRΥƥȤȤ߹ߤޤ
+生成ドキュメントに、\fI@author\fRのテキストを組み込みます。
 .RE
 .PP
 \-splitindex
 .RS 4
-ե򥢥ե٥åȤȤʣΥեʬ䤷ʸȤ1ĤΥեȡե٥åȰʳεǻϤޤȥѤ1ĤΥեޤ
+索引ファイルをアルファベットごとに複数のファイルに分割し、文字ごとに1つのファイルと、アルファベット以外の記号で始まる索引エントリ用に1つのファイルを作成します。
 .RE
 .PP
 \-windowtitle \fItitle\fR
 .RS 4
-HTML\fI<title>\fR֤륿ȥꤷޤ\fItitle\fR˻ꤷƥȤϡɥΥȥ䡢ΥڡФƺ줿֥饦Υ֥åޡ()ɽޤΥȥˤHTMLޤʤǤȥHTMLޤޤƤȡ֥饦Ǥޤ\fItitle\fRŰϥʸѤƥޡޤ\fI\-windowtitle\fRץάȡ\fIjavadoc\fRޥɤϡ\fI\-windowtitle\fRץΤˡ\fI\-doctitle\fRץͤѤޤȤС\fIjavadoc \-windowtitle "Java SE Platform" com\&.mypackage\fRǤ
+HTMLの\fI<title>\fRタグに配置するタイトルを指定します。\fItitle\fRタグに指定したテキストは、ウィンドウのタイトルや、このページに対して作成されたブラウザのブックマーク(お気に入り)に表示されます。このタイトルにはHTMLタグを含めないでください。タイトルにHTMLタグが含まれていると、ブラウザがタグを正しく解釈できません。\fItitle\fRタグ内の内部の二重引用符はエスケープ文字を使用してマークします。\fI\-windowtitle\fRオプションを省略すると、\fIjavadoc\fRコマンドは、\fI\-windowtitle\fRオプションのかわりに、\fI\-doctitle\fRオプションの値を使用します。たとえば、\fIjavadoc \-windowtitle "Java SE Platform" com\&.mypackage\fRです。
 .RE
 .PP
 \-doctitle \fItitle\fR
 .RS 4
-ץޥ꡼եκǾζ᤯֤륿ȥꤷޤ\fItitle\fR˻ꤷƥȤ·ˤʤꡢ٥1θФȤơʥӥ󡦥СΤ֤ޤ\fItitle\fRˤHTMLӶʸޤ뤳ȤǤޤξ硢ȥǰϤɬפޤ\fItitle\fRǰѤϡפɬפޤȤС\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRǤ
+概要サマリー・ファイルの最上部の近くに配置するタイトルを指定します。\fItitle\fRタグに指定したテキストは中央揃えになり、レベル1の見出しとして、上部ナビゲーション・バーのすぐ下に置かれます。\fItitle\fRタグにはHTMLタグおよび空白文字を含めることができますが、その場合、タイトルを引用符で囲む必要があります。\fItitle\fRタグの内部で引用符を使用する場合は、エスケープする必要があります。たとえば、\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRです。
 .RE
 .PP
 \-title \fItitle\fR
 .RS 4
-Ǥ¸ߤޤJavadoc 1\&.2Υ١Ǥˤ¸ߤƤޤǤΥץϡ\fI\-doctitle\fRȤ̾ѹޤ̾ѹͳϡΥץ󤬡ɥΥȥǤϤʤɥȤΥȥ뤳ȤΤˤ뤿Ǥ
+すでに存在しません。Javadoc 1\&.2のベータ版にしか存在していませんでした。このオプションは、\fI\-doctitle\fRという名前に変更されました。名前を変更した理由は、このオプションが、ウィンドウのタイトルではなくドキュメントのタイトルを定義することを明確にするためです。
 .RE
 .PP
 \-header \fIheader\fR
 .RS 4
-ƽϥեκǾ֤إåƥȤꤷޤإåϡʥӥ󡦥Сα֤ޤ\fIheader\fRˤHTMLӶʸޤ뤳ȤǤޤξ硢\fIheader\fRǰϤɬפޤإåΰˤϥʸѤޤȤС\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRǤ
+各出力ファイルの最上部に配置するヘッダー・テキストを指定します。ヘッダーは、ナビゲーション・バーの右上に配置されます。\fIheader\fRにはHTMLタグおよび空白文字を含めることができますが、その場合、\fIheader\fRを引用符で囲む必要があります。ヘッダー内部の引用符にはエスケープ文字を使用します。たとえば、\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRです。
 .RE
 .PP
 \-footer \fIfooter\fR
 .RS 4
-ƽϥեκDz֤եåƥȤꤷޤ\fIfooter\fRͤϡʥӥ󡦥Сα֤ޤ\fIfooter\fRˤHTMLӶʸޤ뤳ȤǤޤξ硢\fIfooter\fRǰϤɬפޤեåΰˤϥʸѤޤ
+各出力ファイルの最下部に配置するフッター・テキストを指定します。\fIfooter\fRの値は、ナビゲーション・バーの右下に配置されます。\fIfooter\fRにはHTMLタグおよび空白文字を含めることができますが、その場合、\fIfooter\fRを引用符で囲む必要があります。フッター内部の引用符にはエスケープ文字を使用します。
 .RE
 .PP
 \-top
 .RS 4
-ƽϥեκǾ֤ƥȤꤷޤ
+各出力ファイルの最上部に配置するテキストを指定します。
 .RE
 .PP
 \-bottom \fItext\fR
 .RS 4
-ƽϥեκDz֤ƥȤꤷޤΥƥȤϡʥӥ󡦥С겼ΡڡκDz֤ޤƥȤˤHTMLӶʸޤ뤳ȤǤޤξ硢ƥȤǰϤɬפޤƥΰˤϥʸѤޤ
+各出力ファイルの最下部に配置するテキストを指定します。このテキストは、下部ナビゲーション・バーより下の、ページの最下部に配置されます。テキストにはHTMLタグおよび空白文字を含めることができますが、その場合、テキストを引用符で囲む必要があります。テキスト内部の引用符にはエスケープ文字を使用します。
 .RE
 .PP
 \-link \fIextdocURL\fR
 .RS 4
-¸Javadocˤ줿ȥ饹ΥɥȤؤΥ󥯤ޤ\fIextdocURL\fRϡȤƻꤹ롢Javadocˤ줿ɥȤޤǥ쥯ȥURLޤURLǤꤷ\fIjavadoc\fRޥɤμ¹Ԥǡʣ\fI\-link\fRץꤷʣΥɥȤؤΥ󥯤Ǥޤ
-.sp
-Υǥ쥯ȥpackage\-listե뤬¸ߤɬפޤ(¸ߤʤϡ\fI\-linkoffline\fRץѤޤ)\fIjavadoc\fRޥɤϡpackage\-listե뤫ѥå̾ɤ߼ä塢URLǤΥѥå˥󥯤ޤ\fIjavadoc\fRޥɤμ¹Իˡ\fIextdocURL\fRͤ줿\fI<A HREF>\fR˥ԡޤäơ\fIextdocURL\fRϥեǤϤʤǥ쥯ȥؤURLǤɬפޤ\fIextdocURL\fRХ󥯤Ѥȡ桼ΥɥȤǤդWebȾΥɥȤ˥󥯤Ǥޤа֤إ󥯤ΤߤξХ󥯤ѤǤޤХ󥯤Ѥ硢Ϥͤϰǥ쥯ȥ꤫顢󥯤Ƥѥåޤǥ쥯ȥؤǤɬפޤ(\fI\-d\fRץǻ)Х󥯤ꤹ硢̾HTTP󥯤ѤޤWebСʤե롦ƥ˥󥯤ϡե롦󥯤ѤǤޤ줿ɥơ˥Ʊե롦ƥͭˤΤߥե롦󥯤Ѥޤɤξ⡢ɤΥڥ졼ƥ󥰡ƥǤ⡢URLФޤФΤǤ⡢ޤ\fIh\fR\fIttp:\fRޤ\fIf\fR\fIile:\fRΤǤ⡢URL: Uniform Resource Locators
-(http://www\&.ietf\&.org/rfc/rfc1738\&.txt)˻ꤵƤȤꡢڤʸȤƥåѤޤ
+既存のJavadocにより生成された外部参照クラスのドキュメントへのリンクを作成します。\fIextdocURL\fR引数は、リンク先として指定する、Javadocにより生成された外部ドキュメントを含むディレクトリの絶対URLまたは相対URLです。指定した\fIjavadoc\fRコマンドの実行で、複数の\fI\-link\fRオプションを指定して複数のドキュメントへのリンクを作成できます。
+.sp
+このディレクトリ内にpackage\-listファイルが存在する必要があります(存在しない場合は、\fI\-linkoffline\fRオプションを使用します)。\fIjavadoc\fRコマンドは、package\-listファイルからパッケージ名を読み取った後、そのURLでこれらのパッケージにリンクします。\fIjavadoc\fRコマンドの実行時に、\fIextdocURL\fRの値が、作成された\fI<A HREF>\fRリンク内にコピーされます。したがって、\fIextdocURL\fRはファイルではなくディレクトリへのURLである必要があります。\fIextdocURL\fRに絶対リンクを使用すると、ユーザーのドキュメントを任意のWebサイト上のドキュメントにリンクできます。相対位置へリンクするのみの場合は相対リンクを使用できます。相対リンクを使用する場合、渡す値は宛先ディレクトリから、リンクされているパッケージを含むディレクトリへである必要があります(\fI\-d\fRオプションで指定)。絶対リンクを指定する場合、通常、HTTPリンクを使用します。ただし、Webサーバーを持たないファイル・システムにリンクする場合は、ファイル・リンクを使用できます。生成されたドキュメンテーションにアクセスする全員が同じファイル・システムを共有する場合にのみファイル・リンクを使用します。どの場合も、どのオペレーティング・システムでも、URLが絶対または相対のいずれでも、また\fIh\fR\fIttp:\fRまたは\fIf\fR\fIile:\fRのいずれでも、URLメモ: Uniform Resource Locators
+(http://www\&.ietf\&.org/rfc/rfc1738\&.txt)に指定されているとおり、区切り文字としてスラッシュを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -2727,8 +2727,8 @@
 .RE
 .\}
 .RE
-\-linkoffline\-linkץΰ㤤.PP
-ξˡ\fI\-link\fRץѤޤ
+\-linkofflineおよび\-linkオプションの違い.PP
+次の場合に、\fI\-link\fRオプションを使用します。
 .sp
 .RS 4
 .ie n \{\
@@ -2738,7 +2738,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-APIɥȤؤХѥѤ硣
+外部APIドキュメントへの相対パスを使用する場合。
 .RE
 .sp
 .RS 4
@@ -2749,14 +2749,14 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-APIɥȤؤURLѤ(URL³ɼԤȤˤäƵĤƤ)
+外部APIドキュメントへの絶対URLを使用する場合(そのURLに接続し、読取りを行うことがシェルによって許可されている場合)。
 .RE
 .PP
-APIɥȤؤURLѤ(URL³ɼԤȤˤäƵĤƤʤ)\fI\-linkoffline\fRץѤޤΤ褦ʾϡե¦եγ¦ˤɥȤ˥󥯤褦Ȥȯޤ
+外部APIドキュメントへの絶対URLを使用する場合(そのURLに接続し、読取りを行うことがシェルによって許可されていない場合)は\fI\-linkoffline\fRオプションを使用します。このような状況は、ファイアウォールの内側からファイアウォールの外側にあるドキュメントにリンクしようとする場合に発生します。
 .PP
-\fBExample 1\fR, ɥȤؤХ
-.RS 4
-http://docs\&.oracle\&.com/javase/8/docs/api/index\&.html˼褦ʡ\fIjava\&.lang\fR\fIjava\&.io\fRӤ¾Javaץåȥեࡦѥå˥󥯤硢ΥޥɤѤޤ
+\fBExample 1\fR, 外部ドキュメントへの絶対リンク
+.RS 4
+http://docs\&.oracle\&.com/javase/8/docs/api/index\&.htmlに示すような、\fIjava\&.lang\fR、\fIjava\&.io\fRおよびその他のJavaプラットフォーム・パッケージにリンクする場合、次のコマンドを使用します
 .sp
 .if n \{\
 .RS 4
@@ -2767,37 +2767,37 @@
 .if n \{\
 .RE
 .\}
-ΥޥɤϡJava SEץåȥեࡦѥåؤΥ󥯻\fIcom\&.mypackage\fRѥåΥɥȤޤɥȤˤϡȤХ饹\fItrees\fR\fIObject\fR饹ؤΥ󥯤ޤޤƤޤ\fI\-sourcepath\fR\fI\-d\fRʤɤ¾Υץɽޤ
+このコマンドは、Java SEプラットフォーム・パッケージへのリンク持つ\fIcom\&.mypackage\fRパッケージのドキュメントを生成します。生成ドキュメントには、たとえばクラス\fItrees\fR内の\fIObject\fRクラスへのリンクが含まれています。\fI\-sourcepath\fRや\fI\-d\fRなどの他のオプションは表示されません。
 .RE
 .PP
-\fBExample 2\fR, ɥȤؤХ
-.RS 4
-Ǥϡ2ĤΥѥåꡢΥɥȤ\fIjavadoc\fRޥɤʣ¹Ԥ줿ΤǤˡΥɥȤХѥʬ䤵ƤޤѥåϡAPIǤ\fIcom\&.apipackage\fRȡSPI(ӥץХ󥿥ե)Ǥc\fIom\&.spipackage\fRǤɥȤγǼϡdocs/api/com/apipackagedocs/spi/com/spipackageǤAPIѥåΥɥȤϤǤƤơdocsߤΥǥ쥯ȥǤ硢APIɥȤؤΥ󥯤SPIѥåɥȲˤϡΥޥɤ¹Ԥޤ\fIjavadoc \-d \&./spi \-link \&.\&./api com\&.spipackage\fR
-.sp
-\fI\-link\fRץϡǥ쥯ȥ(docs/spi)ХѥǤ
-.RE
-.PP
-\fI\-link\fRץѤȡɤϻȤƤƤ⡢\fIjavadoc\fRμ¹ԤǤϥɥȲʤ饹˥󥯤Ǥ褦ˤʤޤ󥯤ͭʥڡ˰ưǤ褦ˤˤϡHTMLڡĴ١ξ\fIextdocURL\fR˻ꤹɬפޤˤꡢɥѡƥΥɥơjava\&.*ɥơ(http://docs\&.oracle\&.com)إ󥯤뤳ȤǤޤ\fIjavadoc\fRޥɤǡߤμ¹ԤƤɥơAPIؤΥ󥯤Τߤˤϡ\fI\-link\fRץάޤ\fI\-link\fRץꤷʤȡ\fIjavadoc\fRޥɤϳȤΤΥɥơؤΥ󥯤ޤ󡣥ɥơ¸ߤΤɤޤϤɤ¸ߤΤ狼ʤǤ\fI\-link\fRץǤϡɥơʣξ˥󥯤Ǥޤեν򻲾ȤƤ⤦1ĤӤϡѥååȤδ֤˥󥯤뤳ȤǤΥѥååȤФ\fIjavadoc\fRޥɤ¹Ԥ塢¾ΥѥååȤФ\fIjavadoc\fRޥɤټ¹Ԥȡξåȴ֤Υ󥯤Ǥޤ
-饹λˡ.PP
-ɽ볰ȥ饹ؤΥ󥯤ξ(ӤΥƥȡ٥ǤϤʤ)饹ϼˡǻȤɬפޤ᥽åɤΤǥ饹򻲾ȤΤߤǤϽʬǤϤޤ\fIimport\fRʸΤ줫ǻȤɬפޤˡ饹\fIjava\&.io\&.File\fR򻲾Ȥˡ򼨤ޤ
+\fBExample 2\fR, 外部ドキュメントへの相対リンク
+.RS 4
+この例では、2つのパッケージがあり、そのドキュメントは\fIjavadoc\fRコマンドを複数回実行した結果生成されたものです。さらに、これらのドキュメントは相対パスで分割されています。パッケージは、APIである\fIcom\&.apipackage\fRと、SPI(サービス・プロバイダ・インタフェース)であるc\fIom\&.spipackage\fRです。ドキュメントの格納先は、docs/api/com/apipackageとdocs/spi/com/spipackageです。APIパッケージのドキュメントはすでに生成されていて、docsが現在のディレクトリである場合、APIドキュメントへのリンクを持つSPIパッケージをドキュメント化するには、次のコマンドを実行します。\fIjavadoc \-d \&./spi \-link \&.\&./api com\&.spipackage\fR
+.sp
+\fI\-link\fRオプションは、宛先ディレクトリ(docs/spi)からの相対パスです。
+.RE
+注意.PP
+\fI\-link\fRオプションを使用すると、コードからは参照されていても、今回の\fIjavadoc\fRの実行ではドキュメント化されないクラスにリンクできるようになります。リンクから有効なページに移動できるようにするには、それらのHTMLページがある場所を調べ、その場所を\fIextdocURL\fRに指定する必要があります。これにより、サードパーティのドキュメンテーションがjava\&.*ドキュメンテーション(http://docs\&.oracle\&.com)へリンクすることができます。\fIjavadoc\fRコマンドで、現在の実行で生成しているドキュメンテーション内のAPIへのリンクのみを作成する場合には、\fI\-link\fRオプションを省略します。\fI\-link\fRオプションを指定しないと、\fIjavadoc\fRコマンドは外部参照のためのドキュメンテーションへのリンクを作成しません。ドキュメンテーションが存在するのかどうか、またはどこに存在するのかがわからないからです。\fI\-link\fRオプションでは、生成ドキュメンテーション内の複数の場所にリンクを作成できます。ソース・ファイルの処理を参照してください。もう1つの用途は、パッケージ・セットの間にクロスリンクを作成することです。一方のパッケージ・セットに対して\fIjavadoc\fRコマンドを実行した後、他方のパッケージ・セットに対して\fIjavadoc\fRコマンドを再度実行すると、両セット間に双方向のリンクを作成できます。
+クラスの参照方法.PP
+表示される外部参照クラスへのリンクの場合(およびそのテキスト・ラベルだけではなく)、クラスは次の方法で参照される必要があります。メソッドの本体でクラスを参照するのみでは十分ではありません。\fIimport\fR文、宣言のいずれかで参照する必要があります。次に、クラス\fIjava\&.io\&.File\fRを参照する方法の例を示します。
 .PP
-٤ƤΥפimportʸξ硣磻ɥɤˤ륤ݡȡ̾ˤŪʥݡȡޤ\fIjava\&.lang\&.*\fRФ뼫ưݡȡ
+すべてのタイプのimport文の場合。ワイルドカードによるインポート、名前による明示的なインポート、または\fIjava\&.lang\&.*\fRに対する自動インポート。
 .PP
-Java SE 1\&.3\&.\fIn\fR1\&.2\&.\fIn\fRǤϡ̾ˤŪʥݡȤΤߵǽޤ磻ɥɤˤ\fIimport\fRʸ⡢\fIimport java\&.lang\&.*\fRμưݡȤⵡǽޤ
+Java SE 1\&.3\&.\fIn\fRおよび1\&.2\&.\fIn\fRでは、名前による明示的なインポートのみ機能します。ワイルドカードによる\fIimport\fR文も、\fIimport java\&.lang\&.*\fRの自動インポートも機能しません。
 .PP
-ξ:
+宣言の場合:
 \fIvoid mymethod(File f) {}\fR
 .PP
-Ȥϡ᥽åɡ󥹥ȥ饯եɡ饹ޤϥ󥿥ե귿ޤϥѥ᡼ס뤤ϼĥޤϥʸˤޤ
+参照は、メソッド、コンストラクタ、フィールド、クラスまたはインタフェースの戻り型またはパラメータ・タイプ、あるいは実装、拡張またはスロー文にあります。
 .PP
-פʷ̤Ȥơ\fI\-link\fRץѤƤ⡢¤Τ˸äɽʤ󥯤¿ȯǽޤƥȤϥϥѡƥȡ󥯤դ줺ɽޤ󥯤ɽٹ𤫤顢Υ󥯤ǧǤޤ饹Ȥˤäƥ󥯤ɲä뤿κǤñˡϤΥ饹򥤥ݡȤ뤳ȤǤ
-ѥåꥹ.PP
-\fI\-link\fRץˤϡ\fIjavadoc\fRޥɤˤäpackage\-listȤ̾Υե뤬\fI\-link\fRץ˻ꤷURL¸ߤƤ뤳ȤɬפǤpackage\-listեϡξˤɥȲ줿ѥå̾ΥꥹȤäñʥƥȡեǤҤǤϡ\fIjavadoc\fRޥɤϡꤷURLpackage\-listȤ̾Υե򸡺ѥå̾ɤ߼äơURLǤΥѥå˥󥯤ޤ
+重要な結果として、\fI\-link\fRオプションを使用しても、この制限のために誤って表示されないリンクが多数発生する可能性があります。テキストはハイパーテキスト・リンクが付けられずに表示されます。リンクが表示する警告から、これらのリンクを認識できます。クラスを正しく参照し、それによってリンクを追加するための最も簡単な方法はそのクラスをインポートすることです。
+パッケージ・リスト.PP
+\fI\-link\fRオプションには、\fIjavadoc\fRコマンドによって生成されるpackage\-listという名前のファイルが、\fI\-link\fRオプションに指定したURLに存在していることが必要です。package\-listファイルは、その場所にあるドキュメント化されたパッケージの名前のリストが入った単純なテキスト・ファイルです。前述の例では、\fIjavadoc\fRコマンドは、指定したURLでpackage\-listという名前のファイルを検索し、パッケージ名を読み取って、そのURLでこれらのパッケージにリンクします。
 .PP
-ȤСJava SE APIΥѥåꥹȤ
-http://docs\&.oracle\&.com/javase/8/docs/api/package\-listˤޤ
+たとえば、Java SE APIのパッケージ・リストは
+http://docs\&.oracle\&.com/javase/8/docs/api/package\-listにあります。
 .PP
-ΥѥåꥹȤϼΤ褦ƤǻϤޤäƤޤ
+このパッケージ・リストは次のような内容で始まっています。
 .sp
 .if n \{\
 .RS 4
@@ -2816,20 +2816,20 @@
 .RE
 .\}
 .PP
-\fI\-link\fRץꤻ\fIjavadoc\fR¹Ԥ硢ȥ饹°̾򸫤Ĥȡ̾󥯤ʤǽϤޤ\fI\-link\fRץꤷ硢\fIjavadoc\fRޥɤϡꤵ줿\fIextdocURL\fRξˤpackage\-listեǤΥѥå̾򸡺ޤѥå̾Ĥȡ\fIextdocURL\fR̾ղäޤ
+\fI\-link\fRオプションを指定せずに\fIjavadoc\fRを実行した場合、外部参照クラスに属する名前を見つけると、その名前をリンクなしで出力します。一方、\fI\-link\fRオプションを指定した場合、\fIjavadoc\fRコマンドは、指定された\fIextdocURL\fRの場所にあるpackage\-listファイルでそのパッケージ名を検索します。パッケージ名が見つかると、\fIextdocURL\fRが名前の前に付加されます。
 .PP
-٤ƤΥ󥯤ǽ뤿ˤϡȤΤ٤ƤΥɥȤꤷURL¸ߤɬפޤ\fIjavadoc\fRޥɤϡꤵ줿package\-list¸ߤ뤫ɤΤߤåΥڡ¸ߤ뤫ɤϥåޤ
-ʣΥ.PP
-ʣ\fI\-link\fRץꤹȡǤդογɥȤؤΥ󥯤ǤޤJavadoc 1\&.2ˤϡʣ\fI\-link\fRץǤʤȤΤԶ礬ޤJavadoc 1\&.2\&.2ǽޤ󥯤볰ɥȤȤˡΤ褦̡Υ󥯡ץꤷޤ\fIjavadoc \-link extdocURL1 \-link extdocURL2 \&.\&.\&. \-link extdocURLn com\&.mypackage\fR
-\fIextdocURL1\fR\fIextdocURL2\fR\&.\fI\&.\&. extdocURLn\fRϡ줾쳰ɥȤΥ롼Ȥؤƥ롼Ȥˤϡpackage\-listȤ̾Υե뤬äƤޤ
-.PP
-˺줿ʣΥɥȤ򥯥󥯤硢֡ȥȥåפɬפˤʤ뤳ȤޤɤΥɥȤˤĤƤpackage\-list¸ߤƤʤϡǽΥɥȤФ\fIjavadoc\fRޥɤ¹Ԥǡ2ܤΥɥȤpackage\-listϤޤ¸ߤƤޤ󡣤äơ󥯤ˤϡ2ܤΥɥȤǡǽΥɥȤʤɬפޤ
+すべてのリンクが正しく機能するためには、外部参照のすべてのドキュメントが、指定したURLに存在する必要があります。\fIjavadoc\fRコマンドは、指定されたpackage\-listが存在するかどうかのみをチェックし、これらのページが存在するかどうかはチェックしません。
+複数のリンク.PP
+複数の\fI\-link\fRオプションを指定すると、任意の数の外部生成ドキュメントへのリンクを作成できます。Javadoc 1\&.2には、複数の\fI\-link\fRオプションを指定できないという既知の不具合があります。これはJavadoc 1\&.2\&.2で修正されました。リンクする外部ドキュメントごとに、次のように別々のリンク・オプションを指定します。\fIjavadoc \-link extdocURL1 \-link extdocURL2 \&.\&.\&. \-link extdocURLn com\&.mypackage\fR
+\fIextdocURL1\fR、\fIextdocURL2\fR、\&.\fI\&.\&. extdocURLn\fRは、それぞれ外部ドキュメントのルートを指し、各ルートには、package\-listという名前のファイルが入っています。
+クロスリンク.PP
+以前に作成された複数のドキュメントをクロスリンクする場合、ブートストラップが必要になることがあります。どのドキュメントについてもpackage\-listが存在していない場合は、最初のドキュメントに対して\fIjavadoc\fRコマンドを実行する時点で、2番目のドキュメントのpackage\-listはまだ存在していません。したがって、外部リンクを作成するには、2番目のドキュメントを生成した後で、最初のドキュメントを生成しなおす必要があります。
 .PP
-ξ硢ǽΥɥŪϡpackage\-list뤳ȤǤ(ѥå̾İƤϼưǺƤ⤫ޤޤ)ˡ2ܤΥɥȤȤγ󥯤ޤɬפʳpackage\-listե뤬¸ߤʤϡ\fIjavadoc\fRޥɤٹ𤬽Ϥޤ
+この場合、最初のドキュメント生成の目的は、package\-listを作成することです(パッケージ名を把握している場合は手動で作成してもかまいません)。次に、2番目のドキュメントとその外部リンクを生成します。必要な外部のpackage\-listファイルが存在しない場合は、\fIjavadoc\fRコマンドから警告が出力されます。
 .PP
 \-linkoffline \fIextdocURL packagelistLoc\fR
 .RS 4
-Υץ\fI\-link\fRץΥХꥨǤξȤ⡢Javadocˤ줿ȥ饹ΥɥȤؤΥ󥯤ޤ\fIjavadoc\fRޥɤWeb³ѤƥɥȤ˥ǤʤȤWebΥɥȤ˥󥯤ˤϡ\fI\-link\fRo\fIffline\fRץѤޤɥȤpackage\-listե˥ǤʤȤޤϤΥե뤬\fIextdocURL\fRǻꤵ줿ˤ¸ߤ\fIpackageListLoc\fRǻǤ̤ξ(̾)¸ߤȤ\fI\-linkoffline\fRץѤޤ\fIextdocURL\fRWorld Wide WebǤǤʤϡ\fI\-linkoffline\fRץꤹ뤳ȤˤꡢɥȤ\fIjavadoc\fRޥɤWeb³ɬפȤ󤬤ʤʤޤ⤦1ĤӤϡɥȤ򹹿뤿βȤƻѤ뤳ȤǤѥåΥåΤФ\fIjavadoc\fRޥɤ¹Ԥ塢ѹΥѥåФƤΤ\fIjavadoc\fRޥɤټ¹Ԥơ줿ե򡢥ꥸʥΥåȤǤ褦ˤޤ򼨤ޤ\fI\-linkoffline\fRץϰ2ļޤ1\fI<a href>\fR󥯤Ȥ߹ޤʸꤷ2package\-listθ\fI\-linkoffline\fRޤ
+このオプションは\fI\-link\fRオプションのバリエーションです。両方とも、Javadocにより生成された外部参照クラスのドキュメントへのリンクを作成します。\fIjavadoc\fRコマンドがWeb接続を使用してドキュメントにアクセスできないとき、Web上のドキュメントにリンクするには、\fI\-link\fRo\fIffline\fRオプションを使用します。外部ドキュメントのpackage\-listファイルにアクセスできないとき、またはこのファイルが\fIextdocURL\fRで指定された場所には存在せず、\fIpackageListLoc\fRで指定できる別の場所(通常ローカル)に存在するとき、\fI\-linkoffline\fRオプションを使用します。\fIextdocURL\fRにWorld Wide Web上でしかアクセスできない場合は、\fI\-linkoffline\fRオプションを指定することにより、ドキュメントの生成時に\fIjavadoc\fRコマンドがWebに接続する必要があるという制約がなくなります。もう1つの用途は、ドキュメントを更新するための回避策として使用することです。パッケージのセット全体に対して\fIjavadoc\fRコマンドを実行した後、変更した一部のパッケージに対してのみ\fIjavadoc\fRコマンドを再度実行して、更新されたファイルを、オリジナルのセットに挿入できるようにします。次に例を示します。\fI\-linkoffline\fRオプションは引数を2つ取ります。第1引数は\fI<a href>\fRリンクに組み込まれる文字列を指定し、第2引数はpackage\-listの検索場所を\fI\-linkoffline\fRに伝えます。
 .sp
 .RS 4
 .ie n \{\
@@ -2839,7 +2839,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIextdocURL\fRͤϡȤƻꤹ롢Javadocˤ줿ɥȤޤǥ쥯ȥURLޤURLǤURLξ硢ͤϡǥ쥯ȥ(\fI\-d\fRץǻ)ȤʤѥåΥ롼ȤؤХѥˤɬפޤܺ٤ϡ\fI\-link\fRץ\fIextdocURL\fR򻲾ȤƤ
+\fIextdocURL\fRの値は、リンク先として指定する、Javadocにより生成された外部ドキュメントを含むディレクトリの絶対URLまたは相対URLです。相対URLの場合、値は、生成先ディレクトリ(\fI\-d\fRオプションで指定)からリンク先となるパッケージのルートへの相対パスにする必要があります。詳細は、\fI\-link\fRオプションの\fIextdocURL\fRを参照してください。
 .RE
 .sp
 .RS 4
@@ -2850,16 +2850,16 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackagelistLoc\fRͤϡɥȤpackage\-listեޤǥ쥯ȥؤΥѥޤURLǤϡURL (http:ޤfile:)Ǥե롦ѥǤ⤫ޤޤ󡣤ޤХѥХѥΤɤǤ⤫ޤޤХѥξϡ\fIjavadoc\fRޥɤ¹Ԥ븽ߤΥǥ쥯ȥ꤫ХѥȤƻꤷޤpackage\-listե̾ޤʤǤ
-.sp
-ꤷ\fIjavadoc\fRޥɤμ¹Ԥǡʣ\fI\-link\fRץǤޤJavadoc 1\&.2\&.2Ǥϡ\fI\-linkfile\fRץ1󤷤ǤޤǤ
-.RE
-.RE
-ɥȤؤХ.PP
-http://docs\&.oracle\&.com/javase/8/docs/api/index\&.html˼褦ʡ\fIjava\&.lang\fR
-\fIjava\&.io\fRӤ¾Java SEѥå˥󥯤ɬפ礬ޤ
+\fIpackagelistLoc\fRの値は、外部ドキュメントのpackage\-listファイルを含むディレクトリへのパスまたはURLです。これは、URL (http:またはfile:)でもファイル・パスでもかまいません。また、絶対パスと相対パスのどちらでもかまいません。相対パスの場合は、\fIjavadoc\fRコマンドが実行される現在のディレクトリからの相対パスとして指定します。package\-listファイル名を含めないでください。
+.sp
+指定した\fIjavadoc\fRコマンドの実行で、複数の\fI\-link\fRオプションを指定できます。Javadoc 1\&.2\&.2より前では、\fI\-linkfile\fRオプションは1回しか指定できませんでした。
+.RE
+.RE
+外部ドキュメントへの絶対リンク.PP
+http://docs\&.oracle\&.com/javase/8/docs/api/index\&.htmlに示すような、\fIjava\&.lang\fR、
+\fIjava\&.io\fRおよびその他のJava SEパッケージにリンクする必要がある場合があります。
 .PP
-ˤWebޤ󡣤ξ硢Ԥޤ
+ただし、シェルにはWebアクセス権がありません。この場合、次を行います。
 .sp
 .RS 4
 .ie n \{\
@@ -2869,7 +2869,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-֥饦package\-listե򳫤ޤ(http://docs\&.oracle\&.com/javase/8/docs/api/package\-list)
+ブラウザでpackage\-listファイルを開きます(http://docs\&.oracle\&.com/javase/8/docs/api/package\-list)
 .RE
 .sp
 .RS 4
@@ -2880,10 +2880,10 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-ե롦ǥ쥯ȥ¸Υ롦ԡ2\fIpackagelistLoc\fRǻꤷޤǤϡѥåꥹȡեϥȡǥ쥯ȥ(\&.)¸Ƥޤ
+ファイルをローカル・ディレクトリに保存し、このローカル・コピーを第2引数\fIpackagelistLoc\fRで指定します。この例では、パッケージ・リスト・ファイルはカレント・ディレクトリ(\&.)に保存されています。
 .RE
 .PP
-ΥޥɤϡJava SEץåȥեࡦѥåؤΥ󥯤c\fIom\&.mypackage\fRѥåΥɥȤޤɥȤˤϡȤХ饹\fItrees\fR\fIObject\fR饹ؤΥ󥯤ޤޤƤޤ\fI\-sourcepath\fRʤɡ¾ɬפʥץɽޤ
+次のコマンドは、Java SEプラットフォーム・パッケージへのリンクを持つc\fIom\&.mypackage\fRパッケージのドキュメントを生成します。生成ドキュメントには、たとえばクラス\fItrees\fR内の\fIObject\fRクラスへのリンクが含まれています。\fI\-sourcepath\fRなど、他の必要なオプションは表示されません。
 .sp
 .if n \{\
 .RS 4
@@ -2894,12 +2894,12 @@
 .if n \{\
 .RE
 .\}
-ɥȤؤХ.PP
-\fI\-linkoffline\fRХѥȤȤ˻Ѥ뤳ȤϤޤꤢޤͳñǡ̾\fI\-link\fRǴ֤˹礦Ǥ\fI\-linkoffline\fRץѤ硢̾package\-listեϥǡХ󥯤ѤϥΥեʤΤǡ̾\fI\-linkoffline\fRץ2ĤΰˡۤʤѥꤹɬפϤޤ2ĤΰƱξ硢\fI\-link\fRץѤǤޤ
-package\-listեμưǤκ.PP
-package\-listե뤬ޤ¸ߤʤƤ⡢ɥȤΥΥѥå̾狼äƤϡΥեΥԡưǺ\fIpackagelistLoc\fRǤΥѥꤹ뤳ȤǤޤ\fIcom\&.apipackage\fRǽ줿\fIcom\&.spipackage\fRΥѥåꥹȤ¸ߤʤȤФΥȤƵ󤲤ޤˡϡѥå̾Ϥ狼äƤΤΡޤƤʤɥȤ˥󥯤ɥȤɬפǤޤpackage\-listե뤬ʤJavadoc 1\&.0ޤ1\&.1줿ѥåѤpackage\-listեˤ⡢ˡѤǤޤƱͤˡ2ĤδȤ̤package\-listեͭǤ뤿ᡢ󥯤ꤷɥȤƱ˥꡼뤳Ȥǽˤʤޤ
-ʣɥȤؤΥ.PP
-ɥȤȤ1\fI\-linkoffline\fRץޤ뤳ȤǤޤ
+外部ドキュメントへの相対リンク.PP
+\fI\-linkoffline\fRを相対パスとともに使用することはあまりありません。理由は単純で、通常は\fI\-link\fRで間に合うからです。\fI\-linkoffline\fRオプションを使用する場合、通常、package\-listファイルはローカルで、相対リンクを使用する場合はリンク先のファイルもローカルなので、通常は\fI\-linkoffline\fRオプションの2つの引数に、異なるパスを指定する必要はありません。2つの引数が同一の場合、\fI\-link\fRオプションを使用できます。
+package\-listファイルの手動での作成.PP
+package\-listファイルがまだ存在しなくても、ドキュメントのリンク先のパッケージ名がわかっている場合は、このファイルのコピーを手動で作成し、\fIpackagelistLoc\fRでそのパスを指定することができます。\fIcom\&.apipackage\fRが最初に生成された時点で\fIcom\&.spipackage\fRのパッケージ・リストが存在しないという前出のケースが一例として挙げられます。この方法は、パッケージ名はわかっているものの、まだ公開されていない、新しい外部ドキュメントにリンクするドキュメントを生成する必要がある場合に便利です。また、package\-listファイルが生成されないJavadoc 1\&.0または1\&.1で生成されたパッケージ用にpackage\-listファイルを作成する場合にも、この方法が使用できます。同様に、2つの企業が未公開のpackage\-listファイルを共有できるため、クロスリンクを設定したドキュメントを同時にリリースすることも可能になります。
+複数ドキュメントへのリンク.PP
+参照先の生成ドキュメントごとに1回、\fI\-linkoffline\fRオプションを含めることができます。
 .sp
 .if n \{\
 .RS 4
@@ -2911,10 +2911,10 @@
 .if n \{\
 .RE
 .\}
-ɥȤι.PP
-ץȤ˲ޤϲɴΥѥåޤޤˤ⡢\fI\-linkoffline\fRץѤǤޤĥ꡼ΤǤǤ\fIjavadoc\fRޥɤ¹ԤȤ硢ɥơ󡦥Ȥˤ鷺ѹ®˲äĥ꡼ΰ\fIjavadoc\fRޥɤƼ¹Ԥ뤳ȤǤޤ2ܤμ¹Ԥϡɥơ󡦥ȤѹѹʤˤΤ뤳ȤդƤɤФɲáޤѹϡѥåĥ꡼ѾСΥꥹȡѥڡʤɤξǡ󥯤뤳Ȥޤ
+ドキュメントの更新.PP
+プロジェクトに何十または何百のパッケージが含まれる場合にも、\fI\-linkoffline\fRオプションを使用できます。ソース・ツリー全体ですでに\fIjavadoc\fRコマンドを実行したことがある場合、ドキュメンテーション・コメントにわずかな変更を迅速に加え、ソース・ツリーの一部で\fIjavadoc\fRコマンドを再実行することができます。2回目の実行は、ドキュメンテーション・コメントを変更し、宣言は変更しない場合にのみ正しく処理されることに注意してください。ソース・コードに対して宣言を追加、削除、または変更した場合は、索引、パッケージ・ツリー、継承されるメンバーのリスト、使用ページなどの場所で、リンクが壊れることがあります。
 .PP
-ޤοϤʼ¹ԤǻѤ롢ǥ쥯ȥ(updateʤ)ޤǤϡǥ쥯ȥ̾htmlǤǤñǤϡhtmlǥ쥯ȥοƥǥ쥯ȥ˰ưޤ\fI\-linkoffline\fRץ1˥ȡǥ쥯ȥ(\&.)ꤷ2package\-listhtmlؤХѥꤷѥåΥѥå̾ΤߤϤޤ
+まず、この新しい小規模な実行で使用する、新しい生成先ディレクトリ(updateなど)を作成します。この例では、元の生成先ディレクトリの名前はhtmlです。最も単純な例では、htmlディレクトリの親ディレクトリに移動します。\fI\-linkoffline\fRオプションの第1引数にカレント・ディレクトリ(\&.)を設定し、第2引数にpackage\-listが検索されるhtmlへの相対パスを設定し、更新するパッケージのパッケージ名のみを渡します。
 .sp
 .if n \{\
 .RS 4
@@ -2926,15 +2926,15 @@
 .RE
 .\}
 .PP
-\fIjavadoc\fRޥɤνλ塢update/com/package줿饹Υڡ򥳥ԡ(פϽ)html/com/packageθΥե˾񤭤ޤ
+\fIjavadoc\fRコマンドの終了後、update/com/package内の生成されたクラスのページをコピーし(概要や索引は除く)、html/com/package内の元のファイルに上書きします。
 .PP
 \-linksource
 .RS 4
-ƥե(ֹդ)HTMLСɸHTMLɥȤ饽եؤΥ󥯤ɲäޤ󥯤ϡեƤ륯饹󥿥ե󥹥ȥ饯᥽åɡեɤФƺޤǤʤ硢ȤХǥեȡ󥹥ȥ饯줿饹ФƤϡ󥯤Ϻޤ
-.sp
-Υץϡ\fI\-public\fR\fI\-package\fR\fI\-protected\fR\fI\-private\fRγƥץȤϴطʤΥ饹եɡΥ᥽åɤΤϤȤȤ߹ޤ줿եΤ٤Ƥξܺ٤ޤ\fI\-private\fRץ⤢碌ƻꤷʤꡢΥ饹䥤󥿥եΰˤϡ󥯤𤷤ƥǤʤȤޤ
-.sp
-ƥ󥯤ϡμ̻̾ξ˺ޤȤС\fIButton\fR饹ΥɤؤΥ󥯤ϡ\fIButton\fRȤξ˺ޤ
+各ソース・ファイル(行番号付き)のHTMLバージョンを作成し、標準HTMLドキュメントからソース・ファイルへのリンクを追加します。リンクは、ソース・ファイル内に宣言されているクラス、インタフェース、コンストラクタ、メソッド、フィールドに対して作成されます。そうでない場合、たとえばデフォルト・コンストラクタや生成されたクラスに対しては、リンクは作成されません。
+.sp
+このオプションは、\fI\-public\fR、\fI\-package\fR、\fI\-protected\fRおよび\fI\-private\fRの各オプションとは関係なく、非公開のクラス、フィールド、非公開のメソッドの本体をはじめとする組み込まれたソース・ファイル内のすべての非公開実装の詳細を公開します。\fI\-private\fRオプションもあわせて指定しないかぎり、非公開のクラスやインタフェースの一部には、リンクを介してアクセスできないことがあります。
+.sp
+各リンクは、その宣言内の識別子名の上に作成されます。たとえば、\fIButton\fRクラスのソース・コードへのリンクは、\fIButton\fRという語の上に作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -2945,7 +2945,7 @@
 .if n \{\
 .RE
 .\}
-\fIButton\fR饹\fIgetLabel\fR᥽åɤΥɤؤΥ󥯤ϡ\fIgetLabel\fRȤξ˺ޤ
+\fIButton\fRクラスの\fIgetLabel\fRメソッドのソース・コードへのリンクは、\fIgetLabel\fRという語の上に作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -2960,7 +2960,7 @@
 .PP
 \-group groupheading \fIpackagepattern:packagepattern\fR
 .RS 4
-ץڡʣΥѥå򡢻ꤷ롼פʬơ롼פȤɽޤƥ롼פϡ줾̤\fI\-group\fRץǻꤷޤ롼פϡޥɹԤǻꤵ줿ǥڡɽޤѥåϡ롼ǥե٥åȽˤʤäƤޤꤷ\fI\-group\fRץǤϡ\fIpackagepattern\fRΥꥹȤ˰פѥåФȤ\fIgroupheading\fR1Ĥɽɽޤ
+概要ページの複数のパッケージを、指定したグループに分けて、グループごとに表を作成します。各グループは、それぞれ別の\fI\-group\fRオプションで指定します。グループは、コマンド行で指定された順序でページに表示されます。パッケージは、グループ内でアルファベット順になっています。指定した\fI\-group\fRオプションでは、\fIpackagepattern\fR式のリストに一致するパッケージが、見出しとして\fIgroupheading\fRを持つ1つの表に表示されます。
 .sp
 .RS 4
 .ie n \{\
@@ -2970,7 +2970,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIgroupheading\fRˤϡǤդΥƥȤǤޤ뤳ȤǤޤꤷƥȤϡ롼פɽФˤʤޤ
+\fIgroupheading\fRには、任意のテキストを指定でき、空白を含めることができます。指定したテキストは、グループの表見出しになります。
 .RE
 .sp
 .RS 4
@@ -2981,12 +2981,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackagepattern\fRͤˤϡǤդΥѥå̾ƬʬȤ³1ĤΥꥹ(*)ǤդΥѥå̾ǤޤꥹϻѤǤͣΥ磻ɥɤǡǤդʸ˰פ롢Ȥ̣Ǥ1ĤΥ롼פˤϡ(:)ǶڤäʣΥѥޤ뤳ȤǤޤѥޤϥѥ󡦥ꥹȤǥꥹѤ硢ѥ󡦥ꥹȤ\fI"java\&.lang*:java\&.util"\fRΤ褦˰ǰϤɬפޤ
-.RE
-.sp
-\fI\-group\fRץꤷʤϡФ\fIPackages\fRŬڤʾФ1ĤΥ롼פ֤ޤФˤ٤ƤΥɥȲѥå(٤ƤΥ롼)ޤޤ櫓ǤϤʤ硢ĤΥѥåϡ֤¾ΥѥåפȤָФΩ롼פޤ
-.sp
-ȤС\fIjavadoc\fRޥɤǤϡ3ĤΥɥȲ줿ѥå\fI֥\fR\fIֳĥ\fR\fI֤¾Υѥå\fRʬޤ\fIjava\&.lang*\fRǤϡǸΥɥå(\&.)ꤷƤޤ\fIjava\&.lang\&.*\fRΤ褦˥ɥåȤȡ\fI java\&.lang\fRѥåϽ뤳Ȥˤʤޤ
+\fIpackagepattern\fRの値には、任意のパッケージ名の先頭部分とそれに続く1つのアスタリスク(*)で任意のパッケージ名を指定できます。アスタリスクは使用できる唯一のワイルドカードで、任意の文字に一致する、という意味です。1つのグループには、コロン(:)で区切って複数のパターンを含めることができます。パターンまたはパターン・リストでアスタリスクを使用する場合、パターン・リストは\fI"java\&.lang*:java\&.util"\fRのように引用符で囲む必要があります。
+.RE
+.sp
+\fI\-group\fRオプションを指定しない場合は、見出し\fIPackages\fRおよび適切な小見出しを持つ1つのグループに配置されます。小見出しにすべてのドキュメント化されるパッケージ(すべてのグループ)が含まれるわけではない場合、残りのパッケージは「その他のパッケージ」というサブ見出しを持つ独立したグループに入れられます。
+.sp
+たとえば、次の\fIjavadoc\fRコマンドでは、3つのドキュメント化されたパッケージが\fI「コア」\fR、\fI「拡張」\fRおよび\fI「その他のパッケージ」\fRに分けられます。\fIjava\&.lang*\fRでは、最後のドット(\&.)を指定していません。\fIjava\&.lang\&.*\fRのようにドットを入れると、\fI java\&.lang\fRパッケージは除外されることになります。
 .sp
 .if n \{\
 .RS 4
@@ -2999,7 +2999,7 @@
 .if n \{\
 .RE
 .\}
-\fBѥå\fR
+\fBコア・パッケージ\fR
 .sp
 \fIjava\&.lang\fR
 .sp
@@ -3007,7 +3007,7 @@
 .sp
 \fIjava\&.util\fR
 .sp
-\fBĥǽѥå\fR
+\fB拡張機能パッケージ\fR
 .sp
 \fIjavax\&.servlet\fR
 .sp
@@ -3018,42 +3018,42 @@
 .PP
 \-nodeprecated
 .RS 4
-侩APIɥȤʤ褦ˤޤΥץꤹȡ\fI\-nodeprecatedlist\fRץꤷƱ̤ꡢɥȤ¾ʬΤǤ⡢侩APIޤ󡣤Υץϡɤ򵭽ҤƤȤ侩ΥɤˤäƵ򻶤餵줿ʤǤ
+非推奨のAPIをドキュメントに生成しないようにします。このオプションを指定すると、\fI\-nodeprecatedlist\fRオプションを指定した場合と同じ効果があり、ドキュメントの他の部分全体でも、非推奨のAPIが生成されません。このオプションは、コードを記述しているとき、非推奨のコードによって気を散らされたくない場合に便利です。
 .RE
 .PP
 \-nodeprecatedlist
 .RS 4
-侩APIΥꥹȤޤե(deprecated\-list\&.html)ӥʥӥ󡦥СΤΥڡؤΥ󥯤ʤ褦ˤޤ\fIjavadoc\fRޥɤǤϡ³ɥȤ¾ʬǤϡ侩APIޤΥץϡ侩APIɤ˴ޤޤƤ餺ʥӥ󡦥С򤹤äȸǤ
+非推奨のAPIのリストを含むファイル(deprecated\-list\&.html)、およびナビゲーション・バーのそのページへのリンクが生成されないようにします。\fIjavadoc\fRコマンドでは、引き続き、ドキュメントの他の部分では、非推奨のAPIが生成されます。このオプションは、非推奨のAPIがソース・コードに含まれておらず、ナビゲーション・バーをすっきりと見せる場合に便利です。
 .RE
 .PP
 \-nosince
 .RS 4
-ɥȤ顢\fI@since\fR˴Ϣդ줿\fIƳ줿С\fRάޤ
+生成ドキュメントから、\fI@since\fRタグに関連付けられた\fI「導入されたバージョン」\fRセクションを省略します。
 .RE
 .PP
 \-notree
 .RS 4
-ɥȤ顢饹ӥ󥿥եγإڡάޤΥڡˤϡʥӥ󡦥СΡֳإĥ꡼ץܥ󤫤饢ǤޤǥեȤǤϡؤޤ
+生成ドキュメントから、クラスおよびインタフェースの階層ページを省略します。これらのページには、ナビゲーション・バーの「階層ツリー」ボタンからアクセスできます。デフォルトでは、階層が生成されます。
 .RE
 .PP
 \-noindex
 .RS 4
-ɥȤ顢άޤǥեȤǤϡޤ
+生成ドキュメントから、索引を省略します。デフォルトでは、索引が生成されます。
 .RE
 .PP
 \-nohelp
 .RS 4
-ϤγƥڡκǾȺDzˤʥӥ󡦥С֥إסץ󥯤άޤ
+出力の各ページの最上部と最下部にあるナビゲーション・バーから「ヘルプ」リンクを省略します。
 .RE
 .PP
 \-nonavbar
 .RS 4
-̾ڡκǾȺDzɽʥӥ󡦥Сإåӥեåʤ褦ˤޤ\fI\-nonavbar\fRץ\fI\-bottom\fRץ˱ƶͿޤ\fI\-nonavbar\fRץϡ뤿ˤΤߥեPostScriptPDFѴʤɡƤΤߤפǡʥӥɬפʤǤ
+通常、生成されるページの最上部と最下部に表示されるナビゲーション・バー、ヘッダー、およびフッターを生成しないようにします。\fI\-nonavbar\fRオプションは\fI\-bottom\fRオプションに影響を与えません。\fI\-nonavbar\fRオプションは、印刷するためにのみファイルをPostScriptやPDFに変換する場合など、内容のみが重要で、ナビゲーションの必要がない場合に便利です。
 .RE
 .PP
 \-helpfile \fIpath\efilename\fR
 .RS 4
-ǾӺDzΥʥӥ󡦥СΡ֥إסץ󥯤ΥȤʤإإסեpath\efilenameΥѥꤷޤΥץ󤬻ꤵƤʤȡ\fIjavadoc\fRޥɤϡ\fIjavadoc\fRޥǥϡɥɤƤإסեhelp\-doc\&.htmlưޤΥץѤȡǥեȤ򥪡С饤ɤǤޤե̾ˤϤɤ̾ǤǤhelp\-doc\&.html˸ꤵޤ\fIjavadoc\fRޥɤϡΤ褦ˡʥӥ󡦥СΥ󥯤ɬפ˱Ĵޤ
+最上部および最下部のナビゲーション・バーの「ヘルプ」リンクのリンク先となる代替ヘルプ・ファイルpath\efilenameのパスを指定します。このオプションが指定されていないと、\fIjavadoc\fRコマンドは、\fIjavadoc\fRコマンド内でハードコードされているヘルプ・ファイルhelp\-doc\&.htmlを自動作成します。このオプションを使用すると、デフォルトをオーバーライドできます。ファイル名にはどんな名前でも指定でき、help\-doc\&.htmlに限定されません。\fIjavadoc\fRコマンドは、次の例のように、ナビゲーション・バー内のリンクを必要に応じて調整します。
 .sp
 .if n \{\
 .RS 4
@@ -3068,7 +3068,7 @@
 .PP
 \-stylesheet \fIpath/filename \fR
 .RS 4
-HTML륷ȡեΥѥꤷޤΥץ󤬻ꤵƤʤȡ\fIjavadoc\fRޥɤϡ\fIjavadoc\fRޥǥϡɥɤƤ륹륷ȡեstylesheet\&.cssưޤΥץѤȡǥեȤ򥪡С饤ɤǤޤե̾ˤϤɤ̾ǤǤstylesheet\&.css˸ꤵޤ
+代替HTMLスタイルシート・ファイルのパスを指定します。このオプションが指定されていないと、\fIjavadoc\fRコマンドは、\fIjavadoc\fRコマンド内でハードコードされているスタイルシート・ファイルstylesheet\&.cssを自動作成します。このオプションを使用すると、デフォルトをオーバーライドできます。ファイル名にはどんな名前でも指定でき、stylesheet\&.cssに限定されません。
 .sp
 .if n \{\
 .RS 4
@@ -3083,15 +3083,15 @@
 .PP
 \-serialwarn
 .RS 4
-\fI@serial\fRʤϡѥ˷ٹޤǥեȤǤϡJavadoc 1\&.2\&.2ʹߤǤϡľ󲽤ηٹޤ󡣰Υ꡼ȤϵդưǤΥץѤȡľ󲽤ηٹɽΤǡǥեȤľ󲽲ǽեɤ\fIwriteExternal\fR᥽åɤŬڤ˥ɥȲΤΩޤ
+\fI@serial\fRタグがない場合は、コンパイル時に警告を生成します。デフォルトでは、Javadoc 1\&.2\&.2以降では、直列化の警告は生成されません。以前のリリースとは逆の動作です。このオプションを使用すると、直列化の警告が表示されるので、デフォルトの直列化可能フィールドと\fIwriteExternal\fRメソッドを適切にドキュメント化するのに役立ちます。
 .RE
 .PP
 \-charset \fIname\fR
 .RS 4
-ΥɥѤHTMLʸåȤꤷޤ̾ϡIANA RegistryCharacter Sets
-(http://www\&.iana\&.org/assignments/character\-sets)˼줿ͥMIME̾Ǥɬפޤ
-.sp
-ȤС\fIjavadoc \-charset "iso\-8859\-1" mypackage\fRϼιԤ줿ƥڡΥإåޤ
+このドキュメント用のHTML文字セットを指定します。この名前は、IANA RegistryのCharacter Sets
+(http://www\&.iana\&.org/assignments/character\-sets)に示された、優先MIME名である必要があります。
+.sp
+たとえば、\fIjavadoc \-charset "iso\-8859\-1" mypackage\fRは次の行を生成された各ページのヘッダーに挿入します。
 .sp
 .if n \{\
 .RS 4
@@ -3102,24 +3102,24 @@
 .if n \{\
 .RE
 .\}
-\fIMETA\fRϡHTMLɸ(41972654137321)HTML Document Representation
-(http://www\&.w3\&.org/TR/REC\-html40/charset\&.html#h\-5\&.2\&.2)˵ܤƤޤ
-.sp
-ӥץ⻲ȤƤ
+この\fIMETA\fRタグは、HTML標準(4197265および4137321)のHTML Document Representation
+(http://www\&.w3\&.org/TR/REC\-html40/charset\&.html#h\-5\&.2\&.2)に記載されています。
+.sp
+およびオプションも参照してください。
 .RE
 .PP
 \-docencoding \fIname\fR
 .RS 4
-HTMLեΥ󥳡ǥ󥰤ꤷޤ̾ϡIANA RegistryCharacter Sets
-(http://www\&.iana\&.org/assignments/character\-sets)˼줿ͥMIME̾Ǥɬפޤ
-.sp
-\fI\-docencoding\fRץά\fI\-encoding\fRץѤȡ줿HTMLեΰŹ沽\fI\-encoding\fRץꤵޤ:
-\fIjavadoc \-docencoding"iso\-8859\-1" mypackage\fRӥץ⻲ȤƤ
+生成されるHTMLファイルのエンコーディングを指定します。この名前は、IANA RegistryのCharacter Sets
+(http://www\&.iana\&.org/assignments/character\-sets)に示された、優先MIME名である必要があります。
+.sp
+\fI\-docencoding\fRオプションを省略し、\fI\-encoding\fRオプションを使用すると、生成されたHTMLファイルの暗号化は\fI\-encoding\fRオプションで特定されます。例:
+\fIjavadoc \-docencoding"iso\-8859\-1" mypackage\fRおよびオプションも参照してください。
 .RE
 .PP
 \-keywords
 .RS 4
-HTML<META>򡢥饹ȤեɲäޤΥϡ<META>򸡺륵󥸥󤬥ڡ򸫤ĤΩޤ󥿡ͥåΤ򸡺븡󥸥ΤۤȤɤ<META>򻲾Ȥޤ󡣥ڡѤƤǽ뤫ǤȤWebȤؤθ¤롢Ȥˤ󶡤븡󥸥ϡ<META>򻲾Ȥ뤳ȤDzä뤳ȤǤޤ<META>ˤϡ饹δ̾ȡեɤӥ᥽åɤνƤʤ̾ޤޤޤ󥹥ȥ饯ϡ饹̾ƱǤ뤿ޤޤޤ󡣤ȤС饹\fIString\fRϼΥɤdzϤޤ
+HTMLキーワード<META>タグを、クラスごとに生成されるファイルに追加します。これらのタグは、<META>タグを検索するサーチ・エンジンがページを見つける場合に役立ちます。インターネット全体を検索する検索エンジンのほとんどは<META>タグを参照しません。ページが誤用している可能性があるからです。自身のWebサイトへの検索を制限する、企業により提供される検索エンジンは、<META>タグを参照することで恩恵を受けることができます。<META>タグには、クラスの完全修飾名と、フィールドおよびメソッドの修飾されていない名前が含まれます。コンストラクタは、クラス名と同じであるため含まれません。たとえば、クラス\fIString\fRは次のキーワードで開始します。
 .sp
 .if n \{\
 .RS 4
@@ -3137,42 +3137,42 @@
 .PP
 \-tag \fItagname\fR:Xaoptcmf:"\fItaghead\fR"
 .RS 4
-\fIjavadoc\fRޥɤɥơ󡦥ΰ1ļñʥࡦ֥å\fI@tagname\fRǤ褦ˤޤˤꡢ\fIjavadoc\fRޥɤϥ̾ΥڥåԤȤǤΤǡ¸ߤ뤹٤ƤΥࡦˤĤơ\fI\-tag\fRץȤ߹ळȤפǤμ¹ԤǤϽϤʤϡ\fIX\fRդ̵ˤޤ\fI\-tag\fRץϡθФ\fItaghead\fRǽϤޤμιԤˤϡΥץ1ĤΰǻꤷƥȤ³ޤ֥åƱ͡ΰΥƥȤˤϥ饤󡦥ޤ뤳ȤǤޤΥ饤󡦥ᤵޤϤϡ1ļɸΥ(\fI@return\fR\fI@author\fRʤ)νϤȤ褯Ƥޤ\fItaghead\fRͤάȡ\fItagname\fRФȤɽޤ
-.sp
-\fB\fR:
-\fIXaoptcmf\fRˤꡢǥ֤Ǥ꤬ޤꡢ̵ˤǤ뤫ɤ(\fIX\fRѤ)ޤޤְ֤¤ʤ\fIa\fRꤷޤʳʸȹ礻ǽǤ
+\fIjavadoc\fRコマンドがドキュメンテーション・コメント内の引数を1つ取る単純なカスタム・ブロック・タグ\fI@tagname\fRを解釈できるようにします。これにより、\fIjavadoc\fRコマンドはタグ名のスペルチェックを行うことができるので、ソース・コード内に存在するすべてのカスタム・タグについて、\fI\-tag\fRオプションを組み込むことが重要です。今回の実行では出力されないタグは、\fIX\fRを付けて無効にします。\fI\-tag\fRオプションは、タグの見出し\fItaghead\fRを太字で出力します。その次の行には、このオプションの1つの引数で指定したテキストが続きます。ブロック・タグと同様、この引数のテキストにはインライン・タグを含めることができます。このインライン・タグも解釈されます。出力は、引数を1つ取る標準のタグ(\fI@return\fRや\fI@author\fRなど)の出力とよく似ています。\fItaghead\fRの値を省略すると、\fItagname\fRが見出しとして表示されます。
+.sp
+\fBタグの配置\fR:
+\fIXaoptcmf\fR引数により、ソース・コード内でタグを配置できる場所が決まり、タグを無効にできるかどうか(\fIX\fRを使用して)が決まります。タグの配置位置を制限しない場合は\fIa\fRを指定します。それ以外の文字の組合せも可能です。
 .sp
 \fIX\fR
-(̵)
+(タグの無効化)
 .sp
 \fIa\fR
-(٤)
+(すべて)
 .sp
 \fIo\fR
-()
+(概要)
 .sp
 \fIp\fR
-(ѥå)
+(パッケージ)
 .sp
 \fIt\fR
-(סĤޤꥯ饹ȥ󥿥ե)
+(タイプ、つまりクラスとインタフェース)
 .sp
 \fIc\fR
-(󥹥ȥ饯)
+(コンストラクタ)
 .sp
 \fIm\fR
-(᥽å)
+(メソッド)
 .sp
 \fIf\fR
-(ե)
-.sp
-\fB󥰥롦\fR: Ǥդΰ֤ǻѤǤ륿Υץ򼨤ޤ\fI\-tag todo:a:"To Do:"\fR
-.sp
-\fI@todo\fR򥳥󥹥ȥ饯᥽åɤӥեɤȤΤ߻Ѥ硢\fI\-tag todo:cmf:"To Do:"\fRѤޤ
-.sp
-ǸΥ(:)ϡѥ᡼ڤʸǤϤʤФƥȤΰˤʤäƤޤ\fI@todo\fRޤࡢѤΤ줫ΥץѤޤȤС\fI@todo The documentation for this method needs work\fRǤ
-.sp
-\fB̾Υ\fR: ̾ǥѤϥХååѤƥפޤΥɥơ󡦥Ȥˤϡ\fI\-tag ejb\e\e:bean:a:"EJB Bean:"\fRץѤޤ
+(フィールド)
+.sp
+\fBシングル・タグの例\fR: ソース・コード内の任意の位置で使用できるタグのタグ・オプションの例を示します。\fI\-tag todo:a:"To Do:"\fR
+.sp
+\fI@todo\fRタグをコンストラクタ、メソッドおよびフィールドとのみ使用する場合、\fI\-tag todo:cmf:"To Do:"\fRを使用します。
+.sp
+最後のコロン(:)は、パラメータ区切り文字ではなく、見出しテキストの一部になっています。\fI@todo\fRタグを含む、ソース・コード用のいずれかのタグ・オプションを使用します。たとえば、\fI@todo The documentation for this method needs work\fRです。
+.sp
+\fBタグ名内のコロン\fR: タグ名内でコロンを使用する場合はバックスラッシュを使用してエスケープします。次のドキュメンテーション・コメントには、\fI\-tag ejb\e\e:bean:a:"EJB Bean:"\fRオプションを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -3185,12 +3185,12 @@
 .if n \{\
 .RE
 .\}
-\fB̾Υڥå\fR: γȯԤɬϤʤࡦ򥽡֤뤳Ȥޤξ硢Τ٤ƤΥꥹȤϤ륿ͭˤϤʤ̵ˤɬפޤ\fIX\fRꤹȥ̵ˤʤޤꤷʤȡͭˤʤޤˤꡢ\fIjavadoc\fRޥɤϡФϥߥʤɤˤǤ뤫ɤǤޤΤ褦ʾˡ\fIjavadoc\fRޥɤٹ𤬽ϤޤǤ֤Ƥͤ\fIX\fRɲäǤޤƤС\fIX\fRΤߤǥͭˤ뤳ȤǤޤȤС\fI@todo\fRϤ硢\fI\-tag todo:Xcmf:"To Do:"\fRѤޤ˴ñˤ硢\fI\-tag todo:X\fRѤޤʸ\fI\-tag todo:X\fRϡ\fI@todo\fRåȤƤƤⵡǽޤ
-.sp
-\fBν\fR:
-\fI\-ta\fR\fIg\fR\fI\-taglet\fRץνˤäơνϽ礬ޤޤࡦɸॿȤ߹礻ƻѤ뤳ȤǤޤɸॿΥץϡꤹ뤿Υץ졼ۥǤɸॿ̾ΤߤޤɸॿξФѹǤޤ󡣤򼡤˼ޤ\fI\-tag\fRץꤷʤȡ\fI\-tagle\fR\fIt\fRץΰ֤ˤꡢޤޤξȤ¸ߤ硢ޥɥ饤κǸˤνꤷޤϡ䥿åȤޥɥ饤˻ꤵ줿֤˽뤿ǤȤС\fI\-taglet\fR\fI\-tag\fRץ̾\fItodo\fRͤľ硢ޥɥ饤˺Ǹ˻ꤵ줿Τꤷޤ
-.sp
-\fBδåȤ\fR: ǤϡϤParametersThrowsδ֤To Doޤ\fIX\fRѤơ\fI@example\fRκμ¹ԤǤϽϤʤǤ뤳Ȥꤷޤ\fI@argfile\fRѤϡΤ褦ˡե̡ιԤ˥֤Ǥޤ(Ԥη³򼨤ʸ)
+\fBタグ名のスペルチェック\fR: 一部の開発者が必ずしも出力しないカスタム・タグをソース・コード内に配置することがあります。この場合、ソース・コード内のすべてのタグをリストし、出力するタグを有効にし、出力しないタグを無効にする必要があります。\fIX\fRを指定するとタグは無効になります。指定しないと、タグは有効になります。これにより、\fIjavadoc\fRコマンドは、検出したタグが入力ミスなどによる不明タグであるかどうかを特定できます。このような場合に、\fIjavadoc\fRコマンドから警告が出力されます。すでに配置されている値に\fIX\fRを追加できます。こうしておけば、\fIX\fRを削除するのみでタグを有効にすることができます。たとえば、\fI@todo\fRタグを出力で抑制する場合、\fI\-tag todo:Xcmf:"To Do:"\fRを使用します。さらに簡単にする場合、\fI\-tag todo:X\fRを使用します。構文\fI\-tag todo:X\fRは、\fI@todo\fRタグがタグレットで定義されていても機能します。
+.sp
+\fBタグの順序\fR:
+\fI\-ta\fR\fIg\fRおよび\fI\-taglet\fRオプションの順序によって、タグの出力順が決まります。カスタム・タグと標準タグを組み合せて使用することもできます。標準タグのタグ・オプションは、順序を決定するためだけのプレースホルダです。標準タグの名前のみを取ります。標準タグの小見出しは変更できません。これを次の例に示します。\fI\-tag\fRオプションを指定しないと、\fI\-tagle\fR\fIt\fRオプションの位置により、順序が決まります。タグが両方とも存在する場合、コマンドラインの最後にある方がその順序を決定します。これは、タグやタグレットがコマンドラインに指定された順番に処理されるためです。たとえば、\fI\-taglet\fRおよび\fI\-tag\fRオプションが名前\fItodo\fR値を持つ場合、コマンドラインに最後に指定されたものが順序を決定します。
+.sp
+\fBタグの完全セットの例\fR: この例では、出力のParametersとThrowsの間にTo Doを挿入します。\fIX\fRを使用して、\fI@example\fRタグが、ソース・コード内の今回の実行では出力されないタグであることも指定します。\fI@argfile\fRタグを使用する場合は、次のように、引数ファイル内の別々の行にタグを配置できます(行の継続を示す文字は不要)。
 .sp
 .if n \{\
 .RS 4
@@ -3206,24 +3206,24 @@
 .if n \{\
 .RE
 .\}
-\fIjavadoc\fRޥɤɥơ󡦥ȤϤݤ˸줿ΤɸॿǤ⡢\fI\-tag\fR\fI\-taglet\fRץϤ줿ǤʤΤϤ٤Ȥߤʤ졢ٹ𤬥ޤ
-.sp
-ɸॿϡǽ顢ǥեȤνǥꥹŪ˳Ǽޤ\fI\-tag\fRץѤȡΥϤΥꥹȤɲäޤɸॿϡǥեȤΰ֤ưޤΤᡢɸॿ\fI\-tag\fRץάȡϥǥեȤΰ֤֤줿ޤޤˤʤޤ
-.sp
-\fBβ\fR: ֤ͭ̾ˤϡѥå˻ѤƤ\fIcom\&.mycompany\&.todo\fRȤ̾Τ褦ˡɥåȤǶڤ줿̾ѤޤOracleϡ̾˥ɥåȤޤޤʤɸॿޤ桼ϡOracleƱ̾Υư򥪡С饤ɤޤ\fI@todo\fRȤ̾ΥޤϥåȤ桼硢θOracleƱ̾ɸॿƤ⡢ΥޤϥåȤϾ˥桼ΤƱưݻޤ
-.sp
-\fBvs\&. Javadoc\fR: ̤ˡɲäɬפΤޡåפɥȤ˱ƶͿɥȤꤹ뤿ΤΤǤ硢ΥޡåפJavadocˤޤʳξˤޤJavadocġǤDocȤεˡΥࡦ˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#annotations)򻲾ȤƤ
-.sp
-\fI\-taglet\fRץѤơʣʥ֥å䥫ࡦ饤󡦥Ǥޤ
+\fIjavadoc\fRコマンドがドキュメンテーション・コメントを解析する際に検索されたタグのうち、標準タグでも、\fI\-tag\fRや\fI\-taglet\fRオプションで渡されたタグでもないものはすべて不明タグとみなされ、警告がスローされます。
+.sp
+標準タグは、最初、デフォルトの順序でリスト内に内部的に格納されます。\fI\-tag\fRオプションを使用すると、それらのタグはこのリストに追加されます。標準タグは、デフォルトの位置から移動されます。そのため、標準タグの\fI\-tag\fRオプションを省略すると、それはデフォルトの位置に配置されたままになります。
+.sp
+\fB競合の回避\fR: 固有の名前空間を作成するには、パッケージに使用されている\fIcom\&.mycompany\&.todo\fRという名前のように、ドットで区切られた名前を使用します。Oracleは、今後も名前にドットを含まない標準タグを作成します。ユーザーが作成したタグは、Oracleが定義する同じ名前のタグの動作をオーバーライドします。\fI@todo\fRという名前のタグまたはタグレットをユーザーが作成した場合、その後にOracleが同じ名前の標準タグを作成しても、そのタグまたはタグレットは常にユーザーが定義したのと同じ動作を保持します。
+.sp
+\fB注釈vs\&. Javadocタグ\fR: 一般に、追加する必要のあるマークアップが、ドキュメントに影響を与えたりドキュメントを生成したりするためのものである場合、そのマークアップはJavadocタグにします。それ以外の場合は注釈にします。JavadocツールでのDocコメントの記述方法のカスタム・タグと注釈に関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#annotations)を参照してください。
+.sp
+\fI\-taglet\fRオプションを使用して、より複雑なブロック・タグやカスタム・インライン・タグも作成できます。
 .RE
 .PP
 \-taglet \fIclass\fR
 .RS 4
-ΥΥɥȤ˻ѤɥååȤư뤿Υ饹եꤷޤ\fIclass\fRͤδ̾ѤޤΥåȤϡࡦΥƥȰοޤåȤϡΰդϤޤåȤѤ˭٤ʥɥȤˤĤƤϡåȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/taglet/overview\&.html)򻲾ȤƤ
-.sp
-åȤϡ֥åޤϥ饤󡦥ǤåȤǤդοΰȤ뤳ȤǤޤޤƥȤˤ롢վ񤭤롢ƥȤե˽񤭽Ф¾Υץ򳫻ϤʤɤΥưǤޤåȤǻǤΤϡ־ַΤߤǤ¾Τ٤ƤηϡɥååȤˤäƹԤޤåȤѤƤ⡢ޥ饹ΥꥹȤ饯饹̾ʤɤνϼ¹ԤǤޤ󡣤ΥƥȤե˽Ϥꡢ̤ΥץȥꥬʤɤѤޤåȤؤΥѥꤹˤϡ\fI\-tagletpath\fRץѤޤˡڡParametersThrowsδ֤To DoåȤ򼨤ޤޤϡ\fI\-taglet\fRץ򤽤\fI\-tag\fRץΤ˻Ѥ뤳ȤǤޤɤ߼꤬ˤʤǽޤ
+そのタグのドキュメントの生成に使用するドックレットを起動するためのクラス・ファイルを指定します。\fIclass\fR値の完全修飾名を使用します。このタグレットは、カスタム・タグのテキスト引数の数も定義します。タグレットは、これらの引数を受け付け、処理し、出力を生成します。タグレットの例を使用した豊富なドキュメントについては、タグレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/taglet/overview\&.html)を参照してください。
+.sp
+タグレットは、ブロックタグまたはインライン・タグで便利です。タグレットは任意の数の引数をとることができます。また、テキストを太字にする、箇条書きを作成する、テキストをファイルに書き出す、その他のプロセスを開始するなどのカスタム動作を実装できます。タグレットで指定できるのは、タグの配置場所と配置形式のみです。その他のすべての決定は、ドックレットによって行われます。タグレットを使用しても、包含クラスのリストからクラス名を削除するなどの処理は実行できません。ただし、タグのテキストをファイルに出力したり、別のプロセスをトリガーするなどの副作用は得られます。タグレットへのパスを指定するには、\fI\-tagletpath\fRオプションを使用します。次に、生成されるページのParametersとThrowsの間にTo Doタグレットを挿入する例を示します。または、\fI\-taglet\fRオプションをその\fI\-tag\fRオプションのかわりに使用することができますが、読み取りが困難になる可能性があります。
 .sp
 .if n \{\
 .RS 4
@@ -3244,67 +3244,67 @@
 .PP
 \-tagletpath \fItagletpathlist\fR
 .RS 4
-taglet饹ե򸡺뤿θѥꤷޤ\fItagletpathlist\fRˤϡ(:)ǶڤäʣΥѥޤ뤳ȤǤޤ\fIjavadoc\fRޥɤϡꤵ줿ѥʲΤ٤ƤΥ֥ǥ쥯ȥ򸡺ޤ
+tagletクラス・ファイルを検索するための検索パスを指定します。\fItagletpathlist\fRには、コロン(:)で区切って複数のパスを含めることができます。\fIjavadoc\fRコマンドは、指定されたパス以下のすべてのサブディレクトリを検索します。
 .RE
 .PP
 \-docfilesubdirs
 .RS 4
-doc\-filesǥ쥯ȥΥǥסԡͭˤޤˤϡ֥ǥ쥯ȥȤΤ٤ƤƵŪ˥ԡޤȤСǥ쥯ȥoc\-files/example/imagesȤƤ٤ƥԡޤǤ⡢֥ǥ쥯ȥ꤬ǽǤ
+doc\-filesディレクトリのディープ・コピーを有効にします。宛先には、サブディレクトリとそのすべて内容が再帰的にコピーされます。たとえば、ディレクトリoc\-files/example/imagesとその内容がすべてコピーされます。ここでも、サブディレクトリを除外する指定が可能です。
 .RE
 .PP
 \-excludedocfilessubdir \fIname1:name2\fR
 .RS 4
-ꤵ줿̾doc\-files֥ǥ쥯ȥ򤹤٤ƽޤˤꡢSCCSȤ¾Υ極֥ǥ쥯ȥΥԡɤޤ
+指定された名前のdoc\-filesサブディレクトリをすべて除外します。これにより、SCCSとその他のソース・コード制御サブディレクトリのコピーを防ぎます。
 .RE
 .PP
 \-noqualifier all | \fIpackagename1\fR:\fIpackagename2\&.\&.\&.\fR
 .RS 4
-Ϥ륯饹̾齤ѥå̾άޤ\fI\-noqualifier\fRץΰϡ\fIall\fR(٤ƤΥѥåҤά)ޤϽҤȤƺѥåΥڤꥹ(磻ɥɤ)Τ줫Ȥʤޤ饹ޤϥ󥿥ե̾ɽ֤ѥå̾ޤեν򻲾ȤƤ
-.sp
-Ǥϡ٤ƤΥѥåҤάޤ\fI\-noqualifier all\fR
-.sp
-Ǥϡ\fIjava\&.lang\fR\fIjava\&.io\fRѥåҤάޤ:
-\fI\-noqualifier java\&.lang:java\&.io\fR
-.sp
-Ǥϡ\fIjava\fRǻϤޤѥåҤ\fIcom\&.sun\fR֥ѥåάޤ\fIjavax\fRϾάޤ\fI\-noqualifier java\&.*:com\&.sun\&.*\fR
-.sp
-ѥåҤҤư˽äɽ硢̾Ŭڤṳ̂ޤ̾ɽˡפ򻲾ȤƤΥ롼ϡ\fI\-noqualifier\fRץѤ뤫ɤˤ餺ͭǤ
+出力されるクラス名から修飾パッケージ名を省略します。\fI\-noqualifier\fRオプションの引数は、\fIall\fR(すべてのパッケージ修飾子を省略)、または修飾子として削除するパッケージのコロン区切りリスト(ワイルドカードも可)、のいずれかとなります。クラスまたはインタフェース名が表示される位置からパッケージ名が削除されます。ソース・ファイルの処理を参照してください。
+.sp
+次の例では、すべてのパッケージ修飾子を省略します。\fI\-noqualifier all\fR
+.sp
+次の例では、\fIjava\&.lang\fRおよび\fIjava\&.io\fRパッケージ修飾子を省略します:
+\fI\-noqualifier java\&.lang:java\&.io\fR。
+.sp
+次の例では、\fIjava\fRで始まるパッケージ修飾子および\fIcom\&.sun\fRサブパッケージを省略しますが、\fIjavax\fRは省略しません。\fI\-noqualifier java\&.*:com\&.sun\&.*\fR
+.sp
+パッケージ修飾子が前述の動作に従って表示される場合、名前は適切に短縮されます。「名前が表示される方法」を参照してください。このルールは、\fI\-noqualifier\fRオプションを使用するかどうかにかかわらず有効です。
 .RE
 .PP
 \-notimestamp
 .RS 4
-ॹפޤƥڡƬ᤯ˤ롢줿HTMLHTMLȤǥॹפޤ\fI\-notimestamp\fRץϡ\fIjavadoc\fRޥɤ2ĤΥ١Ǽ¹Ԥδ֤κʬ\fIdiff\fRΩޤॹפˤ\fIdiff\fRȯɤǤ(ǤʤȤ٤ƤΥڡ\fIdiff\fRˤʤޤ)ॹפˤ\fIjavadoc\fRޥɤΥ꡼ֹ椬ޤޤ졢ߤǤϡ\fI<!\-\- Generated by javadoc (build 1\&.5\&.0_01) on Thu Apr 02 14:04:52 IST 2009 \-\->\fRΤ褦ɽޤ
+タイムスタンプが抑制されます。各ページの先頭近くにある、生成されたHTML内のHTMLコメントでタイムスタンプが隠されます。\fI\-notimestamp\fRオプションは、\fIjavadoc\fRコマンドを2つのソース・ベースで実行し、それらの間の差分\fIdiff\fRを取得する場合に役立ちます。タイムスタンプによる\fIdiff\fRの発生を防ぐからです(そうでないとすべてのページで\fIdiff\fRになります)。タイムスタンプには\fIjavadoc\fRコマンドのリリース番号が含まれ、現在では、\fI<!\-\- Generated by javadoc (build 1\&.5\&.0_01) on Thu Apr 02 14:04:52 IST 2009 \-\->\fRのように表示されます。
 .RE
 .PP
 \-nocomment
 .RS 4
-Ӥ٤ƤΥޤॳʸΤΤߤޤΥץˤꡢϰۤʤŪΤäեѤץȤᤤʳǥȥHTMLɥȤǤ褦ˤʤޤ
+主説明およびすべてのタグを含むコメント本文全体を抑制し、宣言のみを生成します。このオプションにより、元は異なる目的のためだったソース・ファイルを再利用し、新しいプロジェクトの早い段階でスケルトンHTMLドキュメントを作成できるようになります。
 .RE
 .PP
 \-sourcetab \fItablength\fR
 .RS 4
-dzƥ֤Ѥʸοꤷޤ
-.RE
-.SH "ޥɥ饤ե"
+ソース内で各タブが使用する空白文字の数を指定します。
+.RE
+.SH "コマンドライン引数ファイル"
 .PP
-\fIjavadoc\fRޥɤûʷˤꤹ뤿ˡ\fIjavadoc\fRޥɤФ(\fI\-J\fRץ)ä1İʾΥեꤹ뤳ȤǤޤΤȤѤСɤΥڥ졼ƥ󥰡ƥǤ⡢ǤդĹ\fIjavadoc\fRޥɤǤޤ
+\fIjavadoc\fRコマンドを短くしたり簡潔にしたりするために、\fIjavadoc\fRコマンドに対する引数(\fI\-J\fRオプションを除く)が入った1つ以上のファイルを指定することができます。このことを利用すれば、どのオペレーティング・システム上でも、任意の長さの\fIjavadoc\fRコマンドを作成できます。
 .PP
-եˤϡ\fIjavac\fRΥץȥե̾ͳȤ߹礻ƵҤǤޤեγưϡڡޤϲԤǶڤޤե̾ޤ줿򤬤硢ե̾ΤŰǰϤߤޤ
+引数ファイルには、\fIjavac\fRのオプションとソース・ファイル名を自由に組み合せて記述できます。ファイル内の各引数は、スペースまたは改行で区切ります。ファイル名に埋め込まれた空白がある場合、ファイル名全体を二重引用符で囲みます。
 .PP
-եΥե̾ϡեΰ֤ǤϤʤߤΥǥ쥯ȥŪȤʤޤΥꥹȤǤϡ磻ɥ(\fI*\fR)ϻѤǤޤ󡣤ȤС*\&.javaȤϻǤޤ󡣥åȥޡ(@)ѤơեƵŪ˲᤹뤳ȤϤǤޤ󡣤ޤ\fI\-J\fRץ⥵ݡȤƤޤ󡣤ΥץϵưġϤޤưġǤϰե򥵥ݡȤƤʤǤ
+引数ファイル内のファイル名は、引数ファイルの位置ではなく、現在のディレクトリに相対的となります。これらのリストでは、ワイルドカード(\fI*\fR)は使用できません。たとえば、*\&.javaとは指定できません。アットマーク(@)を使用して、ファイルを再帰的に解釈することはできません。また、\fI\-J\fRオプションもサポートされていません。このオプションは起動ツールに渡されますが、起動ツールでは引数ファイルをサポートしていないからです。
 .PP
-\fIjavadoc\fR¹ԤȤˡưեΥѥȥե̾Ƭ@ʸդϤޤ\fIjavadoc\fRޥɤϡåȥޡ(@)ʸǻϤޤ򸫤ĤȡΥեƤŸưꥹȤޤ
+\fIjavadoc\fRを実行するときに、各引数ファイルのパスとファイル名の先頭に@文字を付けて渡します。\fIjavadoc\fRコマンドは、アットマーク(@)文字で始まる引数を見つけると、そのファイルの内容を展開して引数リストに挿入します。
 .PP
-\fBExample 1\fR, ñΰե
-.RS 4
-\fIargfile\fRȤ̾1ĤΰեѤơ٤Ƥ\fIjavadoc\fRޥɰݻǤޤ\fIjavadoc @argfile\fR˼褦ˡΰեˤξΥեƤޤޤƤޤ
+\fBExample 1\fR, 単一の引数ファイル
+.RS 4
+\fIargfile\fRという名前の1つの引数ファイルを使用して、すべての\fIjavadoc\fRコマンド引数を保持できます。\fIjavadoc @argfile\fR次の例に示すように、この引数ファイルには両方のファイルの内容が含まれています。
 .RE
 .PP
-\fBExample 2\fR, 2Ĥΰե
-.RS 4
-Τ褦ˡ2ĤΰեǤޤ\fIjavadoc\fRޥɤΥץѤ1ġѥå̾ޤϥե̾Ѥ1ĤǤΥꥹȤǤϹԷ³ʸѤƤޤ
-.sp
-ƤޤࡢoptionsȤ̾Υեޤ
+\fBExample 2\fR, 2つの引数ファイル
+.RS 4
+次のように、2つの引数ファイルを作成できます。\fIjavadoc\fRコマンドのオプション用に1つ、パッケージ名またはソース・ファイル名用に1つです。次のリストでは行継続文字を使用していません。
+.sp
+次の内容を含む、optionsという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -3324,7 +3324,7 @@
 .if n \{\
 .RE
 .\}
-ƤޤࡢpackagesȤ̾Υեޤ
+次の内容を含む、packagesという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -3337,7 +3337,7 @@
 .if n \{\
 .RE
 .\}
-Τ褦ˡ\fIjavadoc\fRޥɤ¹Ԥޤ
+次のように、\fIjavadoc\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -3350,9 +3350,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, ѥѤե
-.RS 4
-եϥѥǤޤեΤ٤ƤΥե̾ϡ(\fIpath1\fR\fIpath2\fRǤϤʤ)Τ褦˸ߤκȥǥ쥯ȥŪȤʤޤ
+\fBExample 3\fR, パスを使用した引数ファイル
+.RS 4
+引数ファイルはパスを指定できますが、ファイル内のすべてのファイル名は、(\fIpath1\fRや\fIpath2\fRではなく)次のように現在の作業ディレクトリに相対的となります。
 .sp
 .if n \{\
 .RS 4
@@ -3365,9 +3365,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, ץ
-.RS 4
-ˡ\fIjavadoc\fRޥɤΥץФե˳Ǽ򼨤ޤĹǤΤǡ\fI\-bottom\fRץѤޤΤ褦ʥƥȰޤࡢbottomȤ̾ΥեǤޤ
+\fBExample 4\fR, オプション引数
+.RS 4
+次に、\fIjavadoc\fRコマンドのオプションに対する引数を引数ファイルに格納する例を示します。長い引数を指定できるので、\fI\-bottom\fRオプションを使用します。次のようなテキスト引数を含む、bottomという名前のファイルを作成できます。
 .sp
 .if n \{\
 .RS 4
@@ -3382,37 +3382,37 @@
 .if n \{\
 .RE
 .\}
-\fIjavadoc\fRޥɤ򼡤Τ褦˼¹Ԥޤ\fI javadoc \-bottom @bottom @packages\fR
-.sp
-\fI\-bottom\fRץեκǽ˴ޤơΤ褦\fIjavadoc\fRޥɤ¹Ԥ뤳ȤǤޤ\fIjavadoc @bottom @packages\fR
-.RE
-.SH "JAVADOCޥɤμ¹"
+\fIjavadoc\fRコマンドを次のように実行します。\fI javadoc \-bottom @bottom @packages\fR
+.sp
+\fI\-bottom\fRオプションを引数ファイルの最初に含めて、次のように\fIjavadoc\fRコマンドを実行することもできます。\fIjavadoc @bottom @packages\fR
+.RE
+.SH "JAVADOCコマンドの実行"
 .PP
-\fIjavadoc\fRޥɤΥ꡼ֹ\fIjavadoc \-J\-version\fRץǤޤϥȥ꡼ˤɸɥååȤΥ꡼ֹ椬ޤޤޤ\fI\-quiet\fRץ̵ˤǤޤ
+\fIjavadoc\fRコマンドのリリース番号は\fIjavadoc \-J\-version\fRオプションで特定できます。出力ストリームには標準ドックレットのリリース番号が含まれます。\fI\-quiet\fRオプションで無効にできます。
 .PP
-JavaǵҤ줿ץफ\fIjavadoc\fRޥɤưˤϸץޥƥå󥿥եѤޤΥ󥿥ե\fIcom\&.sun\&.tools\&.javadoc\&.Main\fRˤޤ(ޤ\fIjavadoc\fRޥɤϺǽǤ)ܺ٤ϡɸɥåå
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/standard\-doclet\&.html#runningprogrammatically)򻲾ȤƤ
+Java言語で記述されたプログラムから\fIjavadoc\fRコマンドを起動するには公開プログラマティック・インタフェースを使用します。このインタフェースは\fIcom\&.sun\&.tools\&.javadoc\&.Main\fRにあります(また\fIjavadoc\fRコマンドは再入可能です)。詳細は、標準ドックレット
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/standard\-doclet\&.html#runningprogrammatically)を参照してください。
 .PP
-μǤϡɸHTMLɥååȤƤӽФޤࡦɥååȤƤӽФˤϡ\fI\-doclet\fR\fI\-docletpath\fRץѤޤɥååȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)򻲾ȤƤ
-.SS "ñ"
+次の手順では、標準HTMLドックレットを呼び出します。カスタム・ドックレットを呼び出すには、\fI\-doclet\fRおよび\fI\-docletpath\fRオプションを使用しますドックレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)を参照してください
+.SS "簡単な例"
 .PP
-\fIjavadoc\fRޥɤϡѥåΤФƼ¹Ԥ뤳Ȥ⡢ġΥեФƼ¹Ԥ뤳ȤǤޤƥѥå̾ϡ줾Υѥå̾бǥ쥯ȥ̾ޤ
+\fIjavadoc\fRコマンドは、パッケージ全体に対して実行することも、個々のソース・ファイルに対して実行することもできます。各パッケージ名は、それぞれのパッケージ名に対応するディレクトリ名を持ちます。
 .PP
-Ǥϡե/home/src/java/awt/*\&.javaˤޤǥ쥯ȥ/home/htmlǤ
-1İʾΥѥåΥɥȲ.PP
-ѥåɥȲˤϡΥѥåΥե򡢤ΥѥåƱ̾Υǥ쥯ȥ˳Ǽɬפޤ
+次の例では、ソース・ファイルは/home/src/java/awt/*\&.javaにあります。生成先ディレクトリは/home/htmlです。
+1つ以上のパッケージのドキュメント化.PP
+パッケージをドキュメント化するには、そのパッケージのソース・ファイルを、そのパッケージと同じ名前のディレクトリ内に格納する必要があります。
 .PP
-ѥå̾(\fIjava\&.awt\&.color\fRΤ褦˥ɥåȤǶڤ줿)ʣμ̻Ҥ鹽Ƥ硢³γƼ̻Ҥ̤Υ֥ǥ쥯ȥ(ava/awt/colorʤ)бƤɬפޤ
+パッケージ名が(\fIjava\&.awt\&.color\fRのようにドットで区切られた)複数の識別子から構成されている場合、後続の各識別子が下位のサブディレクトリ(ava/awt/colorなど)に対応している必要があります。
 .PP
-1ĤΥѥåΤʣΥե򡢰ۤʤˤ뤽Τ褦2ĤΥǥ쥯ȥꡦĥ꡼ʬƳǼ뤳ȤǤޤξ\fI\-sourcepath\fRˤäƤξξꤹɬפޤȤСsrc1/java/awt/colorsrc2/java/awt/color
+1つのパッケージのための複数のソース・ファイルを、異なる場所にあるそのような2つのディレクトリ・ツリーに分けて格納することもできます。ただし、その場合は\fI\-sourcepath\fRによってその両方の場所を指定する必要があります。たとえば、src1/java/awt/colorとsrc2/java/awt/color。
 .PP
-ǥ쥯ȥѹ(\fIcd\fRޥɤ)ޤ\fI\-sourcepath\fRץˤꡢ\fIjavadoc\fRޥɤ¹ԤǤޤξ򼨤ޤ
+ディレクトリの変更(\fIcd\fRコマンドを使用)または\fI\-sourcepath\fRオプションにより、\fIjavadoc\fRコマンドを実行できます。次の例で両方の選択肢を示します。
 .PP
-\fBExample 1\fR, 1İʾΥѥåƵŪ˼¹
-.RS 4
-Ǥ\fIjavadoc\fRޥɤǤդΥǥ쥯ȥ꤫¹ԤǤ褦ˡ\fI\-sourcepath\fRѤƵŪΤ\fI\-subpackages\fR
-(1\&.4οץ)Ѥޤϡjavaǥ쥯ȥΥ֥ѥå򤿤ɤޤ\fIjava\&.net\fR\fIjava\&.lang\fR롼Ȥ˻ĥѥåϽޤ\fIjava\&.lang\fRΥ֥ѥåǤ\fIjava\&.lang\&.ref\fRդƤޤ¾Υѥåĥ꡼ˤɤˤϡ\fIjava:javax:org\&.xml\&.sax\fRΤ褦ˡΥѥå̾\fI\-subpackages\fRΰɲäޤ
+\fBExample 1\fR, 1つ以上のパッケージから再帰的に実行
+.RS 4
+この例では\fIjavadoc\fRコマンドが任意のディレクトリから実行できるように、\fI\-sourcepath\fRを使用し、再帰的処理のために\fI\-subpackages\fR
+(1\&.4の新オプション)を使用します。これは、javaディレクトリのサブパッケージをたどりますが、\fIjava\&.net\fRと\fIjava\&.lang\fRをルートに持つパッケージは除外されます。\fIjava\&.lang\fRのサブパッケージである\fIjava\&.lang\&.ref\fRが除外される点に注意してください。また、他のパッケージ・ツリーを下方にたどるには、\fIjava:javax:org\&.xml\&.sax\fRのように、それらのパッケージの名前を\fI\-subpackages\fRの引数に追加します。
 .sp
 .if n \{\
 .RS 4
@@ -3425,9 +3425,9 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, 롼ȤؤΰưŪʥѥåμ¹
-.RS 4
-줿ѥåοƥǥ쥯ȥ˰ưޤˡɥȲ1İʾΥѥå̾ꤷ\fIjavadoc\fRޥɤ¹Ԥޤ
+\fBExample 2\fR, ルートへの移動および明示的なパッケージの実行
+.RS 4
+完全修飾されたパッケージの親ディレクトリに移動します。次に、ドキュメント化する1つ以上のパッケージの名前を指定して\fIjavadoc\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -3439,12 +3439,12 @@
 .if n \{\
 .RE
 .\}
-ޤ¾Υѥåĥ꡼ˤɤˤϡj\fIava:javax:org\&.xml\&.sax\fRΤ褦ˡΥѥå̾\fI\-subpackages\fRΰɲäޤ
+また、他のパッケージ・ツリーを下方にたどるには、j\fIava:javax:org\&.xml\&.sax\fRのように、それらのパッケージの名前を\fI\-subpackages\fRの引数に追加します。
 .RE
 .PP
-\fBExample 3\fR, 1ĤΥĥ꡼ŪʥѥåǤդΥǥ쥯ȥ꤫¹
-.RS 4
-ξ硢ߤΥǥ쥯ȥ꤬ɤǤϤޤ\fIjavadoc\fRޥɤ¹ԤǾ̥ѥåοƥǥ쥯ȥꤷ\fI\-sourcepath\fRץѤޤɥȲ1İʾΥѥå̾ꤷޤ
+\fBExample 3\fR, 1つのツリーの明示的なパッケージの任意のディレクトリから実行
+.RS 4
+この場合、現在のディレクトリがどこかは問題ではありません。\fIjavadoc\fRコマンドを実行し、最上位パッケージの親ディレクトリを指定して\fI\-sourcepath\fRオプションを使用します。ドキュメント化する1つ以上のパッケージの名前を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -3457,9 +3457,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, ʣΥĥ꡼ŪʥѥåǤդΥǥ쥯ȥ꤫¹
-.RS 4
-\fIjavadoc\fRޥɤ¹Ԥƥĥ꡼Υ롼ȤؤΥѥΥڤꥹȤꤷ\fI\-sourcepath\fRץѤޤɥȲ1İʾΥѥå̾ꤷޤꤷѥåΤ٤ƤΥե뤬1ĤΥ롼ȡǥ쥯ȥβ¸ߤɬפϤޤ󤬡ѥǻꤵ줿ΤɤǸĤɬפޤ
+\fBExample 4\fR, 複数のツリーの明示的なパッケージの任意のディレクトリから実行
+.RS 4
+\fIjavadoc\fRコマンドを実行し、各ツリーのルートへのパスのコロン区切りリストを指定して\fI\-sourcepath\fRオプションを使用します。ドキュメント化する1つ以上のパッケージの名前を指定します。指定したパッケージのすべてのソース・ファイルが、1つのルート・ディレクトリの下に存在する必要はありませんが、ソース・パスで指定された場所のどこかで見つかる必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -3470,16 +3470,16 @@
 .if n \{\
 .RE
 .\}
-٤ƤΥj\fIava\&.awt\fR\fIjava\&.awt\&.even\fRtѥå\fIpublic\fR\fIprotected\fR饹ȥ󥿥եˤĤơHTMLΥɥȤ졢ꤵ줿ǥ쥯ȥHTMLե뤬¸ޤ2İʾΥѥåƤΤǡɥȤϡѥåΥꥹȡ饹ΥꥹȡӥᥤΥ饹ڡȤ3ĤHTMLե졼ĤȤˤʤޤ
-.RE
-1İʾΥ饹ΥɥȲ.PP
-ޤ1İʾΥեϤơ\fIjavadoc\fRޥɤ¹Ԥ뤳ȤǤޤ\fIjavadoc\fRϡ2ĤˡΤ줫Ǽ¹ԤǤޤ1Ĥϥǥ쥯ȥѹˡ(\fIcd\fR)⤦1ĤϥեؤΥѥ˻ꤹˡǤХѥϡߤΥǥ쥯ȥȤޤեϤȤϡ\fI\-sourcepath\fRץ̵뤵ޤꥹ(*)Τ褦ʥޥɥ饤󡦥磻ɥɤѤȡ饹Υ롼פǤޤ
+すべてのケースでj\fIava\&.awt\fRおよび\fIjava\&.awt\&.even\fRtパッケージ内の\fIpublic\fRおよび\fIprotected\fRクラスとインタフェースについて、HTML形式のドキュメントが生成され、指定された生成先ディレクトリにHTMLファイルが保存されます。2つ以上のパッケージが生成されているので、ドキュメントは、パッケージのリスト、クラスのリスト、およびメインのクラス・ページという3つのHTMLフレームを持つことになります。
+.RE
+1つ以上のクラスのドキュメント化.PP
+また、1つ以上のソース・ファイルを渡して、\fIjavadoc\fRコマンドを実行することもできます。\fIjavadoc\fRは、次の2つの方法のいずれかで実行できます。1つはディレクトリを変更する方法(\fIcd\fRを使用)、もう1つはソース・ファイルへのパスを完全に指定する方法です。相対パスは、現在のディレクトリを起点とします。ソース・ファイルを渡すときは、\fI\-sourcepath\fRオプションは無視されます。アスタリスク(*)のようなコマンドライン・ワイルドカードを使用すると、クラスのグループを指定できます。
 .PP
-\fBExample 1\fR, ǥ쥯ȥѹ
-.RS 4
-ݻǥ쥯ȥѹޤˡɥȲ1İʾΥե̾ꤷ\fIjavadoc\fRޥɤ¹Ԥޤ
-.sp
-Ǥϡ\fIButton\fR饹\fICanvas\fR饹̾\fIGraphics\fRǻϤޤ륯饹ˤĤơHTMLΥɥȤޤѥå̾ǤϤʤե뤬\fIjavadoc\fRޥɤ˰ȤϤƤΤǡɥȤϡ饹ΥꥹȤȥᥤ󡦥ڡȤ2ĤΥե졼ĤȤˤʤޤ
+\fBExample 1\fR, ソース・ディレクトリに変更
+.RS 4
+ソースを保持するディレクトリに変更します。次に、ドキュメント化する1つ以上のソース・ファイルの名前を指定して\fIjavadoc\fRコマンドを実行します。
+.sp
+この例では、\fIButton\fRクラスと\fICanvas\fRクラス、および名前が\fIGraphics\fRで始まるクラスについて、HTML形式のドキュメントが生成されます。パッケージ名ではなくソース・ファイルが\fIjavadoc\fRコマンドに引数として渡されているので、ドキュメントは、クラスのリストとメイン・ページという2つのフレームを持つことになります。
 .sp
 .if n \{\
 .RS 4
@@ -3493,9 +3493,9 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ѥåΥ롼ȡǥ쥯ȥѹ
-.RS 4
-ϡƱ롼Ȥ̤Υ֥ѥåθġΥեɥȲΤΩޤѥåΥ롼ȡǥ쥯ȥ˰ܤꡢƥե򡢥롼ȤΥѥȤȤ˻ꤷޤ
+\fBExample 2\fR, パッケージのルート・ディレクトリに変更
+.RS 4
+これは、同じルートからの別のサブパッケージの個々のソース・ファイルをドキュメント化するのに役立ちます。パッケージのルート・ディレクトリに移り、各ソース・ファイルを、ルートからのパスとともに指定します。
 .sp
 .if n \{\
 .RS 4
@@ -3509,9 +3509,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, ǤդΥǥ쥯ȥ꤫ΥեΥɥȲ
-.RS 4
-ξ硢ߤΥǥ쥯ȥ꤬ɤǤϤޤ󡣥ɥȲ륽եؤХѥ(ޤϸߤΥǥ쥯ȥ꤫Хѥ)ꤷ\fIjavadoc\fRޥɤ¹Ԥޤ
+\fBExample 3\fR, 任意のディレクトリからのファイルのドキュメント化
+.RS 4
+この場合、現在のディレクトリがどこかは問題ではありません。ドキュメント化するソース・ファイルへの絶対パス(または現在のディレクトリからの相対パス)を指定して\fIjavadoc\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -3524,8 +3524,8 @@
 .RE
 .\}
 .RE
-ѥåӥ饹ΥɥȲ.PP
-ѥåΤȸġΥ饹Ʊ˻ꤷƥɥȲ뤳ȤǤޤˡҤ2ĤȤ߹礻򼨤ޤ\fI\-sourcepath\fRץϡѥåؤΥѥФƤϻѤǤޤġΥ饹ؤΥѥФƤϻѤǤޤ
+パッケージおよびクラスのドキュメント化.PP
+パッケージ全体と個々のクラスを同時に指定してドキュメント化することもできます。次に、前述の2つの例を組み合せた例を示します。\fI\-sourcepath\fRオプションは、パッケージへのパスに対しては使用できますが、個々のクラスへのパスに対しては使用できません。
 .sp
 .if n \{\
 .RS 4
@@ -3537,14 +3537,14 @@
 .if n \{\
 .RE
 .\}
-.SS "ºݤ"
+.SS "実際の例"
 .PP
-Υޥɥ饤󤪤\fImakefile\fRС\fIjavadoc\fRޥɤJavaץåȥեAPIǼ¹ԤޤJava SE 1\&.21500Ĥpublicprotected饹ΥɥȤˤϡ180MBΥ꡼Ѥޤɤ⥪ץΰХѥѤƤ뤿ᡢǤդΥǥ쥯ȥ꤫Ʊ\fIjavadoc\fRޥɤ¹ԤǤޤ
-ޥɥ饤.PP
-ΥޥɤϡΥФĹǽޤ¤򤹤ˤϡޥɥ饤եѤޤޤϡ롦ץȤ򵭽Ҥޤ
+次のコマンドラインおよび\fImakefile\fRバージョンの\fIjavadoc\fRコマンドをJavaプラットフォームAPIで実行します。Java SE 1\&.2で約1500個のpublicおよびprotectedクラスのドキュメントを生成するには、180MBのメモリーを使用します。どちらの例もオプションの引数で絶対パスが使用されているため、任意のディレクトリから同じ\fIjavadoc\fRコマンドを実行できます。
+コマンドラインの例.PP
+次のコマンドは、一部のシェルに対して長すぎる可能性があります。この制限を回避するには、コマンドライン引数ファイルを使用します。または、シェル・スクリプトを記述します。
 .PP
-Ǥϡ\fIpackages\fRϽѥåޤ̾ǡ\fIjava\&.applet\fR
-\fIjava\&.lang\fRʤɤǤƥץΡŰǰϤޤ줿¦ˤϡʸǤޤ󡣤ȤС򥳥ԡɡڡȤϡ\fI\-bottom\fRץ󤫤ʸƤ
+この例では、\fIpackages\fRは処理するパッケージを含む名前で、\fIjava\&.applet\fR
+\fIjava\&.lang\fRなどです。各オプションの、一重引用符で囲まれた引数の内側には、改行文字を挿入できません。たとえば、この例をコピー・アンド・ペーストする場合は、\fI\-bottom\fRオプションから改行文字を削除してください。
 .sp
 .if n \{\
 .RS 4
@@ -3571,10 +3571,10 @@
 .if n \{\
 .RE
 .\}
-ץޥƥå󥿥ե.PP
-Javadoc Access APIǤϡץ¹ԤʤƤ⡢JavadocġJavaץꥱ󤫤ľܵưǤޤ
+プログラマティック・インタフェース.PP
+Javadoc Access APIでは、新しいプロセスを実行しなくても、JavadocツールをJavaアプリケーションから直接起動できます。
 .PP
-ȤСʸϥޥ\fIjavadoc \-d /home/html \-sourcepath /home/src \-subpackages java \-exclude java\&.net:java\&.lang com\&.example\fRƱǤ
+たとえば、次の文はコマンド\fIjavadoc \-d /home/html \-sourcepath /home/src \-subpackages java \-exclude java\&.net:java\&.lang com\&.example\fRと同等です。
 .sp
 .if n \{\
 .RS 4
@@ -3599,13 +3599,13 @@
 .RE
 .\}
 .PP
-\fIrun\fR᥽åɤκǽ3Ĥΰϡϡɸϡɸ२顼ȥ꡼ꤷޤ\fINull\fR\fISystem\&.in\fR\fISystem\&.out\fR\fISystem\&.err\fR줾ΥǥեͤǤ
-.SS "makefile"
+\fIrun\fRメソッドの最初の3つの引数は、入力、標準出力、および標準エラー・ストリームを指定します。\fINull\fRは\fISystem\&.in\fR、\fISystem\&.out\fRおよび\fISystem\&.err\fRそれぞれのデフォルト値です。
+.SS "makefileの例"
 .PP
-ǤϡGNU
-\fImakefile\fR򼨤ޤ\fImakefile\fRΰϡŰǰϤߤޤWindows
-\fImakefile\fRˤĤƤϡJavadoc FAQ\fImakefiles\fR˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html#makefiles)򻲾ȤƤ
+ここでは、GNU
+\fImakefile\fRの例を示します。\fImakefile\fRの引数は、一重引用符で囲みます。Windows
+\fImakefile\fRの例については、Javadoc FAQの\fImakefiles\fRに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html#makefiles)を参照してください
 .sp
 .if n \{\
 .RS 4
@@ -3642,7 +3642,7 @@
 .if n \{\
 .RE
 .\}
-.SS ""
+.SS "注意"
 .sp
 .RS 4
 .ie n \{\
@@ -3652,7 +3652,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-windowtitle\fRץάȡ\fIjavadoc\fRޥɤˤäƥɥȡȥ뤬ɥȥ˥ԡޤ\fI\-windowtitle\fRץΥƥȤϡ\fI\-doctitle\fRץƱǤHTMLϴޤޤޤ󡣤ϡHTMLɥȥˤΤޤޤΥƥȤȤɽΤɤǤ
+\fI\-windowtitle\fRオプションを省略すると、\fIjavadoc\fRコマンドによってドキュメント・タイトルがウィンドウ・タイトルにコピーされます。\fI\-windowtitle\fRオプションのテキストは、\fI\-doctitle\fRオプションと同じですが、HTMLタグは含まれません。これは、HTMLタグが、ウィンドウ・タイトル内にそのままのテキストとして表示されるのを防ぐためです。
 .RE
 .sp
 .RS 4
@@ -3663,7 +3663,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-footer\fRץάȡ\fIjavadoc\fRޥɤˤäƥإåƥȤեå˥ԡޤ
+\fI\-footer\fRオプションを省略すると、\fIjavadoc\fRコマンドによってヘッダー・テキストがフッターにコピーされます。
 .RE
 .sp
 .RS 4
@@ -3674,9 +3674,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ǥɬפޤ󤬡\fI\-classpath\fR\fI\-link\fRפʥץǤ
-.RE
-.SH "Ūʥȥ֥륷塼ƥ"
+この例では必要ありませんが、\fI\-classpath\fRと\fI\-link\fRも重要なオプションです。
+.RE
+.SH "一般的なトラブルシューティング"
 .sp
 .RS 4
 .ie n \{\
@@ -3686,7 +3686,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjavadoc\fRޥɤͭʥ饹̾ޤեΤߤɤ߼ޤ\fIjavadoc\fRޥɤեƤɤ߼äƤʤϡ饹̾ͭǤ뤳Ȥǧޤեν򻲾ȤƤ
+\fIjavadoc\fRコマンドは有効なクラス名を含むファイルのみを読み取ります。\fIjavadoc\fRコマンドがファイルの内容を正しく読み取っていない場合は、クラス名が有効であることを確認します。ソース・ファイルの処理を参照してください。
 .RE
 .sp
 .RS 4
@@ -3697,27 +3697,27 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̤Զ礪ӥȥ֥륷塼ƥ󥰤ΥҥȤˤĤƤϡJavadoc FAQ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html)򻲾ȤƤ
-.RE
-.SH "顼ȷٹ"
+共通の不具合およびトラブルシューティングのヒントについては、Javadoc FAQ
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html)を参照してください。
+.RE
+.SH "エラーと警告"
 .PP
-顼ӷٹåˤϡե̾(ɥơ󡦥ιԤǤϤʤ)ιֹ椬ޤޤޤ
+エラーおよび警告メッセージには、ファイル名と宣言行(ドキュメンテーション・コメント内の特定の行ではない)の行番号が含まれます。
 .PP
-ȤСå\fI֥顼: Class1\&.javaɤ߹ޤ\fRϡ\fIjavadoc\fRޥɤ\fIClass1\&.jav\fR\fIa\fR򸽺ߤΥǥ쥯ȥ˥ɤ褦ȤƤ뤳Ȥ̣ޤ饹̾ϤΥѥ(Фޤ)ɽޤ
-.SH "Ķ"
+たとえば、メッセージ\fI「エラー: Class1\&.javaを読み込めません」\fRは、\fIjavadoc\fRコマンドが\fIClass1\&.jav\fR\fIa\fRを現在のディレクトリにロードしようとしていることを意味します。クラス名はそのパス(絶対または相対)で表示されます。
+.SH "環境"
 .PP
 CLASSPATH
 .RS 4
-\fICLASSPATH\fRϡ\fIjavadoc\fRޥɤ桼饹եθФ˻Ѥѥ󶡤ĶѿǤδĶѿϡ\fI\-classpath\fRץˤäƥС饤ɤޤǥ쥯ȥϥߥ(Windowsξ)ޤϥ(Oracle Solarisξ)Ƕڤޤ
-.sp
-\fBWindows\fR:
+\fICLASSPATH\fRは、\fIjavadoc\fRコマンドがユーザー・クラス・ファイルの検出に使用するパスを提供する環境変数です。この環境変数は、\fI\-classpath\fRオプションによってオーバーライドされます。ディレクトリはセミコロン(Windowsの場合)またはコロン(Oracle Solarisの場合)で区切ります。
+.sp
+\fBWindowsの例\fR:
 \fI\&.;C:\eclasses;C:\ehome\ejava\eclasses\fR
 .sp
-\fBOracle Solaris\fR:
+\fBOracle Solarisの例\fR:
 \fI\&.:/home/classes:/usr/local/java/classes\fR
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -3773,7 +3773,7 @@
 .\}
 javap(1)
 .RE
-.SH "Ϣɥ"
+.SH "関連ドキュメント"
 .sp
 .RS 4
 .ie n \{\
@@ -3783,7 +3783,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JavadocƥΥ
+Javadocテクノロジ
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/index\&.html)
 .RE
 .sp
@@ -3795,7 +3795,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饹θˡ
+クラスの検出方法
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)
 .RE
 .sp
@@ -3807,7 +3807,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JavadocġǤDocȤεˡ
+JavadocツールでのDocコメントの記述方法
 (http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html)
 .RE
 .sp
@@ -3819,7 +3819,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-URL⡢Uniform Resource Locators
+URLメモ、Uniform Resource Locators
 (http://www\&.ietf\&.org/rfc/rfc1738\&.txt)
 .RE
 .sp
@@ -3831,7 +3831,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-HTMLɸࡢHTML Document Representation (41972654137321)
+HTML標準、HTML Document Representation (4197265および4137321)
 (http://www\&.w3\&.org/TR/REC\-html40/charset\&.html#h\-5\&.2\&.2)
 .RE
 .br
--- a/jdk/src/linux/doc/man/ja/javah.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/javah.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javah
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javah" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "javah" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javah \- Java饹Cإåȥեޤ
-.SH ""
+javah \- JavaクラスからCヘッダーとソース・ファイルを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,102 +64,102 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIfully\-qualified\-class\-name\fR
 .RS 4
-CإåȥեѴ륯饹δ줿ꡣ
+Cヘッダーとソース・ファイルに変換されるクラスの完全修飾された場所。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjavah\fRޥɤϡͥƥ֡᥽åɤ뤿ɬפCإåȥեޤ줿إåȥեϡͥƥ֡ɤ饪֥ȤΥ󥹥ѿ򻲾Ȥ뤿CץˤäƻѤޤ\fI\&.h\fRեϡб륯饹Ȱפ֤\fIstruct\fRޤߤޤ\fIstruct\fRΥեɤϡ饹Υ󥹥ѿбޤ
+\fIjavah\fRコマンドは、ネイティブ・メソッドを実装するために必要なCヘッダーとソース・ファイルを生成します。作成されたヘッダーとソース・ファイルは、ネイティブ・ソース・コードからオブジェクトのインスタンス変数を参照するためにCプログラムによって使用されます。\fI\&.h\fRファイルは、対応するクラスと一致する配置を持つ\fIstruct\fR定義を含みます。\fIstruct\fRのフィールドは、クラスのインスタンス変数に対応します。
 .PP
-إåեȤ빽¤Τ̾ϥ饹̾ޤ\fIjavah\fRޥɤϤ륯饹ѥåˤ硢ѥå̾ϥإåե̾ȹ¤̾ξƬղäޤ(_)̾ζڤʸȤƻѤޤ
+ヘッダー・ファイルとその中で宣言される構造体の名前はクラスの名前から派生します。\fIjavah\fRコマンドに渡されるクラスがパッケージの中にある場合、パッケージ名はヘッダー・ファイル名と構造体名の両方の先頭に付加されます。下線(_)が名前の区切り文字として使用されます。
 .PP
-ǥեȤǤ\fIjavah\fRޥɤϡޥɥ饤˥ꥹȤƥ饹ΥإåեߤΥǥ쥯ȥ˥ե֤ޤեˤϡ\fI\-stubs\fRץѤƤ1ĤΥեˡꥹȤ줿٤ƤΥ饹η̤Ϣ뤹ˤϡ\fI\-o\fRץѤƤ
+デフォルトでは\fIjavah\fRコマンドは、コマンドラインにリストされる各クラスのヘッダー・ファイルを作成し、現在のディレクトリにファイルを置きます。ソース・ファイルを作成するには、\fI\-stubs\fRオプションを使用してください。1つのファイルの中に、リストされたすべてのクラスの結果を連結するには、\fI\-o\fRオプションを使用してください。
 .PP
-Java Native Interface (JNI)ϥإåޤϥ֡եɬפȤޤ\fIjavah\fRޥɤϰ³JNIΥͥƥ֡᥽åɤɬפʥͥƥ֡᥽åɴؿץȥפ˻ѤǤޤ\fIjavah\fRޥɤϥǥեȤJNIνϤη̤\fI\&.h\fRե˳Ǽޤ
-.SH "ץ"
+Java Native Interface (JNI)はヘッダー情報またはスタブ・ファイルを必要としません。\fIjavah\fRコマンドは引き続きJNI形式のネイティブ・メソッドに必要なネイティブ・メソッド関数プロトタイプの生成に使用できます。\fIjavah\fRコマンドはデフォルトでJNI形式の出力を生成し、その結果を\fI\&.h\fRファイルに格納します。
+.SH "オプション"
 .PP
 \-o \fIoutputfile\fR
 .RS 4
-ޥɥ饤˥ꥹȤ줿٤ƤΥ饹Фơ̤ΥإåޤϥեϢ뤷ƽϥե˳Ǽޤ\fI\-o\fRޤ\fI\-d\fRΤɤ餫Τ߻ѤǤޤ
+コマンドラインにリストされたすべてのクラスに対して、結果のヘッダーまたはソース・ファイルを連結して出力ファイルに格納します。\fI\-o\fRまたは\fI\-d\fRのどちらかのみ使用できます。
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-\fIjavah\fRإåեޤϥ֡ե¸롢ǥ쥯ȥꤷޤ\fI\-d\fRޤ\fI\-o\fRΤɤ餫Τ߻ѤǤޤ
+\fIjavah\fRがヘッダー・ファイルまたはスタブ・ファイルを保存する、ディレクトリを設定します。\fI\-d\fRまたは\fI\-o\fRのどちらかのみ使用できます。
 .RE
 .PP
 \-stubs
 .RS 4
-\fIjavah\fRޥɤJava֥ȡե뤫Cޤ
+\fIjavah\fRコマンドが、Javaオブジェクト・ファイルからC宣言を生成します。
 .RE
 .PP
 \-verbose
 .RS 4
-ܺٽϤꤷեξ֤˴ؤå\fIjavah\fRޥɤ\fIɸ\fR˽Ϥޤ
+詳細出力を指定し、作成ファイルの状態に関するメッセージを、\fIjavah\fRコマンドが\fI標準出力\fRに出力します。
 .RE
 .PP
 \-help
 .RS 4
-\fIjavah\fRλˡˤĤƤΥإסåϤޤ
+\fIjavah\fRの使用方法についてのヘルプ・メッセージを出力します。
 .RE
 .PP
 \-version
 .RS 4
-\fIjavah\fRޥɤΥ꡼Ϥޤ
+\fIjavah\fRコマンドのリリース情報を出力します。
 .RE
 .PP
 \-jni
 .RS 4
-JNIΥͥƥ֡᥽åɵǽץȥפޤϥե\fIjavah\fRޥɤޤɸϤǤ뤿ᡢ\fI\-jni\fRλѤϥץǤ
+JNI形式のネイティブ・メソッド機能プロトタイプを含む出力ファイルを、\fIjavah\fRコマンドが作成します。これは標準出力であるため、\fI\-jni\fRの使用はオプションです。
 .RE
 .PP
 \-classpath \fIpath\fR
 .RS 4
-饹õ\fIjavah\fRޥɤѤѥꤷޤǥեȤޤ\fICLASSPATH\fRĶѿ򥪡С饤ɤޤǥ쥯ȥOracle SolarisξϥǡWindowsξϥߥǶڤޤѥΰŪʷϼΤ褦ˤʤޤ
+クラスを探すために\fIjavah\fRコマンドが使用するパスを指定します。デフォルトまたは\fICLASSPATH\fR環境変数の設定をオーバーライドします。ディレクトリはOracle Solarisの場合はコロンで、Windowsの場合はセミコロンで区切られます。パスの一般的な形式は次のようになります。
 .sp
-\fBOracle Solaris\fRξ:
+\fBOracle Solaris\fRの場合:
 .sp
 \&.:\fIyour\-path\fR
 .sp
-:
+例:
 \fI\&.:/home/avh/classes:/usr/local/java/classes\fR
 .sp
-\fBWindows\fRξ:
+\fBWindows\fRの場合:
 .sp
 \&.;\fIyour\-path\fR
 .sp
-:
+例:
 \fI\&.;C:\eusers\edac\eclasses;C:\etools\ejava\eclasses\fR
 .sp
-ص塢*Υ١̾ޤ९饹ѥǤϡ\fI\&.jar\fRޤ\fI\&.JAR\fRĥҤ˻ĥǥ쥯ȥΤ٤ƤΥեΥꥹȤꤹΤƱȤߤʤޤ
+便宜上、*のベース名を含むクラス・パス要素は、\fI\&.jar\fRまたは\fI\&.JAR\fRを拡張子に持つディレクトリ内のすべてのファイルのリストを指定するのと同等とみなされます。
 .sp
-ȤСǥ쥯ȥ\fImydir\fR\fIa\&.jar\fR\fIb\&.JAR\fRޤޤƤ硢饹ѥ\fImydir/*\fR\fIA\fR\fI\&.jar:b\&.JAR\fRŸޤJARեν֤̤ȤʤޤΥꥹȤˤϡեޤᡢꤵ줿ǥ쥯ȥΤ٤ƤJARե뤬ޤޤޤ*ʤ륯饹ѥȥϡߤΥǥ쥯ȥΤ٤ƤJARեΥꥹȤŸޤ\fICLASSPATH\fRĶѿ⡢ˤƱͤŸޤ饹ѥΥ磻ɥɤŸϡJavaۥޥ(JVM)γ˹ԤޤJavaץϡĶ䤤礻ŸƤʤ磻ɥɤ򻲾Ȥޤ󡣤ȤС\fISystem\&.getenv("CLASSPATH")\fR򥳡뤷䤤礻Ǥ
+たとえば、ディレクトリ\fImydir\fRに\fIa\&.jar\fRと\fIb\&.JAR\fRが含まれている場合、クラス・パス要素\fImydir/*\fRは\fIA\fR\fI\&.jar:b\&.JAR\fRに展開されますが、JARファイルの順番は未指定となります。このリストには、隠しファイルも含め、指定されたディレクトリ内のすべてのJARファイルが含まれます。*からなるクラス・パス・エントリは、現在のディレクトリ内のすべてのJARファイルのリストに展開されます。\fICLASSPATH\fR環境変数も、定義時には同様に展開されます。クラス・パスのワイルドカードの展開は、Java仮想マシン(JVM)の開始前に行われます。Javaプログラムは、環境を問い合せる場合を除き、展開されていないワイルドカードを参照しません。たとえば、\fISystem\&.getenv("CLASSPATH")\fRをコールして問い合せる場合です。
 .RE
 .PP
 \-bootclasspath \fIpath\fR
 .RS 4
-֡ȥȥåס饹ɤѥꤷޤ֡ȥȥåס饹ϡǥեȤǤ\fIjre\elib\ert\&.jar\fR¾ΤĤJARեˤ롢Javaץåȥե륯饹Ǥ
+ブートストラップ・クラスをロードするパスを指定します。ブートストラップ・クラスは、デフォルトでは\fIjre\elib\ert\&.jar\fRおよび他のいくつかのJARファイルにある、コアJavaプラットフォームを実装するクラスです。
 .RE
 .PP
 \-old
 .RS 4
-ŤJDK 1\&.0Υإåե褦˻ꤷޤ
+古いJDK 1\&.0形式のヘッダー・ファイルを生成するように指定します。
 .RE
 .PP
 \-force
 .RS 4
-ϥե뤬˽񤭹ޤ褦˻ꤷޤ
+出力ファイルが常に書き込まれるように指定します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/javap.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/javap.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javap
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javap" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "javap" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javap \- 1İʾΥ饹եե֥뤷ޤ
-.SH ""
+javap \- 1つ以上のクラス・ファイルを逆アセンブルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,51 +64,51 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclassfile\fR
 .RS 4
-νоݤȤʤ롢Ƕڤä1İʾΥ饹(DocFooter\&.classʤ)饹ѥǸФǤ륯饹򡢥ե̾ޤURL(\fIfile:///home/user/myproject/src/DocFooter\&.class\fRʤ)ǻǤޤ
+注釈の処理対象となる、空白で区切った1つ以上のクラス(DocFooter\&.classなど)。クラス・パスで検出できるクラスを、ファイル名またはURL(\fIfile:///home/user/myproject/src/DocFooter\&.class\fRなど)で指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjavap\fRޥɤϡ1ĤޤʣΥ饹եե֥뤷ޤνϤϻꤹ륪ץˤۤʤޤץꤷʤ硢\fIjavap\fRޥɤϡΥѥåϤ줿饹protectedpublicΥեɤȥ᥽åɤϤޤ\fIjavap\fRޥɤϤνϤ\fIɸ\fRɽޤ
-.SH "ץ"
+\fIjavap\fRコマンドは、1つまたは複数のクラス・ファイルを逆アセンブルします。その出力は指定するオプションにより異なります。オプションを指定しない場合、\fIjavap\fRコマンドは、そのパッケージ、渡されたクラスのprotectedおよびpublicのフィールドとメソッドを出力します。\fIjavap\fRコマンドはその出力を\fI標準出力\fRに表示します。
+.SH "オプション"
 .PP
 \-help, \-\-help, \-?
 .RS 4
-\fIjavap\fRޥɤˤĤƤΥإסåϤޤ
+\fIjavap\fRコマンドについてのヘルプ・メッセージを出力します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-l
 .RS 4
-ֹȥѿɽϤޤ
+行番号とローカル変数表を出力します。
 .RE
 .PP
 \-public
 .RS 4
-public饹ӥСΤɽޤ
+publicクラスおよびメンバーのみ表示します。
 .RE
 .PP
 \-protected
 .RS 4
-protectedpublicΥ饹ȥСΤߤɽޤ
+protectedおよびpublicのクラスとメンバーのみを表示します。
 .RE
 .PP
 \-private, \-p
 .RS 4
-٤ƤΥ饹ȥСɽޤ
+すべてのクラスとメンバーを表示します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤵ줿ץJVMϤޤ򼨤ޤ
+指定されたオプションをJVMに渡します。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -120,51 +120,51 @@
 .if n \{\
 .RE
 .\}
-JVMץξܺ٤ϡޥɤΥޥ˥奢򻲾ȤƤ
+JVMオプションの詳細は、コマンドのマニュアルを参照してください。
 .RE
 .PP
 \-s
 .RS 4
-η˥Ϥޤ
+内部の型シグニチャを出力します。
 .RE
 .PP
 \-sysinfo
 .RS 4
-Υ饹Υƥ(ѥաMD5ϥå)ɽޤ
+処理中のクラスのシステム情報(パス、サイズ、日付、MD5ハッシュ)を表示します。
 .RE
 .PP
 \-constants
 .RS 4
-\fIstatic final\fRɽޤ
+\fIstatic final\fR定数を表示します。
 .RE
 .PP
 \-c
 .RS 4
-饹γƥ᥽åɤΤ˵ե֥뤵륳ɡʤJavaХȥɤʤ̿ɽޤ
+クラスの各メソッドのために逆アセンブルされるコード、すなわちJavaバイトコードからなる命令を表示します。
 .RE
 .PP
 \-verbose
 .RS 4
-᥽åɤΥålocalsargumentsοϤޤ
+メソッドのスタック・サイズ、localsとargumentsの数を出力します。
 .RE
 .PP
 \-classpath \fIpath\fR
 .RS 4
-饹õ\fIjavap\fRޥɤѤѥꤷޤǥեȤޤ\fICLASSPATH\fRĶѿ򥪡С饤ɤޤ
+クラスを探すために\fIjavap\fRコマンドが使用するパスを指定します。デフォルトまたは\fICLASSPATH\fR環境変数の設定をオーバーライドします。
 .RE
 .PP
 \-bootclasspath \fIpath\fR
 .RS 4
-֡ȥȥåס饹ɤѥꤷޤ֡ȥȥåס饹ϡǥեȤǤ\fIjre/lib/rt\&.jar\fR¾ΤĤJARեˤ롢Javaץåȥե륯饹Ǥ
+ブートストラップ・クラスをロードするパスを指定します。ブートストラップ・クラスは、デフォルトでは\fIjre/lib/rt\&.jar\fRおよび他のいくつかのJARファイルにある、コアJavaプラットフォームを実装するクラスです。
 .RE
 .PP
 \-extdir \fIdirs\fR
 .RS 4
-󥹥ȡ뤵줿ĥǽ򸡺򥪡С饤ɤޤĥǽΥǥեȰ֤\fIjava\&.ext\&.dirs\fRǤ
+インストールされた拡張機能を検索する場所をオーバーライドします。拡張機能のデフォルト位置は\fIjava\&.ext\&.dirs\fRです。
 .RE
-.SH ""
+.SH "例"
 .PP
-\fIDocFooter\fR饹򥳥ѥ뤷ޤ
+次の\fIDocFooter\fRクラスをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -193,7 +193,7 @@
 .RE
 .\}
 .PP
-\fIjavap DocFooter\&.class\fRޥɤνϤϼޤ
+\fIjavap DocFooter\&.class\fRコマンドからの出力は次を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -212,7 +212,7 @@
 .RE
 .\}
 .PP
-\fIjavap \-c DocFooter\&.class\fRޥɤνϤϼޤ
+\fIjavap \-c DocFooter\&.class\fRコマンドからの出力は次を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -283,7 +283,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/javaws.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/javaws.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javaws
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Web Startġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Web Startツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javaws" "1" "2013ǯ1121" "JDK 8" "Java Web Startġ"
+.TH "javaws" "1" "2013年11月21日" "JDK 8" "Java Web Startツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javaws \- Java Web Startưޤ
-.SH ""
+javaws \- Java Web Startを起動します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -74,147 +74,147 @@
 .PP
 \fIrun\-options\fR
 .RS 4
-ޥɥ饤\fI¹ԥץ\fR\fI¹ԥץ\fRǤդνǻǤޤ¹ԥץ򻲾ȤƤ
+コマンドライン\fI実行オプション\fR。\fI実行オプション\fRは任意の順序で指定できます。実行オプションを参照してください。
 .RE
 .PP
 \fIjnlp\fR
 .RS 4
-JNLP (Java Network Launching Protocol)եΥѥޤURL (Uniform Resource Locator)Τɤ餫
+JNLP (Java Network Launching Protocol)ファイルのパスまたはURL (Uniform Resource Locator)のどちらか。
 .RE
 .PP
-\fI楪ץ\fR
+\fI制御オプション\fR
 .RS 4
-ޥɥ饤\fI楪ץ\fR\fI楪ץ\fRǤդνǻǤޤ楪ץ򻲾ȤƤ
+コマンドライン\fI制御オプション\fR。\fI制御オプション\fRは任意の順序で指定できます。制御オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fB:\fR
-\fIjavaws\fRޥɤϡOracle SolarisǤϻѤǤޤ
+\fB注意:\fR
+\fIjavaws\fRコマンドは、Oracle Solarisでは使用できません。
 .PP
-\fIjavaws\fRޥɤϡJNLPΥե󥹼ǤJava Web StartưޤJava Web StartϡͥåȥưJavaץꥱ󤪤ӥץåȤưޤ
+\fIjavaws\fRコマンドは、JNLPのリファレンス実装であるJava Web Startを起動します。Java Web Startは、ネットワーク上で動作するJavaアプリケーションおよびアプレットを起動します。
 .PP
-JNLPե뤬ꤵȡ\fIjavaws\fRޥɤJNLPեǻꤷJavaץꥱޤϥץåȤưޤ
+JNLPファイルが指定されると、\fIjavaws\fRコマンドはJNLPファイルで指定したJavaアプリケーションまたはアプレットを起動します。
 .PP
-\fIjavaws\fRưġˤϡߤΥ꡼ǥݡȤƤ1ȤΥץ󤬤ޤΥץϾΥ꡼ǤϺǽޤ
-.SH "¹ԥץ"
+\fIjavaws\fR起動ツールには、現在のリリースでサポートされている1組のオプションがあります。ただし、これらのオプションは将来のリリースでは削除される可能性があります。
+.SH "実行オプション"
 .PP
 \-offline
 .RS 4
-Java Web Start򥪥ե饤󡦥⡼ɤǼ¹Ԥޤ
+Java Web Startをオフライン・モードで実行します。
 .RE
 .PP
 \-Xnosplash
 .RS 4
-ץå̤ɽޤ
+初期スプラッシュ画面を表示しません。
 .RE
 .PP
 \-open \fIarguments\fR
 .RS 4
-ΥץꤹȡJNLPեΰ\fI\-open\fR
-\fIarguments\fR֤ޤ
+このオプションを指定すると、JNLPファイル内の引数が\fI\-open\fR
+\fIarguments\fRに置き換わります。
 .RE
 .PP
 \-print \fIarguments\fR
 .RS 4
-ΥץꤹȡJNLPեΰ\fI\-print\fR
-\fIarguments\fR֤ޤ
+このオプションを指定すると、JNLPファイル内の引数が\fI\-print\fR
+\fIarguments\fRに置き換わります。
 .RE
 .PP
 \-online
 .RS 4
-饤󡦥⡼ɤѤޤϡǥեȤưǤ
+オンライン・モードを使用します。これは、デフォルトの動作です。
 .RE
 .PP
 \-wait
 .RS 4
-\fIjavaws\fRץϡץꥱ󤬽λޤǽλޤWindowsץåȥեǤϡΥץȤ˵ǽޤ
+\fIjavaws\fRプロセスは、アプリケーションが終了するまで終了しません。Windowsプラットフォーム上では、このオプションは説明したとおりに機能しません。
 .RE
 .PP
 \-verbose
 .RS 4
-ɲäνϤɽޤ
+追加の出力を表示します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JavaۥޥoptionϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンにoptionを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
 .PP
 \-system
 .RS 4
-ץꥱ򥷥ƥࡦåΤߤ¹Ԥޤ
+アプリケーションをシステム・キャッシュのみから実行します。
 .RE
-.SH "楪ץ"
+.SH "制御オプション"
 .PP
 \-viewer
 .RS 4
-Javaȥ롦ѥͥǥå塦ӥ塼ɽޤ
+Javaコントロール・パネルでキャッシュ・ビューアを表示します。
 .RE
 .PP
 \-clearcache
 .RS 4
-󥹥ȡ뤵Ƥʤ٤ƤΥץꥱ򥭥å夫ޤ
+インストールされていないすべてのアプリケーションをキャッシュから削除します。
 .RE
 .PP
 \-userConfig \fIproperty\-name\fR
 .RS 4
-ꤵ줿ǥץȡץѥƥ򥯥ꥢޤ
+指定されたデプロイメント・プロパティをクリアします。
 .RE
 .PP
 \-userConfig \fIproperty\-name property\-value\fR
 .RS 4
-ꤵ줿ǥץȡץѥƥꤵ줿ͤꤷޤ
+指定されたデプロイメント・プロパティを指定された値に設定します。
 .RE
 .PP
 \-uninstall
 .RS 4
-å夫餹٤ƤΥץꥱޤ
+キャッシュからすべてのアプリケーションを削除します。
 .RE
 .PP
 \-uninstall \fIjnlp\fR
 .RS 4
-å夫饢ץꥱޤ
+キャッシュからアプリケーションを削除します。
 .RE
 .PP
 \-print \fIimport\-options \fRjnlp
 .RS 4
-å˥ץꥱ򥤥ݡȤޤ
+キャッシュにアプリケーションをインポートします。
 .RE
-.SH "ݡȡץ"
+.SH "インポート・オプション"
 .PP
 \-silent
 .RS 4
-ȡ⡼ɤǥݡȤޤ(桼󥿥եɽޤ)
+サイレント・モードでインポートします(ユーザー・インタフェースは表示されません)。
 .RE
 .PP
 \-system
 .RS 4
-ƥࡦå˥ץꥱ򥤥ݡȤޤ
+システム・キャッシュにアプリケーションをインポートします。
 .RE
 .PP
 \-codebase \fIurl\fR
 .RS 4
-ꤷɥ١꥽ޤ
+指定したコードベースからリソースを取得します。
 .RE
 .PP
 \-shortcut
 .RS 4
-桼ץץȤХ硼ȥåȤ򥤥󥹥ȡ뤷ޤΥץϡ
-\fI\-silent\fRץѤʤȸ̤ޤ
+ユーザーがプロンプトを受け入れればショートカットをインストールします。このオプションは、
+\fI\-silent\fRオプションも使用しないと効果がありません。
 .RE
 .PP
 \-association
 .RS 4
-桼ץץȤХ򥤥󥹥ȡ뤷ޤΥץϡ
-\fI\-silent\fRץѤʤȸ̤ޤ
+ユーザーがプロンプトを受け入れればアソシエーションをインストールします。このオプションは、
+\fI\-silent\fRオプションも使用しないと効果がありません。
 .RE
 .PP
-\fB:\fR\fIjavaws \-shortcut \-uninstall\fR
-.SH "ե"
+\fB注意:\fR\fIjavaws \-shortcut \-uninstall\fR
+.SH "ファイル"
 .PP
-桼ӥƥࡦåʤӤdeployment\&.propertiesեξܺ٤ϡե뤪ӥץѥƥΥǥץ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/deployment/deployment\-guide/properties\&.html)򻲾ȤƤ
-.SH "Ϣ"
+ユーザーおよびシステム・キャッシュならびにdeployment\&.propertiesファイルの詳細は、構成ファイルおよびプロパティのデプロイメント
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/deployment/deployment\-guide/properties\&.html)を参照してください
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jcmd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jcmd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jcmd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jcmd" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jcmd" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jcmd \- ¹Javaۥޥ(JVM)˿ǥޥɡꥯȤޤ
-.SH ""
+jcmd \- 実行中のJava仮想マシン(JVM)に診断コマンド・リクエストを送信します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -91,53 +91,53 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "説明"
 .PP
-\fIjcmd\fR桼ƥƥϡJVM˿ǥޥɡꥯȤ뤿˻ѤޤJVMƯƤΤƱޥǻѤJVMεư˻ѤΤƱͭ桼ӥ롼׼̻ҤäƤɬפޤ
+\fIjcmd\fRユーティリティは、JVMに診断コマンド・リクエストを送信するために使用されます。これはJVMが稼働しているのと同じマシンで使用し、JVMの起動に使用したものと同じ有効ユーザーおよびグループ識別子を持っている必要があります。
 .PP
-\fB:\fR
-⡼ȡޥ󤫤顢ޤ̤μ̻Ҥǿǥޥɤưˤϡ\fIcom\&.sun\&.management\&.DiagnosticCommandMBean\fR󥿥եѤǤޤ\fIDiagnosticCommandMBean\fR󥿥եξܺ٤ϡhttp://download\&.java\&.net/jdk8/docs/jre/api/management/extension/com/sun/management/DiagnosticCommandMBean\&.htmlˤAPIɥȤ򻲾ȤƤ
+\fB注意:\fR
+リモート・マシンから、または別の識別子で診断コマンドを起動するには、\fIcom\&.sun\&.management\&.DiagnosticCommandMBean\fRインタフェースを使用できます。\fIDiagnosticCommandMBean\fRインタフェースの詳細は、http://download\&.java\&.net/jdk8/docs/jre/api/management/extension/com/sun/management/DiagnosticCommandMBean\&.htmlにあるAPIドキュメントを参照してください。
 .PP
-\fIjcmd\fRʤޤ\fI\- l\fRץꤷƼ¹Ԥϡ¹Javaץ̻ҤΥꥹȤᥤ󡦥饹ӥץεư˻Ѥ줿ޥɥ饤ȤȤ˽Ϥޤ\fI\-h\fRޤ\fI\-help\fRץꤷ\fIjcmd\fR¹ԤȡġΥإסåϤޤ
+\fIjcmd\fRを引数なしまたは\fI\- l\fRオプションを指定して実行した場合は、実行中のJavaプロセス識別子のリストが、メイン・クラスおよびプロセスの起動に使用されたコマンドライン引数とともに出力されます。\fI\-h\fRまたは\fI\-help\fRオプションを指定して\fIjcmd\fRを実行すると、ツールのヘルプ・メッセージが出力されます。
 .PP
-ץ̻(\fIpid\fR)ޤϥᥤ󡦥饹(\fImain\-class\fR)ǽΰȤƻꤷ硢\fIjcmd\fRϡ̻ҤꤷJavaץˡᥤ󡦥饹̾ꤷϤ٤ƤJavaץ˿ǥޥɡꥯȤޤץ̻ҤȤ\fI0\fRꤷơ٤ƤλѲǽJavaץ˿ǥޥɡꥯȤ뤳ȤǤޤǥޥɡꥯȤȤơΤ줫Ѥޤ
+プロセス識別子(\fIpid\fR)またはメイン・クラス(\fImain\-class\fR)を最初の引数として指定した場合、\fIjcmd\fRは、識別子を指定した場合はJavaプロセスに、メイン・クラスの名前を指定した場合はすべてのJavaプロセスに診断コマンド・リクエストを送信します。プロセス識別子として\fI0\fRを指定して、すべての使用可能なJavaプロセスに診断コマンド・リクエストを送信することもできます。診断コマンド・リクエストとして、次のいずれかを使用します。
 .PP
 Perfcounter\&.print
 .RS 4
-ꤷJavaץǻѲǽʥѥեޥ󥹡󥿤Ϥޤѥեޥ󥹡󥿤ΥꥹȤJavaץˤäưۤʤ礬ޤ
+指定したJavaプロセスで使用可能なパフォーマンス・カウンタが出力されます。パフォーマンス・カウンタのリストはJavaプロセスによって異なる場合があります。
 .RE
 .PP
 \-f \fIfilename\fR
 .RS 4
-ǥޥɤɤ߼ꡢꤷJavaץե̾\fI\-f\fRץǤΤ߻Ѥޤեγƥޥɤϡ1ԤǵҤɬפޤֹ浭(\fI#\fR)ǻϤޤԤ̵뤵ޤ٤ƤιԤɤ߼뤫\fIstop\fRɤޤԤɤ߼ȡեνλޤ
+診断コマンドを読み取り、指定したJavaプロセスに送信するファイルの名前。\fI\-f\fRオプションでのみ使用します。ファイル内の各コマンドは、1行で記述する必要があります。番号記号(\fI#\fR)で始まる行は無視されます。すべての行が読み取られるか、\fIstop\fRキーワードを含む行が読み取られると、ファイルの処理が終了します。
 .RE
 .PP
 \fIcommand\fR [\fIarguments\fR]
 .RS 4
-ꤵ줿Javaץ륳ޥɡꤷץǻѤǤǥޥɤΥꥹȤϡΥץФ\fIhelp\fRޥɤɽޤƿǥޥɤȼΰåȤޤޥɤʸӻѲǽʰΥꥹȤɽˤϡ\fIhelp\fRޥɤΰȤƥޥ̾Ѥޤ
+指定されたJavaプロセスに送信するコマンド。指定したプロセスで使用できる診断コマンドのリストは、このプロセスに対して\fIhelp\fRコマンドを送信すれば表示されます。各診断コマンドに独自の引数セットがあります。コマンドの説明、構文および使用可能な引数のリストを表示するには、\fIhelp\fRコマンドの引数としてコマンド名を使用します。
 .sp
-\fB:\fR
-˥ڡޤޤƤϡŰޤŰ(\fI\*(Aq\fRޤ\fI"\fR)ǰϤɬפޤäơڥ졼ƥ󥰡ƥࡦ뤬ʤ褦ˡХåå(\fI\e\fR)ǰŰޤŰ򥨥פɬפޤޤϡΰŰǰϤǤ顢ŰǰϤळȤǤޤ(ޤŰǰϤǤ顢ŰǰϤ)
+\fB注意:\fR
+引数にスペースが含まれている場合は、一重引用符または二重引用符(\fI\*(Aq\fRまたは\fI"\fR)で囲む必要があります。加えて、オペレーティング・システム・シェルが引用符を処理しないように、バックスラッシュ(\fI\e\fR)で一重引用符または二重引用符をエスケープする必要があります。または、これらの引数を一重引用符で囲んでから、二重引用符で囲むこともできます(または二重引用符で囲んでから、一重引用符で囲む)。
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
-ƥץϸߤ¾ŪǤ
+各オプションは互いに排他的です。
 .PP
 \-f \fIfilename\fR
 .RS 4
-ꤵ줿ե뤫饳ޥɤɤ߼ޤΥץϡǽΰȤƥץ̻Ҥޤϥᥤ󡦥饹ꤹˤΤ߻ѤǤޤեγƥޥɤϡ1ԤǵҤɬפޤֹ浭(\fI#\fR)ǻϤޤԤ̵뤵ޤ٤ƤιԤɤ߼뤫\fIstop\fRɤޤԤɤ߼ȡեνλޤ
+指定されたファイルからコマンドを読み取ります。このオプションは、最初の引数としてプロセス識別子またはメイン・クラスを指定する場合にのみ使用できます。ファイル内の各コマンドは、1行で記述する必要があります。番号記号(\fI#\fR)で始まる行は無視されます。すべての行が読み取られるか、\fIstop\fRキーワードを含む行が読み取られると、ファイルの処理が終了します。
 .RE
 .PP
 \-h, \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-l
 .RS 4
-¹Javaץ̻ҤΥꥹȤᥤ󡦥饹ӥޥɥ饤ȤȤ˽Ϥޤ
+実行中のJavaプロセス識別子のリストをメイン・クラスおよびコマンドライン引数とともに出力します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jconsole.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jconsole.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jconsole
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaȥ֥륷塼ƥ󥰡ץե󥰡˥󥰤Ӵġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaトラブルシューティング、プロファイリング、モニタリングおよび管理ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jconsole" "1" "2013ǯ1121" "JDK 8" "Javaȥ֥륷塼ƥ󥰡ץե󥰡˥"
+.TH "jconsole" "1" "2013年11月21日" "JDK 8" "Javaトラブルシューティング、プロファイリング、モニタリン"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jconsole \- Javaץꥱƻ뤪Ӵ뤿Υե롦󥽡򳫻Ϥޤ
-.SH ""
+jconsole \- Javaアプリケーションを監視および管理するためのグラフィカル・コンソールを開始します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,56 +64,56 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 connection = \fIpid\fR | \fIhost\fR:\fIport\fR | \fIjmxURL\fR
 .RS 4
-\fIpid\fRͤϥJavaۥޥ(JVM)ΥץIDǤJVM\fIjconsole\fRޥɤ¹ԤƤ桼IDƱ桼IDǼ¹Ԥɬפޤ\fIhost:port\fRͤJVMưƤۥȡƥ̾ȡJVMϤȤ˥ƥࡦץѥƥ\fIcom\&.sun\&.management\&.jmxremote\&.port\fRǻꤷݡֹǤ\fIjmxUrl\fRͤϡJMXServiceURLǵҤƤ롢³JMXȤΥɥ쥹Ǥ
+\fIpid\fR値はローカルのJava仮想マシン(JVM)のプロセスIDです。JVMは\fIjconsole\fRコマンドを実行しているユーザーIDと同じユーザーIDで実行する必要があります。\fIhost:port\fR値はJVMが動作しているホスト・システムの名前と、JVMが開始したときにシステム・プロパティ\fIcom\&.sun\&.management\&.jmxremote\&.port\fRで指定したポート番号です。\fIjmxUrl\fR値は、JMXServiceURLで記述されている、接続されるJMXエージェントのアドレスです。
 .sp
-\fIconnection\fRѥ᡼ξܺ٤ϡJMXƥΥѤ˥󥰤Ӵ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/agent\&.html)򻲾ȤƤ
+\fIconnection\fRパラメータの詳細は、JMXテクノロジを使用したモニタリングおよび管理
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/agent\&.html)を参照してください
 .sp
-\fIJMXServiceURL\fR饹(
-http://docs\&.oracle\&.com/javase/8/docs/api/javax/management/remote/JMXServiceURL\&.html)⻲ȤƤ
+\fIJMXServiceURL\fRクラスの説明(
+http://docs\&.oracle\&.com/javase/8/docs/api/javax/management/remote/JMXServiceURL\&.html)も参照してください
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjconsole\fRޥɤϡ롦ޥޤϥ⡼ȡޥJavaץꥱȲۥޥδƻȴԤե롦󥽡롦ġưޤ
+\fIjconsole\fRコマンドは、ローカル・マシンまたはリモート・マシン上のJavaアプリケーションと仮想マシンの監視と管理を行うグラフィカル・コンソール・ツールを起動します。
 .PP
-WindowsǤϡ\fIjconsole\fRޥɤϥ󥽡롦ɥȴϢդƤޤ󡣤\fIjconsole\fRޥɤԤȡ顼򼨤ܥåɽޤ
-.SH "ץ"
+Windows上では、\fIjconsole\fRコマンドはコンソール・ウィンドウと関連付けられていません。ただし、\fIjconsole\fRコマンドが失敗すると、エラー情報を示すダイアログ・ボックスが表示されます。
+.SH "オプション"
 .PP
 \-interval\fI=n\fR
 .RS 4
-ֳ֤\fIn\fRäꤷޤ(ǥեȤ4)
+更新間隔を\fIn\fR秒に設定します(デフォルトは4秒)。
 .RE
 .PP
 \-notile
 .RS 4
-ǽ˥ɥ򥿥󥰤ޤ(ʣ³ξ)
+最初にウィンドウをタイリングしません(複数接続の場合)。
 .RE
 .PP
 \-pluginpath \fIplugins\fR
 .RS 4
-\fIJConsole\fRץ饰򸡺ǥ쥯ȥޤJARեΥꥹȤꤷޤ\fIplugins\fRѥˤ\fIMETA\-INF/services/com\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fRȤ̾ΥץХեޤǤɬפꡢˤϥץ饰󤴤Ȥ1ԤޤޤƤޤιԤ\fIcom\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fR饹Ƥ륯饹δ饹̾ꤷޤ
+\fIJConsole\fRプラグインを検索するディレクトリまたはJARファイルのリストを指定します。\fIplugins\fRパスには\fIMETA\-INF/services/com\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fRという名前のプロバイダ構成ファイルを含んでいる必要があり、これにはプラグインごとに1行が含まれています。その行は\fIcom\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fRクラスを実装しているクラスの完全修飾クラス名を指定します。
 .RE
 .PP
 \-version
 .RS 4
-꡼ɽƽλޤ
+リリース情報を表示して終了します。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjconsole\fRޥɤ¹ԤJVM\fIflag\fRϤޤ
+\fIjconsole\fRコマンドを実行したJVMに\fIflag\fRを渡します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -123,7 +123,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JConsoleλ
+JConsoleの使用
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/jconsole\&.html)
 .RE
 .sp
@@ -135,7 +135,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JMXƥΥѤ˥󥰤Ӵ
+JMXテクノロジを使用したモニタリングおよび管理
 
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/agent\&.html)
 .RE
@@ -148,7 +148,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIJMXServiceURL\fR饹(
+\fIJMXServiceURL\fRクラスの説明(
 http://docs\&.oracle\&.com/javase/8/docs/api/javax/management/remote/JMXServiceURL\&.html)
 .RE
 .br
--- a/jdk/src/linux/doc/man/ja/jdb.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jdb.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jdb
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jdb" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jdb" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jdb \- JavaץåȥեࡦץԶ򸡽Фӽޤ
-.SH ""
+jdb \- Javaプラットフォーム・プログラムの不具合を検出および修正します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,25 +64,25 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclass\fRname
 .RS 4
-ǥХåᥤ󡦥饹̾
+デバッグするメイン・クラスの名前。
 .RE
 .PP
 \fIarguments\fR
 .RS 4
-class\fImain()\fR᥽åɤϤ
+classの\fImain()\fRメソッドに渡す引数。
 .RE
-.SH ""
+.SH "説明"
 .PP
-JavaǥХå(JDB)ϡJava饹Ѥδñʥޥɥ饤󡦥ǥХåǤ\fIjdb\fRޥɤȤΥץJDBƤӽФޤ\fIjdb\fRޥɤϡJDBA (Java Platform Debugger Architecture)Ū˼¹Ԥޤϥ⡼ȤJavaۥޥ(JVM)θȥǥХåԤȤǤޤJava Platform Debugger Architecture (JDBA)
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)򻲾ȤƤ
-.SS "JDBåγ"
+Javaデバッガ(JDB)は、Javaクラス用の簡単なコマンドライン・デバッガです。\fIjdb\fRコマンドとそのオプションはJDBを呼び出します。\fIjdb\fRコマンドは、JDBA (Java Platform Debugger Architecture)を視覚的に実行し、ローカルまたはリモートのJava仮想マシン(JVM)の検査とデバッグを行うことができます。Java Platform Debugger Architecture (JDBA)
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)を参照してください。
+.SS "JDBセッションの開始"
 .PP
-JDBå򳫻Ϥˤ͡ˡޤǤˤ˻ѤΤϡǥХå륢ץꥱΥᥤ󡦥饹ѤơJDB鿷JVMưˡǤޥɥ饤ǡ\fIjava\fRޥɤΤ\fIjdb\fRޥɤϤޤȤСץꥱΥᥤ󡦥饹\fIMyClass\fRξϡJDBĶǥǥХåȤ˼ΥޥɤѤޤ
+JDBセッションを開始するには様々な方法があります。最も頻繁に使用されるのは、デバッグするアプリケーションのメイン・クラスを使用して、JDBから新しいJVMを起動する方法です。コマンドラインで、\fIjava\fRコマンドのかわりに\fIjdb\fRコマンドを入力します。たとえば、アプリケーションのメイン・クラスが\fIMyClass\fRの場合は、JDB環境でデバッグするときに次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -94,9 +94,9 @@
 .RE
 .\}
 .PP
-ˡǵưȡ\fIjdb\fRޥɤϡꤵ줿ѥ᡼Ѥ2ܤJVMƤӽФޤˡꤵ줿饹ɤơ饹κǽ̿¹ԤJVMߤޤ
+この方法で起動すると、\fIjdb\fRコマンドは、指定されたパラメータを使用して2つ目のJVMを呼び出します。次に、指定されたクラスをロードして、クラスの最初の命令を実行する前にJVMを停止させます。
 .PP
-\fIjdb\fRޥɤΤ⤦1ĤλˡϡǤ˼¹JVMjdb³뤳ȤǤ\fIjdb\fRޥɤ³VM򡢤μ¹˵ư뤿ιʸ򼡤˼ޤϡץǥХåѥ饤֥ɤ³μꤷޤ
+\fIjdb\fRコマンドのもう1つの使用方法は、すでに実行中のJVMにjdbを接続することです。\fIjdb\fRコマンドが接続するVMを、その実行中に起動するための構文を次に示します。これは、インプロセス・デバッグ用ライブラリをロードし、接続の種類を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -108,7 +108,7 @@
 .RE
 .\}
 .PP
-ΥޥɤѤơ\fIjdb\fRޥɤJVM³Ǥޤ
+次のコマンドを使用して、\fIjdb\fRコマンドをJVMに接続できます。
 .sp
 .if n \{\
 .RS 4
@@ -120,36 +120,36 @@
 .RE
 .\}
 .PP
-ξ硢\fIjdb\fRޥɤϿJVMư뤫˴¸JVM³뤿ᡢ\fIjdb\fRޥɥ饤\fIMyClass\fRϻꤷޤ
+この場合、\fIjdb\fRコマンドは新しいJVMを起動するかわりに既存のJVMに接続されるため、\fIjdb\fRコマンドラインに\fIMyClass\fR引数は指定しません。
 .PP
-ǥХåJVM³ˤ¾ˤ͡ˡꡢ٤\fIjdb\fRޥɤǥݡȤƤޤ³ץˤĤƤϡJava Platform Debugger ArchitectureΥɥȤ򻲾ȤƤ
-.SS "jdbޥ"
+デバッガをJVMに接続するには他にも様々な方法があり、すべて\fIjdb\fRコマンドでサポートされています。接続オプションについては、Java Platform Debugger Architectureのドキュメントを参照してください。
+.SS "基本jdbコマンド"
 .PP
-Ū\fIjdb\fRޥɤΰ򼨤ޤJDBݡȤ륳ޥɤϤʳˤ⤢ꡢ\fI\-help\fRץѤɽǤޤ
+基本的な\fIjdb\fRコマンドの一覧を示します。JDBがサポートするコマンドはこれ以外にもあり、それらは\fI\-help\fRオプションを使用して表示できます。
 .PP
-helpޤ?
+helpまたは?
 .RS 4
-\fIhelp\fRޤ\fI?\fRޥɤϡǧ줿ޥɤΥꥹȤ˴ʷդɽޤ
+\fIhelp\fRまたは\fI?\fRコマンドは、認識されたコマンドのリストに簡潔な説明を付けて表示します。
 .RE
 .PP
 run
 .RS 4
-JDBưƥ֥졼ݥȤꤷȤˡ\fIrun\fRޥɤѤơǥХå륢ץꥱμ¹Ԥ򳫻ϤǤޤ\fIrun\fRޥɤϡ¸VM³ƤȤϰۤʤꡢǥХå륢ץꥱ\fIjdb\fR鵯ưȤˤΤ߻ѤǤޤ
+JDBを起動してブレークポイントを設定したあとに、\fIrun\fRコマンドを使用して、デバッグするアプリケーションの実行を開始できます。\fIrun\fRコマンドは、既存のVMに接続している場合とは異なり、デバッグするアプリケーションが\fIjdb\fRから起動したときにのみ使用できます。
 .RE
 .PP
 cont
 .RS 4
-֥졼ݥȡ㳰ޤϥƥå׼¹ԤθǡǥХå륢ץꥱμ¹Ԥ³ޤ
+ブレークポイント、例外、またはステップ実行の後で、デバッグするアプリケーションの実行を継続します。
 .RE
 .PP
 print
 .RS 4
-Java֥ȤӥץߥƥͤɽޤץߥƥַѿޤϥեɤξˤϡºݤͤϤޤ֥ȤξˤϡûϤޤ֥Ȥξܺ٤ˡõˤϡdumpޥɤ򻲾ȤƤ
+Javaオブジェクトおよびプリミティブ値を表示します。プリミティブ型の変数またはフィールドの場合には、実際の値が出力されます。オブジェクトの場合には、短い説明が出力されます。オブジェクトの詳細を取得する方法を探すには、dumpコマンドを参照してください。
 .sp
-\fB:\fR
-ѿɽˤϡޤǤ륯饹\fIjavac \-g\fRץѤƥѥ뤵Ƥɬפޤ
+\fB注意:\fR
+ローカル変数を表示するには、含んでいるクラスが\fIjavac \-g\fRオプションを使用してコンパイルされている必要があります。
 .sp
-\fIprint\fRޥɤϡ˼褦ʡ᥽åɸƽФѤΤʤɡ¿δñJava򥵥ݡȤޤ
+\fIprint\fRコマンドは、次に示すような、メソッド呼出しを使用したものなど、多くの簡単なJava式をサポートします。
 .sp
 .if n \{\
 .RS 4
@@ -168,12 +168,12 @@
 .PP
 dump
 .RS 4
-ץߥƥͤξ硢\fIdump\fRޥɤ\fIprint\fRޥɤƱǤ֥Ȥξ硢\fIdump\fRޥɤǤϡ֥ƤƥեɤθߤͤϤޤstaticեɤinstanceեɤϤޤ\fIdump\fRޥɤǤϡ\fIprint\fRޥɤƱݡȤޤ
+プリミティブ値の場合、\fIdump\fRコマンドは\fIprint\fRコマンドと同一です。オブジェクトの場合、\fIdump\fRコマンドでは、オブジェクト内に定義されている各フィールドの現在の値が出力されます。staticフィールドとinstanceフィールドが出力されます。\fIdump\fRコマンドでは、\fIprint\fRコマンドと同じ式がサポートされます。
 .RE
 .PP
 threads
 .RS 4
-߼¹ΥåɤɽޤåɤȤˡ̾ȸߤξ֡¾Υޥɤ˻ѤǤ륤ǥåϤޤǤϡåɡǥå4Ǥꡢåɤ\fIjava\&.lang\&.Thread\fRΥ󥹥󥹤ǡåɤ̾\fImain\fRǤꡢ߼¹Ǥ
+現在実行中のスレッドを一覧表示します。スレッドごとに、名前と現在の状態、および他のコマンドに使用できるインデックスが出力されます。この例では、スレッド・インデックスは4であり、スレッドは\fIjava\&.lang\&.Thread\fRのインスタンスで、スレッドの名前は\fImain\fRであり、現在実行中です。
 .sp
 .if n \{\
 .RS 4
@@ -188,20 +188,20 @@
 .PP
 thread
 .RS 4
-ߤΥåɤˤ륹åɤ򤷤ޤ¿\fIjdb\fRޥɤϡߤΥåɤ˴ŤƼ¹ԤޤåɤϡthreadsޥɤåɡǥåȤȤ˻ꤷޤ
+現在のスレッドにするスレッドを選択します。多くの\fIjdb\fRコマンドは、現在のスレッドの設定に基づいて実行されます。スレッドは、threadsコマンドで説明したスレッド・インデックスとともに指定します。
 .RE
 .PP
 where
 .RS 4
-ꤷʤ\fIwhere\fRޥɤ¹ԤȡߤΥåɤΥåפޤ\fIwhere\fR
-\fIall\fRޥɤϡߤΥåɡ롼פˤ륹åɤΥå򤹤٤ƥפޤ\fIwhere\fR
-\fIthreadindex\fRޥɤϡꤵ줿åɤΥåפޤ
+引数を指定しないで\fIwhere\fRコマンドを実行すると、現在のスレッドのスタックがダンプされます。\fIwhere\fR
+\fIall\fRコマンドは、現在のスレッド・グループにあるスレッドのスタックをすべてダンプします。\fIwhere\fR
+\fIthreadindex\fRコマンドは、指定されたスレッドのスタックをダンプします。
 .sp
-ߤΥåɤ(֥졼ݥȤ\fIsuspend\fRޥɤˤä)ǤƤϡѿȥեɤ\fIprint\fRޥɤ\fIdump\fRޥɤɽǤޤ\fIup\fRޥɤ\fIdown\fRޥɤǡɤΥåե졼򸽺ߤΥåե졼ˤ뤫֤ȤǤޤ
+現在のスレッドが(ブレークポイントか\fIsuspend\fRコマンドによって)中断している場合は、ローカル変数とフィールドは\fIprint\fRコマンドと\fIdump\fRコマンドで表示できます。\fIup\fRコマンドと\fIdown\fRコマンドで、どのスタック・フレームを現在のスタック・フレームにするかを選ぶことができます。
 .RE
-.SS "֥졼ݥ"
+.SS "ブレークポイント"
 .PP
-֥졼ݥȤϡֹޤϥ᥽åɤκǽ̿JDBǤޤ򼨤ޤ
+ブレークポイントは、行番号またはメソッドの最初の命令でJDBに設定できます。次に例を示します。
 .sp
 .RS 4
 .ie n \{\
@@ -211,7 +211,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥ\fIstop at MyClass:22\fRϡ\fIMyClass\fRޤޤ륽ե22ܤκǽ̿˥֥졼ݥȤꤷޤ
+コマンド\fIstop at MyClass:22\fRは、\fIMyClass\fRが含まれるソース・ファイルの22行目の最初の命令にブレークポイントを設定します。
 .RE
 .sp
 .RS 4
@@ -222,7 +222,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥ\fIstop in java\&.lang\&.String\&.length\fRϡ᥽å\fIjava\&.lang\&.String\&.length\fRƬ˥֥졼ݥȤꤷޤ
+コマンド\fIstop in java\&.lang\&.String\&.length\fRは、メソッド\fIjava\&.lang\&.String\&.length\fRの先頭にブレークポイントを設定します。
 .RE
 .sp
 .RS 4
@@ -233,106 +233,106 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥ\fIstop in MyClass\&.<clinit>\fRϡ\fI<clinit>\fRѤ\fIMyClass\fRŪɤꤷޤ
+コマンド\fIstop in MyClass\&.<clinit>\fRは、\fI<clinit>\fRを使用して\fIMyClass\fRの静的初期化コードを特定します。
 .RE
 .PP
-᥽åɤСɤƤˤϡ᥽åɤΰηꤷơ֥졼ݥȤФŬڤʥ᥽åɤ򤵤褦ˤɬפޤȤС\fIMyClass\&.myMethod(int,java\&.lang\&.String)\fRޤ\fIMyClass\&.myMethod()\fRȻꤷޤ
+メソッドがオーバーロードされている場合には、メソッドの引数の型も指定して、ブレークポイントに対して適切なメソッドが選択されるようにする必要があります。たとえば、\fIMyClass\&.myMethod(int,java\&.lang\&.String)\fRまたは\fIMyClass\&.myMethod()\fRと指定します。
 .PP
-\fIclear\fRޥɤϡ\fIclear MyClass:45\fRΤ褦ʹʸѤƥ֥졼ݥȤޤ\fIclear\fRѤ뤫ꤷʤ\fIstop\fRޥɤѤȡꤵƤ뤹٤ƤΥ֥졼ݥȤɽޤ\fIcont\fRޥɤϼ¹Ԥ³ޤ
-.SS "ƥå׼¹"
+\fIclear\fRコマンドは、\fIclear MyClass:45\fRのような構文を使用してブレークポイントを削除します。\fIclear\fRを使用するか、引数を指定しないで\fIstop\fRコマンドを使用すると、現在設定されているすべてのブレークポイントが表示されます。\fIcont\fRコマンドは実行を継続します。
+.SS "ステップ実行"
 .PP
-\fIstep\fRޥɤϡߤΥåե졼ޤϸƤӽФ줿᥽åǡιԤ¹Ԥޤ\fInext\fRޥɤϡߤΥåե졼μιԤ¹Ԥޤ
-.SS "㳰"
+\fIstep\fRコマンドは、現在のスタック・フレームまたは呼び出されたメソッド内で、次の行を実行します。\fInext\fRコマンドは、現在のスタック・フレームの次の行を実行します。
+.SS "例外"
 .PP
-Ƥ륹åɤθƽФåΤɤˤ\fIcatch\fRʸʤ㳰ȯȡJVM̾㳰ȥ졼ϤƽλޤJDBĶǼ¹ԤƤϡȿΥJDB椬ޤˡ\fIjdb\fRޥɤѤ㳰θǤޤ
+スローしているスレッドの呼出しスタック上のどこにも\fIcatch\fR文がない場合に例外が発生すると、JVMは通常、例外トレースを出力して終了します。ただし、JDB環境で実行している場合は、違反のスロー時にJDBに制御が戻ります。次に、\fIjdb\fRコマンドを使用して例外の原因を診断します。
 .PP
-ȤС\fIcatch java\&.io\&.FileNotFoundException\fRޤ\fIcatch\fR
-\fImypackage\&.BigTroubleException\fRΤ褦\fIcatch\fRޥɤѤȡǥХå줿ץꥱϡ¾㳰줿Ȥߤޤ㳰Υ饹ޤϥ֥饹Υ󥹥󥹤ξϡץꥱ㳰줿ߤޤ
+たとえば、\fIcatch java\&.io\&.FileNotFoundException\fRまたは\fIcatch\fR
+\fImypackage\&.BigTroubleException\fRのように\fIcatch\fRコマンドを使用すると、デバッグされたアプリケーションは、他の例外がスローされたときに停止します。例外が特定のクラスまたはサブクラスのインスタンスの場合は、アプリケーションは例外がスローされた場所で停止します。
 .PP
-\fIignore\fRޥɤѤȡ\fIcatch\fRޥɤθ̵̤ˤʤޤ\fIignore\fRޥɤǤϡǥХåJVM㳰̵뤻ǥХåΤߤ̵뤷ޤ
-.SH "ץ"
+\fIignore\fRコマンドを使用すると、以前の\fIcatch\fRコマンドの効果が無効になります。\fIignore\fRコマンドでは、デバッグされるJVMは特定の例外を無視せず、デバッガのみを無視します。
+.SH "オプション"
 .PP
-ޥɥ饤\fIjava\fRޥɤΤ\fIjdb\fRޥɤѤ硢\fIjdb\fRޥɤϡ\fI\-D\fR\fI\-classpath\fR\fI\-X\fRʤɡ\fIjava\fRޥɤƱΥץޤ\fIjdb\fRޥɤϡ¾˼ΥꥹȤˤ륪ץޤ
+コマンドラインで\fIjava\fRコマンドのかわりに\fIjdb\fRコマンドを使用する場合、\fIjdb\fRコマンドは、\fI\-D\fR、\fI\-classpath\fR、\fI\-X\fRなど、\fIjava\fRコマンドと同じ数のオプションを受け入れます。\fIjdb\fRコマンドは、その他に次のリストにあるオプションを受け入れます。
 .PP
-ǥХåԤJVM˥ǥХå³뤿ص󶡤뤿ˡ¾Υץ󤬥ݡȤƤޤ³ؤ˴ؤܺ٤ʥɥȤϡJava Platform Debugger Architecture (JPDA)
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)򻲾ȤƤ
+デバッグを行うJVMにデバッガを接続するための代替機構を提供するために、その他のオプションがサポートされています。これらの接続の代替に関する詳細なドキュメントは、Java Platform Debugger Architecture (JPDA)
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)を参照してください
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
 .PP
 \-sourcepath \fIdir1:dir2: \&. \&. \&.\fR
 .RS 4
-ꤵ줿ѥѤơե򸡺ޤΥץ󤬻ꤵƤʤϡǥեȡѥΥɥå(\&.)Ѥޤ
+指定されたパスを使用して、ソース・ファイルを検索します。このオプションが指定されていない場合は、デフォルト・パスのドット(\&.)が使用されます。
 .RE
 .PP
 \-attach \fIaddress\fR
 .RS 4
-ǥեȤ³Ѥơ¹JVM˥ǥХå³ޤ
+デフォルトの接続機構を使用して、実行中のJVMにデバッガを接続します。
 .RE
 .PP
 \-listen \fIaddress\fR
 .RS 4
-¹JVMɸΥͥѤƻꤵ줿ɥ쥹³ΤԵޤ
+実行中のJVMが標準のコネクタを使用して指定されたアドレスに接続するのを待機します。
 .RE
 .PP
 \-launch
 .RS 4
-ǥХå륢ץꥱJDBεư夿˵ưޤ\fI\-launch\fRץˤꡢ\fIrun\fRޥɤɬפʤʤޤǥХå륢ץꥱϡư塢ץꥱ󡦥饹ɤľߤޤλǡɬפʥ֥졼ݥȤꤷ\fIcont\fRޥɤѤƼ¹Ԥ³Ǥޤ
+デバッグするアプリケーションをJDBの起動後ただちに起動します。\fI\-launch\fRオプションにより、\fIrun\fRコマンドが必要なくなります。デバッグするアプリケーションは、起動後、初期アプリケーション・クラスがロードされる直前に停止します。その時点で、必要なブレークポイントを設定し、\fIcont\fRコマンドを使用して実行を継続できます。
 .RE
 .PP
 \-listconnectors
 .RS 4
-JVMѤǤ륳ͥɽޤ
+このJVMで利用できるコネクタを一覧表示します。
 .RE
 .PP
 \-connect connector\-name:\fIname1=value1\fR
 .RS 4
-ɽ줿ͤȻΥͥѤƥåJVM³ޤ
+一覧表示された引数の値と指定のコネクタを使用してターゲットJVMに接続します。
 .RE
 .PP
 \-dbgtrace [\fIflags\fR]
 .RS 4
-\fIjdb\fRޥɤΥǥХåξϤޤ
+\fIjdb\fRコマンドのデバッグの情報を出力します。
 .RE
 .PP
 \-tclient
 .RS 4
-Java HotSpot VM饤ǥץꥱ¹Ԥޤ
+Java HotSpot VMクライアント内でアプリケーションを実行します。
 .RE
 .PP
 \-tserver
 .RS 4
-Java HotSpot VMСǥץꥱ¹Ԥޤ
+Java HotSpot VMサーバー内でアプリケーションを実行します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JVM\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+JVMに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ǥХåоݤΥץž륪ץ"
+.SH "デバッグ対象のプロセスに転送されるオプション"
 .PP
 \-v \-verbose[:\fIclass\fR|gc|jni]
 .RS 4
-Ĺ⡼ɤˤޤ
+冗長モードにします。
 .RE
 .PP
 \-D\fIname\fR=\fIvalue\fR
 .RS 4
-ƥࡦץѥƥꤷޤ
+システム・プロパティを設定します。
 .RE
 .PP
 \-classpath \fIdir\fR
 .RS 4
-饹򸡺뤿ΡǶڤäƻꤵ줿ǥ쥯ȥΥꥹȡ
+クラスを検索するための、コロンで区切って指定されたディレクトリのリスト。
 .RE
 .PP
 \-X\fIoption\fR
 .RS 4
-ɸॿåJVMץǤ
+非標準ターゲットJVMオプションです。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jdeps.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jdeps.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jdeps
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jdeps" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jdeps" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jdeps \- Java饹¸ʥ饤
-.SH ""
+jdeps \- Javaクラス依存性アナライザ。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,99 +64,99 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclasses\fR
 .RS 4
-ʬϤ륯饹̾饹ѥǸФǤ륯饹򡢥ե̾ǥ쥯ȥޤJARեǻǤޤ
+分析するクラスの名前。クラス・パスで検出できるクラスを、ファイル名、ディレクトリまたはJARファイルで指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjdeps\fRޥɤϡJava饹եΥѥå٥ޤϥ饹٥ΰ¸򼨤ޤϥ饹ˤϡ\fI\&.class\fRեΥѥ̾ǥ쥯ȥꡢJARե롢ޤϤ٤ƤΥ饹եʬϤ뤿δ饹̾ǤޤץˤϤꤷޤǥեȤǤϡ\fIjdeps\fRϥƥϤ˰¸طϤޤDOTǰ¸طǤޤ(\fI\-dotoutput\fRץ򻲾)
-.SH "ץ"
+\fIjdeps\fRコマンドは、Javaクラス・ファイルのパッケージレベルまたはクラスレベルの依存性を示します。入力クラスには、\fI\&.class\fRファイルのパス名、ディレクトリ、JARファイル、またはすべてのクラス・ファイルを分析するための完全修飾クラス名を指定できます。オプションにより出力が決定します。デフォルトでは、\fIjdeps\fRはシステム出力に依存関係を出力します。DOT言語で依存関係を生成できます(\fI\-dotoutput\fRオプションを参照)。
+.SH "オプション"
 .PP
 \-dotoutput <\fIdir\fR>
 .RS 4
-DOTեϤΰǥ쥯ȥꡣꤷ\fIjdeps\fR<\fIarchive\-file\-name\fR>\&.dotȤ̾ʬϺѤߥ֤Ȥ˰¸طꥹȤ1Ĥdotեִ֤ΰ¸طꥹȤsummary\&.dotȤ̾Υޥ꡼եޤ
+DOTファイル出力の宛先ディレクトリ。指定した場合は\fIjdeps\fRは<\fIarchive\-file\-name\fR>\&.dotという名前の分析済みアーカイブごとに依存関係をリストする1つのdotファイルを生成し、アーカイブ間の依存関係をリストするsummary\&.dotという名前のサマリー・ファイルも生成します。
 .RE
 .PP
 \-s, \-summary
 .RS 4
-¸طΥޥ꡼ΤߤϤޤ
+依存関係のサマリーのみを出力します。
 .RE
 .PP
 \-v, \-verbose
 .RS 4
-٤ƤΥ饹٥ΰ¸طϤޤ
+すべてのクラスレベルの依存関係を出力します。
 .RE
 .PP
 \-verbose:package
 .RS 4
-Ʊΰ¸طѥå٥ΰ¸طϤޤ
+同じアーカイブ内の依存関係を除き、パッケージレベルの依存関係を出力します。
 .RE
 .PP
 \-verbose:class
 .RS 4
-Ʊΰ¸ط饹٥ΰ¸طϤޤ
+同じアーカイブ内の依存関係を除き、クラスレベルの依存関係を出力します。
 .RE
 .PP
 \-cp <\fIpath\fR>, \-classpath <\fIpath\fR>
 .RS 4
-饹եθꤷޤ
+クラス・ファイルの検索場所を指定します。
 .sp
-Setting the Class Path ⻲ȤƤ
+Setting the Class Path も参照してください。
 .RE
 .PP
 \-p <\fIpkg name\fR>, \-package <\fIpkg name\fR>
 .RS 4
-ꤷѥåΰ¸ط򸡽ФޤۤʤѥåФƤΥץʣǤޤ\fI\-p\fRץ\fI\-e\fRץƱ˻ꤹ뤳ȤϤǤޤ
+指定したパッケージの依存関係を検出します。異なるパッケージに対してこのオプションを複数回指定できます。\fI\-p\fRオプションと\fI\-e\fRオプションを同時に指定することはできません。
 .RE
 .PP
 \-e <\fIregex\fR>, \-regex <\fIregex\fR>
 .RS 4
-ꤷɽѥȰפѥåΰ¸ط򸡽Фޤ\fI\-p\fRץ\fI\-e\fRץƱ˻ꤹ뤳ȤϤǤޤ
+指定した正規表現パターンと一致するパッケージの依存関係を検出します。\fI\-p\fRオプションと\fI\-e\fRオプションを同時に指定することはできません。
 .RE
 .PP
 \-include <\fIregex\fR>
 .RS 4
-ʬϤѥ˰פ륯饹¤ޤΥץϡʬϤ륯饹ΥꥹȤե륿ޤ¸ط˥ѥŬѤ\fI\-p\fR\fI\-e\fRȤȤ˻ѤǤޤ
+分析をパターンに一致するクラスに制限します。このオプションは、分析するクラスのリストをフィルタします。依存関係にパターンを適用する\fI\-p\fRおよび\fI\-e\fRとともに使用できます。
 .RE
 .PP
 \-jdkinternals
 .RS 4
-JDKAPIΥ饹٥ΰ¸ط򸡽ФޤǥեȤǤϡ\fI\-include\fRץꤷʤꡢ\fI\-classpath\fRץ󤪤ϥե˻ꤵ줿٤ƤΥ饹ʬϤޤΥץϡ\fI\-p\fRץ\fI\-e\fRץ󤪤\fI\-s\fRץȤȤ˻ѤǤޤ
+JDKの内部APIのクラスレベルの依存関係を検出します。デフォルトでは、\fI\-include\fRオプションを指定しないかぎり、\fI\-classpath\fRオプションおよび入力ファイルに指定されたすべてのクラスを分析します。このオプションは、\fI\-p\fRオプション、\fI\-e\fRオプションおよび\fI\-s\fRオプションとともに使用できません。
 .sp
-\fBٹ\fR: JDKAPIϡΥ꡼ǥǤʤʤǽޤ
+\fB警告\fR: JDKの内部APIは、今後のリリースでアクセスできなくなる可能性があります。
 .RE
 .PP
 \-P, \-profile
 .RS 4
-ѥåޤץեޤϥեɽޤ
+パッケージを含むプロファイルまたはファイルを表示します。
 .RE
 .PP
 \-apionly
 .RS 4
-եɡס᥽åɡѥ᡼ס꥿סå줿㳰פޤѥ֥å饹\fIpublic\fR\fIprotected\fRСν̾ΰ¸طʤɡʬϤAPI¤ޤ
+フィールド・タイプ、メソッド・パラメータ・タイプ、戻りタイプ、チェックされた例外タイプを含むパブリック・クラスの\fIpublic\fRおよび\fIprotected\fRメンバーの署名からの依存関係など、分析をAPIに制限します。
 .RE
 .PP
 \-R, \-recursive
 .RS 4
-٤Ƥΰ¸طƵŪޤ
+すべての依存関係を再帰的に走査します。
 .RE
 .PP
 \-version
 .RS 4
-СϤޤ
+バージョン情報を出力します。
 .RE
 .PP
 \-h, \-?, \-help
 .RS 4
-\fIjdeps\fR˴ؤإסåϤޤ
+\fIjdeps\fRに関するヘルプ・メッセージを出力します。
 .RE
-.SH ""
+.SH "例"
 .PP
-Notepad\&.jarΰ¸طʬϡ
+Notepad\&.jarの依存関係の分析。
 .sp
 .if n \{\
 .RS 4
@@ -185,7 +185,7 @@
 .RE
 .\}
 .PP
-\-Pޤ\-profileץѤơĢ¸ץեɽޤ
+\-Pまたは\-profileオプションを使用して、メモ帳が依存するプロファイルを表示します。
 .sp
 .if n \{\
 .RS 4
@@ -213,7 +213,7 @@
 .RE
 .\}
 .PP
-tools\&.jarե\fIcom\&.sun\&.tools\&.jdeps\&.Main\fR饹ʤɡΥ饹ѥΥ饹ľܰ¸طʬϡ
+tools\&.jarファイル内の\fIcom\&.sun\&.tools\&.jdeps\&.Main\fRクラスなど、特定のクラスパス内の特定のクラスの直接依存関係の分析。
 .sp
 .if n \{\
 .RS 4
@@ -229,7 +229,7 @@
 .RE
 .\}
 .PP
-\fI\-verbose:class\fRץѤơ饹٥¸ط򸡺뤫\fI\-v\fRޤ\fI\-verbose\fRץѤƱJARե뤫ΰ¸طޤޤ
+\fI\-verbose:class\fRオプションを使用して、クラスレベル依存関係を検索するか\fI\-v\fRまたは\fI\-verbose\fRオプションを使用して同じJARファイルからの依存関係を含めます。
 .sp
 .if n \{\
 .RS 4
@@ -249,7 +249,7 @@
 .RE
 .\}
 .PP
-\fI\-R\fRޤ\fI\-recursive\fRץѤơ\fIcom\&.sun\&.tools\&.jdeps\&.Main\fR饹οŪʰ¸طʬϤޤ
+\fI\-R\fRまたは\fI\-recursive\fRオプションを使用して、\fIcom\&.sun\&.tools\&.jdeps\&.Main\fRクラスの推移的な依存関係を分析します。
 .sp
 .if n \{\
 .RS 4
@@ -305,7 +305,7 @@
 .RE
 .\}
 .PP
-Ģǥΰ¸طdotեޤ
+メモ帳デモの依存関係のdotファイルを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -317,7 +317,7 @@
 .RE
 .\}
 .PP
-\fIjdeps\fRϡ\fI\-dotoutput\fRץǻꤵ줿dotǥ쥯ȥ<\fIfilename\fR>\&.dotȤ̾dotեJARե뤴Ȥ˺JARե֤ΰ¸طꥹȤsummary\&.dotȤ̾Υޥ꡼եޤ
+\fIjdeps\fRは、\fI\-dotoutput\fRオプションで指定されたdotディレクトリに<\fIfilename\fR>\&.dotという名前のdotファイルを特定のJARファイルごとに作成し、JARファイル間の依存関係をリストするsummary\&.dotという名前のサマリー・ファイルも作成します
 .sp
 .if n \{\
 .RS 4
@@ -350,7 +350,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jhat.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jhat.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jhat
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jhat" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jhat" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jhat \- JavaҡפʬϤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jhat \- Javaヒープを分析します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,18 +64,18 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIheap\-dump\-file\fR
 .RS 4
-֥饦оݤȤʤJavaХʥꡦҡססե롣ʣΥҡספޤסեξ硢\fImyfile\&.hprof#3\fRΤ褦˥ե̾θ\fI#<number>\fRղä뤳ȤǡեΥפǤޤ
+ブラウズ対象となるJavaバイナリ・ヒープ・ダンプ・ファイル。複数のヒープ・ダンプを含むダンプ・ファイルの場合、\fImyfile\&.hprof#3\fRのようにファイル名の後に\fI#<number>\fRを付加することで、ファイル内の特定のダンプを指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjhat\fRޥɤJavaҡססեϤWebС򳫻Ϥޤ\fIjhat\fRޥɤѤơΥ֥饦ǥҡספ򻲾ȤǤޤ\fIjhat\fRޥɤϡΤΥ饹\fIMyClass\fRΤ٤ƤΥ󥹥󥹤ɽʤɤλ߷׺Ѥ礻Object Query Language (OQL)򥵥ݡȤޤҡספ礻OQLSQL˻ƤޤOQLΥإפˤϡ\fIjhat\fRޥɤˤäɽOQLإסڡ饢ǤޤǥեȡݡȤѤ硢OQLΥإפhttp://localhost:7000/oqlhelp/ѲǽǤ
+\fIjhat\fRコマンドはJavaヒープ・ダンプ・ファイルを解析し、Webサーバーを開始します。\fIjhat\fRコマンドを使用して、お気に入りのブラウザでヒープ・ダンプを参照できます。\fIjhat\fRコマンドは、既知のクラス\fIMyClass\fRのすべてのインスタンスを表示するなどの事前設計済の問合せやObject Query Language (OQL)をサポートします。ヒープ・ダンプの問合せを除き、OQLはSQLに似ています。OQLのヘルプには、\fIjhat\fRコマンドによって表示されるOQLヘルプ・ページからアクセスできます。デフォルト・ポートを使用する場合、OQLのヘルプはhttp://localhost:7000/oqlhelp/で利用可能です。
 .PP
-JavaΥҡספˤϡΤĤˡޤ
+Javaのヒープ・ダンプを生成するには、次のいくつかの方法があります。
 .sp
 .RS 4
 .ie n \{\
@@ -85,7 +85,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjmap \-dump\fRץѤƼ¹Ի˥ҡספޤjmap(1)򻲾ȤƤ
+\fIjmap \-dump\fRオプションを使用して実行時にヒープ・ダンプを取得します。jmap(1)を参照してください。
 .RE
 .sp
 .RS 4
@@ -96,8 +96,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjconsole\fRץѤ\fIHotSpotDiagnosticMXBean\fRͳǼ¹Ի˥ҡספޤjconsole(1)\fIHotSpotDiagnosticMXBean\fRΥ󥿥ե(
-http://docs\&.oracle\&.com/javase/8/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean\&.html)򻲾ȤƤ
+\fIjconsole\fRオプションを使用して\fIHotSpotDiagnosticMXBean\fR経由で実行時にヒープ・ダンプを取得します。jconsole(1)および\fIHotSpotDiagnosticMXBean\fRのインタフェースの説明(
+http://docs\&.oracle\&.com/javase/8/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean\&.html)を参照してください。
 .RE
 .sp
 .RS 4
@@ -108,8 +108,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ҡספϡ\fI\-XX:+HeapDumpOnOutOfMemoryError\fR
-Javaۥޥ(JVM)ץꤹ뤳Ȥǡ\fIOutOfMemoryError\fR줿Ȥޤ
+ヒープ・ダンプは、\fI\-XX:+HeapDumpOnOutOfMemoryError\fR
+Java仮想マシン(JVM)オプションを指定することで、\fIOutOfMemoryError\fRがスローされたときに生成されます。
 .RE
 .sp
 .RS 4
@@ -120,61 +120,61 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIhprof\fRޥɤѤޤHPROF: Heap/CPUץե󥰡ġ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/hprof\&.html)򻲾ȤƤ
+\fIhprof\fRコマンドを使用します。HPROF: Heap/CPUプロファイリング・ツール
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/hprof\&.html)を参照してください
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
 \-stack false|true
 .RS 4
-֥ȳƽФåפ̵ˤޤҡסdzȾ󤬻ѤǤʤ硢Υե饰\fIfalse\fRꤹɬפޤǥեȤ\fItrue\fRǤ
+オブジェクト割当呼出しスタックの追跡を無効にします。ヒープ・ダンプ内で割当サイト情報が使用できない場合、このフラグを\fIfalse\fRに設定する必要があります。デフォルトは\fItrue\fRです。
 .RE
 .PP
 \-refs false|true
 .RS 4
-֥ȤؤλȤפ̵ˤޤǥեȤ\fItrue\fRǤǥեȤǤϡҡΤ٤ƤΥ֥ȤˤĤơХåݥ(ꤵ줿֥ȤݥȤƤ륪֥ȡȼԤޤϼȤȤƤФ)׻ޤ
+オブジェクトへの参照の追跡を無効にします。デフォルトは\fItrue\fRです。デフォルトでは、ヒープ内のすべてのオブジェクトについて、バックポインタ(指定されたオブジェクトをポイントしているオブジェクト。参照者または受信参照とも呼ばれる)が計算されます。
 .RE
 .PP
 \-port \fIport\-number\fR
 .RS 4
-\fIjhat\fRHTTPСΥݡȤꤷޤǥեȤ7000Ǥ
+\fIjhat\fRのHTTPサーバーのポートを設定します。デフォルトは7000です。
 .RE
 .PP
 \-exclude \fIexclude\-file\fR
 .RS 4
-ãǽʥ֥Ȥ礻ɬפǡСΰޤեꤷޤȤСΥե\fIjava\&.lang\&.String\&.value\fRޤޤƤ硢Υ֥\fIo\fRãǽʥ֥ȤΥꥹȤ׻ݤˡ\fIjava\&.lang\&.String\&.value\fRեɤ˴Ϣ뻲ȥѥθʤʤޤ
+到達可能なオブジェクトの問合せから除外する必要があるデータ・メンバーの一覧を含むファイルを指定します。たとえば、このファイルに\fIjava\&.lang\&.String\&.value\fRが含まれていた場合、特定のオブジェクト\fIo\fRから到達可能なオブジェクトのリストを計算する際に、\fIjava\&.lang\&.String\&.value\fRフィールドに関連する参照パスが考慮されなくなります。
 .RE
 .PP
 \-baseline \fIexclude\-file\fR
 .RS 4
-١饤ȤʤҡספꤷޤξΥҡסƱ֥IDĥ֥ȤϿǤϤʤȤƥޡޤ¾Υ֥ȤϿȤƥޡޤϡۤʤ2ĤΥҡספӤݤΩޤ
+ベースラインとなるヒープ・ダンプを指定します。両方のヒープ・ダンプ内で同じオブジェクトIDを持つオブジェクトは新規ではないとしてマークされます。他のオブジェクトは新規としてマークされます。これは、異なる2つのヒープ・ダンプを比較する際に役立ちます。
 .RE
 .PP
 \-debug \fIint\fR
 .RS 4
-ΥġΥǥХå٥ꤷޤ٥0ϥǥХåϤʤȤ̣ޤ礭ͤꤹȡĹʥ⡼ɤˤʤޤ
+このツールのデバッグ・レベルを設定します。レベル0はデバッグ出力がないことを意味します。より大きな値を設定すると、より冗長なモードになります。
 .RE
 .PP
 \-version
 .RS 4
-꡼ֹݡȤƽλޤ
+リリース番号をレポートして終了します
 .RE
 .PP
 \-h
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjhat\fRޥɤ¹ԤƤJavaۥޥ\fIflag\fRϤޤȤС512MХȤκҡסѤˤϡ\fI\-J\-Xmx512m\fRȤޤ
+\fIjhat\fRコマンドを実行しているJava仮想マシンに\fIflag\fRを渡します。たとえば、512Mバイトの最大ヒープ・サイズを使用するには、\fI\-J\-Xmx512m\fRとします。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -206,7 +206,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-HPROF: Heap/CPUץե󥰡ġ
+HPROF: Heap/CPUプロファイリング・ツール
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/hprof\&.html)
 .RE
 .br
--- a/jdk/src/linux/doc/man/ja/jinfo.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jinfo.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jinfo
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jinfo" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jinfo" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jinfo \- ޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jinfo \- 構成情報を生成します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -82,83 +82,83 @@
 .RE
 .\}
 .PP
-\fIץ\fR
+\fIオプション\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIpid\fR
 .RS 4
-󤬽ϤץIDץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤ
+構成情報が出力されるプロセスID。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-󤬽Ϥ륳ե롣
+構成情報が出力されるコア・ファイル。
 .RE
 .PP
 \fIremote\-hostname\-or\-IP\fR
 .RS 4
-⡼ȡǥХåС\fIۥ̾\fRޤ\fIIP\fRɥ쥹jsadebugd(1)򻲾ȤƤ
+リモート・デバッグ・サーバーの\fIホスト名\fRまたは\fIIP\fRアドレス。jsadebugd(1)を参照してください。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥ⡼ȡۥȤǼ¹ԤƤΡץͭID
+複数のデバッグ・サーバーが同一のリモート・ホストで実行している場合の、オプション固有のID。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjinfo\fRޥɤϡꤵ줿Javaץ䥳եޤϥ⡼ȡǥХåСJavaϤޤˤϡJavaƥࡦץѥƥJavaۥޥ(JVM)Υޥɥ饤󡦥ե饰ޤޤƤޤꤵ줿ץ64ӥåJVMǼ¹ԤƤ硢\fI\-J\-d64\fRץꤹɬפ礬ޤ򼨤ޤ\fIjinfo\fR
-\fI\-J\-d64 \-sysprops pid\fR
+\fIjinfo\fRコマンドは、指定されたJavaプロセスやコア・ファイルまたはリモート・デバッグ・サーバーのJava構成情報を出力します。構成情報には、Javaシステム・プロパティとJava仮想マシン(JVM)のコマンドライン・フラグが含まれています。指定されたプロセスが64ビットJVM上で実行されている場合、\fI\-J\-d64\fRオプションを指定する必要がある場合があります。次に例を示します。\fIjinfo\fR
+\fI\-J\-d64 \-sysprops pid\fR。
 .PP
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤ\fIdbgeng\&.dll\fR¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤjvm\&.dllξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤȤС\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fRǤ
-.SH "ץ"
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。\fIdbgeng\&.dll\fRが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。\fIPATH\fR環境変数には、ターゲット・プロセスによって使用されるjvm\&.dllの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。たとえば、\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fRです。
+.SH "オプション"
 .PP
 no\-option
 .RS 4
-ޥɥ饤󡦥ե饰򡢥ƥࡦץѥƥ̾ͤΥڥȤȤ˽Ϥޤ
+コマンドライン・フラグを、システム・プロパティ名と値のペアとともに出力します。
 .RE
 .PP
 \-flag \fIname\fR
 .RS 4
-ꤵ줿ޥɥ饤󡦥ե饰̾ͤϤޤ
+指定されたコマンドライン・フラグの名前と値を出力します。
 .RE
 .PP
 \-flag \fI[+|\-]name\fR
 .RS 4
-ꤵ줿֡뷿Υޥɥ饤󡦥ե饰ͭޤ̵ˤޤ
+指定されたブール型のコマンドライン・フラグを有効または無効にします。
 .RE
 .PP
 \-flag \fIname=value\fR
 .RS 4
-ꤵ줿ޥɥ饤󡦥ե饰ꤵ줿ͤꤷޤ
+指定されたコマンドライン・フラグを指定された値に設定します。
 .RE
 .PP
 \-flags
 .RS 4
-JVMϤ륳ޥɥ饤󡦥ե饰Ϥޤ
+JVMに渡されるコマンドライン・フラグを出力します。
 .RE
 .PP
 \-sysprops
 .RS 4
-Javaƥࡦץѥƥ̾ͤΥڥȤƽϤޤ
+Javaシステム・プロパティを名前と値のペアとして出力します。
 .RE
 .PP
 \-h
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jjs.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jjs.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jjs
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jjs" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jjs" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jjs \- Nashorn󥸥ƤӽФޤ
-.SH ""
+jjs \- Nashornエンジンを呼び出します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,28 +64,28 @@
 .PP
 \fIoptions\fR
 .RS 4
-ʸǶڤ줿\fIjjs\fRޥɤ1İʾΥץ󡣾ܺ٤ϡץ򻲾ȤƤ
+空白文字で区切られた、\fIjjs\fRコマンドの1つ以上のオプション。詳細は、オプションを参照してください。
 .RE
 .PP
 \fIscript\-files\fR
 .RS 4
-ʸǶڤ줿NashornѤƲ᤹1İʾΥץȡե롣ե뤬ꤵʤϡ÷뤬ưޤ
+空白文字で区切られた、Nashornを使用して解釈する1つ以上のスクリプト・ファイル。ファイルが指定されない場合は、対話型シェルが起動されます。
 .RE
 .PP
 \fIarguments\fR
 .RS 4
-ťϥե󡦥ޡ(\fI\-\-\fR)θΤ٤ƤͤȤƥץȤޤ÷Ϥޤͤˤ\fIarguments\fRץѥƥѤƥǤޤ(Example 3򻲾ȤƤ)
+二重ハイフン・マーカー(\fI\-\-\fR)の後のすべての値が、引数としてスクリプトまたは対話型シェルに渡されます。これらの値には\fIarguments\fRプロパティを使用してアクセスできます(Example 3を参照してください)。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjjs\fRޥɥ饤󡦥ġѤNashorn󥸥ƤӽФޤѤơ1ĤޤʣΥץȡեᤷꡢ÷¹Ԥ뤳ȤǤޤ
-.SH "ץ"
+\fIjjs\fRコマンドライン・ツールを使用してNashornエンジンを呼び出します。これを使用して、1つまたは複数のスクリプト・ファイルを解釈したり、対話型シェルを実行することができます。
+.SH "オプション"
 .PP
-\fIjjs\fRޥɤΥץϥץȤNashornˤäƲᤵ椷ޤ
+\fIjjs\fRコマンドのオプションはスクリプトがNashornによって解釈される条件を制御します。
 .PP
 \-ccs=\fIsize\fR, \-\-class\-cache\-size=\fIsize\fR
 .RS 4
-饹å塦Хñ̤ꤷޤХ(KB)򼨤\fIk\fRޤ\fIK\fRʸɲäᥬХ(MB)򼨤\fIm\fRޤ\fIM\fRʸɲäХ(GB)򼨤\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡ饹å塦50ХȤꤵޤϡ1024Х(1 KB)ꤹˡ򼨤ޤ
+クラス・キャッシュ・サイズをバイト単位で設定します。キロバイト(KB)を示すために\fIk\fRまたは\fIK\fRの文字を追加し、メガバイト(MB)を示すために\fIm\fRまたは\fIM\fRの文字を追加し、ギガバイト(GB)を示すために\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、クラス・キャッシュ・サイズは50バイトに設定されます。次の例は、1024バイト(1 KB)に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -101,17 +101,17 @@
 .PP
 \-co, \-\-compile\-only
 .RS 4
-ץȤ¹Ԥ˥ѥ뤷ޤ
+スクリプトを実行せずにコンパイルします。
 .RE
 .PP
 \-cp \fIpath\fR, \-\-classpath \fIpath\fR
 .RS 4
-ݡȤ륯饹ؤΥѥꤷޤʣΥѥꤹˤϡΥץ򷫤֤ޤϳƥѥ򥳥(:)Ƕڤޤ
+サポートするクラスへのパスを指定します。複数のパスを設定するには、このオプションを繰り返すか、または各パスをコロン(:)で区切ります。
 .RE
 .PP
 \-D\fIname\fR=\fIvalue\fR
 .RS 4
-ץѥƥ̾ͤƤ뤳ȤǡץȤϤƥࡦץѥƥꤷޤǡ÷⡼ɤNashornƤӽФơ\fImyValue\fR\fImyKey\fRȤ̾Υץѥƥ˳Ƥˡ򼨤ޤ
+プロパティ名に値を割り当てることで、スクリプトに渡すシステム・プロパティを設定します。次の例で、対話型モードでNashornを呼び出して、\fImyValue\fRを\fImyKey\fRという名前のプロパティに割り当てる方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -125,67 +125,67 @@
 .if n \{\
 .RE
 .\}
-Υץ򷫤֤ѤȡʣΥץѥƥǤޤ
+このオプションを繰り返し使用すると、複数のプロパティを設定できます。
 .RE
 .PP
 \-d=\fIpath\fR, \-\-dump\-debug\-dir=\fIpath\fR
 .RS 4
-饹եפǥ쥯ȥؤΥѥꤷޤ
+クラス・ファイルをダンプするディレクトリへのパスを指定します。
 .RE
 .PP
 \-\-debug\-lines
 .RS 4
-饹եιֹɽޤǥեȤǤϡΥץͭˤʤäƤޤ̵ˤˤ\fI\-\-debug\-lines=false\fRꤷޤ
+クラス・ファイル内の行番号表を生成します。デフォルトでは、このオプションは有効になっています。無効にするには\fI\-\-debug\-lines=false\fRを指定します。
 .RE
 .PP
 \-\-debug\-locals
 .RS 4
-饹եΥѿޤ
+クラス・ファイル内のローカル変数を生成します。
 .RE
 .PP
 \-doe, \-\-dump\-on\-error
 .RS 4
-顼ȯȤˡե롦åȥ졼󶡤ޤǥեȤǤϡñʥ顼åΤߤϤޤ
+エラーが発生したときに、フル・スタック・トレースを提供します。デフォルトでは、簡単なエラー・メッセージのみが出力されます。
 .RE
 .PP
 \-\-early\-lvalue\-error
 .RS 4
-̵ʺͼ顼Ȥ(ĤޤꡢɤϤȤ)𤵤ޤǥեȤǤϡΥץͭˤʤäƤޤ̵ˤˤ\fI\-\-early\-lvalue\-error=false\fRꤷޤ̵ʾ硢̵ʺͼϥɤ¹Ԥޤ𤵤ޤ
+無効な左辺値式が早期エラーとして(つまり、コードが解析されるときに)報告されます。デフォルトでは、このオプションは有効になっています。無効にするには\fI\-\-early\-lvalue\-error=false\fRを指定します。無効な場合、無効な左辺値式はコードが実行されるまで報告されません。
 .RE
 .PP
 \-\-empty\-statements
 .RS 4
-ʸJavaݹʸĥ꡼¸ޤ
+空の文をJavaの抽象構文ツリーに保存します。
 .RE
 .PP
 \-fv, \-\-fullversion
 .RS 4
-NashornСʸϤޤ
+完全なNashornバージョン文字列を出力します。
 .RE
 .PP
 \-\-function\-statement\-error
 .RS 4
-ؿʸȤƻѤȥ顼åϤޤ
+関数の宣言が文として使用されるとエラー・メッセージが出力されます。
 .RE
 .PP
 \-\-function\-statement\-warning
 .RS 4
-ؿʸȤƻѤȷٹåϤޤ
+関数の宣言が文として使用されると警告メッセージが出力されます。
 .RE
 .PP
 \-fx
 .RS 4
-ץȤJavaFXץꥱȤƵưޤ
+スクリプトをJavaFXアプリケーションとして起動します。
 .RE
 .PP
 \-h, \-help
 .RS 4
-ץΥꥹȤȤϤޤ
+オプションのリストとその説明を出力します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤷ\fIjava\fRưץJVMϤޤǡ÷⡼ɤNashornƤӽФơJVMˤäƻѤ꡼4 GBꤹˡ򼨤ޤ
+指定した\fIjava\fR起動オプションをJVMに渡します。次の例で、対話型モードでNashornを呼び出して、JVMによって使用される最大メモリーを4 GBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -199,22 +199,22 @@
 .if n \{\
 .RE
 .\}
-Υץ򷫤֤Ѥȡʣ\fIjava\fRޥɡץϤȤǤޤ
+このオプションを繰り返し使用すると、複数の\fIjava\fRコマンド・オプションを渡すことができます。
 .RE
 .PP
 \-\-lazy\-compilation
 .RS 4
-쥤ά(ĤޤꡢץΤ٤˥ѥ뤵ʤ)ͭˤޤΥץϻŪʤΤǤ
+レイジー・コード生成戦略(つまり、スクリプト全体が一度にコンパイルされない)を有効にします。このオプションは試験的なものです。
 .RE
 .PP
 \-\-loader\-per\-compile
 .RS 4
-ѥ뤴Ȥ˿饹ޤǥեȤǤϡΥץͭˤʤäƤޤ̵ˤˤ\fI\-\-loader\-per\-compile=false\fRꤷޤ
+コンパイルごとに新しいクラス・ローダーを作成します。デフォルトでは、このオプションは有効になっています。無効にするには\fI\-\-loader\-per\-compile=false\fRを指定します。
 .RE
 .PP
 \-\-log=\fIsubsystem\fR:\fIlevel\fR
 .RS 4
-ꤵ줿֥ƥФơΥ٥ǥ󥰤¹ԤޤޤǶڤäʣΥ֥ƥΥ󥰡٥Ǥޤ򼨤ޤ
+指定されたサブシステムに対して、特定のレベルでロギングを実行します。カンマで区切って複数のサブシステムのロギング・レベルを指定できます。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -229,116 +229,116 @@
 .PP
 \-\-package=\fIname\fR
 .RS 4
-줿饹եɲäѥåꤷޤ
+生成されたクラス・ファイルを追加するパッケージを指定します。
 .RE
 .PP
 \-\-parse\-only
 .RS 4
-ѥ뤻˥ɤϤޤ
+コンパイルせずにコードを解析します。
 .RE
 .PP
 \-\-print\-ast
 .RS 4
-ݹʸĥ꡼Ϥޤ
+抽象構文ツリーを出力します。
 .RE
 .PP
 \-\-print\-code
 .RS 4
-ХȥɤϤޤ
+バイトコードを出力します。
 .RE
 .PP
 \-\-print\-lower\-ast
 .RS 4
-겼ݹʸĥ꡼Ϥޤ
+掘り下げた抽象構文ツリーを出力します。
 .RE
 .PP
 \-\-print\-lower\-parse
 .RS 4
-겼ϥĥ꡼Ϥޤ
+掘り下げた解析ツリーを出力します。
 .RE
 .PP
 \-\-print\-no\-newline
 .RS 4
-¾\fI\-\-print*\fRץǶŪ1ԤǽϤޤ
+その他の\fI\-\-print*\fRオプションで強制的に1行で出力します。
 .RE
 .PP
 \-\-print\-parse
 .RS 4
-ϥĥ꡼Ϥޤ
+解析ツリーを出力します。
 .RE
 .PP
 \-\-print\-symbols
 .RS 4
-ɽϤޤ
+記号表を出力します。
 .RE
 .PP
 \-pcs, \-\-profile\-callsites
 .RS 4
-ƤӽФȤΥץե롦ǡפޤ
+呼び出しサイトのプロファイル・データをダンプします。
 .RE
 .PP
 \-scripting
 .RS 4
-Υץȵǽͭˤޤ
+シェルのスクリプト機能を有効にします。
 .RE
 .PP
 \-\-stderr=\fIfilename\fR|\fIstream\fR|\fItty\fR
 .RS 4
-ɸ२顼ȥ꡼ꤷե롢ȥ꡼(Ȥ\fIstdout\fR)ˡޤϥƥü˥쥯Ȥޤ
+標準エラー・ストリームを指定したファイル、ストリーム(たとえば\fIstdout\fR)に、またはテキスト端末にリダイレクトします。
 .RE
 .PP
 \-\-stdout=\fIfilename\fR|\fIstream\fR|\fItty\fR
 .RS 4
-ɸϥȥ꡼ꤷե롢ȥ꡼(Ȥ\fIstderr\fR)ˡޤϥƥü˥쥯Ȥޤ
+標準出力ストリームを指定したファイル、ストリーム(たとえば\fIstderr\fR)に、またはテキスト端末にリダイレクトします。
 .RE
 .PP
 \-strict
 .RS 4
-ɸ(ECMAScript Edition 5\&.1)ؤν򶯲strict⡼ɤͭˤˤ궦̤Υǥ󥰡顼ñ˸ФǤ褦ˤʤޤ
+標準(ECMAScript Edition 5\&.1)への準拠を強化するstrictモードを有効にし、これにより共通のコーディング・エラーを簡単に検出できるようになります。
 .RE
 .PP
 \-t=\fIzone\fR, \-timezone=\fIzone\fR
 .RS 4
-ץȤμ¹ԤФꤷॾꤷޤOSꤵ줿ॾ򥪡С饤ɤ\fIDate\fR֥ȤǻѤޤ
+スクリプトの実行に対し指定したタイムゾーンを設定します。OSで設定されたタイムゾーンをオーバーライドし、\fIDate\fRオブジェクトで使用されます。
 .RE
 .PP
 \-tcs=\fIparameter\fR, \-\-trace\-callsites=\fIparameter\fR
 .RS 4
-ƽФȤΥȥ졼Υ⡼ɤͭˤޤѲǽʥѥ᡼ϡΤȤǤ
+呼出しサイトのトレースのモードを有効にします。使用可能なパラメータは、次のとおりです。
 .PP
 miss
 .RS 4
-ƽФȤΥߥȥ졼ޤ
+呼出しサイトのミスをトレースします。
 .RE
 .PP
 enterexit
 .RS 4
-ƽФȤؤνȥ졼ޤ
+呼出しサイトへの出入りをトレースします。
 .RE
 .PP
 objects
 .RS 4
-֥ȤΥץѥƥϤޤ
+オブジェクトのプロパティを出力します。
 .RE
 .RE
 .PP
 \-\-verify\-code
 .RS 4
-Хȥɤ¹Ԥ˸ڤޤ
+バイトコードを実行する前に検証します。
 .RE
 .PP
 \-v, \-version
 .RS 4
-NashornСʸϤޤ
+Nashornバージョン文字列を出力します。
 .RE
 .PP
 \-xhelp
 .RS 4
-ޥɥ饤󡦥ץγĥإפϤޤ
+コマンドライン・オプションの拡張ヘルプを出力します。
 .RE
-.SH ""
+.SH "例"
 .PP
-\fBExample 1\fR, NashornѤץȤμ¹
+\fBExample 1\fR, Nashornを使用したスクリプトの実行
 .RS 4
 .sp
 .if n \{\
@@ -352,7 +352,7 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ÷⡼ɤǤNashornμ¹
+\fBExample 2\fR, 対話型モードでのNashornの実行
 .RS 4
 .sp
 .if n \{\
@@ -370,7 +370,7 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, NashornؤΰϤ
+\fBExample 3\fR, Nashornへの引数の渡し
 .RS 4
 .sp
 .if n \{\
@@ -386,7 +386,7 @@
 .RE
 .\}
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .PP
 \fIjrunscript\fR
 .br
--- a/jdk/src/linux/doc/man/ja/jmap.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jmap.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jmap
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jmap" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jmap" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jmap \- ץ䥳եޤϥ⡼ȡǥХåСΡѥ֥ȡ꡼ޥåפޤϥҡס꡼ξܺ٤ϤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jmap \- プロセスやコア・ファイルまたはリモート・デバッグ・サーバーの、共用オブジェクト・メモリー・マップまたはヒープ・メモリーの詳細を出力します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -84,93 +84,93 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIpid\fR
 .RS 4
-Ϥ꡼ޥåפΥץIDץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤ
+出力するメモリー・マップのプロセスID。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-Ϥ꡼ޥåפΥե롣
+出力するメモリー・マップのコア・ファイル。
 .RE
 .PP
 \fIremote\-hostname\-or\-IP\fR
 .RS 4
-⡼ȡǥХåС\fIۥ̾\fRޤ\fIIP\fRɥ쥹jsadebugd(1)򻲾ȤƤ
+リモート・デバッグ・サーバーの\fIホスト名\fRまたは\fIIP\fRアドレス。jsadebugd(1)を参照してください。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥ⡼ȡۥȤǼ¹ԤƤΡץͭID
+複数のデバッグ・サーバーが同一のリモート・ホストで実行している場合の、オプション固有のID。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjmap\fRޥɤϡꤵ줿ץ䥳եޤϥ⡼ȡǥХåСΡѥ֥ȡ꡼ޥåפޤϥҡס꡼ξܺ٤Ϥޤꤵ줿ץ64ӥåJavaۥޥ(JVM)Ǽ¹ԤƤ硢\fI\-J\-d64\fRץꤹɬפ礬ޤ򼨤ޤ\fIjmap\fR
-\fI\-J\-d64 \-heap pid\fR
+\fIjmap\fRコマンドは、指定されたプロセスやコア・ファイルまたはリモート・デバッグ・サーバーの、共用オブジェクト・メモリー・マップまたはヒープ・メモリーの詳細を出力します。指定されたプロセスが64ビットJava仮想マシン(JVM)上で実行されている場合、\fI\-J\-d64\fRオプションを指定する必要がある場合があります。次に例を示します。\fIjmap\fR
+\fI\-J\-d64 \-heap pid\fR。
 .PP
-\fB:\fR
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤ\fIdbgeng\&.dll\fRե뤬¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤ\fIjvm\&.dll\fRξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤ򼨤ޤ\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fR
-.SH "ץ"
+\fB注意:\fR
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。\fIdbgeng\&.dll\fRファイルが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。\fIPATH\fR環境変数には、ターゲット・プロセスによって使用される\fIjvm\&.dll\fRの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。次に例を示します。\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fR。
+.SH "オプション"
 .PP
-<ץʤ>
+<オプションなし>
 .RS 4
-ץѤʤ硢\fIjmap\fRޥɤ϶ѥ֥ȡޥåԥ󥰤ϤޤåJVM˥ɤ줿ѥ֥ȤȤˡϥɥ쥹ޥåԥ󥰤ΥӶѥ֥ȡեΥեѥϤޤưϡOracle Solaris
-\fIpmap\fR桼ƥƥƤޤ
+オプションを使用しない場合、\fIjmap\fRコマンドは共用オブジェクト・マッピングを出力します。ターゲットJVMにロードされた共用オブジェクトごとに、開始アドレス、マッピングのサイズおよび共用オブジェクト・ファイルのフルパスが出力されます。この動作は、Oracle Solaris
+\fIpmap\fRユーティリティと類似しています。
 .RE
 .PP
 \-dump:[live,] format=b, file=\fIfilename\fR
 .RS 4
-Javaҡפ\fIhprof\fRХʥ\fIfilename\fR˥פޤ\fIlive\fR֥ץϥץǤꤷ硢ҡΥƥ֤ʥ֥ȤΤߤפޤҡספ򻲾Ȥˤϡjhat(1)ޥɤѤ줿եɤ߼ޤ
+Javaヒープを\fIhprof\fRバイナリ形式で\fIfilename\fRにダンプします。\fIlive\fRサブオプションはオプションですが、指定した場合、ヒープ内のアクティブなオブジェクトのみがダンプされます。ヒープ・ダンプを参照するには、jhat(1)コマンドを使用して生成されたファイルを読み取ります。
 .RE
 .PP
 \-finalizerinfo
 .RS 4
-եʥ饤ԤäƤ륪֥Ȥ˴ؤϤޤ
+ファイナライズを待っているオブジェクトに関する情報を出力します。
 .RE
 .PP
 \-heap
 .RS 4
-ѤƤ륬١쥯Υҡסޥ꡼إåϢΥҡ׻ѾϤޤˡintern줿ʸοȥϤޤ
+使用されているガベージ・コレクションのヒープ・サマリー、ヘッダー構成、および世代関連のヒープ使用状況を出力します。さらに、internされた文字列の数とサイズも出力されます。
 .RE
 .PP
 \-histo[:live]
 .RS 4
-ҡפΥҥȥϤޤJava饹Ȥˡ֥ȤοХñ̤ǤΥ꡼Ӵ饹̾ϤޤJVM饹̾ϥꥹ(*)ƬդƽϤޤ\fIlive\fR֥ץ󤬻ꤵ줿硢ƥ֤ʥ֥ȤΤߤȤޤ
+ヒープのヒストグラムを出力します。Javaクラスごとに、オブジェクトの数、バイト単位でのメモリー・サイズ、および完全修飾クラス名が出力されます。JVMの内部クラス名はアスタリスク(*)の接頭辞を付けて出力されます。\fIlive\fRサブオプションが指定された場合、アクティブなオブジェクトのみがカウントされます。
 .RE
 .PP
 \-clstats
 .RS 4
-JavaҡפΡ饹ϢץǡϤޤ饹Ȥˡ̾֡ɥ쥹ƥ饹ӥ饹ɤ饹οȥϤޤ
+Javaヒープの、クラス・ローダー関連の統計データを出力します。クラス・ローダーごとに、その名前、状態、アドレス、親クラス・ローダー、およびクラス・ローダーがロードしたクラスの数とサイズが出力されます。
 .RE
 .PP
 \-F
 .RS 4
-ޤPIDʤȤˡΥץ\fIjmap \-dump\fRޤ\fIjmap \-histo\fRץȤȤ˻ѤޤΥ⡼ɤǤϡ\fIlive\fR֥ץϥݡȤޤ
+強制します。PIDが応答しないときに、このオプションを\fIjmap \-dump\fRまたは\fIjmap \-histo\fRオプションとともに使用します。このモードでは、\fIlive\fRサブオプションはサポートされません。
 .RE
 .PP
 \-h
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjmap\fRޥɤ¹ԤƤJavaۥޥ\fIflag\fRϤޤ
+\fIjmap\fRコマンドを実行しているJava仮想マシンに\fIflag\fRを渡します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jps.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jps.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jps
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ˥󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: モニタリング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jps" "1" "2013ǯ1121" "JDK 8" "˥󥰡ġ"
+.TH "jps" "1" "2013年11月21日" "JDK 8" "モニタリング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jps \- åȡƥǷ¬줿Javaۥޥ(JVM)ɽޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jps \- ターゲット・システム上で計測されたJava仮想マシン(JVM)を一覧表示します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,60 +64,60 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIhostid\fR
 .RS 4
-ץݡȤۥȤμ̻ҡ\fIhostid\fRˤϡ̿ץȥ롢ݡֹ桢˸ͭ¾Υǡꤷץ󡦥ݡͥȤޤ뤳ȤǤޤۥȼ̻Ҥ򻲾ȤƤ
+プロセス・レポートを生成するホストの識別子。\fIhostid\fRには、通信プロトコル、ポート番号、実装に固有な他のデータを指定したオプション・コンポーネントを含めることができます。ホスト識別子を参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjps\fRޥɤϡåȡƥǷ¬줿Java HotSpot VMɽޤΥޥɤɽǤݡȾϡäJVM˴ؤΤ˸ꤵޤ
+\fIjps\fRコマンドは、ターゲット・システム上で計測されたJava HotSpot VMを一覧表示します。このコマンドで表示できるレポート情報は、アクセス権を持ったJVMに関するものに限定されます。
 .PP
-\fIhostid\fRꤻ\fIjps\fRޥɤ¹Ԥ硢롦ۥȤǷ¬줿JVMޤ\fIhostid\fRꤷƵư硢ꤵ줿ץȥȥݡȤѤơꤵ줿ۥȾJVM򸡺ޤ\fIjstatd\fRץåȡۥȾǼ¹ԤƤꤵޤ
+\fIhostid\fRを指定せずに\fIjps\fRコマンドを実行した場合、ローカル・ホストで計測されたJVMが検索されます。\fIhostid\fRを指定して起動した場合、指定されたプロトコルとポートを使用して、指定されたホスト上のJVMを検索します。\fIjstatd\fRプロセスがターゲット・ホスト上で実行されていると想定されます。
 .PP
-\fIjps\fRޥɤϡåȡƥǷ¬줿JVMˤĤơVM̻ҡĤޤ\fIlvmid\fRݡȤޤ\fIlvmid\fRϡŪˤJVMץФ륪ڥ졼ƥ󥰡ƥΥץ̻ҤǤɬ⤽ǤȤϸ¤ޤ󡣥ץꤷʤ硢\fIjps\fRˤäơJavaץꥱ\fIlvmid\fRɽ졢줾˥ץꥱΥ饹̾ޤJARե̾ñʷǼޤδñʷΥ饹̾JARե̾Ǥϡ饹ΥѥåޤJARե롦ѥ󤬾άƤޤ
+\fIjps\fRコマンドは、ターゲット・システムで計測された各JVMについて、ローカルVM識別子、つまり\fIlvmid\fRをレポートします。\fIlvmid\fRは、一般的にはJVMプロセスに対するオペレーティング・システムのプロセス識別子ですが、必ずしもそうであるとは限りません。オプションを指定しない場合、\fIjps\fRによって、各Javaアプリケーションの\fIlvmid\fRが一覧表示され、それぞれにアプリケーションのクラス名またはJARファイル名が簡単な形式で示されます。この簡単な形式のクラス名とJARファイル名では、クラスのパッケージ情報またはJARファイル・パス情報が省略されています。
 .PP
-\fIjps\fRޥɤϡJavaưġѤmain᥽åɤϤ륯饹̾Ȱ򸡺ޤȼεưġѤƥåJVMưϡ\fImain\fR᥽åɤϤ륯饹̾ޤJARե̾ȰѤǤޤ󡣤ξ硢\fIjps\fRޥɤϡ\fImain\fR᥽åɤϤ륯饹̾ޤJARե̾ȰФơʸ\fIUnknown\fRϤޤ
+\fIjps\fRコマンドは、Java起動ツールを使用してmainメソッドに渡されるクラス名と引数を検索します。独自の起動ツールを使用してターゲットJVMを起動した場合は、\fImain\fRメソッドに渡されるクラス名またはJARファイル名と引数は利用できません。この場合、\fIjps\fRコマンドは、\fImain\fRメソッドに渡されるクラス名またはJARファイル名と引数に対して、文字列\fIUnknown\fRを出力します。
 .PP
-\fIjps\fRޥɤJVMΥꥹȤϡΥޥɤ¹Ԥץ󥷥ѥͿ줿˴Ť¤礬ޤΥޥɤϡڥ졼ƥ󥰡ƥȼΥ浡ˤ˴Ťơץ󥷥ѥ˥ͿƤJVMΤߤɽޤ
-.SH "ץ"
+\fIjps\fRコマンドで生成されるJVMのリストは、このコマンドを実行するプリンシパルに与えられたアクセス権に基づき、制限される場合があります。このコマンドは、オペレーティング・システム独自のアクセス制御機構による決定に基づいて、プリンシパルにアクセス権が与えられているJVMのみを一覧表示します。
+.SH "オプション"
 .PP
-\fIjps\fRޥɤǤϡޥɤνϤѹ륪ץ¿ݡȤƤޤ衢Υץϡѹޤѻߤǽޤ
+\fIjps\fRコマンドでは、コマンドの出力を変更するオプションが多数サポートされています。将来、これらのオプションは、変更または廃止される可能性があります。
 .PP
 \-q
 .RS 4
-饹̾JARե̾\fImain\fR᥽åɤϤ줿νϤVM̻ҤΰΤߤޤ
+クラス名、JARファイル名、および\fImain\fRメソッドに渡された引数の出力を抑制し、ローカルVM識別子の一覧のみを生成します。
 .RE
 .PP
 \-m
 .RS 4
-\fImain\fR᥽åɤϤϤޤνϤϡȤ߹ޤƤJVMФ\fInull\fRˤʤ뤳Ȥ⤢ޤ
+\fImain\fRメソッドに渡される引数を出力します。この出力は、組み込まれているJVMに対して\fInull\fRになることもあります。
 .RE
 .PP
 \-l
 .RS 4
-ץꥱ\fImain\fR饹Υե롦ѥå̾ޤϥץꥱJARեؤΥեѥ̾Ϥޤ
+アプリケーションの\fImain\fRクラスのフル・パッケージ名、またはアプリケーションのJARファイルへのフルパス名を出力します。
 .RE
 .PP
 \-v
 .RS 4
-JVMϤɽޤ
+JVMに渡される引数を表示します。
 .RE
 .PP
 \-V
 .RS 4
-饹̾JARե̾mai᥽åɤϤ줿νϤVM̻ҤΰΤߤޤ
+クラス名、JARファイル名、およびmaiメソッドに渡された引数の出力を抑制し、ローカルVM識別子の一覧のみを生成します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JVM\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ\fIץ\fR1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+JVMに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されている\fIオプション\fRを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ۥȼ̻"
+.SH "ホスト識別子"
 .PP
-ۥȼ̻ҡĤޤ\fIhostid\fRϡåȡƥ򼨤ʸǤ\fIhostid\fRʸιʸϡURIιʸбƤޤ
+ホスト識別子、つまり\fIhostid\fRは、ターゲット・システムを示す文字列です。\fIhostid\fR文字列の構文は、URIの構文に対応しています。
 .sp
 .if n \{\
 .RS 4
@@ -131,27 +131,27 @@
 .PP
 \fIprotocol\fR
 .RS 4
-̿ץȥǤ\fIprotocol\fRά졢\fIhostname\fRꤵƤʤ硢ǥեȤΥץȥ뤬ץåȥեͭκŬ줿롦ץȥˤʤޤץȥ뤬ά졢ۥ̾ꤵƤϡǥեȡץȥ\fIrmi\fRˤʤޤ
+通信プロトコルです。\fIprotocol\fRが省略され、\fIhostname\fRが指定されていない場合、デフォルトのプロトコルが、プラットフォーム固有の最適化されたローカル・プロトコルになります。プロトコルが省略され、ホスト名が指定されている場合は、デフォルト・プロトコルは\fIrmi\fRになります。
 .RE
 .PP
 hostname
 .RS 4
-åȡۥȤ򼨤ۥ̾ޤIPɥ쥹Ǥ\fIhostname\fRѥ᡼άƤϡåȡۥȤϥ롦ۥȤˤʤޤ
+ターゲット・ホストを示すホスト名またはIPアドレスです。\fIhostname\fRパラメータが省略されている場合は、ターゲット・ホストはローカル・ホストになります。
 .RE
 .PP
 port
 .RS 4
-⡼ȡС̿뤿ΥǥեȡݡȤǤ\fIhostname\fRѥ᡼άƤ뤫\fIprotocol\fRѥ᡼Ŭ줿롦ץȥꤷƤ硢\fIport\fRѥ᡼̵뤵ޤʳξ硢\fIport\fRѥ᡼ΰϡˤäưۤʤޤǥեȤ
-\fIrmi\fRץȥξ硢\fIport\fRѥ᡼ϡ⡼ȡۥȾrmiregistryΥݡֹ򼨤ޤ\fIport\fRѥ᡼άƤ뤫\fIprotocol\fRѥ᡼\fIrmi\fR򼨤Ƥ硢ǥեȤrmiregistryݡ(1099)Ѥޤ
+リモート・サーバーと通信するためのデフォルト・ポートです。\fIhostname\fRパラメータが省略されているか、\fIprotocol\fRパラメータが、最適化されたローカル・プロトコルを指定している場合、\fIport\fRパラメータは無視されます。それ以外の場合、\fIport\fRパラメータの扱いは、実装によって異なります。デフォルトの
+\fIrmi\fRプロトコルの場合、\fIport\fRパラメータは、リモート・ホスト上のrmiregistryのポート番号を示します。\fIport\fRパラメータが省略されているか、\fIprotocol\fRパラメータが\fIrmi\fRを示している場合、デフォルトのrmiregistryポート(1099)が使用されます。
 .RE
 .PP
 servername
 .RS 4
-Υѥ᡼ΰϡˤäưۤʤޤŬ줿롦ץȥξ硢Υեɤ̵뤵ޤ\fIrmi\fRץȥξ硢Υѥ᡼ϡ⡼ȡۥȾRMI⡼ȡ֥Ȥ̾򼨤ʸˤʤޤܺ٤ϡ\fIjstatd\fRޥɤ\fI\-n\fRץ򻲾ȤƤ
+このパラメータの扱いは、実装によって異なります。最適化されたローカル・プロトコルの場合、このフィールドは無視されます。\fIrmi\fRプロトコルの場合、このパラメータは、リモート・ホスト上のRMIリモート・オブジェクトの名前を示す文字列になります。詳細は、\fIjstatd\fRコマンドの\fI\-n\fRオプションを参照してください。
 .RE
-.SH "ϥեޥå"
+.SH "出力フォーマット"
 .PP
-\fIjps\fRޥɤνϤϡΥѥ˽ޤ
+\fIjps\fRコマンドの出力は、次のパターンに従います。
 .sp
 .if n \{\
 .RS 4
@@ -163,15 +163,15 @@
 .RE
 .\}
 .PP
-٤Ƥνϥȡ϶ʸǶڤޤ\fIarg\fRͤǶѤȡºݤ֥ѥ᡼˰ޥåԥ󥰤褦ȤȤˡޤˤʤޤ
+すべての出力トークンは空白文字で区切られます。\fIarg\fR値の中で空白を使用すると、実際の定位置パラメータに引数をマッピングしようとするときに、あいまいになります。
 .PP
-\fB:\fR
-Υ꡼Ǥηѹǽ뤿ᡢ\fIjps\fRνϤϤ륹ץȤϺʤȤᤷޤ\fIjps\fRϤϤ륹ץȤȡΥġξΥ꡼ǡץȤѹɬפˤʤǽޤ
-.SH ""
+\fB注意:\fR
+将来のリリースでこの形式は変更される可能性があるため、\fIjps\fRの出力を解析するスクリプトは作成しないことをお薦めします。\fIjps\fR出力を解析するスクリプトを作成すると、このツールの将来のリリースで、作成したスクリプトの変更が必要になる可能性があります。
+.SH "例"
 .PP
-ιǤϡ\fIjps\fRޥɤ򼨤ޤ
+この項では、\fIjps\fRコマンドの例を示します。
 .PP
-롦ۥȾǷ¬줿JVMɽ:
+ローカル・ホスト上で計測されたJVMを一覧表示する場合:
 .sp
 .if n \{\
 .RS 4
@@ -186,7 +186,7 @@
 .RE
 .\}
 .PP
-Ǥϡ⡼ȡۥȾǷ¬줿JVMɽޤǤϡ\fIjstat\fRСȡRMI쥸ȥޤ̤γrmiregistryץΤ줫⡼ȡۥȤΥǥեȡݡ(ݡ1099)Ǽ¹ԤƤꤷƤޤޤ롦ۥȤ⡼ȡۥȤؤͭʥäƤ뤳ȤꤷƤޤˤϡ\fI\-l\fRץޤޤ졢饹̾ޤJARե̾ܺ٤ʷǽϤޤ
+次の例では、リモート・ホスト上で計測されたJVMを一覧表示します。この例では、\fIjstat\fRサーバーと、その内部RMIレジストリまたは別の外部rmiregistryプロセスのいずれかが、リモート・ホストのデフォルト・ポート(ポート1099)で実行されていると想定しています。また、ローカル・ホストが、リモート・ホストへの有効なアクセス権を持っていることも想定しています。この例には、\fI\-l\fRオプションも含まれ、クラス名またはJARファイル名を詳細な形式で出力します。
 .sp
 .if n \{\
 .RS 4
@@ -200,7 +200,7 @@
 .RE
 .\}
 .PP
-ǤϡRMI쥸ȥ˥ǥեȤǤϤʤݡȤѤơ⡼ȡۥȾǷ¬줿JVMɽޤǤϡRMI쥸ȥ꤬ݡ2002˥Хɤ줿\fIjstatd\fRС⡼ȡۥȾǼ¹ԤƤꤷƤޤޤ\fI\-m\fRץѤơɽ줿줾Javaץꥱ\fImain\fR᥽åɤϤȤ߹Ǥޤ
+次の例では、RMIレジストリにデフォルトではないポートを使用して、リモート・ホスト上で計測されたJVMを一覧表示します。この例では、内部RMIレジストリがポート2002にバインドされた\fIjstatd\fRサーバーが、リモート・ホスト上で実行されていると想定しています。また、\fI\-m\fRオプションを使用して、一覧表示されたそれぞれのJavaアプリケーションの\fImain\fRメソッドに渡される引数を組み込んでいます。
 .sp
 .if n \{\
 .RS 4
@@ -213,7 +213,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jrunscript.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jrunscript.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jrunscript
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ץƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: スクリプティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jrunscript" "1" "2013ǯ1121" "JDK 8" "ץƥ󥰡ġ"
+.TH "jrunscript" "1" "2013年11月21日" "JDK 8" "スクリプティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jrunscript \- ÷⡼ɤȥХå⡼ɤ򥵥ݡȤ륳ޥɥ饤󡦥ץȡ¹ԤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jrunscript \- 対話型モードとバッチ・モードをサポートするコマンドライン・スクリプト・シェルを実行します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,83 +64,83 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIarguments\fR
 .RS 4
-Ѥ硢ץޤϥޥ̾ľ˵ҤƤ򻲾ȤƤ
+引数を使用する場合、オプションまたはコマンド名の直後に記述してください。引数を参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjrunscript\fRޥɤϡ˰¸ʤޥɥ饤󡦥ץȡǤ\fIjrunscript\fRϡ÷(read\-eval\-print)⡼ɤȥХå(\fI\-f\fRץ)⡼ɤξΥץȼ¹Ԥ򥵥ݡȤޤǥեȤλѸJavaScriptǤ\fI\-l\fRץѤ¾θǤޤ\fIjrunscript\fRޥɤϡJavaȥץȸȤ̿ѤõŪʥץߥ󥰡򥵥ݡȤޤ
-.SH "ץ"
+\fIjrunscript\fRコマンドは、言語に依存しないコマンドライン・スクリプト・シェルです。\fIjrunscript\fRは、対話型(read\-eval\-print)モードとバッチ(\fI\-f\fRオプション)・モードの両方のスクリプト実行をサポートします。デフォルトの使用言語はJavaScriptですが、\fI\-l\fRオプションを使用すれば他の言語も指定できます。\fIjrunscript\fRコマンドは、Javaとスクリプト言語との通信を使用して探求的なプログラミング・スタイルをサポートします。
+.SH "オプション"
 .PP
 \-classpath \fIpath\fR
 .RS 4
-ץȤɬפΤ륯饹եξ򼨤ޤ
+スクリプトがアクセスする必要のあるクラス・ファイルの場所を示します。
 .RE
 .PP
 \-cp \fIpath\fR
 .RS 4
 \fI\-classpath\fR
-\fIpath\fRƱǤ
+\fIpath\fRと同じです。
 .RE
 .PP
 \-D\fIname\fR=\fIvalue\fR
 .RS 4
-JavaΥƥࡦץѥƥꤷޤ
+Javaのシステム・プロパティを設定します。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIflag\fR\fIjrunscript\fRޥɤ¹ԤƤJavaۥޥľϤޤ
+\fIflag\fRを、\fIjrunscript\fRコマンドが実行されているJava仮想マシンに直接渡します。
 .RE
 .PP
 \-I \fIlanguage\fR
 .RS 4
-ꤵ줿ץȸѤޤǥեȤǤJavaScriptѤޤ¾ΥץȸѤˤϡ\fI\-cp\fRޤ\fI\-classpath\fRץѤơб륹ץȡ󥸥JARեꤹɬפޤ
+指定されたスクリプト言語を使用します。デフォルトではJavaScriptが使用されます。他のスクリプト言語を使用するには、\fI\-cp\fRまたは\fI\-classpath\fRオプションを使用して、対応するスクリプト・エンジンのJARファイルを指定する必要があります。
 .RE
 .PP
 \-e \fIscript\fR
 .RS 4
-ꤵ줿ץȤɾޤΥץѤСޥɥ饤ˤ٤Ƥꤵ줿1ԥץȤ¹ԤǤޤ
+指定されたスクリプトを評価します。このオプションを使用すれば、コマンドラインにすべてが指定された1行スクリプトを実行できます。
 .RE
 .PP
 \-encoding \fIencoding\fR
 .RS 4
-ץȡեɼ˻Ѥʸ󥳡ǥ󥰤ꤷޤ
+スクリプト・ファイルの読取り時に使用する文字エンコーディングを指定します。
 .RE
 .PP
 \-f \fIscript\-file\fR
 .RS 4
-ꤵ줿ץȡե(Хå⡼)ɾޤ
+指定されたスクリプト・ファイル(バッチ・モード)を評価します。
 .RE
 .PP
 \-f \-
 .RS 4
-ɸϤ饹ץȤɤ߼ꡢɾޤ(÷⡼)
+標準入力からスクリプトを読み取り、それを評価します(対話型モード)。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-?
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-q
 .RS 4
-Ѳǽʤ٤ƤΥץȡ󥸥ɽȡλޤ
+利用可能なすべてのスクリプト・エンジンを一覧表示したあと、終了します。
 .RE
-.SH ""
+.SH "引数"
 .PP
-arguments¸ߤƤơ\fI\-e\fR\fI\-f\fRΤΥץѤʤä硢ǽΰץȡեȤʤꡢ¾ΰ¸ߤϥץȤϤޤargumentsȡ\fI\-e\fRޤ\fI\-f\fRץ󤬻ѤƤ硢٤ƤargumentsץȤϤޤarguments\fI\-e\fR\fI\-f\fRɤ¸ߤʤäϡ÷⡼ɤѤޤץȤ饹ץȰѤˤϡ\fIarguments\fRȤ̾\fIString\fR󷿤Υ󥸥ѿѤޤ
-.SH ""
-.SS "饤󡦥ץȤμ¹"
+argumentsが存在していて、かつ\fI\-e\fR、\fI\-f\fRのいずれのオプションも使用されなかった場合、最初の引数がスクリプト・ファイルとなり、他の引数が存在する場合はスクリプトに渡されます。argumentsと、\fI\-e\fRまたは\fI\-f\fRオプションが使用されている場合、すべてのargumentsがスクリプトに渡されます。arguments、\fI\-e\fR、\fI\-f\fRがどれも存在しなかった場合は、対話型モードが使用されます。スクリプトからスクリプト引数を使用するには、\fIarguments\fRという名前の\fIString\fR配列型のエンジン変数を使用します。
+.SH "例"
+.SS "インライン・スクリプトの実行"
 .sp
 .if n \{\
 .RS 4
@@ -152,7 +152,7 @@
 .if n \{\
 .RE
 .\}
-.SS "ꤵ줿λѤӥץȡեɾ"
+.SS "指定された言語の使用およびスクリプト・ファイルの評価"
 .sp
 .if n \{\
 .RS 4
@@ -163,7 +163,7 @@
 .if n \{\
 .RE
 .\}
-.SS "÷⡼"
+.SS "対話型モード"
 .sp
 .if n \{\
 .RS 4
@@ -184,9 +184,9 @@
 .if n \{\
 .RE
 .\}
-.SS "ץȰꤷץȡեμ¹"
+.SS "スクリプト引数を指定したスクリプト・ファイルの実行"
 .PP
-test\&.jsեϥץȡեǤ\fIarg1\fR\fIarg2\fR\fIarg3\fRγưץȤϤޤץȤargumentsѤƤΰ˥Ǥޤ
+test\&.jsファイルはスクリプト・ファイルです。\fIarg1\fR、\fIarg2\fRおよび\fIarg3\fRの各引数がスクリプトに渡されます。スクリプトはarguments配列を使用してこれらの引数にアクセスできます。
 .sp
 .if n \{\
 .RS 4
@@ -197,10 +197,10 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .PP
-JavaScriptѤ硢桼ץȤɾˡ\fIjrunscript\fRޥɤϤĤȹߴؿȹߥ֥ȤޤJavaScriptȹߤˤĤƤϡhttp://code\&.google\&.com/p/jsdoc\-toolkit/ˤ
-JsDoc\-Toolkit򻲾ȤƤ
+JavaScriptが使用される場合、ユーザー定義スクリプトを評価する前に、\fIjrunscript\fRコマンドはいくつかの組込み関数や組込みオブジェクトを初期化します。これらのJavaScriptの組込みについては、http://code\&.google\&.com/p/jsdoc\-toolkit/にある
+JsDoc\-Toolkitを参照してください。
 .br
 'pl 8.5i
 'bp
--- a/jdk/src/linux/doc/man/ja/jsadebugd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jsadebugd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jsadebugd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jsadebugd" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jsadebugd" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jsadebugd \- Javaץޤϥե³ǥХåСȤƵǽޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jsadebugd \- Javaプロセスまたはコア・ファイルに接続し、デバッグ・サーバーとして機能します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -74,26 +74,26 @@
 .PP
 \fIpid\fR
 .RS 4
-ǥХåС³ץΥץIDǤץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤñΥץ³ǤǥХåСΥ󥹥󥹤ϡ1Ĥ¤ޤ
+デバッグ・サーバーが接続するプロセスのプロセスIDです。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。単一のプロセスに接続できるデバッグ・サーバーのインスタンスは、1つに制限されます。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-ǥХåС³륳եǤ
+デバッグ・サーバーを接続するコア・ファイルです。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥޥǼ¹ԤƤɬפˤʤ롢ץΰդIDǤIDϡ⡼ȡ饤Ȥ³ΥǥХåСꤹ뤿˻ѤɬפޤIDϡñΥޥǰդˤɬפޤ
+複数のデバッグ・サーバーが同一のマシン上で実行されている場合に必要になる、オプションの一意のIDです。このIDは、リモート・クライアントが、接続先のデバッグ・サーバーを特定するために使用する必要があります。このIDは、単一のマシン内で一意にする必要があります。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjsadebugd\fRޥɤϡJavaץޤϥե³ǥХåСȤƵǽޤ\fIjstack\fR\fIjmap\fR\fIjinfo\fRʤɤΥ⡼ȡ饤ȤϡJava Remote Method Invocation (RMI)ѤƤ륵С³Ǥޤ\fIjsadebugd\fRޥɤưˡ\fIrmiregistry\fRޥɤRMI쥸ȥ򼡤Τ褦˵ưޤ\fI$JAVA_HOME\fRJDKΥ󥹥ȡ롦ǥ쥯ȥǤ
+\fIjsadebugd\fRコマンドは、Javaプロセスまたはコア・ファイルに接続し、デバッグ・サーバーとして機能します。\fIjstack\fR、\fIjmap\fRおよび\fIjinfo\fRなどのリモート・クライアントは、Java Remote Method Invocation (RMI)を使用しているサーバーに接続できます。\fIjsadebugd\fRコマンドを起動する前に、\fIrmiregistry\fRコマンドでRMIレジストリを次のように起動します。\fI$JAVA_HOME\fRはJDKのインストール・ディレクトリです。
 .sp
 .if n \{\
 .RS 4
@@ -105,12 +105,12 @@
 .RE
 .\}
 .PP
-RMI쥸ȥ꤬ưƤʤ硢\fIjsadebugd\fRޥɤRMI쥸ȥɸ(1099)ݡȤǵưޤǥХåСϡ\fISIGINT\fR뤳ȤˤߤǤޤSIGINTˤϡ\fB[Ctrl] + [C]\fR򲡤ޤ
+RMIレジストリが起動していない場合、\fIjsadebugd\fRコマンドはRMIレジストリを標準(1099)ポートで内部で起動します。デバッグ・サーバーは、\fISIGINT\fRを送信することにより停止できます。SIGINTを送信するには、\fB[Ctrl] + [C]\fRを押します。
 .PP
-\fB:\fR
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤ\fIdbgeng\&.dll\fR¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤjvm\&.dllξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤ:
+\fB注意:\fR
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。\fIdbgeng\&.dll\fRが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。\fIPATH\fR環境変数には、ターゲット・プロセスによって使用されるjvm\&.dllの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。例:
 \fIs\fR\fIet PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fR
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jstack.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jstack.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jstack
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jstack" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jstack" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jstack \- Javaץեޤϥ⡼ȡǥХåСФJavaåɤΥåȥ졼ϤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jstack \- Javaプロセス、コア・ファイルまたはリモート・デバッグ・サーバーに対するJavaスレッドのスタック・トレースを出力します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -84,40 +84,40 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIpid\fR
 .RS 4
-Ϥ륹åȥ졼ΥץIDǤץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤ
+出力するスタック・トレースのプロセスIDです。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-Ϥ륹åȥ졼ΥեǤ
+出力するスタック・トレースのコア・ファイルです。
 .RE
 .PP
 \fIremote\-hostname\-or\-IP\fR
 .RS 4
-⡼ȡǥХåС\fIۥ̾\fRޤ\fIIP\fRɥ쥹jsadebugd(1)򻲾ȤƤ
+リモート・デバッグ・サーバーの\fIホスト名\fRまたは\fIIP\fRアドレス。jsadebugd(1)を参照してください。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥ⡼ȡۥȤǼ¹ԤƤΡץͭID
+複数のデバッグ・サーバーが同一のリモート・ホストで実行している場合の、オプション固有のID。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjstack\fRޥɤϡꤵ줿Javaץեޤϥ⡼ȡǥХåСФJavaåɤJavaåȥ졼ϤޤJavaե졼ऴȤˡե륯饹̾᥽å̾Хȥɡǥå(bci)ӹֹ(Ѳǽʾ)Ϥޤ\fI\-m\fRץѤȡ\fIjstack\fRޥɤϡ٤ƤΥåɤJavaե졼ȥͥƥ֡ե졼ξ򡢥ץࡦ(PC)ȤȤ˽Ϥޤͥƥ֡ե졼ऴȤˡPC˺Ǥᤤͥƥ֡ܥ(Ѳǽʾ)ϤޤC++ʬ̾ʬޤC++̾ʬˤϡΥޥɤνϤ\fIc++filt\fR˥ѥפޤꤵ줿ץ64ӥåJavaۥޥǼ¹ԤƤϡ\fI\-J\-d64\fRץꤹɬפޤ(:
-\fIjstack \-J\-d64 \-m pid\fR)
+\fIjstack\fRコマンドは、指定されたJavaプロセス、コア・ファイルまたはリモート・デバッグ・サーバーに対するJavaスレッドのJavaスタック・トレースを出力します。Javaフレームごとに、フルクラス名、メソッド名、バイトコード・インデックス(bci)、および行番号(利用可能な場合)が出力されます。\fI\-m\fRオプションを使用すると、\fIjstack\fRコマンドは、すべてのスレッドのJavaフレームとネイティブ・フレームの両方を、プログラム・カウンタ(PC)とともに出力します。ネイティブ・フレームごとに、PCに最も近いネイティブ・シンボル(利用可能な場合)が出力されます。C++分解名は分解解除されません。C++名を分解解除するには、このコマンドの出力を\fIc++filt\fRにパイプします。指定されたプロセスが64ビットJava仮想マシン上で実行されている場合は、\fI\-J\-d64\fRオプションを指定する必要があります(例:
+\fIjstack \-J\-d64 \-m pid\fR)。
 .PP
-\fB\fR
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤdbgeng\&.dllե뤬¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ󡣤ޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤjvm\&.dllξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤ򼨤ޤ
+\fB注意\fR
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。dbgeng\&.dllファイルが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。また、\fIPATH\fR環境変数には、ターゲット・プロセスによって使用されるjvm\&.dllの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -128,39 +128,39 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-F
 .RS 4
 \fIjstack\fR
 [\fI\-l\fR]
-\fIpid\fRʤ˥åפޤ
+\fIpid\fRが応答しない場合にスタック・ダンプを強制します。
 .RE
 .PP
 \-l
 .RS 4
-ĹΥꥹȡͭ\fIjava\&.util\&.concurrent\fRνͭǤ륷󥯥ʥΰʤɡåˤĤƤɲþޤhttp://docs\&.oracle\&.com/javase/8/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer\&.htmlˤ
-\fIAbstractOwnableSynchronizer\fR饹Ҥ򻲾ȤƤ
+長形式のリスト。所有\fIjava\&.util\&.concurrent\fRの所有できるシンクロナイザの一覧など、ロックについての追加情報を印刷します。http://docs\&.oracle\&.com/javase/8/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer\&.htmlにある
+\fIAbstractOwnableSynchronizer\fRクラス記述を参照してください
 .RE
 .PP
 \-m
 .RS 4
-JavaӥͥƥC/C++ե졼ξĺ⡼ɤΥåȥ졼Ϥޤ
+JavaおよびネイティブC/C++フレームの両方を持つ混合モードのスタック・トレースを出力します。
 .RE
 .PP
 \-h
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
-.SH "ΤԶ"
+.SH "既知の不具合"
 .PP
-⡼ɤΥåȥ졼Ǥϡ\fI\-m\fRץϥ⡼ȡǥХåСǤϵǽޤ
-.SH "Ϣ"
+混合モードのスタック・トレースでは、\fI\-m\fRオプションはリモート・デバッグ・サーバーでは機能しません。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jstat.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jstat.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jstat
 .\" Language: English
-.\" Date: 2011ǯ510
-.\" SectDesc: ˥󥰡ġ
+.\" Date: 2011年5月10日
+.\" SectDesc: モニタリング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jstat" "1" "2011ǯ510" "JDK 8" "˥󥰡ġ"
+.TH "jstat" "1" "2011年5月10日" "JDK 8" "モニタリング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jstat \- Javaۥޥ(JVM)פƻ뤷ޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jstat \- Java仮想マシン(JVM)の統計を監視します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,17 +64,17 @@
 .PP
 \fIgeneralOption\fR
 .RS 4
-ñȤǻѤŪʥޥɥ饤󡦥ץǤ(\fI\-help\fRޤ\fI\-options\fR)Ūʥץ򻲾ȤƤ
+単独で使用する一般的なコマンドライン・オプションです(\fI\-help\fRまたは\fI\-options\fR)。一般的なオプションを参照してください。
 .RE
 .PP
 \fIoutputOptions\fR
 .RS 4
-ñ\fIstatOption\fR\fI\-t\fR\fI\-h\fR\fI\-J\fRΤ줫Υץǹ1İʾνϥץ󡣽ϥץ򻲾ȤƤ
+単一の\fIstatOption\fRと\fI\-t\fR、\fI\-h\fRおよび\fI\-J\fRのいずれかのオプションで構成される1つ以上の出力オプション。出力オプションを参照してください。
 .RE
 .PP
 \fIvmid\fR
 .RS 4
-åJVM򼨤ʸǤ벾ۥޥ̻ҤǤŪʹʸϼΤȤǤ
+ターゲットJVMを示す文字列である仮想マシン識別子です。一般的な構文は次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -85,24 +85,24 @@
 .if n \{\
 .RE
 .\}
-\fIvmid\fRʸιʸϡURIιʸбƤޤ\fIvmid\fRʸϡJVMɽñ顢̿ץȥ롢ݡֹ桢¾μͭͤ򼨤ʣʹ¤ޤǡ͡˰ۤʤޤۥޥ̻Ҥ򻲾ȤƤ
+\fIvmid\fR文字列の構文は、URIの構文に対応しています。\fIvmid\fR文字列は、ローカルJVMを表す単純な整数から、通信プロトコル、ポート番号、および他の実装固有の値を示す複雑な構造まで、様々に異なります。仮想マシン識別子を参照してください。
 .RE
 .PP
 \fIinterval\fR [s|ms]
 .RS 4
-(s)ޤϥߥ(ms)Τꤷñ̤ǤΥץ󥰴ֳ֤ǤǥեȤñ̤ϥߥäǤˤɬפޤꤷ硢\fIjstat\fRޥɤϳƴֳ֤ǽϤޤ
+秒(s)またはミリ秒(ms)のうち指定した単位でのサンプリング間隔です。デフォルトの単位はミリ秒です。正の整数にする必要があります。指定した場合、\fIjstat\fRコマンドは各間隔で出力を生成します。
 .RE
 .PP
 \fIcount\fR
 .RS 4
-ɽ륵ץǤǥե̵ͤ¤ǡåJVMλޤǡޤ\fIjstat\fRޥɤλޤǡ\fIjstat\fRޥɤץǡɽޤͤϡǤɬפޤ
+表示するサンプル数です。デフォルト値は無限で、ターゲットJVMが終了するまで、または\fIjstat\fRコマンドが終了するまで、\fIjstat\fRコマンドは統計データを表示します。この値は、正の整数である必要があります。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjstat\fRޥɤϡ֤ƤJava HotSpot VMΥѥեޥץǡɽޤåJVMϡۥޥ̻Ҥޤ\fIvmid\fRץˤäƼ̤ޤ
-.SH "ۥޥ̻"
+\fIjstat\fRコマンドは、設置されているJava HotSpot VMのパフォーマンス統計データを表示します。ターゲットJVMは、仮想マシン識別子または\fIvmid\fRオプションによって識別されます。
+.SH "仮想マシン識別子"
 .PP
-\fIvmid\fRʸιʸϡURIιʸбƤޤ
+\fIvmid\fR文字列の構文は、URIの構文に対応しています。
 .sp
 .if n \{\
 .RS 4
@@ -116,380 +116,380 @@
 .PP
 \fIprotocol\fR
 .RS 4
-̿ץȥǤ\fIprotocol\fRͤά졢ۥ̾ꤵƤʤ硢ǥեȤΥץȥ뤬ץåȥեͭκŬ줿롦ץȥˤʤޤ\fIprotocol\fRͤά졢ۥ̾ꤵƤϡǥեȡץȥ\fIrmi\fRˤʤޤ
+通信プロトコルです。\fIprotocol\fR値が省略され、ホスト名が指定されていない場合、デフォルトのプロトコルが、プラットフォーム固有の最適化されたローカル・プロトコルになります。\fIprotocol\fR値が省略され、ホスト名が指定されている場合は、デフォルト・プロトコルは\fIrmi\fRになります。
 .RE
 .PP
 \fIlvmid\fR
 .RS 4
-åJVMΥ벾ۥޥ̻ҤǤ\fIlvmid\fRϡƥJVMդ˼̤ץåȥեͭͤǤ\fIlvmid\fRϡۥޥ̻ҤͣɬǤǤ\fIlvmid\fRϡŪˤϥåJVMץФ륪ڥ졼ƥ󥰡ƥΥץ̻ҤǤɬ⤽ǤȤϸ¤ޤ\fIjps\fRޥɤѤơ\fIlvmid\fRǤޤޤUNIXץåȥեǤ\fIps\fRޥɤѤơWindowsǤWindowsޥ͡Ѥơ\fIlvmid\fRǤޤ
+ターゲットJVMのローカル仮想マシン識別子です。\fIlvmid\fRは、システム上のJVMを一意に識別するプラットフォーム固有の値です。\fIlvmid\fRは、仮想マシン識別子の唯一の必須要素です。\fIlvmid\fRは、一般的にはターゲットJVMプロセスに対するオペレーティング・システムのプロセス識別子ですが、必ずしもそうであるとは限りません。\fIjps\fRコマンドを使用して、\fIlvmid\fRを特定できます。また、UNIXプラットフォームでは\fIps\fRコマンドを使用して、WindowsではWindowsタスク・マネージャを使用して、\fIlvmid\fRを特定できます。
 .RE
 .PP
 \fIhostname\fR
 .RS 4
-åȡۥȤ򼨤ۥ̾ޤIPɥ쥹Ǥ\fIhostname\fRͤάƤϡåȡۥȤϥ롦ۥȤˤʤޤ
+ターゲット・ホストを示すホスト名またはIPアドレスです。\fIhostname\fR値が省略されている場合は、ターゲット・ホストはローカル・ホストになります。
 .RE
 .PP
 \fIport\fR
 .RS 4
-⡼ȡС̿뤿ΥǥեȡݡȤǤ\fIhostname\fRͤάƤ뤫Ŭ줿롦ץȥ뤬\fIprotocol\fRͤ˻ꤵƤ硢\fIport\fR̵ͤ뤵ޤʳξ硢\fIport\fRѥ᡼ΰϡˤäưۤʤޤǥեȤ\fIrmi\fRץȥξ硢ݡͤϡ⡼ȡۥȾrmiregistryΥݡֹ򼨤ޤ\fIport\fRͤά졢\fIprotocol\fRͤ\fIrmi\fRꤵƤ硢ǥեȤrmiregistryݡ(1099)Ѥޤ
+リモート・サーバーと通信するためのデフォルト・ポートです。\fIhostname\fR値が省略されているか、最適化されたローカル・プロトコルが\fIprotocol\fR値に指定されている場合、\fIport\fR値は無視されます。それ以外の場合、\fIport\fRパラメータの扱いは、実装によって異なります。デフォルトの\fIrmi\fRプロトコルの場合、ポート値は、リモート・ホスト上のrmiregistryのポート番号を示します。\fIport\fR値が省略され、\fIprotocol\fR値で\fIrmi\fRが指定されている場合、デフォルトのrmiregistryポート(1099)が使用されます。
 .RE
 .PP
 \fIservername\fR
 .RS 4
-\fIservername\fRѥ᡼ΰϡˤäưۤʤޤŬ줿롦ץȥξ硢Υեɤ̵뤵ޤ\fIrmi\fRץȥξ硢ϡ⡼ȡۥȾRMI꥽֥Ȥ̾ɽޤ
+\fIservername\fRパラメータの扱いは、実装によって異なります。最適化されたローカル・プロトコルの場合、このフィールドは無視されます。\fIrmi\fRプロトコルの場合、これは、リモート・ホスト上のRMIリソース・オブジェクトの名前を表します。
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
-\fIjstat\fRޥɤϡŪʥץȽϥץ2ĤΥפΥץ򥵥ݡȤƤޤŪʥץѤ硢\fIjstat\fRޥɤϴñʻΨӥСɽޤϥץˤäơץǡϤƤȷޤޤ
+\fIjstat\fRコマンドは、一般的なオプションと出力オプションの2つのタイプのオプションをサポートしています。一般的なオプションを使用した場合、\fIjstat\fRコマンドは簡単な使用率およびバージョン情報を表示します。出力オプションによって、統計データ出力の内容と形式が決まります。
 .PP
-٤ƤΥץȤεǽϡΥ꡼ѹޤѻߤǽޤ
-.SS "Ūʥץ"
+すべてのオプションとその機能は、将来のリリースで変更または廃止される可能性があります。
+.SS "一般的なオプション"
 .PP
-줫ΰŪʥץꤷ硢¾Υץޤϥѥ᡼ϰڻǤޤ
+いずれかの一般的なオプションを指定した場合、他のオプションまたはパラメータは一切指定できません。
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
 .PP
 \-options
 .RS 4
-StaticץΥꥹȤɽޤϥץ򻲾ȤƤ
+Staticオプションのリストを表示します。出力オプションを参照してください。
 .RE
-.SS "ϥץ"
+.SS "出力オプション"
 .PP
-ŪʥץꤷʤˡϥץǤޤϥץϡ\fIjstat\fRޥɤνϤƤȷꤷñ\fIstatOption\fRȤ줫νϥץ(\fI\-h\fR\fI\-t\fR\fI\-J\fR)ǹޤ\fIstatOption\fRϺǽ˵Ҥɬפޤ
+一般的なオプションを指定しない場合に、出力オプションを指定できます。出力オプションは、\fIjstat\fRコマンドの出力の内容と形式を決定し、単一の\fIstatOption\fRといずれかの出力オプション(\fI\-h\fR、\fI\-t\fRおよび\fI\-J\fR)で構成されます。\fIstatOption\fRは最初に記述する必要があります。
 .PP
-Ϥϡ󤬶Ƕڤ줿ɽηˤʤޤȥޤإåԤˤäơΰ̣狼ޤإåɽ٤ꤹˤϡ\fI\-h\fRץѤޤΥإå̾ϡ͡ʥץ֤ǰݤƤޤ̤ˡ2ĤΥץƱ̾󤬻ѤƤС2ĤΥǡƱǤ
+出力は、各列が空白で区切られた表の形式になります。タイトルを含むヘッダー行によって、各列の意味がわかります。ヘッダーの表示頻度を設定するには、\fI\-h\fRオプションを使用します。列のヘッダー名は、様々なオプション間で一貫性が保たれています。一般に、2つのオプションで同じ名前の列が使用されていれば、2つの列のデータ・ソースは同じです。
 .PP
-\fI\-t\fRץѤȡTimestampȤ٥դॹפ󤬡ϤκǽȤɽޤTimestampˤϡåJVMεưηв֤ñ̤ɽޤॹפ٤ϡ͡װˤäưۤʤꡢ̤٤ΤäƥǤΥåɡ塼ٱˤưޤ
+\fI\-t\fRオプションを使用すると、Timestampというラベルの付いたタイムスタンプの列が、出力の最初の列として表示されます。Timestamp列には、ターゲットJVMの起動からの経過時間が、秒単位で表示されます。タイムスタンプの精度は、様々な要因によって異なり、大量の負荷のかかったシステムでのスレッド・スケジュールの遅延により変動します。
 .PP
-intervalcountѥ᡼Ѥơ\fIjstat\fRޥɤνϤɽ٤Ȳ򤽤줾ꤷޤ
+intervalおよびcountパラメータを使用して、\fIjstat\fRコマンドがその出力を表示する頻度と回数をそれぞれ指定します。
 .PP
-\fB:\fR
-Υ꡼Ǥηѹǽ뤿ᡢ\fIjstat\fRޥɤνϤϤ륹ץȤϺʤǤ\fIjstat\fRޥɤνϤϤ륹ץȤϡΥġξΥ꡼ǡΥץȤѹɬפ뤳ȤαդƤ
+\fB注意:\fR
+将来のリリースでこの形式は変更される可能性があるため、\fIjstat\fRコマンドの出力を解析するスクリプトは作成しなでください。\fIjstat\fRコマンドの出力を解析するスクリプトを作成する場合は、このツールの将来のリリースで、そのスクリプトを変更する必要があることに留意してください。
 .PP
 \-\fIstatOption\fR
 .RS 4
-\fIjstat\fRޥɤɽץǡꤷޤˡѲǽʥץΰ򼨤ޤΥץåȥեࡦ󥹥ȡΥץɽˤϡŪʥץ\fI\-options\fRѤޤStatץ󤪤ӽϤ򻲾ȤƤ
+\fIjstat\fRコマンドが表示する統計データ情報を指定します。次に、利用可能なオプションの一覧を示します。特定のプラットフォーム・インストールのオプションを一覧表示するには、一般的なオプションの\fI\-options\fRを使用します。Statオプションおよび出力を参照してください。
 .sp
-\fIclass\fR: 饹ư˴ؤץǡɽޤ
+\fIclass\fR: クラス・ローダーの動作に関する統計データを表示します。
 .sp
-\fIcompiler\fR: Java HotSpot VM Just\-in\-Timeѥư˴ؤץǡɽޤ
+\fIcompiler\fR: Java HotSpot VM Just\-in\-Timeコンパイラの動作に関する統計データを表示します。
 .sp
-\fIgc\fR: ١쥯Ȥ줿ҡפư˴ؤץǡɽޤ
+\fIgc\fR: ガベージ・コレクトされたヒープの動作に関する統計データを表示します。
 .sp
-\fIgccapacity\fR: 头Ȥ̤бΰ˴ؤץǡɽޤ
+\fIgccapacity\fR: 世代ごとの容量と対応する領域に関する統計データを表示します。
 .sp
-\fIgccause\fR: ١쥯ץǡΥޥ꡼(\fI\-gcutil\fRƱ)ȡľӸ(ŬѲǽʾ)Υ١쥯󡦥٥Ȥθɽޤ
+\fIgccause\fR: ガベージ・コレクション統計データのサマリー(\fI\-gcutil\fRと同じ)と、直前および現在(適用可能な場合)のガベージ・コレクション・イベントの原因を表示します。
 .sp
-\fIgcnew\fR: Newư˴ؤץǡɽޤ
+\fIgcnew\fR: New世代の動作に関する統計データを表示します。
 .sp
-\fIgcnewcapacity\fR: NewΥбΰ˴ؤץǡɽޤ
+\fIgcnewcapacity\fR: New世代のサイズと対応する領域に関する統計データを表示します。
 .sp
-\fIgcold\fR: Oldưȥ᥿ڡ˴ؤץǡɽޤ
+\fIgcold\fR: Old世代の動作とメタスペースに関する統計データを表示します。
 .sp
-\fIgcoldcapacity\fR: OldΥ˴ؤץǡɽޤ
+\fIgcoldcapacity\fR: Old世代のサイズに関する統計データを表示します。
 .sp
-\fIgcmetacapacity\fR: ᥿ڡΥ˴ؤץǡɽޤ
+\fIgcmetacapacity\fR: メタスペースのサイズに関する統計データを表示します。
 .sp
-\fIgcutil\fR: ١쥯Υޥ꡼˴ؤץǡɽޤ
+\fIgcutil\fR: ガベージ・コレクションのサマリーに関する統計データを表示します。
 .sp
-\fIprintcompilation\fR: Java HotSpot VMѥ롦᥽åɤץǡɽޤ
+\fIprintcompilation\fR: Java HotSpot VMコンパイル・メソッドの統計データを表示します。
 .RE
 .PP
 \-h \fIn\fR
 .RS 4
-\fIn\fRץ(Ϲ)Ȥإåɽޤǡ\fIn\fRͤǤǥեͤ0Ǥξ硢ǡκǽιԤξإåɽޤ
+\fIn\fRサンプル(出力行)ごとに列ヘッダーを表示します。ここで、\fIn\fRは正の整数値です。デフォルト値は0です。この場合、データの最初の行の上に列ヘッダーが表示されます。
 .RE
 .PP
 \-t
 .RS 4
-ॹϤκǽȤɽޤॹפϡåJVMεưηв֤Ǥ
+タイムスタンプ列を出力の最初の列として表示します。タイムスタンプは、ターゲットJVMの起動時からの経過時間です。
 .RE
 .PP
 \-J\fIjavaOption\fR
 .RS 4
-\fIjavaOption\fRJavaץꥱưġϤޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤץδʥꥹȤˤĤƤϡjava(1)򻲾ȤƤ
+\fIjavaOption\fRをJavaアプリケーション起動ツールに渡します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。オプションの完全なリストについては、java(1)を参照してください。
 .RE
-.SS "Statץ󤪤ӽ"
+.SS "Statオプションおよび出力"
 .PP
-ξϡ\fIjstat\fRޥɤ\fIstatOption\fRˤĤƽϤޤȤ᤿ΤǤ
+次の情報は、\fIjstat\fRコマンドが各\fIstatOption\fRについて出力する列をまとめたものです。
 .PP
 \-class \fIoption\fR
 .RS 4
-饹ץǡ
+クラス・ローダーの統計データ。
 .sp
-\fILoaded\fR: ɤ줿饹ο
+\fILoaded\fR: ロードされたクラスの数。
 .sp
-\fIBytes\fR: ɤ줿KBο
+\fIBytes\fR: ロードされたKBの数。
 .sp
-\fIUnloaded\fR: ɤ줿饹ο
+\fIUnloaded\fR: アンロードされたクラスの数。
 .sp
-\fIBytes\fR: ɤ줿KBο
+\fIBytes\fR: アンロードされたKBの数。
 .sp
-\fITime\fR: 饹Υɤ䥢ɽפ֡
+\fITime\fR: クラスのロードやアンロード処理に要した時間。
 .RE
 .PP
 \-compiler \fIoption\fR
 .RS 4
-Java HotSpot VM Just\-in\-Timeѥץǡ
+Java HotSpot VM Just\-in\-Timeコンパイラの統計データ。
 .sp
-\fICompiled\fR: ¹Ԥ줿ѥ롦ο
+\fICompiled\fR: 実行されたコンパイル・タスクの数。
 .sp
-\fIFailed\fR: Ԥѥ롦ο
+\fIFailed\fR: 失敗したコンパイル・タスクの数。
 .sp
-\fIInvalid\fR: ̵ˤ줿ѥ롦ο
+\fIInvalid\fR: 無効にされたコンパイル・タスクの数。
 .sp
-\fITime\fR: ѥ롦μ¹Ԥפ֡
+\fITime\fR: コンパイル・タスクの実行に要した時間。
 .sp
-\fIFailedType\fR: Ǹ˼ԤѥΥѥ롦ס
+\fIFailedType\fR: 最後に失敗したコンパイルのコンパイル・タイプ。
 .sp
-\fIFailedMethod\fR: Ǹ˼ԤѥΥ饹̾ȥ᥽åɡ
+\fIFailedMethod\fR: 最後に失敗したコンパイルのクラス名とメソッド。
 .RE
 .PP
 \-gc \fIoption\fR
 .RS 4
-١쥯Ȥ줿ҡפץǡ
+ガベージ・コレクトされたヒープの統計データ。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIS0U\fR: Survivorΰ0λΨ(KB)
+\fIS0U\fR: Survivor領域0の使用率(KB)。
 .sp
-\fIS1U\fR: Survivorΰ1λΨ(KB)
+\fIS1U\fR: Survivor領域1の使用率(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIEU\fR: EdenΰλΨ(KB)
+\fIEU\fR: Eden領域の使用率(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIOU\fR: OldΰλΨ(KB)
+\fIOU\fR: Old領域の使用率(KB)。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIMU\fR: ᥿ڡλΨ(KB)
+\fIMU\fR: メタスペースの使用率(KB)。
 .sp
-\fIYGC\fR: 㤤Υ١쥯󡦥٥Ȥο
+\fIYGC\fR: 若い世代のガベージ・コレクション・イベントの数。
 .sp
-\fIYGCT\fR: 㤤Υ١쥯֡
+\fIYGCT\fR: 若い世代のガベージ・コレクション時間。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gccapacity \fIoption\fR
 .RS 4
-꡼ס太ΰ̡
+メモリー・プール世代および領域容量。
 .sp
-\fINGCMN\fR: NewκǾ(KB)
+\fINGCMN\fR: New世代の最小容量(KB)。
 .sp
-\fINGCMX\fR: Newκ(KB)
+\fINGCMX\fR: New世代の最大容量(KB)。
 .sp
-\fINGC\fR: Newθߤ(KB)
+\fINGC\fR: New世代の現在の容量(KB)。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIOGCMN\fR: OldκǾ(KB)
+\fIOGCMN\fR: Old世代の最小容量(KB)。
 .sp
-\fIOGCMX\fR: Oldκ(KB)
+\fIOGCMX\fR: Old世代の最大容量(KB)。
 .sp
-\fIOGC\fR: Oldθߤ(KB)
+\fIOGC\fR: Old世代の現在の容量(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIMCMN\fR: ᥿ڡκǾ(KB)
+\fIMCMN\fR: メタスペースの最小容量(KB)。
 .sp
-\fIMCMX\fR: ᥿ڡκ(KB)
+\fIMCMX\fR: メタスペースの最大容量(KB)。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .RE
 .PP
 \-gccause \fIoption\fR
 .RS 4
-Υץϡ\fI\-gcutil\fRץƱ١쥯ץǡΥޥ꡼ɽޤǸΥ١쥯󡦥٥Ȥ(ŬѲǽʾ)ߤΥ١쥯󡦥٥Ȥθޤޤޤ\fI\-gcutil\fRǰɽΤۤΥץǤϼɲäޤ
+このオプションは、\fI\-gcutil\fRオプションと同じガベージ・コレクション統計データのサマリーを表示しますが、最後のガベージ・コレクション・イベントと(適用可能な場合は)現在のガベージ・コレクション・イベントの原因が含まれます。\fI\-gcutil\fRで一覧表示される列のほか、このオプションでは次の列が追加されます。
 .sp
-١쥯󡦥٥Ȥޤ६١쥯ץǡ
+ガベージ・コレクション・イベントを含むガベージ・コレクション統計データ。
 .sp
-\fILGCC\fR: ǸΥ١쥯θ
+\fILGCC\fR: 最後のガベージ・コレクションの原因。
 .sp
-\fIGCC\fR: ߤΥ١쥯θ
+\fIGCC\fR: 現在のガベージ・コレクションの原因。
 .RE
 .PP
 \-gcnew \fIoption\fR
 .RS 4
-Newץǡ
+New世代の統計データ。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIS0U\fR: Survivorΰ0λΨ(KB)
+\fIS0U\fR: Survivor領域0の使用率(KB)。
 .sp
-\fIS1U\fR: Survivorΰ1λΨ(KB)
+\fIS1U\fR: Survivor領域1の使用率(KB)。
 .sp
-\fITT\fR: Ʋꤷ͡
+\fITT\fR: 殿堂入りしきい値。
 .sp
-\fIMTT\fR: Ʋꤷ͡
+\fIMTT\fR: 最大殿堂入りしきい値。
 .sp
-\fIDSS\fR: ŬڤSurvivor(KB)
+\fIDSS\fR: 適切なSurvivorサイズ(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIEU\fR: EdenΰλΨ(KB)
+\fIEU\fR: Eden領域の使用率(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIYGCT\fR: 㤤Υ١쥯֡
+\fIYGCT\fR: 若い世代のガベージ・コレクション時間。
 .RE
 .PP
 \-gcnewcapacity \fIoption\fR
 .RS 4
-Newΰ襵ץǡ
+New世代領域サイズの統計データ。
 .sp
-NGCMN: NewκǾ(KB)
+NGCMN: New世代の最小容量(KB)。
 .sp
-\fINGCMX\fR: Newκ(KB)
+\fINGCMX\fR: New世代の最大容量(KB)。
 .sp
-\fINGC\fR: Newθߤ(KB)
+\fINGC\fR: New世代の現在の容量(KB)。
 .sp
-\fIS0CMX\fR: Survivorΰ0κ(KB)
+\fIS0CMX\fR: Survivor領域0の最大容量(KB)。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1CMX\fR: Survivorΰ1κ(KB)
+\fIS1CMX\fR: Survivor領域1の最大容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIECMX\fR: Edenΰκ(KB)
+\fIECMX\fR: Eden領域の最大容量(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .RE
 .PP
 \-gcold \fIoption\fR
 .RS 4
-OldPermanentץǡ
+OldおよびPermanent世代の統計データ。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIMU\fR: ᥿ڡλΨ(KB)
+\fIMU\fR: メタスペースの使用率(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIOU\fR: OldΰλΨ(KB)
+\fIOU\fR: Old領域の使用率(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gcoldcapacity \fIoption\fR
 .RS 4
-Oldץǡ
+Old世代の統計データ。
 .sp
-\fIOGCMN\fR: OldκǾ(KB)
+\fIOGCMN\fR: Old世代の最小容量(KB)。
 .sp
-\fIOGCMX\fR: Oldκ(KB)
+\fIOGCMX\fR: Old世代の最大容量(KB)。
 .sp
-\fIOGC\fR: Oldθߤ(KB)
+\fIOGC\fR: Old世代の現在の容量(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gcmetacapacity \fIoption\fR
 .RS 4
-Permanentץǡ
+Permanent世代の統計データ。
 .sp
-\fIMCMN\fR: ᥿ڡκǾ(KB)
+\fIMCMN\fR: メタスペースの最小容量(KB)。
 .sp
-\fIMCMX\fR: ᥿ڡκ(KB)
+\fIMCMX\fR: メタスペースの最大容量(KB)。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gcutil \fIoption\fR
 .RS 4
-١쥯ץǡΥޥ꡼
+ガベージ・コレクション統計データのサマリー
 .sp
-\fIS0\fR: Survivorΰ0λΨ(ߤ̤Фѡơ)
+\fIS0\fR: Survivor領域0の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIS1\fR: Survivorΰ1λΨ(ߤ̤Фѡơ)
+\fIS1\fR: Survivor領域1の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIE\fR: EdenΰλΨ(ߤ̤Фѡơ)
+\fIE\fR: Eden領域の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIO\fR: OldΰλΨ(ߤ̤Фѡơ)
+\fIO\fR: Old領域の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIM\fR: ᥿ڡλΨ(ΰθߤ̤Фѡơ)
+\fIM\fR: メタスペースの使用率(領域の現在の容量に対するパーセンテージ)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIYGCT\fR: 㤤Υ١쥯֡
+\fIYGCT\fR: 若い世代のガベージ・コレクション時間。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-printcompilation \fIoption\fR
 .RS 4
-Java HotSpot VMѥ롦᥽åɤץǡ
+Java HotSpot VMコンパイル・メソッドの統計データ。
 .sp
-\fICompiled\fR: Ƕᥳѥ뤵줿᥽åɤǼ¹Ԥ줿ѥ롦ο
+\fICompiled\fR: 最近コンパイルされたメソッドで実行されたコンパイル・タスクの数。
 .sp
-\fISize\fR: Ƕᥳѥ뤵줿᥽åɤΥХȡɤΥХȿ
+\fISize\fR: 最近コンパイルされたメソッドのバイト・コードのバイト数。
 .sp
-\fIType\fR: Ƕᥳѥ뤵줿᥽åɤΥѥ롦ס
+\fIType\fR: 最近コンパイルされたメソッドのコンパイル・タイプ。
 .sp
-\fIMethod\fR: Ƕᥳѥ뤵줿᥽åɤꤹ륯饹̾ȥ᥽å̾饹̾Ǥϡ֤̾ζڤʸȤơɥå(\&.)Τ˥å(/)Ѥޤ᥽å̾ϡꤵ줿饹Υ᥽åɤǤ2ĤΥեɤηϡHotSpot
-\fI\-XX:+PrintComplation\fRץбƤޤ
+\fIMethod\fR: 最近コンパイルされたメソッドを特定するクラス名とメソッド名。クラス名では、名前空間の区切り文字として、ドット(\&.)のかわりにスラッシュ(/)が使用されます。メソッド名は、指定されたクラス内のメソッドです。これらの2つのフィールドの形式は、HotSpot
+\fI\-XX:+PrintComplation\fRオプションと対応しています。
 .RE
-.SH ""
+.SH "例"
 .PP
-ιǤϡ21891\fIlvmid\fRĥJVM˥󥰤򼨤ޤ
-.SS "gcutilץ"
+この項では、21891の\fIlvmid\fRを持つローカルJVMをモニタリングする例を示します。
+.SS "gcutilオプション"
 .PP
-Ǥϡlvmid 21891³ơ250ߥôֳ֤7ĤΥץ\-\fIgcutil\fRץǤλ˽äƽϤɽޤ
+この例では、lvmid 21891に接続して、250ミリ秒間隔で7つのサンプルを取得し、\-\fIgcutil\fRオプションでの指定に従って出力を表示します。
 .PP
-νϤϡ㤤Υ쥯3ܤ4ܤΥץ֤ǹԤ줿Ȥ򼨤Ƥޤ쥯ˤ0\&.001ääƤꡢ֥ȤEdenΰ(E)Oldΰ(O)˾ʤᡢOldΰλΨ9\&.49%9\&.51%äƤޤSurvivorΰϡ쥯12\&.44%ѤƤޤ쥯λѤ7\&.74%ΤߤǤ
+この例の出力は、若い世代のコレクションが3番目と4番目のサンプル間で行われたことを示しています。コレクションには0\&.001秒かかっており、オブジェクトがEden領域(E)からOld領域(O)に昇格したため、Old領域の使用率は9\&.49%から9\&.51%に増加しています。Survivor領域は、コレクション前は12\&.44%が使用されていましたが、コレクション後の使用は7\&.74%のみです。
 .sp
 .if n \{\
 .RS 4
@@ -508,13 +508,13 @@
 .if n \{\
 .RE
 .\}
-.SS "إåʸη֤"
+.SS "列ヘッダー文字列の繰返し"
 .PP
-Ǥϡlvmid 21891³ơ250ߥôֳ֤ǥץ\fI\-gcutil\fRץǤλ˽äƽϤɽޤˡ\fI\-h3\fRץѤơǡ3ɽ뤴ȤإåϤޤ
+この例では、lvmid 21891に接続して、250ミリ秒間隔でサンプルを取得し、\fI\-gcutil\fRオプションでの指定に従って出力を表示します。さらに、\fI\-h3\fRオプションを使用して、データが3行表示されるごとに列ヘッダーを出力します。
 .PP
-Ǥϡإåʸη֤ɽƤۤ2ܤ3ܤΥץ֤Young GCԤ줿Ȥ狼ޤη³֤0\&.001äǤΥ쥯ǤϡSurvivorΰ0λΨ(S0U)ŬڤSurvivor(DSS)Ķ᤹뤳Ȥˤʤ륢ƥ֡ǡФޤη̡֥ȤϡOld(νϤˤɽ)ؾʤ졢Ʋꤷ(TT)312ع߳ʤޤ
+この例では、ヘッダー文字列の繰返しが表示されているほか、2番目と3番目のサンプル間でYoung GCが行われたことがわかります。この継続時間は0\&.001秒でした。このコレクションでは、Survivor領域0の使用率(S0U)が適切なSurvivorサイズ(DSS)を超過することになるアクティブ・データが検出されました。この結果、オブジェクトは、Old世代(この出力には非表示)へ昇格され、殿堂入りしきい値(TT)が、31から2へ降格されました。
 .PP
-̤Υ쥯󤬡5ܤ6ܤΥץ֤ǹԤƤޤΥ쥯ǤϡSurvivorۤȤɸ줺Ʋꤷͤ31ᤷޤ
+別のコレクションが、5番目と6番目のサンプル間で行われています。このコレクションでは、Survivorがほとんど見られず、殿堂入りしきい値を31に戻しました。
 .sp
 .if n \{\
 .RS 4
@@ -535,11 +535,11 @@
 .if n \{\
 .RE
 .\}
-.SS "ץ뤴ȤΥॹפ"
+.SS "サンプルごとのタイムスタンプの挿入"
 .PP
-Ǥϡlvmid21891³250ߥôֳ֤3ĤΥץƤޤ\fI\-t\fRץѤơǽ˥ץ뤴ȤΥॹפɽƤޤ
+この例では、lvmid21891へ接続し、250ミリ秒間隔で3つのサンプルを取得しています。\fI\-t\fRオプションを使用して、最初の列にサンプルごとのタイムスタンプを表示しています。
 .PP
-TimestampˤϡåJVMεưηв֤ñ̤ǥݡȤƤޤˡ\fI\-gcoldcapacity\fRϤǤϡꥯȤޤϾʥꥯȤ뤤Ϥξ˥ҡפĥ뤿ӤˡOld(OGC)Oldΰ(OC)ȤäƤ뤳Ȥ狼ޤ81ܤΥե롦١쥯(FGC)θ塢Old(OGC)11,696 KB13820 KBäޤ(ΰ)κ̤ϡ60,544 KB (OGCMX)ʤΤǡޤĥǤ;͵ĤƤޤ
+Timestamp列には、ターゲットJVMの起動時からの経過時間が、秒単位でレポートされています。さらに、\fI\-gcoldcapacity\fR出力では、割当リクエストまたは昇格リクエストあるいはその両方を満たすためにヒープが拡張するたびに、Old世代の容量(OGC)とOld領域の容量(OC)とが増加していることがわかります。81番目のフル・ガベージ・コレクション(FGC)の後、Old世代の容量(OGC)は11,696 KBから13820 KBに増加しました。この世代(および領域)の最大容量は、60,544 KB (OGCMX)なので、まだ拡張できる余裕が残されています。
 .sp
 .if n \{\
 .RS 4
@@ -553,11 +553,11 @@
 .if n \{\
 .RE
 .\}
-.SS "⡼JVMΥ󥹥ȥơδƻ"
+.SS "リモートJVMのインストゥルメンテーションの監視"
 .PP
-ϡ\fI\-gcutil\fRץѤơremote\&.domainȤƥlvmid 40496³ץñ̵̤¤˼Ƥޤ
+この例は、\fI\-gcutil\fRオプションを使用して、remote\&.domainというシステム上のlvmid 40496に接続し、サンプルを秒単位で無期限に取得しています。
 .PP
-lvmidϡ⡼ȡۥȤ̾ȷ礵ơ\fI40496@remote\&.domain\fR\fIvmid\fRƤޤ̤Ȥơvmidϡ\fIrmi\fRץȥѤơ⡼ȡۥȾΥǥեȤ\fIjstatd\fRС̿ޤ\fIjstatd\fRСϡrmiregistryѤơǥեȤrmiregistryݡ(ݡ1099)˥Хɤ줿\fIremote\&.domain\fR֤ޤ
+lvmidは、リモート・ホストの名前と結合されて、\fI40496@remote\&.domain\fRの\fIvmid\fRを構成しています。結果として、このvmidは、\fIrmi\fRプロトコルを使用して、リモート・ホスト上のデフォルトの\fIjstatd\fRサーバーと通信します。\fIjstatd\fRサーバーは、rmiregistryを使用して、デフォルトのrmiregistryポート(ポート1099)にバインドされた\fIremote\&.domain\fRに配置されます。
 .sp
 .if n \{\
 .RS 4
@@ -569,7 +569,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jstatd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jstatd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jstatd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ˥󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: モニタリング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jstatd" "1" "2013ǯ1121" "JDK 8" "˥󥰡ġ"
+.TH "jstatd" "1" "2013年11月21日" "JDK 8" "モニタリング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jstatd \- Javaۥޥ(JVM)˥⡼ȡ˥󥰡ġ뤬JVM³Ǥ褦ˤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jstatd \- Java仮想マシン(JVM)をモニターし、リモート・モニタリング・ツールがJVMに接続できるようにします。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,47 +64,47 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjstatd\fRޥɤϡ¬줿Java HotSpot VMκȽλ˥롦ƥǼ¹ԤƤJVMˡ⡼ȡ˥󥰡ġ뤬³Ǥ褦ˤ뤿Υ󥿥ե󶡤RMIСץꥱǤ
+\fIjstatd\fRコマンドは、計測されたJava HotSpot VMの作成と終了をモニターし、ローカル・システム上で実行されているJVMに、リモート・モニタリング・ツールが接続できるようにするためのインタフェースを提供するRMIサーバー・アプリケーションです。
 .PP
-\fIjstatd\fRСǤϡ롦ۥȤRMI쥸ȥ꤬ɬפˤʤޤ\fIjstatd\fRСϥǥեȡݡȤǡޤ\fI\-p\fR
-\fIport\fRץǻꤷݡȤǡRMI쥸ȥ³褦ȤޤRMI쥸ȥ꤬Ĥʤ硢\fI\-p\fR
-\fIport\fRץǻꤵ줿ݡȡޤ\fI\-p\fR
-\fIport\fRץ󤬾άƤϡǥեRMI쥸ȥ˥Хɤ줿\fIjstatd\fRץꥱˡ1ĤRMI쥸ȥ꤬ޤRMI쥸ȥκϡ\fI\-nr\fRץꤹ뤳ȤˤäߤǤޤ
-.SH "ץ"
+\fIjstatd\fRサーバーでは、ローカル・ホストにRMIレジストリが必要になります。\fIjstatd\fRサーバーはデフォルト・ポートで、または\fI\-p\fR
+\fIport\fRオプションで指定したポートで、RMIレジストリに接続しようとします。RMIレジストリが見つからない場合、\fI\-p\fR
+\fIport\fRオプションで指定されたポート、または\fI\-p\fR
+\fIport\fRオプションが省略されている場合は、デフォルトRMIレジストリにバインドされた\fIjstatd\fRアプリケーション内に、1つのRMIレジストリが作成されます。内部RMIレジストリの作成は、\fI\-nr\fRオプションを指定することによって中止できます。
+.SH "オプション"
 .PP
 \-nr
 .RS 4
-¸RMI쥸ȥ꤬Ĥʤ硢\fIjstatd\fRץRMI쥸ȥʤ褦ˤޤ
+既存のRMIレジストリが見つからない場合、\fIjstatd\fRプロセス内に内部RMIレジストリを作成しないようにします。
 .RE
 .PP
 \-p \fIport\fR
 .RS 4
-RMI쥸ȥ꤬ͽۤݡֹǤĤʤϡ\fI\-nr\fRץ󤬻ꤵƤʤкޤ
+RMIレジストリがあると予想されるポート番号です。見つからない場合は、\fI\-nr\fRオプションが指定されていなければ作成されます。
 .RE
 .PP
 \-n \fIrminame\fR
 .RS 4
-RMI쥸ȥˤơ⡼RMI֥ȤХɤ̾Ǥǥե̾\fIJStatRemoteHost\fRǤʣ\fIjstatd\fRСƱۥȾǵưƤ硢ƥСΥݡȤRMI֥Ȥ̾ϡΥץꤹ뤳Ȥˤäơդ̾ˤ뤳ȤǤޤΥץѤ硢˥󥰡饤Ȥ\fIhostid\fR\fIvmid\fRʸˡΰդΥС̾ޤɬפޤ
+RMIレジストリにおいて、リモートRMIオブジェクトがバインドされる名前です。デフォルト名は\fIJStatRemoteHost\fRです。複数の\fIjstatd\fRサーバーが同じホスト上で起動している場合、各サーバーのエクスポートしたRMIオブジェクトの名前は、このオプションを指定することによって、一意の名前にすることができます。ただし、このオプションを使用する場合、モニタリング・クライアントの\fIhostid\fRおよび\fIvmid\fR文字列に、その一意のサーバー名を含める必要があります。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JVM\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ\fIץ\fR1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+JVMに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されている\fIオプション\fRを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ƥ"
+.SH "セキュリティ"
 .PP
-\fIjstatd\fRСϡŬڤʥͥƥ֡JVMΤߤƻǤޤäơ\fIjstatd\fRץϡåJVMƱ桼ʤǼ¹ԤƤɬפޤUNIX١Υƥˤroot桼ʤɤΰΥ桼ʤϡƥǤդJVMˤäƥݡȤ줿󥹥ȥơؤΥäƤޤΤ褦ʻʤǼ¹ԤƤ\fIjstatd\fRץϡƥΤ٤ƤJVMƻǤޤƥ̤꤬ޤ
+\fIjstatd\fRサーバーは、適切なネイティブ・アクセス権を持つJVMのみを監視できます。したがって、\fIjstatd\fRプロセスは、ターゲットJVMと同じユーザー資格で実行されている必要があります。UNIXベースのシステムにおけるrootユーザーなどの一部のユーザー資格は、システム上の任意のJVMによってエクスポートされたインストゥルメンテーションへのアクセス権を持っています。このような資格で実行されている\fIjstatd\fRプロセスは、システム上のすべてのJVMを監視できますが、セキュリティ上の別の問題が起こります。
 .PP
-\fIjstatd\fRСˤϡ⡼ȡ饤Ȥǧڵǽޤ󡣤Τᡢ\fIjstatd\fRСץ¹Ԥȡ\fIjstatd\fRץĤ٤ƤJVMˤ륤󥹥ȥơΥݡȤ򡢥ͥåȥΤ٤ƤΥ桼˸뤳Ȥˤʤޤ̵ʾ֤ϡĶˤäƤ˾ޤʤ礬Τǡä˼²ƯĶޤϰǤʤͥåȥǤϡ\fIjstatd\fRץưˡ롦ƥݥꥷƤɬפޤ
+\fIjstatd\fRサーバーには、リモート・クライアントの認証機能がありません。そのため、\fIjstatd\fRサーバー・プロセスを実行すると、\fIjstatd\fRプロセスがアクセス権を持つすべてのJVMによるインストゥルメンテーションのエクスポートを、ネットワーク上のすべてのユーザーに公開することになります。この無防備な状態は、環境によっては望ましくない場合があるので、特に実稼働環境または安全でないネットワークでは、\fIjstatd\fRプロセスを起動する前に、ローカル・セキュリティ・ポリシーを検討する必要があります。
 .PP
-\fIjstatd\fRСϡ¾Υƥޥ͡㤬󥹥ȡ뤵Ƥʤˤϡ\fIRMISecurityPolicy\fRΥ󥹥󥹤򥤥󥹥ȡ뤷ޤΤᡢƥݥꥷեꤹɬפޤݥꥷեϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlˤ
-֥ǥեȤPolicyμȥݥꥷեιʸפ˽򤷤Ƥɬפޤ
+\fIjstatd\fRサーバーは、他のセキュリティ・マネージャがインストールされていない場合には、\fIRMISecurityPolicy\fRのインスタンスをインストールします。そのため、セキュリティ・ポリシー・ファイルを指定する必要があります。ポリシー・ファイルは、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlにある
+「デフォルトのPolicyの実装とポリシー・ファイルの構文」に準拠している必要があります
 .PP
-ΥݥꥷեǤϡƥ㳰ȯ\fIjstatd\fRС¹ԤǤޤΥݥꥷϡ٤ƤΥɡ١ؤΤ륢ǧݥꥷ⼫ͳ٤㤤Ǥ\fIjstatd\fRС¹Ԥ뤿˺ɬפʥΤߤǧݥꥷ⼫ͳ٤⤯ʤäƤޤ
+次のポリシー・ファイルでは、セキュリティ例外を発生せずに\fIjstatd\fRサーバーを実行できます。このポリシーは、すべてのコード・ベースへのあらゆるアクセス権を認めるポリシーよりも自由度が低いですが、\fIjstatd\fRサーバーを実行するために最低限必要なアクセス権のみを認めるポリシーよりも自由度が高くなっています。
 .sp
 .if n \{\
 .RS 4
@@ -118,7 +118,7 @@
 .RE
 .\}
 .PP
-ΥݥꥷѤˤϡΥƥȤ\fIjstatd\&.all\&.policy\fRȤե˥ԡΤ褦\fIjstatd\fRС¹Ԥޤ
+このポリシー設定を使用するには、このテキストを\fIjstatd\&.all\&.policy\fRというファイルにコピーし、次のように\fIjstatd\fRサーバーを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -130,16 +130,16 @@
 .RE
 .\}
 .PP
-긷ƥ»ܤ륵Ȥξ硢ࡦݥꥷեѤơοǤۥȤޤϥͥåȥ˥¤뤳ȤǤޤΤ褦ˡϡIPɥ쥹İ䤹ʤޤƥˤĤơޥݥꥷեǤнǤʤϡ\fIjstatd\fRС¹Ԥˡ\fIjstat\fR\fIjps\fRġǻѤ뤳ȤǤˡˤʤޤ
-.SH "⡼ȡ󥿥ե"
+より厳しいセキュリティを実施するサイトの場合、カスタム・ポリシー・ファイルを使用して、特定の信頼できるホストまたはネットワークにアクセスを制限することができます。ただし、このような方法は、IPアドレスの盗聴攻撃を受けやすくなります。セキュリティの問題について、カスタマイズしたポリシー・ファイルでも対処できない場合は、\fIjstatd\fRサーバーを実行せずに、\fIjstat\fRと\fIjps\fRツールをローカルで使用することが最も安全な方法になります。
+.SH "リモート・インタフェース"
 .PP
-\fIjstatd\fRץݡȤ륤󥿥եϡȼ˳ȯΤǤѹͽǤ桼ӳȯԤϡΥ󥿥եؤνߤԤʤǤ
-.SH ""
+\fIjstatd\fRプロセスがエクスポートするインタフェースは、独自に開発したものであり変更される予定です。ユーザーおよび開発者は、このインタフェースへの書込みを行わないでください。
+.SH "例"
 .PP
-ˡ\fIjstatd\fRޥɤ򼨤ޤ\fIjstatd\fRץȤˤäơСϥХå饦ɤǼưŪ˵ưޤ
-.SS "RMI쥸ȥ"
+次に、\fIjstatd\fRコマンドの例を示します。\fIjstatd\fRスクリプトによって、サーバーはバックグラウンドで自動的に起動します。
+.SS "内部RMIレジストリ"
 .PP
-ϡRMI쥸ȥѤۥȤˤ\fIjstatd\fRåεưɽƤޤǤϡǥեȤRMI쥸ȥꡦݡ(ݡ1099)ˤϡ¾ΥСϥХɤƤʤꤷƤޤ
+この例は、内部RMIレジストリを使用したホストによる\fIjstatd\fRセッションの起動を表しています。この例では、デフォルトのRMIレジストリ・ポート(ポート1099)には、他のサーバーはバインドされていないと想定しています。
 .sp
 .if n \{\
 .RS 4
@@ -150,9 +150,9 @@
 .if n \{\
 .RE
 .\}
-.SS "RMI쥸ȥ"
+.SS "外部RMIレジストリ"
 .PP
-ϡRMI쥸ȥѤ\fIjstatd\fRåεưɽƤޤ
+この例は、外部RMIレジストリを使用した\fIjstatd\fRセッションの起動を表しています。
 .sp
 .if n \{\
 .RS 4
@@ -165,7 +165,7 @@
 .RE
 .\}
 .PP
-Ǥϡݡ2020γRMI쥸ȥѤ\fIjstatd\fRåưޤ
+この例では、ポート2020の外部RMIレジストリを使用して\fIjstatd\fRセッションを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -178,7 +178,7 @@
 .RE
 .\}
 .PP
-Ǥϡݡ2020γRMI쥸ȥѤơ\fIAlternateJstatdServerName\fR˥ХɤƤ\fIjstatd\fRåưޤ
+この例では、ポート2020の外部RMIレジストリを使用して、\fIAlternateJstatdServerName\fRにバインドされている\fIjstatd\fRセッションを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -191,9 +191,9 @@
 .if n \{\
 .RE
 .\}
-.SS "ץRMI쥸ȥκ"
+.SS "インプロセスRMIレジストリの作成の停止"
 .PP
-ǤϡRMI쥸ȥ꤬ʤ˺ʤ\fIjstatd\fRåưޤǤϡRMI쥸ȥ꤬Ǥ˼¹ԤƤꤷƤޤRMI쥸ȥ꤬¹ԤƤʤ硢顼åɽޤ
+この例では、外部RMIレジストリがない場合に作成しない\fIjstatd\fRセッションを起動します。この例では、RMIレジストリがすでに実行されていると想定しています。RMIレジストリが実行されていない場合、エラー・メッセージが表示されます。
 .sp
 .if n \{\
 .RS 4
@@ -204,9 +204,9 @@
 .if n \{\
 .RE
 .\}
-.SS "RMI󥰤ͭ"
+.SS "RMIロギングの有効化"
 .PP
-ǤϡRMI󥰵ǽͭ\fIjstatd\fRåưޤˡϡȥ֥륷塼ƥ󥰤ޤϥСưΥ˥󥰤Ωޤ
+この例では、RMIロギング機能を有効化して\fIjstatd\fRセッションを起動します。この方法は、トラブルシューティングまたはサーバー活動のモニタリングに役立ちます。
 .sp
 .if n \{\
 .RS 4
@@ -218,7 +218,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/jvisualvm.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/jvisualvm.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jvisualvm
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaȥ֥륷塼ƥ󥰡ץե󥰡˥󥰤Ӵġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaトラブルシューティング、プロファイリング、モニタリングおよび管理ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jvisualvm" "1" "2013ǯ1121" "JDK 8" "Javaȥ֥륷塼ƥ󥰡ץե󥰡˥"
+.TH "jvisualvm" "1" "2013年11月21日" "JDK 8" "Javaトラブルシューティング、プロファイリング、モニタリン"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jvisualvm \- JavaץꥱŪ˴ƻ롢ȥ֥륷塼Ȥӥץե뤷ޤ
-.SH ""
+jvisualvm \- Javaアプリケーションを視覚的に監視、トラブルシュートおよびプロファイルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,17 +64,17 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-Java VisualVMϡꤵ줿Javaۥޥ(JVM)JavaƥΥ١Υץꥱ(Javaץꥱ)¹ԤƤȤˡJavaץꥱ˴ؤܺ٤ʾ󶡤ľŪʥե롦桼󥿥եǤJava VisualVMȤ̾ϡJava VisualVMJVMեȥ˴ؤŪ󶡤Ȥ¤ͳ褷Ƥޤ
+Java VisualVMは、指定されたJava仮想マシン(JVM)でJavaテクノロジ・ベースのアプリケーション(Javaアプリケーション)が実行されているときに、そのJavaアプリケーションに関する詳細な情報を提供する直感的なグラフィカル・ユーザー・インタフェースです。Java VisualVMという名前は、Java VisualVMがJVMソフトウェアに関する情報を視覚的に提供するという事実に由来しています。
 .PP
-Java VisualVMϡĤΥ˥󥰡ȥ֥륷塼ƥ󥰤ӥץե󥰡桼ƥƥ1ĤΥġ礷ޤȤСɥ󡦥ġ\fIjmap\fR\fIjinfo\fR\fIjstat\fR\fIjstack\fR󶡤Ƥ뵡ǽΤۤȤɤJava VisualVMȤ߹ޤƤޤ\fIjconsole\fRޥɤˤä󶡤εǽʤɡ¾εǽϥץΥץ饰ȤɲäǤޤ
+Java VisualVMは、いくつかのモニタリング、トラブルシューティングおよびプロファイリング・ユーティリティを1つのツールに統合します。たとえば、スタンドアロン・ツール\fIjmap\fR、\fIjinfo\fR、\fIjstat\fRおよび\fIjstack\fRで提供されている機能のほとんどが、Java VisualVMに組み込まれています。\fIjconsole\fRコマンドによって提供される一部の機能など、他の機能はオプションのプラグインとして追加できます。
 .PP
-Java VisualVMϡJavaץꥱγȯԤץꥱΥȥ֥륷塼ƥ󥰤ԤäꡢץꥱΥѥեޥ󥹤ƻ뤪ӲꤹΤΩޤJava VisualVMѤȡȯԤϥҡספӲϡ꡼꡼ꡢ١쥯μ¹ԤӴƻ롢ӥ꡼CPUδʰץץե󥰤μ¹Ԥǽˤʤޤץ饰Java VisualVMεǽĥǤޤȤС\fIjconsole\fRޥɤΤۤȤɤεǽϡMBeanץ֤JConsole Plug\-in Wrapperץ饰𤷤ƻѤǤޤɸJava VisualVMץ饰Υ򤹤ˤϡJava VisualVM˥塼\fB֥ġ\fR\fB֥ץ饰\fR򤷤ޤ
+Java VisualVMは、Javaアプリケーションの開発者がアプリケーションのトラブルシューティングを行ったり、アプリケーションのパフォーマンスを監視および改善したりするのに役立ちます。Java VisualVMを使用すると、開発者はヒープ・ダンプの生成および解析、メモリー・リークの特定、ガベージ・コレクションの実行および監視、およびメモリーとCPUの簡易プロファイリングの実行が可能になります。プラグインでJava VisualVMの機能を拡張できます。たとえば、\fIjconsole\fRコマンドのほとんどの機能は、「MBean」タブおよびJConsole Plug\-in Wrapperプラグインを介して使用できます。標準のJava VisualVMプラグインのカタログから選択するには、Java VisualVMメニューの\fB「ツール」\fR、\fB「プラグイン」\fRを選択します。
 .PP
-Java VisualVMưˤϡΥޥɤ¹Ԥޤ
+Java VisualVMを起動するには、次のコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -85,15 +85,15 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
-ΥץϡJava VisualVMưȤ˼¹Բǽˤʤޤ
+次のオプションは、Java VisualVMを起動したときに実行可能になります。
 .PP
 \-J\fIjvm_option\fR
 .RS 4
-\fIjvm_option\fRJVMեȥϤޤ
+この\fIjvm_option\fRをJVMソフトウェアに渡します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -103,7 +103,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java VisualVMȯԤΥ
+Java VisualVM開発者のサイト
 http://visualvm\&.java\&.net/
 .RE
 .sp
@@ -115,7 +115,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java SEɥȤJava VisualVM
+Java SEドキュメントのJava VisualVM
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/visualvm/index\&.html)
 .RE
 .br
--- a/jdk/src/linux/doc/man/ja/keytool.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/keytool.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: keytool
 .\" Language: English
-.\" Date: 2013ǯ86
-.\" SectDesc: ƥġ
+.\" Date: 2013年8月6日
+.\" SectDesc: セキュリティ・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "keytool" "1" "2013ǯ86" "JDK 8" "ƥġ"
+.TH "keytool" "1" "2013年8月6日" "JDK 8" "セキュリティ・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-keytool \- Ź沽X\&.509󤪤ӿǤޤ७ȥ(ǡ١)ޤ
-.SH ""
+keytool \- 暗号化鍵、X\&.509証明書チェーンおよび信頼できる証明書を含むキーストア(データベース)を管理します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,7 +64,7 @@
 .PP
 \fIcommands\fR
 .RS 4
-ޥɤ򻲾ȤƤΥޥɤϡΤ褦˥̤ʬवޤ
+コマンドを参照してください。これらのコマンドは、次のようにタスク別に分類されます。
 .sp
 .RS 4
 .ie n \{\
@@ -74,7 +74,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ȥؤΥǡκޤɲ
+キーストアへのデータの作成または追加
 .sp
 .RS 4
 .ie n \{\
@@ -140,7 +140,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̤ΥȥƤΥݡ
+別のキーストアの内容のインポート
 .sp
 .RS 4
 .ie n \{\
@@ -162,7 +162,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ꥯȤ
+証明書リクエストの生成
 .sp
 .RS 4
 .ie n \{\
@@ -184,7 +184,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǡΥݡ
+データのエクスポート
 .sp
 .RS 4
 .ie n \{\
@@ -206,7 +206,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǡɽ
+データの表示
 .sp
 .RS 4
 .ie n \{\
@@ -261,7 +261,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ȥδ
+キーストアの管理
 .sp
 .RS 4
 .ie n \{\
@@ -316,7 +316,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-إפɽ
+ヘルプの表示
 .sp
 .RS 4
 .ie n \{\
@@ -330,18 +330,18 @@
 .RE
 .RE
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIkeytool\fRޥɤϡȾ뤿Υ桼ƥƥǤˤꡢ桼ϼʬθ̩ΥڥӴϢǥ̾Ѥǧ(¾Υ桼ޤϥӥФƼʬȤǧڤ뤳)䡢ǡȾ˴ؤ륵ӥѤ뤳ȤǤޤ\fIkeytool\fRޥɤǤϡ̿Ƥԥθ򥭥å夹뤳ȤǤޤ(Υե)
+\fIkeytool\fRコマンドは、鍵と証明書を管理するためのユーティリティです。これにより、ユーザーは自分の公開鍵と秘密鍵のペアおよび関連する証明書を管理し、デジタル署名を使用した自己認証(他のユーザーまたはサービスに対して自分自身を認証すること)や、データの整合性と証明書に関するサービスを利用することができます。\fIkeytool\fRコマンドでは、通信しているピアの公開鍵をキャッシュすることもできます(証明書のフォームで)。
 .PP
-Ȥϡ륨ƥƥ(ʪҤʤ)Υǥ̾դʸΤȤǤˤϡ¾Τ륨ƥƥθ(Ӥ¾ξ)̤ͤäƤ뤳Ȥ񤫤Ƥޤ(򻲾ȤƤ)ǡ˥ǥ̾դƤϡǥ̾򸡾ڤ뤳ȤǡǡӥǡʪǤ뤳ȤåǤޤǡȤϡǡѹ줿ꡢѤ줿ꤷƤʤȤ̣ޤޤǡʪǤȤϡΥǡǡƽ̾ȾΤʪϤ줿ǡǤ뤳Ȥ̣ޤ
+証明書とは、あるエンティティ(人物、会社など)からのデジタル署名付きの文書のことです。証明書には、他のあるエンティティの公開鍵(およびその他の情報)が特別な値を持っていることが書かれています。(証明書を参照してください。)データにデジタル署名が付いている場合は、デジタル署名を検証することで、データの整合性およびデータが本物であることをチェックできます。データの整合性とは、データが変更されたり、改変されたりしていないことを意味します。また、データが本物であるとは、そのデータが、データを作成して署名したと称する人物から渡されたデータであることを意味します。
 .PP
-ޤ\fIkeytool\fRޥɤѤСоΰŹ沽/沽(DES)ǻѤ̩ӥѥե졼뤳ȤǤޤ
+また、\fIkeytool\fRコマンドを使用すれば、対称暗号化/復号化(DES)で使用される秘密鍵およびパスフレーズを管理することもできます。
 .PP
-\fIkeytool\fRޥɤϡȾ򥭡ȥ˳Ǽޤȥ̾򻲾ȤƤ
-.SH "ޥɤȥץ˴ؤ"
+\fIkeytool\fRコマンドは、鍵と証明書をキーストアに格納します。キーストアの別名を参照してください。
+.SH "コマンドとオプションに関する注意"
 .PP
-͡ʥޥɤȤˤĤƤϡޥɤ򻲾ȤƤ
+様々なコマンドとその説明については、コマンドを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -351,7 +351,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɤΥޥ̾ӥץ̾ˤƬ˥ޥʥ(\-)դޤ
+どのコマンド名およびオプション名にも先頭にマイナス記号(\-)が付きます。
 .RE
 .sp
 .RS 4
@@ -362,7 +362,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ƥޥɤΥץǤդνǻǤޤ
+各コマンドのオプションは任意の順序で指定できます。
 .RE
 .sp
 .RS 4
@@ -373,7 +373,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åΤˤʤäƤʤ٤Ƥιܡޤ楫åѥåǰϤޤƤ뤹٤ƤιܤϡΤȤ˻ꤹɬפޤ
+イタリック体になっていないすべての項目、または中カッコか角カッコで囲まれているすべての項目は、そのとおりに指定する必要があります。
 .RE
 .sp
 .RS 4
@@ -384,7 +384,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץϤ楫åϡΥץ򥳥ޥɥ饤ǻꤷʤäˡǥեͤѤ뤳Ȥ̣ޤץΥǥեͤ򻲾ȤƤ楫åϡ\fI\-v\fR\fI\-rfc\fR\fI\-J\fRץϤिˤѤޤΥץϥޥɥ饤ǻꤵ줿ˤΤ̣߰ޤꤵƤʤʳǥեͤϤޤ
+オプションを囲む中カッコは、そのオプションをコマンドラインで指定しなかった場合に、デフォルト値が使用されることを意味します。オプションのデフォルト値を参照してください。中カッコは、\fI\-v\fR、\fI\-rfc\fRおよび\fI\-J\fRオプションを囲むためにも使用されますが、これらのオプションはコマンドラインで指定された場合にのみ意味を持ちます。指定されていない場合以外、デフォルト値はありません。
 .RE
 .sp
 .RS 4
@@ -395,7 +395,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץϤѥåϡΥץ򥳥ޥɥ饤ǻꤷʤäˡͤϤ뤳Ȥ̣ޤ\fI\-keypass\fRץξ硢ץ򥳥ޥɥ饤ǻꤷʤäϡ\fIkeytool\fRޥɤޤȥΥѥɤѤ/̩ߤޤλߤԤ硢\fIkeytool\fRޥɤˤꡢ/̩ΥѥɤϤޤ
+オプションを囲む角カッコは、そのオプションをコマンドラインで指定しなかった場合に、値の入力を求められることを意味します。\fI\-keypass\fRオプションの場合、オプションをコマンドラインで指定しなかった場合は、\fIkeytool\fRコマンドがまずキーストアのパスワードを使用して非公開/秘密鍵の復元を試みます。この試みが失敗した場合、\fIkeytool\fRコマンドにより、非公開/秘密鍵のパスワードの入力を求められます。
 .RE
 .sp
 .RS 4
@@ -406,11 +406,11 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åΤιܤμºݤ(ץ)ϡꤹɬפޤȤС\fI\-printcert\fRޥɤηϼΤȤǤ
+イタリック体の項目の実際の値(オプションの値)は、指定する必要があります。たとえば、\fI\-printcert\fRコマンドの形式は次のとおりです。
 .sp
 \fIkeytool \-printcert {\-file cert_file} {\-v}\fR
 .sp
-\fI\-printcert\fRޥɤꤹϡ\fIcert_file\fRºݤΥե֤̾ޤ:
+\fI\-printcert\fRコマンドを指定する場合は、\fIcert_file\fRを実際のファイル名で置き換えます。例:
 \fIkeytool \-printcert \-file VScert\&.cer\fR
 .RE
 .sp
@@ -422,7 +422,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץͤ˶(ڡ)ޤޤƤϡͤǰϤɬפޤ
+オプションの値に空白(スペース)が含まれている場合は、値を引用符で囲む必要があります。
 .RE
 .sp
 .RS 4
@@ -433,11 +433,11 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-help\fRץ󤬥ǥեȤǤ\fIkeytool\fRޥɤϡ\fIkeytool \-help\fRƱǤ
+\fI\-help\fRオプションがデフォルトです。\fIkeytool\fRコマンドは、\fIkeytool \-help\fRと同じです。
 .RE
-.SH "ץΥǥե"
+.SH "オプションのデフォルト値"
 .PP
-ǡ͡ʥץͤΥǥեͤ򼨤ޤ
+次の例で、様々なオプション値のデフォルト値を示します。
 .sp
 .if n \{\
 .RS 4
@@ -474,7 +474,7 @@
 .RE
 .\}
 .PP
-/̩ڥˤơ̾르ꥺ(\fI\-sigalg\fRץ)ϡˤʤ̩Υ르ꥺफޤ
+公開/秘密鍵ペアの生成において、署名アルゴリズム(\fI\-sigalg\fRオプション)は、基になる秘密鍵のアルゴリズムから派生します。
 .sp
 .RS 4
 .ie n \{\
@@ -484,7 +484,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ˤʤ̩DSAפǤϡ\fI\-sigalg\fRץΥǥեͤSHA1withDSAˤʤޤ
+基になる秘密鍵がDSAタイプである場合は、\fI\-sigalg\fRオプションのデフォルト値はSHA1withDSAになります。
 .RE
 .sp
 .RS 4
@@ -495,7 +495,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ˤʤ̩RSAפǤϡ\fI\-sigalg\fRץΥǥեͤSHA256withRSAˤʤޤ
+基になる秘密鍵がRSAタイプである場合は、\fI\-sigalg\fRオプションのデフォルト値はSHA256withRSAになります。
 .RE
 .sp
 .RS 4
@@ -506,40 +506,40 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ˤʤ̩ECפǤϡ\fI\-sigalg\fRץΥǥեͤSHA256withECDSAˤʤޤ
+基になる秘密鍵がECタイプである場合は、\fI\-sigalg\fRオプションのデフォルト値はSHA256withECDSAになります。
 .RE
 .PP
-\fI\-keyalg\fR\fI\-sigalg\fRδʥꥹȤˤĤƤϡ
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAΡJava Cryptography Architecture (JCA) Reference Guideפ򻲾ȤƤ
-.SH "̥ץ"
+\fI\-keyalg\fRおよび\fI\-sigalg\fR引数の完全なリストについては、
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAの「Java Cryptography Architecture (JCA) Reference Guide」を参照してください。
+.SH "一般オプション"
 .PP
-\fI\-v\fRץϡ\fI\-help\fRޥɤ٤ƤΥޥɤǻѤǤޤ\fI\-v\fRץꤷ硢ޥɤϾĹ⡼ɤǼ¹Ԥ졢ܺ٤ʾ󤬽Ϥޤ
+\fI\-v\fRオプションは、\fI\-help\fRコマンドを除くすべてのコマンドで使用できます。\fI\-v\fRオプションを指定した場合、コマンドは冗長モードで実行され、詳細な情報が出力されます。
 .PP
-ǤդΥޥɤǻǤ\fI\-Jjavaoption\fR⤢ޤ\fI\-Jjavaoption\fRꤷ硢ꤵ줿\fIjavaoption\fRʸJava󥿥ץ꥿ľϤޤΥץˤϡޤ뤳ȤϤǤޤ󡣤Υץϡ¹ԴĶޤϥ꡼ѤĴǤǤ륤󥿥ץ꥿ץɽˤϡޥɥ饤\fIjava \-h\fRޤ\fIjava \-X\fRϤƤ
+任意のコマンドで指定できる\fI\-Jjavaoption\fR引数もあります。\fI\-Jjavaoption\fRを指定した場合、指定された\fIjavaoption\fR文字列がJavaインタプリタに直接渡されます。このオプションには、空白を含めることはできません。このオプションは、実行環境またはメモリー使用を調整する場合に便利です。指定できるインタプリタ・オプションを一覧表示するには、コマンドラインで\fIjava \-h\fRまたは\fIjava \-X\fRと入力してください。
 .PP
-ΥץϡȥФԤ٤ƤΥޥɤǻǤޤ
+次のオプションは、キーストアに対する操作を行うすべてのコマンドで指定できます。
 .PP
 \-storetype \fIstoretype\fR
 .RS 4
-νҤϡ󥹥󥹤륭ȥΥפꤷޤ
+この修飾子は、インスタンスを生成するキーストアのタイプを指定します。
 .RE
 .PP
 \-keystore \fIkeystore\fR
 .RS 4
-ȥξꤷޤ
+キーストアの場所を指定します。
 .sp
-\fIkeytool\fRޥɤ¹ԤݤˡJKS
-\fIstoretype\fRѤ졢ĥȥե뤬ޤ¸ߤƤʤä硢ȥե뤬ޤȤС\fIkeytool \-genkeypair\fRθƽФ\fI\-keystore\fRץ󤬻ꤵʤä硢\fI\&.keystore\fRȤ̾Υǥեȡȥե뤬桼Υۡࡦǥ쥯ȥˤޤ¸ߤƤʤС˺ޤƱͤˡ\fI\-keystore ks_file\fRȤץ󤬻ꤵƤ⤽ks_file¸ߤʤä硢Υե뤬ޤJKS
-\fIstoretype\fRξܺ٤ϡ\fI\fRKeyStoreμȥ̾˴ؤ򻲾ȤƤ
+特定の\fIkeytool\fRコマンドを実行する際に、JKS
+\fIstoretype\fRが使用され、かつキーストア・ファイルがまだ存在していなかった場合、新しいキーストア・ファイルが作成されます。たとえば、\fIkeytool \-genkeypair\fRの呼出し時に\fI\-keystore\fRオプションが指定されなかった場合、\fI\&.keystore\fRという名前のデフォルト・キーストア・ファイルがユーザーのホーム・ディレクトリ内にまだ存在していなければ、そこに作成されます。同様に、\fI\-keystore ks_file\fRというオプションが指定されてもそのks_fileが存在しなかった場合、そのファイルが作成されます。JKS
+\fIstoretype\fRの詳細は、\fIの\fRKeyStoreの実装キーストアの別名に関する項を参照してください。
 .sp
-\fI\-keystore\fRץ󤫤ϥȥ꡼ϡ\fIKeyStore\&.load\fR᥽åɤϤޤURLȤ\fINONE\fRꤵƤϡnullΥȥ꡼ब\fIKeyStore\&.load\fR᥽åɤϤޤ\fINONE\fRϡKeyStoreե١ǤϤʤ˻ꤷƤȤСϡɥȡ󡦥ǥХ¸ߤƤʤɤǤ
+\fI\-keystore\fRオプションからの入力ストリームは、\fIKeyStore\&.load\fRメソッドに渡されます。URLとして\fINONE\fRが指定されている場合は、nullのストリームが\fIKeyStore\&.load\fRメソッドに渡されます。\fINONE\fRは、KeyStoreがファイルベースではない場合に指定してください。たとえば、ハードウェア・トークン・デバイス上に存在している場合などです。
 .RE
 .PP
 \-storepass[:\fIenv\fR| :\fIfile\fR] argument
 .RS 4
-ȥݸ뤿˻Ѥѥɤꤷޤ
+キーストアの整合性を保護するために使用するパスワードを指定します。
 .sp
-\fIenv\fRޤ\fIfile\fRꤷʤ硢ѥɤͤ\fIargument\fRˤʤޤͤϡ6ʸʾˤɬפޤʳξ硢ѥɤϼΤ褦ˤƼޤ
+修飾子\fIenv\fRまたは\fIfile\fRを指定しない場合、パスワードの値は\fIargument\fRになります。この値は、6文字以上にする必要があります。それ以外の場合、パスワードは次のようにして取得されます。
 .sp
 .RS 4
 .ie n \{\
@@ -550,7 +550,7 @@
 .IP \(bu 2.3
 .\}
 \fIenv\fR:
-\fIargument\fRȤ̾δĶѿѥɤޤ
+\fIargument\fRという名前の環境変数からパスワードを取得します。
 .RE
 .sp
 .RS 4
@@ -561,119 +561,119 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIfile\fR: argumentȤ̾Υե뤫ѥɤޤ
+\fIfile\fR: argumentという名前のファイルからパスワードを取得します。
 .RE
 .sp
-\fB:\fR
-\fI\-keypass\fR\fI\-srckeypass\fR\-\fIdestkeypass\fR\fI\-srcstorepass\fR\fI\-deststorepass\fRʤɤΥѥɤɬפȤ뤽¾ΥץϤ٤ơ\fIenv\fR\fIfile\fRҤդޤѥɡץȽҤϡɬ(:)ǶڤäƤ
+\fB注意:\fR
+\fI\-keypass\fR、\fI\-srckeypass\fR、\-\fIdestkeypass\fR、\fI\-srcstorepass\fR、\fI\-deststorepass\fRなどのパスワードを必要とするその他のオプションはすべて、\fIenv\fRおよび\fIfile\fR修飾子を受け付けます。パスワード・オプションと修飾子は、必ずコロン(:)で区切ってください。
 .sp
-ѥɤϡȥƤ˥뤹٤ƤΥޥɤǻѤޤμΥޥɤ¹ԤȤˡޥɥ饤\fI\-storepass\fRץꤷʤäϡѥɤϤޤ
+パスワードは、キーストアの内容にアクセスするすべてのコマンドで使用されます。この種のコマンドを実行するときに、コマンドラインで\fI\-storepass\fRオプションを指定しなかった場合は、パスワードの入力を求められます。
 .sp
-ȥ硢ѥɤϾάǽǤѥɤꤵƤʤϡ򸡾ڤǤٹɽޤ
+キーストアから情報を取得する場合、パスワードは省略可能です。パスワードが指定されていない場合は、取得した情報の整合性を検証できず、警告が表示されます。
 .RE
 .PP
 \-providerName \fIprovider_name\fR
 .RS 4
-ƥץѥƥե˴ޤޤŹ沽ӥץХ̾ꤹ뤿˻Ѥޤ
+セキュリティ・プロパティ・ファイル内に含まれる暗号化サービス・プロバイダ名を特定するために使用されます。
 .RE
 .PP
 \-providerClass \fIprovider_class_name\fR
 .RS 4
-Ź沽ӥץХƥץѥƥե˻ꤵƤʤȤϡΥޥ饹ե̾ꤹȤ˻Ѥޤ
+暗号化サービス・プロバイダがセキュリティ・プロパティ・ファイルに指定されていないときは、そのマスター・クラス・ファイルの名前を指定するときに使用されます。
 .RE
 .PP
 \-providerArg \fIprovider_arg\fR
 .RS 4
-\fI\-providerClass\fRץȤȤ˻Ѥ졢\fIprovider_class_name\fRΥ󥹥ȥ饯Υץʸϰɽޤ
+\fI\-providerClass\fRオプションとともに使用され、\fIprovider_class_name\fRのコンストラクタのオプションの文字列入力引数を表します。
 .RE
 .PP
 \-protected
 .RS 4
-\fItrue\fRޤ\fIfalse\fRΤ줫ѥɤPIN꡼ʤɤݸ줿ǧڥѥͳǻꤹɬפϡͤ\fItrue\fR˻ꤹɬפޤ\fI\-importkeystore\fRޥɤˤ2ĤΥȥϢƤ뤿ᡢȥȰ襭ȥˤ줾켡2ĤΥץ\fI\-srcprotected\fR\-\fIdestprotected\fRѰդƤޤ
+\fItrue\fRまたは\fIfalse\fRのいずれか。パスワードを専用PINリーダーなどの保護された認証パス経由で指定する必要がある場合は、この値を\fItrue\fRに指定する必要があります。\fI\-importkeystore\fRコマンドには2つのキーストアが関連しているため、ソース・キーストアと宛先キーストアにそれぞれ次の2つのオプション、\fI\-srcprotected\fRと\-\fIdestprotected\fRが用意されています。
 .RE
 .PP
 \-ext \fI{name{:critical} {=value}}\fR
 .RS 4
-X\&.509񥨥ƥ󥷥򼨤ޤΥץ\fI\-genkeypair\fR\fI\-gencert\fRǻѤơޤ\fI\-certreq\fR˥ƥ󥷥ߡꥯȤǥꥯȤ륨ƥ󥷥򼨤ȤǤޤΥץʣǤޤ\fIname\fRˤϡݡȤƤ륨ƥ󥷥̾(̾դƥ󥷥򻲾)ޤǤդOIDֹǤޤꤵƤ硢\fIvalue\fRϥƥ󥷥ΰؤޤ\fIvalue\fRά硢ƥ󥷥Υǥեͤޤϥƥ󥷥󤬰ɬפȤʤȤ򼨤ޤ\fI:critical\fRҤꤵ줿硢ƥ󥷥\fIisCritical\fR°\fItrue\fRǡꤵʤ\fIfalse\fRǤ\fI:critical\fRΤ\fI:c\fRѤǤޤ
+X\&.509証明書エクステンションを示します。このオプションを\fI\-genkeypair\fRおよび\fI\-gencert\fRで使用して、生成される証明書または\fI\-certreq\fRにエクステンションを埋め込み、証明書リクエストでリクエストされるエクステンションを示すことができます。このオプションは複数回指定できます。\fIname\fR引数には、サポートされているエクステンション名(名前付きエクステンションを参照)または任意のOID番号を指定できます。指定されている場合、\fIvalue\fR引数はエクステンションの引数を指します。\fIvalue\fRを省略した場合、エクステンションのデフォルト値またはエクステンションが引数を必要としないことを示します。\fI:critical\fR修飾子が指定された場合、エクステンションの\fIisCritical\fR属性は\fItrue\fRで、指定されない場合は\fIfalse\fRです。\fI:critical\fRのかわりに\fI:c\fRを使用できます。
 .RE
-.SH "̾դƥ󥷥"
+.SH "名前付きエクステンション"
 .PP
-\fIkeytool\fRޥɤϡ̾Υƥ󥷥򥵥ݡȤƤޤ̾/ʸ϶̤ޤ
+\fIkeytool\fRコマンドは、次の名前のエクステンションをサポートしています。名前の大/小文字は区別されません。
 .PP
-BCޤBasicContraints
+BCまたはBasicContraints
 .RS 4
-\fB\fR: ʷϼΤȤǤ:
-\fIca:{true|false}[,pathlen:<len>]\fRޤ\fI<len>\fR(ϡ\fIca:true,pathlen:<len>\fRû̷Ǥ)<\fIlen\fR>άȡ\fIca:true\fRΰ̣ˤʤޤ
+\fB値\fR: 完全な形式は次のとおりです:
+\fIca:{true|false}[,pathlen:<len>]\fRまたは\fI<len>\fR(これは、\fIca:true,pathlen:<len>\fRの短縮形です)。<\fIlen\fR>を省略すると、\fIca:true\fRの意味になります。
 .RE
 .PP
-KUޤKeyUsage
+KUまたはKeyUsage
 .RS 4
-\fB\fR:
-\fIusage\fR(\fIusage\fR)*\fIusage\fRˤ\fIdigitalSignature\fR\fInonRepudiation\fR
-(contentCommitment)\fIkeyEncipherment\fR\fIdataEncipherment\fR\fIkeyAgreement\fR\fIkeyCertSign\fR\fIcRLSign\fR\fIencipherOnly\fR\fIdecipherOnly\fRΤ줫Ǥޤ\fIusage\fRϡΤˤʤʤꡢǽοʸ(\fIdigitalSignature\fRξ\fIdig\fR)ޤϥ륱(\fIdigitalSignature\fRξ\fIdS\fR\fIcRLSign\fRξ\fIcRLS\fR)ǾάɽǤޤ\fIusage\fRͤϡʸȾʸ̤ޤ
+\fB値\fR:
+\fIusage\fR(\fIusage\fR)*、\fIusage\fRには\fIdigitalSignature\fR、\fInonRepudiation\fR
+(contentCommitment)、\fIkeyEncipherment\fR、\fIdataEncipherment\fR、\fIkeyAgreement\fR、\fIkeyCertSign\fR、\fIcRLSign\fR、\fIencipherOnly\fR、\fIdecipherOnly\fRのいずれかを指定できます。\fIusage\fR引数は、不明確にならないかぎり、最初の数文字(\fIdigitalSignature\fRの場合は\fIdig\fR)またはキャメルケース・スタイル(\fIdigitalSignature\fRの場合は\fIdS\fR、\fIcRLSign\fRの場合は\fIcRLS\fR)で省略表記できます。\fIusage\fR値は、大文字と小文字が区別されます。
 .RE
 .PP
-EKUޤExtendedKeyUsage
+EKUまたはExtendedKeyUsage
 .RS 4
-\fB\fR:
-\fIusage\fR(\fIusage\fR)*\fIusage\fRˤ\fIanyExtendedKeyUsage\fR\fIserverAuth\fR\fIclientAuth\fR\fIcodeSigning\fR\fIemailProtection\fR\fItimeStamping\fR\fIOCSPSigning\fRޤǤդ\fIOIDʸ\fRΤ줫Ǥޤ\fIusage\fRϡΤˤʤʤꡢǽοʸޤϥ륱ǾάɽǤޤ\fIusage\fRͤϡʸȾʸ̤ޤ
+\fB値\fR:
+\fIusage\fR(\fIusage\fR)*、\fIusage\fRには\fIanyExtendedKeyUsage\fR、\fIserverAuth\fR、\fIclientAuth\fR、\fIcodeSigning\fR、\fIemailProtection\fR、\fItimeStamping\fR、\fIOCSPSigning\fRまたは任意の\fIOID文字列\fRのいずれかを指定できます。\fIusage\fR引数は、不明確にならないかぎり、最初の数文字またはキャメルケース・スタイルで省略表記できます。\fIusage\fR値は、大文字と小文字が区別されます。
 .RE
 .PP
-SANޤSubjectAlternativeName
+SANまたはSubjectAlternativeName
 .RS 4
-\fB\fR:
+\fB値\fR:
 \fItype\fR:\fIvalue\fR
-(t\fIype:value\fR)*\fItype\fRˤ\fIEMAIL\fR\fIURI\fR\fIDNS\fR\fIIP\fRޤ\fIOID\fRǤޤ\fIvalue\fRϡ\fItype\fRʸͤǤ
+(t\fIype:value\fR)*、\fItype\fRには\fIEMAIL\fR、\fIURI\fR、\fIDNS\fR、\fIIP\fRまたは\fIOID\fRを指定できます。\fIvalue\fR引数は、\fItype\fRの文字列形式の値です。
 .RE
 .PP
-IANޤIssuerAlternativeName
+IANまたはIssuerAlternativeName
 .RS 4
-\fB\fR:
-\fISubjectAlternativeName\fRƱǤ
+\fB値\fR:
+\fISubjectAlternativeName\fRと同じです。
 .RE
 .PP
-SIAޤSubjectInfoAccess
+SIAまたはSubjectInfoAccess
 .RS 4
-\fB\fR:
+\fB値\fR:
 \fImethod\fR:\fIlocation\-type\fR:\fIlocation\-value\fR
-(\fImethod:location\-type\fR:\fIlocation\-value\fR)*\fImethod\fRˤ\fItimeStamping\fR\fIcaRepository\fRޤǤդOIDǤޤ\fIlocation\-type\fR\fIlocation\-value\fRˤϡ\fISubjectAlternativeName\fRƥ󥷥ǥݡȤǤդ\fItype\fR:\fIvalue\fRǤޤ
+(\fImethod:location\-type\fR:\fIlocation\-value\fR)*、\fImethod\fRには\fItimeStamping\fR、\fIcaRepository\fRまたは任意のOIDを指定できます。\fIlocation\-type\fRおよび\fIlocation\-value\fR引数には、\fISubjectAlternativeName\fRエクステンションでサポートされる任意の\fItype\fR:\fIvalue\fRを指定できます。
 .RE
 .PP
-AIAޤAuthorityInfoAccess
+AIAまたはAuthorityInfoAccess
 .RS 4
-\fB\fR:
-\fISubjectInfoAccess\fRƱǤ\fImethod\fRˤϡ\fIocsp\fR\fIcaIssuers\fRޤǤդOIDǤޤ
+\fB値\fR:
+\fISubjectInfoAccess\fRと同じです。\fImethod\fR引数には、\fIocsp\fR、\fIcaIssuers\fRまたは任意のOIDを指定できます。
 .RE
 .PP
-\fIname\fROIDξ硢OCTET STRINGפĹΥХȤƥ󥷥ˤĤƤϡͤ\fIextnValue\fR16ʥפDER󥳡ǥ󥰤ǤHEXʸǤϡɸ16ʿ(0\-9a\-fA\-F)ʳʸ̵뤵ޤäơ01:02:03:0401020304ξȤƱͤȤƼդޤͤʤ硢ƥ󥷥ͥեɤ϶ˤʤޤ
+\fIname\fRがOIDの場合、OCTET STRINGタイプと長さのバイトを除外したエクステンションについては、値は\fIextnValue\fRの16進ダンプのDERエンコーディングです。HEX文字列では、標準の16進数(0\-9、a\-f、A\-F)以外の文字は無視されます。したがって、01:02:03:04と01020304の両方とも同一の値として受け付けられます。値がない場合、エクステンションの値フィールドは空になります。
 .PP
-\fI\-gencert\fRǤΤ߻Ѥ\fIhonored\fRȤ̤̾ϡꥯȤ˴ޤޤ륨ƥ󥷥ͥ褹ˡ򼨤ޤ̾ͤϡ\fIall\fR(ꥯȤ뤹٤ƤΥƥ󥷥ͥ褵)\fIname{:[critical|non\-critical]}\fR(̾դΥƥ󥷥ͥ褵뤬̤\fIisCritical\fR°Ѥ)\fI\-name\fR(\fIall\fRȤȤ˻Ѥ㳰򼨤)Υ޶ڤꥹȤǤǥեȤǤϡꥯȤ륨ƥ󥷥ͥ褵ޤ
+\fI\-gencert\fRでのみ使用する\fIhonored\fRという特別な名前は、証明書リクエストに含まれるエクステンションを優先する方法を示します。この名前の値は、\fIall\fR(リクエストされるすべてのエクステンションが優先される)、\fIname{:[critical|non\-critical]}\fR(名前付きのエクステンションが優先されるが、別の\fIisCritical\fR属性を使用する)、および\fI\-name\fR(\fIall\fRとともに使用し、例外を示す)のカンマ区切りリストです。デフォルトでは、リクエストされるエクステンションは優先されません。
 .PP
-\fI\-ext honored\fRץ˲ä̤̾ΡޤOID
-\fI\-ext\fRΥץꤷϡΥƥ󥷥󤬡Ǥͥ褵Ƥ륨ƥ󥷥ɲäޤ̾(ޤOID)ͥ褵ͤǤѤϡͤȽꥯȤ˴ޤޤΤ򥪡С饤ɤޤ
+\fI\-ext honored\fRオプションに加え、別の名前の、またはOID
+\fI\-ext\fRのオプションを指定した場合は、このエクステンションが、すでに優先されているエクステンションに追加されます。ただし、この名前(またはOID)を優先される値でも使用した場合は、その値と重要性がリクエストに含まれるものをオーバーライドします。
 .PP
-\fIsubjectKeyIdentifier\fRƥ󥷥Ͼ˺ޤʽ̾Ǥʤξϡ\fIauthorityKeyIdentifier\fRޤ
+\fIsubjectKeyIdentifier\fRエクステンションは常に作成されます。自己署名でない証明書の場合は、\fIauthorityKeyIdentifier\fRが作成されます。
 .PP
-\fB:\fR
-桼ϡƥ󥷥(Ӿ¾Υե)ȹ礻ˤäƤϡ󥿡ͥåȤɸ˽򤷤ʤ礬뤳ȤդƤν˴ؤٹ򻲾ȤƤ
-.SH "ޥ"
+\fB注意:\fR
+ユーザーは、エクステンション(および証明書の他のフィールド)の組合せによっては、インターネットの標準に準拠しない場合があることに注意してください。証明書の準拠に関する警告を参照してください。
+.SH "コマンド"
 .PP
 \-gencert
 .RS 4
 \fI{\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ꥯȡե(\fIkeytool\fR
-\fI\-certreq\fRޥɤǺǽ)Ф쥹ݥ󥹤ȤƾޤΥޥɤϡ\fIinfile\fR(άϡɸϤ)ꥯȤɤ߹ߡ̩̾ѤƤΥꥯȤ˽̾ơX\&.509\fIoutfile\fR(άϡɸϤ)Ϥޤ\fI\-rfc\fRꤷ硢ϷBASE64沽PEMˤʤޤʳξϡХʥDERޤ
+証明書リクエスト・ファイル(\fIkeytool\fR
+\fI\-certreq\fRコマンドで作成可能)に対するレスポンスとして証明書を生成します。このコマンドは、\fIinfile\fRから(省略した場合は、標準入力から)リクエストを読み込み、別名の秘密鍵を使用してそのリクエストに署名して、X\&.509証明書を\fIoutfile\fRに(省略した場合は、標準出力に)出力します。\fI\-rfc\fRを指定した場合、出力形式はBASE64符号化のPEMになります。それ以外の場合は、バイナリDERが作成されます。
 .sp
-\fIsigalg\fRͤˤϡ˽̾դȤ˻Ѥ륢르ꥺꤷޤ\fIstartdate\fRϡͭǤ\fIvalDays\fRϡͭ򼨤ޤ
+\fIsigalg\fR値には、証明書に署名を付けるときに使用するアルゴリズムを指定します。\fIstartdate\fR引数は、証明書の有効開始日時です。\fIvalDays\fR引数は、証明書の有効日数を示します。
 .sp
-\fIdname\fRꤹȡμΤȤƻѤޤʳξϡꥯȤ̾Ѥޤ
+\fIdname\fRを指定すると、生成される証明書の主体として使用されます。それ以外の場合は、証明書リクエストからの名前が使用されます。
 .sp
-\fIext\fRͤϡޤX\&.509ƥ󥷥򼨤ޤ\fI\-ext\fRιʸˤĤƤϡ̥ץ򻲾ȤƤ
+\fIext\fR値は、証明書に埋め込まれるX\&.509エクステンションを示します。\fI\-ext\fRの構文については、一般オプションを参照してください。
 .sp
-\fI\-gencert\fRץѤȡǤޤǤϡ\fIe1\fRȤޤξξˤϡ3Ĥξ񤬴ޤޤƤޤ
+\fI\-gencert\fRオプションを使用すると、証明書チェーンを作成できます。次の例では、\fIe1\fRという証明書を作成します。この証明書の証明書チェーンには、3つの証明書が含まれています。
 .sp
-Υޥɤϡ\fIca\fR\fIca1\fR\fIca2\fR\fIe1\fR4Ĥθڥޤ
+次のコマンドは、\fIca\fR、\fIca1\fR、\fIca2\fRおよび\fIe1\fRの4つの鍵ペアを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -687,7 +687,7 @@
 .if n \{\
 .RE
 .\}
-2ĤΥޥɤϡ̾դΥޤ\fIca\fR\fIca1\fR˽̾\fIca1\fR\fIca2\fR˽̾ޤ٤ƼȯԤǤ
+次の2つのコマンドは、署名付き証明書のチェーンを作成します。\fIca\fRは\fIca1\fRに署名し、\fIca1\fRは\fIca2\fRに署名します。すべて自己発行です。
 .sp
 .if n \{\
 .RS 4
@@ -704,7 +704,7 @@
 .if n \{\
 .RE
 .\}
-Υޥɤϡ\fIe1\fRƥե\fIe1\&.cert\fR˳Ǽޤξ\fIca2\fRˤäƽ̾ޤη̡\fIe1\fRξˤ\fIca\fR\fIca1\fR\fIca2\fRޤޤ뤳Ȥˤʤޤ
+次のコマンドは、証明書\fIe1\fRを作成してファイル\fIe1\&.cert\fRに格納します。この証明書は\fIca2\fRによって署名されます。その結果、\fIe1\fRの証明書チェーンには\fIca\fR、\fIca1\fRおよび\fIca2\fRが含まれることになります。
 .sp
 .if n \{\
 .RS 4
@@ -721,23 +721,23 @@
 .RS 4
 \fI{\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-Υڥ(ӴϢ̩)ޤX\&.509 v3ʽ̾ǥåפޤϡñǤľȤƳǼޤξ̩ϡaliasꤵ뿷ȥȥ˳Ǽޤ
+鍵のペア(公開鍵および関連する秘密鍵)を生成します。公開鍵はX\&.509 v3自己署名証明書でラップされます。証明書は、単一の要素を持つ証明書チェーンとして格納されます。この証明書チェーンと秘密鍵は、aliasで特定される新しいキーストア・エントリに格納されます。
 .sp
-\fIkeyalg\fRͤϸڥ˻Ѥ륢르ꥺ\fIkeysize\fRͤƸΥ򡢤줾ꤷޤ\fIsigalg\fRͤϡʽ̾˽̾դ뤿˻Ѥ륢르ꥺꤷޤΥ르ꥺ\fIkeyalg\fRͤȸߴɬפޤ
+\fIkeyalg\fR値は鍵ペアの生成に使用するアルゴリズムを、\fIkeysize\fR値は生成する各鍵のサイズを、それぞれ指定します。\fIsigalg\fR値は、自己署名証明書に署名を付けるために使用するアルゴリズムを指定します。このアルゴリズムは\fIkeyalg\fR値と互換性がある必要があります。
 .sp
-\fIdname\fRͤˤϡ\fIalias\fRͤ˴Ϣդʽ̾issuerեɤsubjectեɤȤƻѤX\&.500̾ꤷޤޥɥ饤Ǽ̾ꤷʤäϡ̾Ϥޤ
+\fIdname\fR値には、\fIalias\fR値に関連付け、自己署名証明書のissuerフィールドとsubjectフィールドとして使用するX\&.500識別名を指定します。コマンドラインで識別名を指定しなかった場合は、識別名の入力を求められます。
 .sp
-\fIkeypass\fRͤˤϡ븰ΥڥΤ̩ݸΤ˻ѤѥɤꤷޤѥɤꤷʤäϡѥɤϤޤΤȤ\fI[Return]\fR򲡤ȡȥΥѥɤƱѥɤΥѥɤꤵޤ\fIkeypass\fRͤϡ6ʸʾˤɬפޤ
+\fIkeypass\fR値には、生成される鍵のペアのうち、秘密鍵を保護するのに使用するパスワードを指定します。パスワードを指定しなかった場合は、パスワードの入力を求められます。このとき、\fI[Return]キー\fRを押すと、キーストアのパスワードと同じパスワードが鍵のパスワードに設定されます。\fIkeypass\fR値は、6文字以上にする必要があります。
 .sp
-\fIstartdate\fRͤˤϡȯԻꤷޤϡX\&.509ΡValidityץեɤΡNot BeforeͤȤƤФޤ
+\fIstartdate\fR値には、証明書の発行時刻を指定します。これは、X\&.509証明書の「Validity」フィールドの「Not Before」値とも呼ばれます。
 .sp
-ץͤϡ2ĤηΤ줫Ǥޤ
+オプションの値は、次の2つの形式のいずれかで設定できます。
 .sp
 \fI([+\-]nnn[ymdHMS])+\fR
 .sp
 \fI[yyyy/mm/dd] [HH:MM:SS]\fR
 .sp
-ǽηǤϡȯԻϡꤵͤʬߤλ狼ܤޤꤵͤϡϢβ̤ͤϢ뤷Τˤʤޤ̤γͤǡץ饹(+)ϻ֤ʤळȤ򡢥ޥʥ(\-)ϻ֤뤳Ȥ̣Ƥޤܤ֤\fInnn\fRǡñ̤ǯ֡ʬޤäǤ(줾졢1ʸ\fIy\fR\fIm\fR\fId\fR\fIH\fR\fIM\fRޤ\fIS\fRפǼƤޤ)̤γͤ\fIjava\&.util\&.GregorianCalendar\&.add(int field, int amount)\fR᥽åɤѤ뤳ȤǡȯԻɲäͤ鱦ط׻ޤȤСꤹȡȯԻϼΤ褦ˤʤޤ
+最初の形式では、発行時刻は、指定される値の分、現在の時刻から移ります。指定される値は、一連の下位の値を連結したものになります。下位の各値で、プラス記号(「+」)は時間が進むことを、マイナス記号(「\-」)は時間が戻ることを意味しています。移る時間は\fInnn\fRで、単位は年、月、日、時間、分または秒です(それぞれ、1文字の\fIy\fR、\fIm\fR、\fId\fR、\fIH\fR、\fIM\fRまたは\fIS\fR」で示されています)。下位の各値で\fIjava\&.util\&.GregorianCalendar\&.add(int field, int amount)\fRメソッドを使用することで、発行時刻の追加の値が左から右へ計算されます。たとえば、指定すると、発行時刻は次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -752,182 +752,182 @@
 .if n \{\
 .RE
 .\}
-2ܤηǤϡ桼ϡǯ//Ȼ:ʬ:ä2ĤʬǸ̩ʳϻꤷޤ(ϸλӤ)桼ϡ1ĤʬΤߤǤޤϡ⤦1Ĥʬϸߤ(ޤϻ)ƱˤʤȤȤǤ桼ϡ˼Ƥ褦ˡ̩˻ꤹɬפޤ(û0ޤ)դȻξꤵ줿֤ǡ2Ĥʬδ֤˶ʸ1(1ĤΤ)ޤ֤Ͼ24ַǻꤷƤ
+2番目の形式では、ユーザーは、年/月/日と時間:分:秒の2つの部分で厳密な開始時刻を設定します(地元の時間帯を使用)。ユーザーは、1つの部分のみを指定できます。これは、もう1つの部分は現在の日付(または時刻)と同じになるということです。ユーザーは、形式の定義に示されているように、桁数を厳密に指定する必要があります(短い場合は0で埋めます)。日付と時刻の両方が指定された状態で、2つの部分の間に空白文字が1つ(1つのみ)あります。時間は常に24時間形式で指定してください。
 .sp
-ץꤷʤȡդϸߤλˤʤޤץϡ1Ǥޤ
+オプションを指定しないと、開始日付は現在の時刻になります。オプションは、最大で1回指定できます。
 .sp
-\fIvalDays\fRͤˤϡͭꤷޤ(\fI\-startdate\fRǻꤵ줿աޤ\fI\-startdate\fRꤵƤʤϸߤդϤޤޤ)
+\fIvalDays\fRの値には、証明書の有効日数を指定します(\fI\-startdate\fRで指定された日付、または\fI\-startdate\fRが指定されていない場合は現在の日付から始まります)。
 .sp
-ΥޥɤϡΥ꡼Ǥ\fI\-genkey\fRȤ̾ǤΥ꡼Ǥϡ³Ť̾ݡȤƤޤϡ̾\fI\-genkeypair\fRͥ褵ޤ
+このコマンドは、以前のリリースでは\fI\-genkey\fRという名前でした。このリリースでは、引き続き古い名前がサポートされています。今後は、新しい名前\fI\-genkeypair\fRが優先されます。
 .RE
 .PP
 \-genseckey
 .RS 4
 \fI\-genseckey {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-̩򿷤\fIKeyStore\&.SecretKeyEntry\fR(\fIalias\fRꤵ)˳Ǽޤ
+秘密鍵を生成し、それを新しい\fIKeyStore\&.SecretKeyEntry\fR(\fIalias\fRで特定される)内に格納します。
 .sp
-\fIkeyalg\fRͤϸڥ˻Ѥ륢르ꥺ\fIkeysize\fRͤƸΥ򡢤줾ꤷޤ\fIkeypass\fRͤϡ̩ݸѥɤǤѥɤꤷʤäϡѥɤϤޤΤȤ[Return]򲡤ȡ\fIkeystore\fRΥѥɤƱѥɤΥѥɤꤵޤ\fIkeypass\fRͤϡ6ʸʾˤɬפޤ
+\fIkeyalg\fR値は鍵ペアの生成に使用するアルゴリズムを、\fIkeysize\fR値は生成する各鍵のサイズを、それぞれ指定します。\fIkeypass\fR値は、秘密鍵を保護するパスワードです。パスワードを指定しなかった場合は、パスワードの入力を求められます。このとき、[Return]キーを押すと、\fIkeystore\fRのパスワードと同じパスワードが鍵のパスワードに設定されます。\fIkeypass\fR値は、6文字以上にする必要があります。
 .RE
 .PP
 \-importcert
 .RS 4
 \fI\-importcert {\-alias alias} {\-file cert_file} [\-keypass keypass] {\-noprompt} {\-trustcacerts} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ե\fIcert_file\fRޤϾ(ξϡPKCS#7αޤϰϢX\&.509󶡤)ɤ߹ߡ\fIalias\fRˤäꤵ\fIkeystore\fRȥ˳Ǽޤե뤬ꤵƤʤϡ\fIstdin\fRޤϾɤ߹ߤޤ
+ファイル\fIcert_file\fRから証明書または証明書チェーン(証明書チェーンの場合は、PKCS#7形式の応答または一連のX\&.509証明書で提供されるもの)を読み込み、\fIalias\fRによって特定される\fIkeystore\fRエントリに格納します。ファイルが指定されていない場合は、\fIstdin\fRから証明書または証明書チェーンを読み込みます。
 .sp
-\fIkeytool\fRޥɤǤϡX\&.509 v1v2v3ξ񡢤PKCS#7ξ񤫤鹽ƤPKCS#7ξ򥤥ݡȤǤޤݡȤǡϡХʥ沽ޤϽϲǽ沽(Base64沽ȤƤФ)Τɤ餫󶡤ɬפޤϲǽ沽ϡ󥿡ͥåRFC 1421沽ʤƤޤ沽ξ硢\fI\-\fR\fI\-\-\-\-BEGIN\fRǻϤޤʸdzϤ졢\fI\-\-\-\-\-END\fRǻϤޤʸǽλɬפޤ
+\fIkeytool\fRコマンドでは、X\&.509 v1、v2、v3の証明書、およびPKCS#7形式の証明書から構成されているPKCS#7形式の証明書チェーンをインポートできます。インポートするデータは、バイナリ符号化方式、または出力可能符号化方式(Base64符号化とも呼ばれる)のどちらかで提供する必要があります。出力可能符号化方式は、インターネットRFC 1421証明書符号化規格で定義されています。この符号化方式の場合、証明書は\fI\-\fR\fI\-\-\-\-BEGIN\fRで始まる文字列で開始され、\fI\-\-\-\-\-END\fRで始まる文字列で終了する必要があります。
 .sp
-ϡǤΥꥹȤɲä뤿ᡢǧڶ(CA)˾̾ꥯȤ̤ȤCA򥤥ݡȤ뤿(ޥɤ\fI\-certreq\fRץ򻲾)Ȥ2ĤͳǥݡȤޤ
+証明書は、信頼できる証明書のリストに追加するため、および認証局(CA)に証明書署名リクエストを送信した結果としてCAから受信した証明書応答をインポートするため(コマンドの\fI\-certreq\fRオプションを参照)という2つの理由でインポートします。
 .sp
-ɤΥפΥݡȤԤϡ\fI\-alias\fRץͤˤäƻꤷޤ̾ȥݥȤʤ硢\fIkeytool\fRޥɤϥ桼Ǥ񥨥ȥɲä褦ȤƤΤȤߤʤޤξ硢̾ȥ¸ߤƤʤȤɬפǤ̾Ǥ¸ߤƤ硢̾οǤ񤬤Ǥ¸ߤ뤳ȤˤʤΤǡ\fIkeytool\fRޥɤϥ顼ϤΥݡȤԤޤ̾ȥݥȤ硢\fIkeytool\fRޥɤϥ桼򥤥ݡȤ褦ȤƤΤȤߤʤޤ
+どちらのタイプのインポートを行うかは、\fI\-alias\fRオプションの値によって指定します。別名がキー・エントリをポイントしない場合、\fIkeytool\fRコマンドはユーザーが信頼できる証明書エントリを追加しようとしているものとみなします。この場合、別名がキーストア内に存在していないことが必要です。別名がすでに存在している場合、その別名の信頼できる証明書がすでに存在することになるので、\fIkeytool\fRコマンドはエラーを出力し、証明書のインポートを行いません。別名がキー・エントリをポイントする場合、\fIkeytool\fRコマンドはユーザーが証明書応答をインポートしようとしているものとみなします。
 .RE
 .PP
 \-importpassword
 .RS 4
 \fI{\-alias alias} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ѥե졼򥤥ݡȤ\fIalias\fRǼ̤뿷\fIKeyStore\&.SecretKeyEntry\fR˳Ǽޤѥե졼ϡɸϥȥ꡼𤷤󶡤Ǥޤޤϡ桼ˤΥץץȤɽޤ\fIkeypass\fRϡݡȤѥե졼ݸ˻ѤѥɤǤѥɤꤷʤäϡѥɤϤޤΤȤ[Return]򲡤ȡ\fIkeystore\fRΥѥɤƱѥɤΥѥɤꤵޤ\fIkeypass\fRϡ6ʸʾˤɬפޤ
+パスフレーズをインポートし、\fIalias\fRで識別される新規\fIKeyStore\&.SecretKeyEntry\fRに格納します。パスフレーズは、標準入力ストリームを介して提供できます。または、ユーザーにそのプロンプトが表示されます。\fIkeypass\fRは、インポートされるパスフレーズの保護に使用されるパスワードです。パスワードを指定しなかった場合は、パスワードの入力を求められます。このとき、[Return]キーを押すと、\fIkeystore\fRのパスワードと同じパスワードが鍵のパスワードに設定されます。\fIkeypass\fRは、6文字以上にする必要があります。
 .RE
 .PP
 \-importkeystore
 .RS 4
 \fI{\-srcstoretype srcstoretype} {\-deststoretype deststoretype} [\-srcstorepass srcstorepass] [\-deststorepass deststorepass] {\-srcprotected} {\-destprotected} {\-srcalias srcalias {\-destalias destalias} [\-srckeypass srckeypass] } [\-destkeypass destkeypass] {\-noprompt} {\-srcProviderName src_provider_name} {\-destProviderName dest_provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ȥ饿åȡȥءñΥȥޤϤ٤ƤΥȥ򥤥ݡȤޤ
+ソース・キーストアからターゲット・キーストアへ、単一のエントリまたはすべてのエントリをインポートします。
 .sp
-\fI\-srcalias\fRץ󤬻ꤵ줿硢Υޥɤϡ̾ꤵñΥȥ򥿡åȡȥ˥ݡȤޤ\fIdestalias\fRͳǥå̾ꤵʤä硢\fIsrcalias\fRå̾ȤƻѤޤΥȥ꤬ѥɤݸƤ硢\fIsrckeypass\fRѤƤΥȥ꤬ޤ\fIsrckeypass\fRꤵʤä硢\fIkeytool\fRޥɤ\fIsrcstorepass\fRѤƤΥȥ褦Ȥޤ\fIsrcstorepass\fRꤵʤäʤä硢桼ϥѥɤϤޤåȤΥȥ\fIdestkeypass\fRˤäݸޤ\fIdestkeypass\fRꤵʤä硢åȡȥϥȥΥѥɤˤäݸޤȤСۤȤɤΥɡѡƥġǤϡPKCS #12ȥ\fIstorepass\fR\fIkeypass\fRƱǤɬפޤΥġPKCS #12ȥϡ\fI\-destkeypass\fR\fI\-deststorepass\fRƱˤʤ褦˻ꤷޤ
+\fI\-srcalias\fRオプションが指定された場合、このコマンドは、その別名で特定される単一のエントリをターゲット・キーストアにインポートします。\fIdestalias\fR経由でターゲット別名が指定されなかった場合、\fIsrcalias\fRがターゲット別名として使用されます。ソースのエントリがパスワードで保護されていた場合、\fIsrckeypass\fRを使用してそのエントリが回復されます。\fIsrckeypass\fRが指定されなかった場合、\fIkeytool\fRコマンドは\fIsrcstorepass\fRを使用してそのエントリを回復しようとします。\fIsrcstorepass\fRが指定されなかったか正しくなかった場合、ユーザーはパスワードの入力を求められます。ターゲットのエントリは\fIdestkeypass\fRによって保護されます。\fIdestkeypass\fRが指定されなかった場合、ターゲット・エントリはソース・エントリのパスワードによって保護されます。たとえば、ほとんどのサード・パーティ・ツールでは、PKCS #12キーストアで\fIstorepass\fRと\fIkeypass\fRが同じである必要があります。これらのツールのPKCS #12キーストアを作成する場合は、常に\fI\-destkeypass\fRと\fI\-deststorepass\fRが同じになるように指定します。
 .sp
-\fI\-srcalias\fRץ󤬻ꤵʤä硢ȥΤ٤ƤΥȥ꤬åȡȥ˥ݡȤޤƥåȡȥб륽ȥ̾β˳ǼޤΥȥ꤬ѥɤݸƤ硢\fIsrcstorepass\fRѤƤΥȥ꤬ޤ\fIsrcstorepass\fRꤵʤäʤä硢桼ϥѥɤϤޤȥΤ륨ȥꡦפåȡȥǥݡȤƤʤ䡢륨ȥ򥿡åȡȥ˳Ǽݤ˥顼ȯ硢桼ϤΥȥ򥹥åפƽ³Ԥ뤫뤤ϽǤ뤫ޤåȡȥϥȥΥѥɤˤäݸޤ
+\fI\-srcalias\fRオプションが指定されなかった場合、ソース・キーストア内のすべてのエントリがターゲット・キーストア内にインポートされます。各ターゲット・エントリは対応するソース・エントリの別名の下に格納されます。ソースのエントリがパスワードで保護されていた場合、\fIsrcstorepass\fRを使用してそのエントリが回復されます。\fIsrcstorepass\fRが指定されなかったか正しくなかった場合、ユーザーはパスワードの入力を求められます。ソース・キーストア内のあるエントリ・タイプがターゲット・キーストアでサポートされていない場合や、あるエントリをターゲット・キーストアに格納する際にエラーが発生した場合、ユーザーはそのエントリをスキップして処理を続行するか、あるいは処理を中断するかの選択を求められます。ターゲット・エントリはソース・エントリのパスワードによって保護されます。
 .sp
-å̾åȡȥˤǤ¸ߤƤ硢桼ϡΥȥ񤭤뤫뤤ϰۤʤ̾βǿȥ뤫ޤ
+ターゲット別名がターゲット・キーストア内にすでに存在していた場合、ユーザーは、そのエントリを上書きするか、あるいは異なる別名の下で新しいエントリを作成するかの選択を求められます。
 .sp
 
-\fI\-noprompt\fRץꤷ硢桼Ͽå̾Ϥޤ󡣴¸Υȥ꤬Υå̾Ǿ񤭤ޤݡȤǤʤȥϥåפ졢ٹ𤬽Ϥޤ
+\fI\-noprompt\fRオプションを指定した場合、ユーザーは新しいターゲット別名の入力を求められません。既存のエントリがそのターゲット別名で上書きされます。インポートできないエントリはスキップされ、警告が出力されます。
 .RE
 .PP
 \-printcertreq
 .RS 4
 \fI{\-file file}\fR
 .sp
-PKCS#10ξꥯȤƤϤޤΥꥯȤϡ\fIkeytool\fR
-\fI\-certreq\fRޥɤǤޤΥޥɤϡե뤫ꥯȤɤ߼ޤե뤬¸ߤʤ硢ꥯȤɸϤɤ߼ޤ
+PKCS#10形式の証明書リクエストの内容を出力します。このリクエストは、\fIkeytool\fR
+\fI\-certreq\fRコマンドで生成できます。このコマンドは、ファイルからリクエストを読み取ります。ファイルが存在しない場合、リクエストは標準入力から読み取られます。
 .RE
 .PP
 \-certreq
 .RS 4
 \fI{\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-PKCS#10Ѥƾ̾ꥯ(CSR)ޤ
+PKCS#10形式を使用して証明書署名リクエスト(CSR)を生成します。
 .sp
-CSRϡȯԶ(CA)뤳ȤŪȤΤǤCAϡ׵Ԥ(̾ϥե饤)ǧڤޤϾ֤ޤξޤϾϡȥδ¸ξ(ǽ1Ĥμʽ̾񤫤鹽)֤ƻѤޤ
+CSRは、証明書発行局(CA)に送信することを目的としたものです。CAは、証明書要求者を(通常はオフラインで)認証し、証明書または証明書チェーンを送り返します。この証明書または証明書チェーンは、キーストア内の既存の証明書チェーン(最初は1つの自己署名証明書から構成される)に置き換えて使用します。
 .sp
-alias˴Ϣդ줿̩ϡPKCS#10ꥯȤΤ˻Ѥޤ̩˥ˤϡѥɤꤹɬפޤޥɥ饤\fIkeypass\fRꤷƤ餺̩ΥѥɤȥΥѥɤȰۤʤϡ̩ΥѥɤϤޤ\fIdname\fRꤵƤϡ줬CSRǼΤȤƻѤޤʳξϡ̾˴Ϣդ줿X\&.500̾Ѥޤ
+aliasに関連付けられた秘密鍵は、PKCS#10証明書リクエストを作成するのに使用されます。秘密鍵にアクセスするには、正しいパスワードを指定する必要があります。コマンドラインで\fIkeypass\fRを指定しておらず、秘密鍵のパスワードがキーストアのパスワードと異なる場合は、秘密鍵のパスワードの入力を求められます。\fIdname\fRが指定されている場合は、それがCSRで主体として使用されます。それ以外の場合は、別名に関連付けられたX\&.500識別名が使用されます。
 .sp
-\fIsigalg\fRͤˤϡCSR˽̾դȤ˻Ѥ륢르ꥺꤷޤ
+\fIsigalg\fR値には、CSRに署名を付けるときに使用するアルゴリズムを指定します。
 .sp
-CSRϡեcertreq_file˳Ǽޤե뤬ꤵƤʤϡ\fIstdout\fRCSRϤޤ
+CSRは、ファイルcertreq_fileに格納されます。ファイルが指定されていない場合は、\fIstdout\fRにCSRが出力されます。
 .sp
-CAΥ쥹ݥ󥹤򥤥ݡȤˤϡ\fIimportcert\fRޥɤѤޤ
+CAからのレスポンスをインポートするには、\fIimportcert\fRコマンドを使用します。
 .RE
 .PP
 \-exportcert
 .RS 4
 \fI{\-alias alias} {\-file cert_file} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-rfc} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-\fIalias\fR˴Ϣդ줿򥭡ȥɤ߹ߡեcert_file˳Ǽޤե뤬ꤵƤʤϡ\fIstdout\fR˾񤬽Ϥޤ
+\fIalias\fRに関連付けられた証明書をキーストアから読み込み、ファイルcert_fileに格納します。ファイルが指定されていない場合は、\fIstdout\fRに証明書が出力されます。
 .sp
-ǥեȤǤϡϥХʥ沽ǽϤޤ\fI\-rfc\fRץ󤬻ꤵƤ硢ϲǽ沽νϤϥ󥿡ͥåRFC 1421沽ʤޤ
+デフォルトでは、証明書はバイナリ符号化で出力されます。\fI\-rfc\fRオプションが指定されている場合、出力可能符号化方式の出力はインターネットRFC 1421証明書符号化規格で定義されます。
 .sp
-\fIalias\fRǤ򻲾ȤƤϡ񤬽Ϥޤʳξ硢\fIalias\fRϡϢդ줿ĸȥ򻲾Ȥޤξϡκǽξ֤ޤξϡ\fIalias\fRˤäɽ륨ƥƥθǧڤǤ
+\fIalias\fRが、信頼できる証明書を参照している場合は、該当する証明書が出力されます。それ以外の場合、\fIalias\fRは、関連付けられた証明書チェーンを持つ鍵エントリを参照します。この場合は、チェーン内の最初の証明書が返されます。この証明書は、\fIalias\fRによって表されるエンティティの公開鍵を認証する証明書です。
 .sp
-ΥޥɤϡΥ꡼Ǥ\fI\-export\fRȤ̾ǤΥ꡼Ǥϡ³Ť̾ݡȤƤޤϡ̾\fI\-exportcert\fRͥ褵ޤ
+このコマンドは、以前のリリースでは\fI\-export\fRという名前でした。このリリースでは、引き続き古い名前がサポートされています。今後は、新しい名前\fI\-exportcert\fRが優先されます。
 .RE
 .PP
 \-list
 .RS 4
 \fI{\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption}\fR
 .sp
-\fIalias\fRꤵ륭ȥȥƤ\fIstdout\fR˽Ϥޤ\fIalias\fRꤵƤʤϡȥΤƤɽޤ
+\fIalias\fRで特定されるキーストア・エントリの内容を\fIstdout\fRに出力します。\fIalias\fRが指定されていない場合は、キーストア全体の内容が表示されます。
 .sp
-ΥޥɤϡǥեȤǤϾSHA1ե󥬡ץȤɽޤ
-\fI\-v\fRץ󤬻ꤵƤϡͭԡȯԼԡꥢֹ桢ĥǽʤɤղŪʾȤȤˡʹ֤ɤळȤΤǤǾɽޤ\fI\-rfc\fRץ󤬻ꤵƤϡϲǽ沽ǾƤϤޤϲǽ沽ϡ󥿡ͥåRFC 1421沽ʤƤޤ
+このコマンドは、デフォルトでは証明書のSHA1フィンガープリントを表示します。
+\fI\-v\fRオプションが指定されている場合は、所有者、発行者、シリアル番号、拡張機能などの付加的な情報とともに、人間が読むことのできる形式で証明書が表示されます。\fI\-rfc\fRオプションが指定されている場合は、出力可能符号化方式で証明書の内容が出力されます。出力可能符号化方式は、インターネットRFC 1421証明書符号化規格で定義されています。
 .sp
-\fI\-v\fRץ\fI\-rfc\fRץƱ˻ꤹ뤳ȤϤǤޤ
+\fI\-v\fRオプションと\fI\-rfc\fRオプションを同時に指定することはできません。
 .RE
 .PP
 \-printcert
 .RS 4
 \fI{\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}\fR
 .sp
-եcert_filehost:portˤSSLСޤϽ̾դJARե\fIJAR_file\fR(\fI\-jarfile\fRץ)ɤ߹ߡʹ֤ɤळȤΤǤǾƤɽޤݡȤꤵƤʤϡɸHTTPSݡ443ꤵޤ\fI\-sslserver\fR\-fileץƱ˻ꤹ뤳ȤϤǤޤ󡣤ȿ硢顼𤵤ޤץ󤬻ꤵƤʤϡ\fIstdin\fRɤ߹ߤޤ
+ファイルcert_file、host:portにあるSSLサーバー、または署名付きJARファイル\fIJAR_file\fR(\fI\-jarfile\fRオプションを指定)から証明書を読み込み、人間が読むことのできる形式で証明書の内容を表示します。ポートが指定されていない場合は、標準のHTTPSポート443が想定されます。\fI\-sslserver\fRおよび\-fileオプションを同時に指定することはできません。これに反する場合、エラーが報告されます。オプションが指定されていない場合は、\fIstdin\fRから証明書を読み込みます。
 .sp
-\fI\-rfc\fRꤵƤ硢\fIkeytool\fRޥɤϡ󥿡ͥåRFC 1421沽ɸƤ褦ˡPEM⡼ɤǾϤޤ󥿡ͥåRFC 1421沽ʤ򻲾ȤƤ
+\fI\-rfc\fRが指定されている場合、\fIkeytool\fRコマンドは、インターネットRFC 1421証明書符号化標準で定義されているように、PEMモードで証明書を出力します。インターネットRFC 1421証明書符号化規格を参照してください。
 .sp
-եޤ\fIstdin\fRɤ߹硢ξϡ󥿡ͥåRFC 1421沽ɸƤ褦ˡХʥ沽ޤϽϲǽ沽ɽǤޤ
+ファイルまたは\fIstdin\fRから証明書を読み込む場合、その証明書は、インターネットRFC 1421証明書符号化標準で定義されているように、バイナリ符号化方式または出力可能符号化方式で表示できます。
 .sp
-SSLСեظˤϡ\fI\-J\-Dhttps\&.proxyHost=proxyhost\fR\fI\-J\-Dhttps\&.proxyPort=proxyport\fRץ򥳥ޥɥ饤ǻꤷơץȥͥ󥰤ѤǤޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide\&.html
-Java Secure Socket Extension (JSSE) Reference Guideפ򻲾ȤƤ
+SSLサーバーがファイアウォールの背後にある場合は、\fI\-J\-Dhttps\&.proxyHost=proxyhost\fRおよび\fI\-J\-Dhttps\&.proxyPort=proxyport\fRオプションをコマンドラインで指定して、プロキシ・トンネリングを使用できます。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide\&.htmlの
+「Java Secure Socket Extension (JSSE) Reference Guide」を参照してください
 .sp
-\fB:\fR
-ΥץϥȥȤϴطʤѤǤޤ
+\fB注意:\fR
+このオプションはキーストアとは関係なく使用できます。
 .RE
 .PP
 \-printcrl
 .RS 4
 \fI\-file crl_ {\-v}\fR
 .sp
-ե\fIcrl_\fR񼺸ꥹ(CRL)ɤ߹ߤޤCRLϡȯԤCAˤäƼ줿ǥΥꥹȤǤCAϡ\fIcrl_\fRޤ
+ファイル\fIcrl_\fRから証明書失効リスト(CRL)を読み込みます。CRLは、発行したCAによって失効されたデジタル証明書のリストです。CAは、\fIcrl_\fRを生成します。
 .sp
-\fB:\fR
-ΥץϥȥȤϴطʤѤǤޤ
+\fB注意:\fR
+このオプションはキーストアとは関係なく使用できます。
 .RE
 .PP
 \-storepasswd
 .RS 4
 \fI[\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}\fR
 .sp
-ȥƤݸ뤿˻Ѥѥɤѹޤ\fInew_storepass\fRˤϡѥɤꤷޤnew_storepassϡ6ʸʾǤɬפޤ
+キーストアの内容の整合性を保護するために使用するパスワードを変更します。\fInew_storepass\fRには、新しいパスワードを指定します。new_storepassは、6文字以上である必要があります。
 .RE
 .PP
 \-keypasswd
 .RS 4
 \fI{\-alias alias} [\-keypass old_keypass] [\-new new_keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}\fR
 .sp
-\fIalias\fRˤäꤵ/̩ݸ뤿Υѥɤ\fIold_keypass\fR\fInew_keypass\fRѹޤnew_keypassϡ6ʸʾǤɬפޤ
+\fIalias\fRによって特定される非公開/秘密鍵を保護するためのパスワードを、\fIold_keypass\fRから\fInew_keypass\fRに変更します。new_keypassは、6文字以上である必要があります。
 .sp
-ޥɥ饤\fI\-keypass\fRץꤷƤ餺ΥѥɤȥΥѥɤȰۤʤϡΥѥɤϤޤ
+コマンドラインで\fI\-keypass\fRオプションを指定しておらず、鍵のパスワードがキーストアのパスワードと異なる場合は、鍵のパスワードの入力を求められます。
 .sp
-ޥɥ饤\fI\-new\fRץꤷʤäϡѥɤϤޤ
+コマンドラインで\fI\-new\fRオプションを指定しなかった場合は、新しいパスワードの入力を求められます。
 .RE
 .PP
 \-delete
 .RS 4
 \fI[\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-\fIalias\fRˤäꤵ륨ȥ򥭡ȥޤޥɥ饤̾ꤷʤäϡ̾Ϥޤ
+\fIalias\fRによって特定されるエントリをキーストアから削除します。コマンドラインで別名を指定しなかった場合は、別名の入力を求められます。
 .RE
 .PP
 \-changealias
 .RS 4
 \fI{\-alias alias} [\-destalias destalias] [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ꤵ줿\fIalias\fR鿷̾\fIdestalias\fRء¸Υȥȥưޤå̾ꤷʤä硢å̾ϤޤΥȥ꤬ȥꡦѥɤݸƤ硢\fI\-keypass\fRץǤΥѥɤǤޤѥɤꤵʤä硢\fIstorepass\fR(ꤵ줿)ޤߤޤλߤԤȡ桼ϥѥɤϤޤ
+指定された\fIalias\fRから新しい別名\fIdestalias\fRへ、既存のキーストア・エントリを移動します。ターゲット別名を指定しなかった場合、ターゲット別名の入力を求められます。元のエントリがエントリ・パスワードで保護されていた場合、\fI\-keypass\fRオプションでそのパスワードを指定できます。鍵パスワードが指定されなかった場合、\fIstorepass\fR(指定された場合)がまず試みられます。その試みが失敗すると、ユーザーはパスワードの入力を求められます。
 .RE
 .PP
 \-help
 .RS 4
-ŪʥޥɤȤΥץΰɽޤ
+基本的なコマンドとそのオプションの一覧を表示します。
 .sp
-Υޥɤξܺ٤򻲾ȤˤϡΤ褦ϤƤ:
-\fIkeytool \-command_name \-help\fR\fIcommand_name\fRϥޥɤ̾Ǥ
+特定のコマンドの詳細を参照するには、次のように入力してください:
+\fIkeytool \-command_name \-help\fR。\fIcommand_name\fRはコマンドの名前です。
 .RE
-.SH ""
+.SH "例"
 .PP
-Ǥϡ/̩ΥڥӿǤ륨ƥƥξ뤿Υȥ򼨤ޤ
-.SS "Υڥ"
+この例では、公開/秘密鍵のペアおよび信頼できるエンティティからの証明書を管理するためのキーストアを作成する手順を示します。
+.SS "鍵のペアの生成"
 .PP
-ޤȥƸΥڥޤñԤϤ롢Τ褦ʥޥɤѤǤޤ
+まず、キーストアを作成して鍵のペアを生成します。単一行に入力する、次のようなコマンドを使用できます。
 .sp
 .if n \{\
 .RS 4
@@ -942,11 +942,11 @@
 .RE
 .\}
 .PP
-ޥɤϡworkingǥ쥯ȥ\fImykeystore\fRȤ̾Υȥ(ȥϤޤ¸ߤƤʤȲ)ȥˡ\fI<new password for keystore>\fRǻꤷѥɤƤޤ̩Υڥб륨ƥƥΡּ̾פϡ̾ΤMark Jonesȿñ̤JavaȿOracle2ʸιֹ椬USǤ̩ΥϤɤ1024ӥåȤǡκˤϥǥեȤDSA르ꥺѤޤ
+コマンドは、workingディレクトリに\fImykeystore\fRという名前のキーストアを作成し(キーストアはまだ存在していないと仮定)、作成したキーストアに、\fI<new password for keystore>\fRで指定したパスワードを割り当てます。生成する公開鍵と秘密鍵のペアに対応するエンティティの「識別名」は、通称がMark Jones、組織単位がJava、組織がOracle、2文字の国番号がUSです。公開鍵と秘密鍵のサイズはどちらも1024ビットで、鍵の作成にはデフォルトのDSA鍵生成アルゴリズムを使用します。
 .PP
-ΥޥɤϡǥեȤSHA1withDSA̾르ꥺѤơȼ̾ޤ༫ʽ̾ޤ֤ͭ180Ǥϡ̾\fIbusiness\fRꤵ륭ȥȥ̩˴Ϣդޤ̩ˤϡ\fI<new password for private key>\fRǻꤷѥɤƤޤ
+このコマンドは、デフォルトのSHA1withDSA署名アルゴリズムを使用して、公開鍵と識別名情報を含む自己署名証明書を作成します。証明書の有効期間は180日です。証明書は、別名\fIbusiness\fRで特定されるキーストア・エントリ内の秘密鍵に関連付けられます。秘密鍵には、\fI<new password for private key>\fRで指定したパスワードが割り当てられます。
 .PP
-ץΥǥեͤѤ硢ޥɤûʤޤξ硢ץפǤǥեͤĥץǤϡץꤷʤХǥեͤѤޤɬͤϤޤѲǽͤϼΤȤǤ
+オプションのデフォルト値を使用する場合、コマンドは大幅に短くなります。この場合、オプションは不要です。デフォルト値を持つオプションでは、オプションを指定しなければデフォルト値が使用されます。必須値の入力を求められます。使用可能な値は次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -958,12 +958,12 @@
 .RE
 .\}
 .PP
-ξϡ\fImykey\fRȤ̾ǥȥȥ꤬졢줿Υڥ90ͭʾ񤬤Υȥ˳ǼޤΥȥϡۡࡦǥ쥯ȥ\fI\&.keystore\fRȤ̾Υȥ֤ޤȥϡޤ¸ߤƤʤ˺ޤ̾󡢥ȥΥѥɤ̩ΥѥɤϤޤ
+この場合は、\fImykey\fRという別名でキーストア・エントリが作成され、新しく生成された鍵のペア、および90日間有効な証明書がこのエントリに格納されます。このエントリは、ホーム・ディレクトリ内の\fI\&.keystore\fRという名前のキーストアに置かれます。キーストアは、まだ存在していない場合に作成されます。識別名情報、キーストアのパスワードおよび秘密鍵のパスワードの入力を求められます。
 .PP
-ʹߤǤϡץꤷʤ\fI\-genkeypair\fRޥɤ¹ԤΤȤ򼨤ޤϤ줿ϡǽ˼\fI\-genkeypair\fRޥɤͤϤΤȤޤȤм̾ˤ\fIcn=Mark Jones\fR\fIou=Java\fR\fIo=Oracle\fR\fIc=US\fRȻꤷޤ
-.SS "CAν̾դΥꥯ"
+以降では、オプションを指定しないで\fI\-genkeypair\fRコマンドを実行したものとして例を示します。情報の入力を求められた場合は、最初に示した\fI\-genkeypair\fRコマンドの値を入力したものとします。たとえば識別名には\fIcn=Mark Jones\fR、\fIou=Java\fR、\fIo=Oracle\fR、\fIc=US\fRと指定します。
+.SS "CAからの署名付き証明書のリクエスト"
 .PP
-ʽ̾븰Υڥ˾ȯԶ(CA)ν̾դƤС¾Υ桼񤬿ꤵǽ⤯ʤޤCAν̾ˤϡޤ̾ꥯ(CSR)ޤȤСΤ褦ˤޤ
+自己署名証明書を作成する鍵のペアの生成。証明書に証明書発行局(CA)の署名が付いていれば、他のユーザーから証明書が信頼される可能性も高くなります。CAの署名を取得するには、まず、証明書署名リクエスト(CSR)を生成します。たとえば、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -975,12 +975,12 @@
 .RE
 .\}
 .PP
-CSR(ǥե̾\fImykey\fRˤäꤵ륨ƥƥCSR)졢MarkJ\&.csrȤ̾Υե֤ޤΥեCA (VeriSignʤ)ФޤCA׵Ԥ(̾ϥե饤)ǧڤ׵Ԥθǧڤ̾դξ֤ޤˤäƤϡCAΥ֤Ȥ⤢ޤΥǤϡƾ񤬥Τν̾Ԥθǧڤޤ
-.SS "CAξΥݡ"
+CSR(デフォルト別名\fImykey\fRによって特定されるエンティティのCSR)が作成され、MarkJ\&.csrという名前のファイルに置かれます。このファイルをCA (VeriSignなど)に提出します。CAは要求者を(通常はオフラインで)認証し、要求者の公開鍵を認証した署名付きの証明書を送り返します。場合によっては、CAが証明書のチェーンを返すこともあります。証明書のチェーンでは、各証明書がチェーン内のその前の署名者の公開鍵を認証します。
+.SS "CAからの証明書のインポート"
 .PP
-ʽ̾ϡ֤ɬפޤǤϡƾ񤬡֥롼ȡCAȤμξν̾Ԥθǧڤޤ
+作成した自己署名証明書は、証明書チェーンで置き換える必要があります。証明書チェーンでは、各証明書が、「ルート」CAを起点とするチェーン内の次の証明書の署名者の公開鍵を認証します。
 .PP
-CAξ򥤥ݡȤˤϡȥ\fIcacerts\fRȥե1İʾοǤ񤬤ɬפޤ\fI\fR\-importcertޥɤ򻲾ȤƤ
+CAからの証明書応答をインポートするには、キーストアか、\fIcacerts\fRキーストア・ファイル内に1つ以上の信頼できる証明書がある必要があります。\fIの\fR\-importcertコマンドを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -990,7 +990,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ξϡκǾ̾ɬפǤCAθǧڤ롼CA
+証明応答が証明書チェーンの場合は、チェーンの最上位証明書が必要です。CAの公開鍵を認証するルートCA証明書。
 .RE
 .sp
 .RS 4
@@ -1001,14 +1001,14 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ñξξϡȯCA(̾)ξɬפǤξ񤬼ʽ̾Ǥʤϡν̾ԤξɬפǤꡢΤ褦ˤƼʽ̾롼Ⱦɬפˤʤޤ
+証明書応答が単一の証明書の場合は、発行CA(署名した)の証明書が必要です。その証明書が自己署名でない場合は、その署名者の証明書が必要であり、このようにして自己署名ルート証明書が必要になります。
 .RE
 .PP
-\fIcacerts\fRȥեϡĤVeriSign롼CAޤ֤ǽв٤ƤΤǡVeriSignξ򡢿ǤȤƥȥ˥ݡȤɬפʤ礬ޤ¾CAФƽ̾դꥯȤƤơCAθǧڤ񤬡\fIcacerts\fRˤޤɲäƤʤϡCAξ򡢡ֿǤפȤƥݡȤɬפޤ
+\fIcacerts\fRキーストア・ファイルは、いくつかのVeriSignルートCA証明書を含んだ状態で出荷されているので、VeriSignの証明書を、信頼できる証明書としてキーストア内にインポートする必要がない場合があります。ただし、他のCAに対して署名付き証明書をリクエストしていて、このCAの公開鍵を認証する証明書が、\fIcacerts\fRにまだ追加されていない場合は、該当するCAからの証明書を、「信頼できる証明書」としてインポートする必要があります。
 .PP
-̾CAξϡʽ̾񡢤ޤ¾CAˤäƽ̾줿Ǥ(Ԥξϡ¾CAθǧڤɬ)ABC, Inc\&.,CAǡABC鼫ʽ̾ǤA\fIBCCA\&.cer\fRȤ̾ΥեȤޤ(ξCAθǧڤޤ)ǤȤƾ򥤥ݡȤȤϡͭǤ뤳Ȥǧɬפޤޤ\fIkeytool \-printcert\fRޥɤޤ\fI\-noprompt\fRץʤ\fIkeytool \-importcert\fRޥɤǤɽɽ줿Υե󥬡ץȤԤΤȰפ뤫ɤǧޤʪϢοʪ󼨤(ޤϰʸΥݥȥˤä󼨤)ե󥬡ץȤȡΥޥɤɽ줿ե󥬡ץȤȤӤޤե󥬡ץȤפС¾βԤ(Ԥʤ)ˤΤؤԤƤʤȤǧǤޤǤμι⤬ԤƤ硢åԤ鷺˾򥤥ݡȤȡԤˤäƽ̾줿٤ƤΤΤꤹ뤳Ȥˤʤޤ
+通常、CAからの証明書は、自己署名証明書、または他のCAによって署名された証明書です(後者の場合は、該当する他のCAの公開鍵を認証する証明書が必要)。ABC, Inc\&.,がCAで、ABCから自己署名証明書であるA\fIBCCA\&.cer\fRという名前のファイルを取得したとします(この証明書はCAの公開鍵を認証します)。信頼できる証明書として証明書をインポートするときは、証明書が有効であることを確認する必要があります。まず、\fIkeytool \-printcert\fRコマンドまたは\fI\-noprompt\fRオプションなしの\fIkeytool \-importcert\fRコマンドでそれを表示し、表示された証明書のフィンガープリントが期待されるものと一致するかどうかを確認します。証明書を送信した人物に連絡し、この人物が提示した(または安全な公開鍵のリポジトリによって提示される)フィンガープリントと、上のコマンドで表示されたフィンガープリントとを比較します。フィンガープリントが一致すれば、送信途中で他の何者か(攻撃者など)による証明書のすり替えが行われていないことを確認できます。送信途中でこの種の攻撃が行われていた場合、チェックを行わずに証明書をインポートすると、攻撃者によって署名されたすべてのものを信頼することになります。
 .PP
-ͭǤȿꤹϡΥޥɤǥȥɲäǤޤ
+証明書が有効であると信頼する場合は、次のコマンドでキーストアに追加できます。
 .sp
 .if n \{\
 .RS 4
@@ -1020,12 +1020,12 @@
 .RE
 .\}
 .PP
-ABCCA\&.cerեΥǡޤ࿮ǤΥȥ꤬ȥ˺졢륨ȥ\fIabc\fRȤ̾Ƥޤ
-.SS "CAξΥݡ"
+ABCCA\&.cerファイルのデータを含む信頼できる証明書のエントリがキーストア内に作成され、該当するエントリに\fIabc\fRという別名が割り当てられます。
+.SS "CAからの証明書応答のインポート"
 .PP
-̾ꥯȤCAθǧڤ򥤥ݡȤ(ޤƱξ񤬤Ǥcacertsե¸ߤƤ)򥤥ݡȤʽ֤̾뤳ȤǤޤΥϡCAαξˡꥯȤФ쥹ݥ󥹤ȤCA֤줿ǤޤCAαñξξϡξȡݡΥȥޤ\fIcacerts\fRȥեˤǤ¸ߤ뿮ǤȤѤƹۤǤ
+証明書署名リクエストの提出先のCAの公開鍵を認証する証明書をインポートした後は(または同種の証明書がすでにcacertsファイル内に存在している場合は)、証明応答をインポートし、自己署名証明書を証明書チェーンで置き換えることができます。このチェーンは、CAの応答がチェーンの場合に、リクエストに対するレスポンスとしてCAから送り返された証明書チェーンです。また、CAの応答が単一の証明書の場合は、この証明応答と、インポート先のキーストア内または\fIcacerts\fRキーストアファイル内にすでに存在する信頼できる証明書とを使用して構築した証明書チェーンです。
 .PP
-ȤС̾ꥯȤVeriSign硢֤줿̾VSMarkJ\&.cerȤȡΤ褦ˤƱ򥤥ݡȤǤޤ
+たとえば、証明書署名リクエストをVeriSignに送信する場合、送り返された証明書の名前がVSMarkJ\&.cerだとすると、次のようにして応答をインポートできます。
 .sp
 .if n \{\
 .RS 4
@@ -1036,11 +1036,11 @@
 .if n \{\
 .RE
 .\}
-.SS "ǧڤΥݡ"
+.SS "公開鍵を認証する証明書のエクスポート"
 .PP
-\fIjarsigner\fRޥɤѤJava Archive (JAR)ե˽̾硢ΥեѤ륯饤ȤϽ̾ǧڤɬפޤ饤Ȥ̾ǧڤˡ1ĤˡޤʬθξǤ륨ȥȤƥ饤ȤΥȥ˥ݡȤˡޤ
+\fIjarsigner\fRコマンドを使用してJava Archive (JAR)ファイルに署名する場合、このファイルを使用するクライアントは署名を認証する必要があります。クライアントが署名を認証する方法の1つに、まず自分の公開鍵の証明書を信頼できるエントリとしてクライアントのキーストアにインポートする方法があります。
 .PP
-Τˤϡ򥨥ݡȤơ饤Ȥ󶡤ޤȤơΥޥɤѤơMJ\&.cerȤ̾Υե˾򥳥ԡǤޤΥޥɤǤϡȥ̾\fImykey\fRȲꤷƤޤ
+そのためには、証明書をエクスポートして、クライアントに提供します。例として、次のコマンドを使用して、MJ\&.cerという名前のファイルに証明書をコピーできます。このコマンドでは、エントリに別名\fImykey\fRがあると仮定しています。
 .sp
 .if n \{\
 .RS 4
@@ -1052,12 +1052,12 @@
 .RE
 .\}
 .PP
-Ƚ̾դJARեꤷ饤Ȥϡ\fIjarsigner\fRޥɤѤƽ̾ǧڤǤޤ
-.SS "ȥΥݡ"
+証明書と署名付きJARファイルを入手したクライアントは、\fIjarsigner\fRコマンドを使用して署名を認証できます。
+.SS "キーストアのインポート"
 .PP
-ޥ\fIimportkeystore\fRѤС륭ȥΤ̤Υȥ˥ݡȤǤޤϡȤäȥΤ٤ƤΥȥ꤬ñΥޥɤѤƥåȥȥ˥ݡȤ뤳Ȥ̣ޤΥޥɤѤСۤʤ륿פΥȥ˴ޤޤ륨ȥ򥤥ݡȤ뤳ȤǤޤݡȻˤϡåȡȥοȥϤ٤ơƱ̾(̩̩ξ)ݸѥѥɤޤȥ/̩ꥫХǤʤ硢\fIkeytool\fRޥɤϥ桼˥ѥɤϤޤΥޥɤϡ̾νʣ򸡽Фȡ桼˿̾Ϥޤ桼ϡ̾ꤹ뤳Ȥ⡢ñ˴¸̾ξ񤭤\fIkeytool\fRޥɤ˵Ĥ뤳ȤǤޤ
+コマンド\fIimportkeystore\fRを使用すれば、あるキーストアの全体を別のキーストア内にインポートできます。これは、鍵や証明書といったソースキーストア内のすべてのエントリが、単一のコマンドを使用してターゲットキーストア内にインポートされることを意味します。このコマンドを使用すれば、異なるタイプのキーストア内に含まれるエントリをインポートすることができます。インポート時には、ターゲット・キーストア内の新しいエントリはすべて、元と同じ別名および(秘密鍵や秘密鍵の場合は)保護用パスワードを持ちます。ソースキーストア内の非公開/秘密鍵をリカバリできない場合、\fIkeytool\fRコマンドはユーザーにパスワードの入力を求めます。このコマンドは、別名の重複を検出すると、ユーザーに新しい別名の入力を求めます。ユーザーは、新しい別名を指定することも、単純に既存の別名の上書きを\fIkeytool\fRコマンドに許可することもできます。
 .PP
-ȤС̾JKSפΥȥkey\&.jksΥȥPKCS#11פΥϡɥ١Υȥ˥ݡȤˤϡΥޥɤѤޤ
+たとえば、通常のJKSタイプのキーストアkey\&.jks内のエントリをPKCS#11タイプのハードウェア・ベースのキーストア内にインポートするには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1073,7 +1073,7 @@
 .RE
 .\}
 .PP
-ޤ\fIimportkeystore\fRޥɤѤС륽ȥñΥȥ򥿡åȡȥ˥ݡȤ뤳ȤǤޤξϡΥץ˲äơݡȤ̾ꤹɬפޤ\fI\-srcalias\fRץꤹˤϡå̾⥳ޥɥ饤󤫤Ǥ̩ۤ/̩ݸѥѥɤ䥿åݸѥѥɤǤޤˡ򼨤ޥɤ򼡤˼ޤ
+また、\fIimportkeystore\fRコマンドを使用すれば、あるソース・キーストア内の単一のエントリをターゲット・キーストアにインポートすることもできます。この場合は、前例のオプションに加えて、インポートする別名を指定する必要があります。\fI\-srcalias\fRオプションを指定する場合には、ターゲット別名もコマンドラインから指定できるほか、秘密/秘密鍵の保護用パスワードやターゲット保護用パスワードも指定できます。その方法を示すコマンドを次に示します。
 .sp
 .if n \{\
 .RS 4
@@ -1092,9 +1092,9 @@
 .if n \{\
 .RE
 .\}
-.SS "SSLСξ"
+.SS "SSLサーバーの証明書の生成"
 .PP
-ˡ3ĤΥƥƥĤޤ롼CA(\fIroot\fR)CA(\fIca\fR)SSLС(\fIserver\fR)ѤθڥȾ\fIkeytool\fRޥɤ򼨤ޤ٤ƤξƱȥ˳Ǽ褦ˤƤǤϡRSA侩븰Υ르ꥺǤ
+次に、3つのエンティティ、つまりルートCA(\fIroot\fR)、中間CA(\fIca\fR)およびSSLサーバー(\fIserver\fR)用の鍵ペアと証明書を生成する\fIkeytool\fRコマンドを示します。すべての証明書を同じキーストアに格納するようにしてください。これらの例では、RSAが推奨される鍵のアルゴリズムです。
 .sp
 .if n \{\
 .RS 4
@@ -1120,30 +1120,30 @@
 .if n \{\
 .RE
 .\}
-.SH "Ѹ"
+.SH "用語"
 .PP

+キーストア
 .RS 4
-ȥϡŹ沽θȾǼ뤿εǽǤ
+キーストアは、暗号化の鍵と証明書を格納するための機能です。
 .RE
 .PP
-ȥΥȥ
+キーストアのエントリ
 .RS 4
-ȥˤϰۤʤ륿פΥȥޤ뤳ȤǤޤ\fIkeytool\fRޥɤǺǤŬϰϤιȥꡦפϡ2ĤǤ
+キーストアには異なるタイプのエントリを含めることができます。\fIkeytool\fRコマンドで最も適用範囲の広いエントリ・タイプは、次の2つです。
 .sp
-\fBΥȥ\fR
-\- ƥȥϡ˽פʰŹ沽θξݻޤξϡĤƤʤɤˡݸ줿dzǼޤ̤ˡμΥȥȤƳǼ븰ϡ̩бξȼ̩Ǥ򻲾ȤƤ\fIkeytool\fRޥɤξΥפΥȥǤΤФ\fIjarsigner\fRġϸԤΥפΥȥꡢĤޤ̩Ȥ˴Ϣդ줿Τߤޤ
+\fB鍵のエントリ\fR
+\- 各エントリは、非常に重要な暗号化の鍵の情報を保持します。この情報は、許可していないアクセスを防ぐために、保護された形で格納されます。一般に、この種のエントリとして格納される鍵は、秘密鍵か、対応する公開鍵の証明書チェーンを伴う秘密鍵です。証明書チェーンを参照してください。\fIkeytool\fRコマンドがこの両方のタイプのエントリを処理できるのに対し、\fIjarsigner\fRツールは後者のタイプのエントリ、つまり秘密鍵とそれに関連付けられた証明書チェーンのみを処理します。
 .sp
-\fBǤΥȥ\fR: ƥȥϡ軰Ԥθ1ĴޤǤޤΥȥϡǤȸƤФޤϡθSubject(ͭ)ˤäꤵ륢ǥƥƥͳ褹ΤǤ뤳Ȥ򡢥ȥνͭԤꤹ뤫ǤȯԼԤϡ˽̾դ뤳ȤˤäơƤݾڤޤ
+\fB信頼できる証明書のエントリ\fR: 各エントリは、第三者からの公開鍵証明書を1つ含んでいます。このエントリは、信頼できる証明書と呼ばれます。それは、証明書内の公開鍵が、証明書のSubject(所有者)によって特定されるアイデンティティに由来するものであることを、キーストアの所有者が信頼するからです。証明書の発行者は、証明書に署名を付けることによって、その内容を保証します。
 .RE
 .PP
-ȥ̾
+キーストアの別名
 .RS 4
-ȥΤ٤ƤΥȥ(ӿǤ񥨥ȥ)ϡդ̾𤷤ƥޤ
+キーストアのすべてのエントリ(鍵および信頼できる証明書エントリ)は、一意の別名を介してアクセスされます。
 .sp
-̾ꤹΤϡ\fI\-genseckey\fRޥɤѤ̩ꡢ\fI\-genkeypair\fRޥɤѤƸڥ(̩)ꡢ\fI\-importcert\fRޥɤѤƾޤϾǤΥꥹȤɲäʤɡΥƥƥ򥭡ȥɲäǤʸ塢\fIkeytool\fRޥɤǥƥƥ򻲾ȤϡΤȤ˻ꤷ̾Ѥɬפޤ
+別名を指定するのは、\fI\-genseckey\fRコマンドを使用して秘密鍵を生成したり、\fI\-genkeypair\fRコマンドを使用して鍵ペア(公開鍵と秘密鍵)を生成したり、\fI\-importcert\fRコマンドを使用して証明書または証明書チェーンを信頼できる証明書のリストに追加するなど、特定のエンティティをキーストアに追加する場合です。これ以後、\fIkeytool\fRコマンドでエンティティを参照する場合は、このときに指定した別名を使用する必要があります。
 .sp
-ȤС\fIduke\fRȤ̾Ѥƿ̩Υڥ򼫸ʽ̾ǥåפȤޤξϡΥޥɤ¹Ԥޤ򻲾ȤƤ
+たとえば、\fIduke\fRという別名を使用して新しい公開鍵と秘密鍵のペアを生成し、公開鍵を自己署名証明書でラップするとします。この場合は、次のコマンドを実行します。証明書チェーンを参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -1154,7 +1154,7 @@
 .if n \{\
 .RE
 .\}
-ǤϡѥɤȤ\fIdukekeypasswd\fRꤷƤޤʸ塢̾\fIduke\fR˴Ϣդ줿̩˥륳ޥɤ¹ԤȤϡΥѥɤɬפˤʤޤDuke̩Υѥɤ򤢤ȤѹˤϡΥޥɤ¹Ԥޤ
+この例では、初期パスワードとして\fIdukekeypasswd\fRを指定しています。以後、別名\fIduke\fRに関連付けられた秘密鍵にアクセスするコマンドを実行するときは、このパスワードが必要になります。Dukeの秘密鍵のパスワードをあとから変更するには、次のコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -1165,29 +1165,29 @@
 .if n \{\
 .RE
 .\}
-ѥɤ\fIdukekeypasswd\fR\fInewpass\fRѹޤƥȤŪȤ硢ޤϰǤ뤳Ȥ狼äƤ륷ƥǼ¹Ԥʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤɬפʥѥɤΥץ򥳥ޥɥ饤ǻꤷʤäϡѥɤϤޤ
+パスワードが、\fIdukekeypasswd\fRから\fInewpass\fRに変更されます。テストを目的とする場合、または安全であることがわかっているシステムで実行する場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。必要なパスワードのオプションをコマンドラインで指定しなかった場合は、パスワードの入力を求められます。
 .RE
 .PP
-ȥμ
+キーストアの実装
 .RS 4
-\fIjava\&.security\fRѥå󶡤Ƥ\fIKeyStore\fR饹ϡȥξؤΥӾѹԤΡΤ줿󥿥ե󶡤ޤȥθȤƤϡ줾줬ΥפΥȥоݤȤʣΰۤʤ¸߲ǽǤ
+\fIjava\&.security\fRパッケージで提供されている\fIKeyStore\fRクラスは、キーストア内の情報へのアクセスおよび情報の変更を行うための、明確に定義されたインタフェースを提供します。キーストアの固定実装としては、それぞれが特定のタイプのキーストアを対象とする複数の異なる実装が存在可能です。
 .sp
-ߡ\fIkeytool\fR\fIjarsigner\fR2ĤΥޥɥ饤󡦥ġȡPolicy ToolȤ̾GUI١Υġ뤬ȥμѤƤޤ\fIKeyStore\fR饹\fIpublic\fRǤ뤿ᡢ桼KeyStoreѤ¾ΥƥץꥱǤޤ
+現在、\fIkeytool\fRと\fIjarsigner\fRの2つのコマンドライン・ツールと、Policy Toolという名前のGUIベースのツールが、キーストアの実装を使用しています。\fIKeyStore\fRクラスは\fIpublic\fRであるため、ユーザーはKeyStoreを使用した他のセキュリティ・アプリケーションも作成できます。
 .sp
-ȥˤϡOracle󶡤ȹߤΥǥեȤμޤϡJKSȤ̾ȼΥȥ()ѤΤǡȥեȤƼƤޤμǤϡġ̩ϸ̤Υѥɤˤäݸ졢ȥΤ(̩Ȥ̤)ѥɤˤäݸޤ
+キーストアには、Oracleが提供する組込みのデフォルトの実装があります。これは、JKSという名前の独自のキーストア・タイプ(形式)を利用するもので、キーストアをファイルとして実装しています。この実装では、個々の秘密鍵は個別のパスワードによって保護され、キーストア全体の整合性も(秘密鍵とは別の)パスワードによって保護されます。
 .sp
-ȥμϡץХ١ǤŪˤϡ\fIKeyStore\fRˤä󶡤륢ץꥱ󡦥󥿥եӥץХ󥿥ե(SPI)˴ŤƼޤĤޤꡢб\fIKeystoreSpi\fRݥ饹(\fIjava\&.security\fRѥå˴ޤޤƤޤ)ꡢΥ饹ץХɬפΤService Provider InterfaceΥ᥽åɤƤޤǡ\fIץХ\fRȤϡJava Security APIˤäƥǽʥӥΥ֥åȤФθ󶡤ѥåޤϥѥåνΤȤǤȥμ󶡤ˤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlˤ
-JavaŹ沽ƥΥץХμˡƤ褦ˡ饤ȤϥץХ\fIKeystoreSpi\fR֥饹μ󶡤ɬפޤ
+キーストアの実装は、プロバイダベースです。具体的には、\fIKeyStore\fRによって提供されるアプリケーション・インタフェースがサービス・プロバイダ・インタフェース(SPI)に基づいて実装されます。つまり、対応する\fIKeystoreSpi\fR抽象クラス(これも\fIjava\&.security\fRパッケージに含まれています)があり、このクラスが、プロバイダが実装する必要のあるService Provider Interfaceのメソッドを定義しています。ここで、\fIプロバイダ\fRとは、Java Security APIによってアクセス可能なサービスのサブセットに対し、その固定実装を提供するパッケージまたはパッケージの集合のことです。キーストアの実装を提供するには、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlにある
+Java暗号化アーキテクチャのプロバイダの実装方法で説明しているように、クライアントはプロバイダを実装し、\fIKeystoreSpi\fRサブクラスの実装を提供する必要があります。
 .sp
-ץꥱǤϡ\fIKeyStore\fR饹󶡤\fIgetInstance\fRեȥꡦ᥽åɤѤ뤳Ȥǡ͡ʥץХۤʤ륿פΥȥμǤޤȥΥפϡȥγǼȥǡȤȤˡȥ/̩ȥȥݸ뤿˻Ѥ륢르ꥺޤۤʤ륿פΥȥμˤϡߴϤޤ
+アプリケーションでは、\fIKeyStore\fRクラスが提供する\fIgetInstance\fRファクトリ・メソッドを使用することで、様々なプロバイダから異なるタイプのキーストアの実装を選択できます。キーストアのタイプは、キーストア情報の格納形式とデータ形式を定義するとともに、キーストア内の非公開/秘密鍵とキーストアの整合性を保護するために使用されるアルゴリズムを定義します。異なるタイプのキーストアの実装には、互換性はありません。
 .sp
-\fIkeytool\fRޥɤϡǤդΥե١Υȥưޤޥɡ饤Ϥ줿ȥξե̾Ȥưäơ\fIFileInputStream\fRѴ饭ȥɤޤ\fIjarsigner\fR\fIpolicytool\fRޥɤϡURLǻǤǤդξ꤫饭ȥɤ߼뤳ȤǤޤ
+\fIkeytool\fRコマンドは、任意のファイルベースのキーストア実装で動作します。コマンド・ラインで渡されたキーストアの場所をファイル名として扱って、\fIFileInputStream\fRに変換し、ここからキーストア情報をロードします。\fIjarsigner\fRおよび\fIpolicytool\fRコマンドは、URLで指定できる任意の場所からキーストアを読み取ることができます。
 .sp
-\fIkeytool\fR\fIjarsigner\fRξ硢\fI\-storetype\fRץѤƥޥɥ饤ǥȥΥפǤޤPolicy Toolξϡ֥ȥץ˥塼ˤäƥȥΥפǤޤ
+\fIkeytool\fRと\fIjarsigner\fRの場合、\fI\-storetype\fRオプションを使用してコマンドラインでキーストアのタイプを指定できます。Policy Toolの場合は、「キーストア」メニューによってキーストアのタイプを指定できます。
 .sp
-桼ȥΥפŪ˻ꤷʤä硢ƥץѥƥեǻꤵ줿\fIkeystore\&.type\fRץѥƥͤ˴Ťơġˤäƥȥμ򤵤ޤΥƥץѥƥե\fIjava\&.security\fRȸƤФ졢WindowsǤϥƥץѥƥǥ쥯ȥ\fIjava\&.home\elib\esecurity\fROracle SolarisǤ\fIjava\&.home/lib/security\fRˤޤ\fIjava\&.home\fRϡ¹ԻĶΥǥ쥯ȥǤ\fIjre\fRǥ쥯ȥϡSDKޤJava Runtime Environment (JRE)κǾ̤Υǥ쥯ȥˤޤ
+ユーザーがキーストアのタイプを明示的に指定しなかった場合、セキュリティ・プロパティ・ファイルで指定された\fIkeystore\&.type\fRプロパティの値に基づいて、ツールによってキーストアの実装が選択されます。このセキュリティ・プロパティ・ファイルは\fIjava\&.security\fRと呼ばれ、Windowsではセキュリティ・プロパティ・ディレクトリ\fIjava\&.home\elib\esecurity\fR、Oracle Solarisでは\fIjava\&.home/lib/security\fRにあります。\fIjava\&.home\fRは、実行時環境のディレクトリです。\fIjre\fRディレクトリは、SDKまたはJava Runtime Environment (JRE)の最上位のディレクトリにあります。
 .sp
-ƥġϡ\fIkeystore\&.type\fRͤͤǻꤵ줿פΥȥƤץХĤޤǡߥ󥹥ȡ뤵Ƥ뤹٤ƤΥץХĴ٤ޤΥץХΥȥμѤޤ\fIKeyStore\fR饹Ƥstatic᥽å\fIgetDefaultType\fRѤȡץꥱ䥢ץåȤ\fIkeystore\&.type\fRץѥƥͤǤޤΥɤϡǥեȤΥȥ(\fIkeystore\&.type\fRץѥƥǻꤵ줿)Υ󥹥󥹤ޤ
+各ツールは、\fIkeystore\&.type\fRの値を取得し、この値で指定されたタイプのキーストアを実装しているプロバイダが見つかるまで、現在インストールされているすべてのプロバイダを調べます。そのプロバイダからのキーストアの実装を使用します。\fIKeyStore\fRクラスに定義されているstaticメソッド\fIgetDefaultType\fRを使用すると、アプリケーションやアプレットから\fIkeystore\&.type\fRプロパティの値を取得できます。次のコードは、デフォルトのキーストア・タイプ(\fIkeystore\&.type\fRプロパティで指定されたタイプ)のインスタンスを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1198,7 +1198,7 @@
 .if n \{\
 .RE
 .\}
-ǥեȤΥȥפ\fIjks\fRǡOracle󶡤ȼΥפΥȥμǤϡƥץѥƥեμιԤˤäƻꤵƤޤ
+デフォルトのキーストア・タイプは\fIjks\fRで、これはOracleが提供する独自のタイプのキーストアの実装です。これは、セキュリティ・プロパティ・ファイル内の次の行によって指定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1209,7 +1209,7 @@
 .if n \{\
 .RE
 .\}
-ƥġǥǥեȰʳΥȥμѤˤϡιԤѹ̤ΥȥΥפꤷޤȤС\fIpkcs12\fRȸƤФ륭ȥΥפΥȥμ󶡤ץХѥå硢Ԥ򼡤Τ褦ѹޤ
+各ツールでデフォルト以外のキーストアの実装を使用するには、上の行を変更して別のキーストアのタイプを指定します。たとえば、\fIpkcs12\fRと呼ばれるキーストアのタイプのキーストアの実装を提供するプロバイダ・パッケージがある場合、行を次のように変更します。
 .sp
 .if n \{\
 .RS 4
@@ -1220,56 +1220,56 @@
 .if n \{\
 .RE
 .\}
-\fB:\fR
-ȥΥפλǤϡʸȾʸ϶̤ޤ󡣤ȤСJKSjksƱΤȤưޤ
+\fB注意:\fR
+キーストアのタイプの指定では、大文字と小文字は区別されません。たとえば、JKSとjksは同じものとして扱われます。
 .RE
 .PP
-
+証明書
 .RS 4
-()Ȥϡ륨ƥƥ(ȯԼ)Υǥ̾դʸΤȤǤˤϡ¾Τ륨ƥƥ(̾)θ(Ӥ¾ξ)̤ͤäƤ뤳Ȥ񤫤ƤޤѸϡ˴ϢƤޤ
+証明書(公開鍵証明書)とは、あるエンティティ(発行者)からのデジタル署名付きの文書のことです。証明書には、他のあるエンティティ(署名者)の公開鍵(およびその他の情報)が特別な値を持っていることが書かれています。次の用語は、証明書に関連しています。
 .sp
-\fB\fR: ϡΥƥƥ˴Ϣդ줿Ǥϡ륨ƥƥȤδ֤˿Ǥطɬפ뤹٤ƤοͤФƸ뤳ȤտޤΤǤϡ̾򸡾ڤΤ˻Ѥޤ
+\fB公開鍵\fR: 公開鍵は、特定のエンティティに関連付けられた数です。公開鍵は、該当するエンティティとの間に信頼できる関係を持つ必要があるすべての人に対して公開することを意図したものです。公開鍵は、署名を検証するのに使用されます。
 .sp
-\fBǥ̾\fR: ǡǥ̾ȡΥǡϡƥƥΥǥƥƥȡΥƥƥǡƤˤĤΤäƤ뤳Ȥ񤹤̾ȤȤ˳Ǽޤƥƥ̩Ѥƥǡ˽̾դȡǡε¤Բǽˤʤޤ
+\fBデジタル署名\fR: データがデジタル署名されると、そのデータは、エンティティのアイデンティティと、そのエンティティがデータの内容について知っていることを証明書する署名とともに格納されます。エンティティの秘密鍵を使用してデータに署名を付けると、データの偽造は不可能になります。
 .sp
-\fBǥƥƥ\fR: ƥƥ򥢥ɥ쥹ꤹΤˡƥˤäƤϡ򥢥ǥƥƥˤΤޤ¾ˤ⡢Oracle Solaris UIDŻҥ᡼롦ɥ쥹X\&.509̾ʤɡ͡ʤΤ򥢥ǥƥƥȤ뤳ȤǤޤ
+\fBアイデンティティ\fR: エンティティをアドレス指定する既知の方法。システムによっては、公開鍵をアイデンティティにするものがあります。公開鍵の他にも、Oracle Solaris UIDや電子メール・アドレス、X\&.509識別名など、様々なものをアイデンティティとすることができます。
 .sp
-\fB̾\fR: ̾ϡʤ餫Υǡ˥ƥƥ̩ѤƷ׻ޤ̾ԡξȯԼԤȤƤФޤ
+\fB署名\fR: 署名は、なんらかのデータを基にエンティティの秘密鍵を使用して計算されます。署名者、証明書の場合は発行者とも呼ばれます。
 .sp
-\fB̩\fR: ̩ΥƥƥΤߤΤäƤΤȤǡοΤȤ򡢤Υƥƥ̩Ȥޤ̩ϡ¾Τʤ褦̩ˤƤȤˤʤäƤޤ̩ȸϡ٤ƤθŹ沽ƥФˤʤä¸ߤƤޤDSAʤɤŵŪʸŹ沽ƥξ硢1Ĥ̩Τ1Ĥθбޤ̩ϡ̾׻Τ˻Ѥޤ
+\fB秘密鍵\fR: 秘密鍵は特定のエンティティのみが知っている数のことで、この数のことを、そのエンティティの秘密鍵といいます。秘密鍵は、他に知られないように秘密にしておくことが前提になっています。秘密鍵と公開鍵は、すべての公開鍵暗号化システムで対になって存在しています。DSAなどの典型的な公開鍵暗号化システムの場合、1つの秘密鍵は正確に1つの公開鍵に対応します。秘密鍵は、署名を計算するのに使用されます。
 .sp
-\fBƥƥ\fR: ƥƥϡ͡ȿץࡢԥ塼ȡԤʤɡٹ礤ǿоݤȤʤ͡ʤΤؤޤ
+\fBエンティティ\fR: エンティティは、人、組織、プログラム、コンピュータ、企業、銀行など、一定の度合いで信頼の対象となる様々なものを指します。
 .sp
-Ź沽Ǥϡ桼θ˥ɬפޤ絬ϤʥͥåȥĶǤϡߤ̿Ƥ륨ƥƥ֤ǰδط³ΩƤȲꤷꡢѤƤ뤹٤Ƥθ᤿Ǥݥȥ꤬¸ߤȲꤷꤹ뤳ȤԲǽǤΤ褦ʸۤ˴ؤ褹뤿˾񤬹ͰƤޤߤǤϡȯԶ(CA)Ǥ軰ԤȤƵǽޤCAϡ¾Υƥƥξ˽̾(ȯԤ)԰٤򡢿ꤷǤƤ륨ƥƥ(Ȥʤ)ǤCAˡΧη˹«ΤǡͭĿǤΤߤΤȤưޤVeriSignThawteEntrustϤᡢ¿θŪʾȯԶɤ¸ߤޤ
+公開鍵暗号化では、ユーザーの公開鍵にアクセスする必要があります。大規模なネットワーク環境では、互いに通信しているエンティティ間で以前の関係が引続き確立されていると仮定したり、使用されているすべての公開鍵を収めた信頼できるリポジトリが存在すると仮定したりすることは不可能です。このような公開鍵の配布に関する問題を解決するために証明書が考案されました。現在では、証明書発行局(CA)が信頼できる第三者として機能します。CAは、他のエンティティの証明書に署名する(発行する)行為を、信頼して任されているエンティティ(企業など)です。CAは法律上の契約に拘束されるので、有効かつ信頼できる証明書のみを作成するものとして扱われます。VeriSign、Thawte、Entrustをはじめ、多くの公的な証明書発行局が存在します。
 .sp
-MicrosoftǧڥСEntrustCAʤʤɤ°ȿѤСȼξȯԶɤ򱿱Ĥ뤳ȤǽǤ\fIkeytool\fRޥɤѤȡɽݡȤӥݡȤԤȤǤޤޤʽ̾뤳ȤǤޤ
+Microsoftの認証サーバー、EntrustのCA製品などを所属組織内で利用すれば、独自の証明書発行局を運営することも可能です。\fIkeytool\fRコマンドを使用すると、証明書の表示、インポートおよびエクスポートを行うことができます。また、自己署名証明書を生成することもできます。
 .sp
-ߡ\fIkeytool\fRޥɤX\&.509оݤˤƤޤ
+現在、\fIkeytool\fRコマンドはX\&.509証明書を対象にしています。
 .RE
 .PP
-X\&.509
+X\&.509証明書
 .RS 4
-X\&.509ʤǤϡ˴ޤƤꡢξ˽񤭹ˡ(ǡ)ˤĤƤ⵭ҤƤޤΤ٤ƤΥǡϡASN\&.1/DERȸƤФ2ĤδϢʤѤ沽ޤAbstract Syntax Notation 1ϥǡˤĤƵҤƤޤDefinite Encoding Rulesϡǡ¸žˡˤĤƵҤƤޤ
+X\&.509規格では、証明書に含める情報が定義されており、この情報を証明書に書き込む方法(データ形式)についても記述されています。証明書のすべてのデータは、ASN\&.1/DERと呼ばれる2つの関連規格を使用して符号化されます。Abstract Syntax Notation 1はデータについて記述しています。Definite Encoding Rulesは、データの保存および転送の方法について記述しています。
 .sp
-٤ƤX\&.509ϡ̾¾˼ΥǡޤǤޤ
+すべてのX\&.509証明書は、署名の他に次のデータを含んでいます。
 .sp
-\fBС\fR: ŬѤX\&.509ʤΥСꤷޤ˻ǤϡСˤäưۤʤޤΤȤ3ĤΥСƤޤ\fIkeytool\fRޥɤǤϡv1v2v3ξ򥤥ݡȤӥݡȤǤޤv3ξޤ
+\fBバージョン\fR: 証明書に適用されるX\&.509規格のバージョンを特定します。証明書に指定できる情報は、バージョンによって異なります。今のところ、3つのバージョンが定義されています。\fIkeytool\fRコマンドでは、v1、v2、v3の証明書をインポートおよびエクスポートできます。v3の証明書を生成します。
 .sp
-X\&.509 Version 1ϡ1988ǯѤƹڤƤꡢǤŪǤ
+X\&.509 Version 1は、1988年から利用されて広く普及しており、最も一般的です。
 .sp
-X\&.509 Version 2ǤϡSubjectȯԼԤ̾򤢤ȤǺѤǤ褦ˤ뤿ˡSubjectȯԼԤΰռ̻ҤγǰƳޤۤȤɤξץեʸǤϡ̾ƻѤʤȤȡǰդμ̻ҤѤʤȤ侩ƤޤVersion 2ξϡϻѤƤޤ
+X\&.509 Version 2では、Subjectや発行者の名前をあとで再利用できるようにするために、Subjectと発行者の一意識別子の概念が導入されました。ほとんどの証明書プロファイル文書では、名前を再使用しないことと、証明書で一意の識別子を使用しないことが、強く推奨されています。Version 2の証明書は、広くは使用されていません。
 .sp
-X\&.509 Version 3ϺǤ⿷(1996ǯ)ʤǡƥ󥷥γǰ򥵥ݡȤƤޤƥ󥷥ïǤ뤳ȤǤ˴ޤ뤳ȤǤޤŪʥƥ󥷥ȤƤϡKeyUsage(\fI̾\fRʤɡλѤŪ¤)AlternativeNames(DNS̾Żҥ᡼롦ɥ쥹IPɥ쥹ʤɡ¾Υǥƥƥ˴Ϣդ뤳ȤǤ)ʤɤޤƥ󥷥ˤϡcriticalȤޡդơΥƥ󥷥ΥåȻѤ̳Ť뤳ȤǤޤȤСcriticalȥޡ졢\fIkeyCertSign\fRꤵ줿KeyUsageƥ󥷥󤬾˴ޤޤƤ硢ξSSL̿󼨤ȡ񤬵ݤޤϡΥƥ󥷥ˤäơϢ̩ν̾ѤȤƻꤵƤꡢSSLǤϻѤǤʤǤ
+X\&.509 Version 3は最も新しい(1996年)規格で、エクステンションの概念をサポートしています。エクステンションは誰でも定義することができ、証明書に含めることができます。一般的なエクステンションとしては、KeyUsage(\fI署名専用\fRなど、鍵の使用を特定の目的に制限する)、AlternativeNames(DNS名、電子メール・アドレス、IPアドレスなど、他のアイデンティティを公開鍵に関連付けることができる)などがあります。エクステンションには、criticalというマークを付けて、そのエクステンションのチェックと使用を義務づけることができます。たとえば、criticalとマークされ、\fIkeyCertSign\fRが設定されたKeyUsageエクステンションが証明書に含まれている場合、この証明書をSSL通信中に提示すると、証明書が拒否されます。これは、証明書のエクステンションによって、関連する秘密鍵が証明書の署名専用として指定されており、SSLでは使用できないためです。
 .sp
-\fBꥢֹ\fR: ƥƥϡΥƥƥȯԤ¾ξȶ̤뤿ˡ˥ꥢֹƤޤξϡ͡ˡǻѤޤȤС񤬼äȡꥢֹ椬񼺸ꥹ(CRL)˳Ǽޤ
+\fBシリアル番号\fR: 証明書を作成したエンティティは、そのエンティティが発行する他の証明書と区別するために、証明書にシリアル番号を割り当てます。この情報は、様々な方法で使用されます。たとえば、証明書が取り消されると、シリアル番号が証明書失効リスト(CRL)に格納されます。
 .sp
-\fB񥢥르ꥺ༱̻\fR: ˽̾դȤCAѤ르ꥺꤷޤ
+\fB証明書アルゴリズム識別子\fR: 証明書に署名を付けるときにCAが使用したアルゴリズムを特定します。
 .sp
-\fBȯԼ̾\fR: ˽̾դƥƥX\&.500̾ǤX\&.500̾򻲾ȤƤ̾CAǤξѤ뤳Ȥϡ˽̾դƥƥꤹ뤳Ȥ̣ޤ롼ȤĤޤȥåץ٥CAξʤɡˤäƤȯԼԤȤξ˽̾դ뤳Ȥޤ
+\fB発行者名\fR: 証明書に署名を付けたエンティティのX\&.500識別名です。X\&.500識別名を参照してください。通常はCAです。この証明書を使用することは、証明書に署名を付けたエンティティを信頼することを意味します。ルートつまりトップレベルのCAの証明書など、場合によっては発行者が自身の証明書に署名を付けることがあります。
 .sp
-\fBͭ\fR: ƾϸ¤줿֤ΤͭǤδ֤ϳϤȽλˤäƻꤵ졢äû֤100ǯȤĹˤ錄뤳Ȥ⤢ޤ򤵤֤ͭϡؤν̾˻Ѥ̩ζ٤˻ʧۤʤɡ͡װǰۤʤޤ֤ͭϡϢ̩»ʤˡƥƥǤȴԤ֤Ǥ
+\fB有効期間\fR: 各証明書は限られた期間のみ有効です。この期間は開始の日時と終了の日時によって指定され、数秒の短い期間から100年という長期にわたることもあります。選択される有効期間は、証明書への署名に使用される秘密鍵の強度や証明書に支払う金額など、様々な要因で異なります。有効期間は、関連する秘密鍵が損われない場合に、エンティティが公開鍵を信頼できると期待される期間です。
 .sp
-\fB̾\fR: Ǹǧڤ륨ƥƥ̾̾X\&.500ɸѤΤǡ󥿡ͥåΤǰդʤΤꤵޤϡƥƥX\&.500̾(DN)ǤX\&.500̾򻲾ȤƤ򼨤ޤ
+\fB主体名\fR: 証明書で公開鍵を認証するエンティティの名前。この名前はX\&.500標準を使用するので、インターネット全体で一意なものと想定されます。これは、エンティティのX\&.500識別名(DN)です。X\&.500識別名を参照してください。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1280,33 +1280,33 @@
 .if n \{\
 .RE
 .\}
-Ϥ줾Τ̾(CN)ȿñ(OU)ȿ(O)(C)ɽޤ
+これらはそれぞれ主体の通称(CN)、組織単位(OU)、組織(O)、国(C)を表します。
 .sp
-\fBΤθ\fR: ̾դ줿ƥƥθȥ르ꥺ༱̻ҤǤ르ꥺ༱̻ҤǤϡФƻѤƤŹ沽ƥपӴϢ븰ѥ᡼ꤵƤޤ
+\fB主体の公開鍵情報\fR: 名前を付けられたエンティティの公開鍵とアルゴリズム識別子です。アルゴリズム識別子では、公開鍵に対して使用されている公開鍵暗号化システムおよび関連する鍵パラメータが指定されています。
 .RE
 .PP
-
+証明書チェーン
 .RS 4
-\fIkeytool\fRޥɤǤϡ̩ӴϢޤ७ȥθȥ뤳ȤǤޤΤ褦ʥȥǤϡ̩бϡκǽξ˴ޤޤƤޤ
+\fIkeytool\fRコマンドでは、秘密鍵および関連する証明書チェーンを含むキーストアの鍵エントリを作成し、管理することができます。このようなエントリでは、秘密鍵に対応する公開鍵は、チェーンの最初の証明書に含まれています。
 .sp
-ƺȡʽ̾Ȥ1ĤǤΤߤޤ󤬳Ϥޤ\fI\fR\-genkeypairޥɤ򻲾ȤƤʽ̾ȯԼ(̾)ΤƱǤΤϡθˤäǧڤ륨ƥƥǤ\fI\-genkeypair\fRޥɤƤӽФƿ̩ΥڥȡϾ˼ʽ̾ǥåפޤ
+鍵を初めて作成すると、自己署名証明書という1つの要素のみを含むチェーンが開始されます。\fIの\fR\-genkeypairコマンドを参照してください。自己署名証明書は発行者(署名者)が主体と同じです。主体は、その公開鍵が証明書によって認証されるエンティティです。\fI\-genkeypair\fRコマンドを呼び出して新しい公開鍵と秘密鍵のペアを作成すると、公開鍵は常に自己署名証明書でラップされます。
 .sp
-θ塢̾ꥯ(CSR)\fI\-certreq\fRޥɤơCSRȯԶ(CA)ȡCAΥ쥹ݥ󥹤\fI\-importcert\fRǥݡȤ졢μʽ̾Ͼˤä֤ޤޥɤ\fI\-certreq\fR\fI\-importcert\fRץ򻲾ȤƤκǸˤΤϡSubjectθǧڤCAȯԤ()ǤΤξϡCAθǧڤǤ
+この後、証明書署名リクエスト(CSR)が\fI\-certreq\fRコマンドで生成されて、CSRが証明書発行局(CA)に送信されると、CAからのレスポンスが\fI\-importcert\fRでインポートされ、元の自己署名証明書は証明書チェーンによって置き換えられます。コマンドの\fI\-certreq\fRおよび\fI\-importcert\fRオプションを参照してください。チェーンの最後にあるのは、Subjectの公開鍵を認証したCAが発行した証明書(応答)です。チェーン内のその前の証明書は、CAの公開鍵を認証する証明書です。
 .sp
-CAθǧڤϡ¿ξ硢ʽ̾(ĤޤCAȤθǧڤ)ǤꡢϥκǽξˤʤޤˤäƤϡCAΥ֤Ȥ⤢ޤξ硢κǸξ(CAˤäƽ̾졢ȥθǧڤ)ѤϤޤ󤬡ΤξϡCSRCAȤ̤CAˤäƽ̾졢CSRCAθǧڤˤʤޤΤξϡCAθǧڤˤʤޤʲƱͤˡʽ̾줿֥롼ȡ׾ãޤǥ³ޤäơ(ǽξʸ)ƾǤϡμξν̾ԤθǧڤƤ뤳Ȥˤʤޤ
+CAの公開鍵を認証する証明書は、多くの場合、自己署名証明書(つまりCAが自身の公開鍵を認証した証明書)であり、これはチェーンの最初の証明書になります。場合によっては、CAが証明書のチェーンを返すこともあります。この場合、チェーン内の最後の証明書(CAによって署名され、鍵エントリの公開鍵を認証する証明書)に変わりはありませんが、チェーン内のその前の証明書は、CSRの送信先のCAとは別のCAによって署名され、CSRの送信先のCAの公開鍵を認証する証明書になります。チェーン内のその前の証明書は、次のCAの鍵を認証する証明書になります。以下同様に、自己署名された「ルート」証明書に達するまでチェーンが続きます。したがって、チェーン内の(最初の証明書以後の)各証明書では、チェーン内の次の証明書の署名者の公開鍵が認証されていることになります。
 .sp
-¿CAϡ򥵥ݡȤȯԺѤξΤߤ֤ޤäˡ֤CA¸ߤʤեåȤʳع¤ξϡηǤΤ褦ʾϡȥˤǤ˳ǼƤ뿮Ǥ󤫤顢Ωɬפޤ
+多くのCAは、チェーンをサポートせずに発行済の証明書のみを返します。特に、中間のCAが存在しないフラットな階層構造の場合は、その傾向が顕著です。このような場合は、キーストアにすでに格納されている信頼できる証明書情報から、証明書チェーンを確立する必要があります。
 .sp
-̤α(PKCS#7Ƥ)ǤϡȯԺѾ˲äΥݡȤޤޤƤޤ\fIkeytool\fRޥɤǤϡɤαⰷȤǤޤ
+別の応答形式(PKCS#7で定義されている形式)では、発行済証明書に加え、証明書チェーンのサポートが含まれています。\fIkeytool\fRコマンドでは、どちらの応答形式も扱うことができます。
 .sp
-ȥåץ٥(롼)CAξϡʽ̾Ǥ롼Ȥθؤοϡ롼ȾΤǤϤʤʹʤ¾ΥޤϡVeriSign롼CAʤɤμ̾ѤơïǤ⼫ʽ̾Ǥ뤿Ǥ롼CAθϹΤƤޤ롼CAθ˳ǼͳϡȤˤ뤳Ȥ¿Υġ뤫ѤǤ褦ˤʤ뤫ˤޤ󡣤Ĥޤꡢϡ롼CAθ򱿤֡ΡפȤѤΤߤǤ롼CAξ򥭡ȥɲäȤϡ\fI\-printcert\fRץѤơ˾Ƥɽɽ줿ե󥬡ץȤȡʹ롼CAWebڡʤɤꤷΤΥե󥬡ץȤȤӤɬפޤ
+トップレベル(ルート)CAの証明書は、自己署名証明書です。ただし、ルートの公開鍵への信頼は、ルート証明書自体からではなく、新聞など他のソースから取得されます。これは、VeriSignルートCAなどの識別名を使用して、誰でも自己署名型証明書を生成できるためです。ルートCAの公開鍵は広く知られています。ルートCAの公開鍵を証明書に格納する理由は、証明書という形式にすることで多くのツールから利用できるようになるからにすぎません。つまり、証明書は、ルートCAの公開鍵を運ぶ「媒体」として利用されるのみです。ルートCAの証明書をキーストアに追加するときは、\fI\-printcert\fRオプションを使用して、その前に証明書の内容を表示し、表示されたフィンガープリントと、新聞やルートCAのWebページなどから入手した既知のフィンガープリントとを比較する必要があります。
 .RE
 .PP
-cacertsե
+cacerts証明書ファイル
 .RS 4
-\fIcacerts\fRȤ̾ξեϡWindowsǤϥƥץѥƥǥ쥯ȥ\fIjava\&.home\elib\esecurity\fROracle SolarisǤ\fIjava\&.home/lib/security\fR֤Ƥޤ\fIjava\&.home\fRϡ¹ԴĶΥǥ쥯ȥ(SDK\fIjre\fRǥ쥯ȥޤJREκǾ̥ǥ쥯ȥ)Ǥ
+\fIcacerts\fRという名前の証明書ファイルは、Windowsではセキュリティ・プロパティ・ディレクトリ\fIjava\&.home\elib\esecurity\fR、Oracle Solarisでは\fIjava\&.home/lib/security\fRに置かれています。\fIjava\&.home\fRは、実行環境のディレクトリ(SDKの\fIjre\fRディレクトリまたはJREの最上位ディレクトリ)です。
 .sp
-\fIcacerts\fRեϡCAξޤࡢƥΤΥȥǤƥԤϡȥפ\fIjks\fRꤹ뤳Ȥǡ\fIkeytool\fRޥɤѤƤΥեιȴԤȤǤޤ\fIcacerts\fRȥեϡ롼CAΥǥեȡåȤޤ֤ǽв٤ƤޤǥեȤξɽˤϡΥޥɤѤޤ
+\fIcacerts\fRファイルは、CAの証明書を含む、システム全体のキーストアです。システム管理者は、キーストア・タイプに\fIjks\fRを指定することで、\fIkeytool\fRコマンドを使用してこのファイルの構成と管理を行うことができます。\fIcacerts\fRキーストア・ファイルは、ルートCA証明書のデフォルト・セットを含んだ状態で出荷されています。デフォルトの証明書を一覧表示するには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1317,23 +1317,23 @@
 .if n \{\
 .RE
 .\}
-\fIcacerts\fRȥեνѥɤϡ\fIchangeit\fRǤƥԤϡSDKΥ󥹥ȡ塢ΥեΥѥɤȥǥեȡѹɬפޤ
+\fIcacerts\fRキーストア・ファイルの初期パスワードは、\fIchangeit\fRです。システム管理者は、SDKのインストール後、このファイルのパスワードとデフォルト・アクセス権を変更する必要があります。
 .sp
-\fB:\fR
-\fIcacerts\fRեǧ뤳ȤפǤ\fIcacerts\fRեCAϡ̾¾ΥƥƥؤξȯԤΤΥƥƥȤƿꤵ뤿ᡢ\fIcacerts\fRեδϿŤ˹Ԥɬפޤ\fIcacerts\fRեˤϡꤹCAξΤߤޤޤƤɬפޤ桼ϡȤǤˤơ\fIcacerts\fRե˥Хɥ뤵Ƥ뿮Ǥ롼CA򸡾ڤ˴ؤȼηԤޤ
+\fB注意:\fR
+\fIcacerts\fRファイルを確認することが重要です。\fIcacerts\fRファイル内のCAは、署名および他のエンティティへの証明書発行のためのエンティティとして信頼されるため、\fIcacerts\fRファイルの管理は慎重に行う必要があります。\fIcacerts\fRファイルには、信頼するCAの証明書のみが含まれている必要があります。ユーザーは、自身の責任において、\fIcacerts\fRファイルにバンドルされている信頼できるルートCA証明書を検証し、信頼性に関する独自の決定を行います。
 .sp
-ǤʤCA\fIcacerts\fRե뤫ˤϡ\fIkeytool\fRޥɤ\fIdelete\fRץѤޤ\fIcacerts\fRեJREΥ󥹥ȡ롦ǥ쥯ȥˤޤΥեԽ륢ʤϡƥԤϢƤ
+信頼できないCA証明書を\fIcacerts\fRファイルから削除するには、\fIkeytool\fRコマンドの\fIdelete\fRオプションを使用します。\fIcacerts\fRファイルはJREのインストール・ディレクトリにあります。このファイルを編集するアクセス権がない場合は、システム管理者に連絡してください
 .RE
 .PP
-󥿡ͥåRFC 1421沽
+インターネットRFC 1421証明書符号化規格
 .RS 4
-¿ξ硢ϡХʥ沽ǤϤʤ󥿡ͥåRFC 1421ʤƤϲǽ沽ѤƳǼޤBase 64沽ȤƤФ뤳ξǤϡŻҥ᡼䤽¾ε̤ơ¾Υץꥱ˾ưפ˥ݡȤǤޤ
+多くの場合、証明書は、バイナリ符号化ではなく、インターネットRFC 1421規格で定義されている出力可能符号化方式を使用して格納されます。Base 64符号化とも呼ばれるこの証明書形式では、電子メールやその他の機構を通じて、他のアプリケーションに証明書を容易にエクスポートできます。
 .sp
-\fI\-importcert\fR\fI\-printcert\fRޥɤǤϡηξȥХʥ沽ξɤ߹ळȤǤޤ\fI\-exportcert\fRޥɤǤϡǥեȤǥХʥ沽ξ񤬽Ϥޤ\fI\-rfc\fRץꤷϡϲǽ沽ξ񤬽Ϥޤ
+\fI\-importcert\fRと\fI\-printcert\fRコマンドでは、この形式の証明書とバイナリ符号化の証明書を読み込むことができます。\fI\-exportcert\fRコマンドでは、デフォルトでバイナリ符号化の証明書が出力されます。ただし、\fI\-rfc\fRオプションを指定した場合は、出力可能符号化方式の証明書が出力されます。
 .sp
-\fI\-list\fRޥɤǤϡǥեȤǾSHA1ե󥬡ץȤϤޤ\fI\-v\fRץ󤬻ꤵƤ硢ϿͤǤǽϤޤ\fI\-rfc\fRץ󤬻ꤵƤ硢Ͻϲǽ沽ǽϤޤ
+\fI\-list\fRコマンドでは、デフォルトで証明書のSHA1フィンガープリントが出力されます。\fI\-v\fRオプションが指定されている場合、証明書は人が理解できる形式で出力されます。\fI\-rfc\fRオプションが指定されている場合、証明書は出力可能符号化方式で出力されます。
 .sp
-ϲǽ沽沽줿ϡΥƥȤǻϤޤꡢΥƥȤǽλޤ
+出力可能符号化方式で符号化された証明書は、次のテキストで始まり、次のテキストで終了します。
 .sp
 .if n \{\
 .RS 4
@@ -1350,21 +1350,21 @@
 .\}
 .RE
 .PP
-X\&.500̾
+X\&.500識別名
 .RS 4
-X\&.500̾ϡƥƥꤹ뤿˻ѤޤȤСX\&.509\fIsubject\fRեɤ\fIissuer\fR(̾)եɤǻꤵ̾ϡX\&.500̾Ǥ\fIkeytool\fRޥɤϡΥ֥ѡȤ򥵥ݡȤƤޤ
+X\&.500識別名は、エンティティを特定するために使用されます。たとえば、X\&.509証明書の\fIsubject\fRフィールドと\fIissuer\fR(署名者)フィールドで指定される名前は、X\&.500識別名です。\fIkeytool\fRコマンドは、次のサブパートをサポートしています。
 .sp
-\fBcommonName\fR: Susan Jonesʤɡͤ̾Ρ
+\fBcommonName\fR: Susan Jonesなど、人の通称。
 .sp
-\fBorganizationUnit\fR: ȿ(ݤʤ)̾ΡPurchasingʤɤǤ
+\fBorganizationUnit\fR: 小さな組織(部、課など)の名称。Purchasingなどです。
 .sp
-\fBlocalityName\fR: ϰ(Ի)̾Palo Altoʤɡ
+\fBlocalityName\fR: 地域(都市)名。Palo Altoなど。
 .sp
-\fBstateName\fR: ̾ޤ̾Californiaʤɡ
+\fBstateName\fR: 州名または地方名。Californiaなど。
 .sp
-\fBcountry\fR: 2ʸι񥳡ɡCHʤɡ
+\fBcountry\fR: 2文字の国コード。CHなど。
 .sp
-̾ʸ\fI\-dname\fRץͤȤƻꤹ(Ȥ\fI\-genkeypair\fRޥɤ)ʸϼηˤɬפޤ
+識別名文字列を\fI\-dname\fRオプションの値として指定する場合(たとえば\fI\-genkeypair\fRコマンドに)、文字列は次の形式にする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1375,7 +1375,7 @@
 .if n \{\
 .RE
 .\}
-åΤιܤϡºݤ˻ꤹͤɽޤû̷Υɤΰ̣ϡΤȤǤ
+イタリック体の項目は、実際に指定する値を表します。短縮形のキーワードの意味は、次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -1391,7 +1391,7 @@
 .if n \{\
 .RE
 .\}
-˼Τϡ̾ʸǤ
+次に示すのは、識別名文字列の例です。
 .sp
 .if n \{\
 .RS 4
@@ -1402,7 +1402,7 @@
 .if n \{\
 .RE
 .\}
-ʸѤޥɤǤ
+この文字列を使用したコマンドの例です。
 .sp
 .if n \{\
 .RS 4
@@ -1414,9 +1414,9 @@
 .if n \{\
 .RE
 .\}
-ɤû̷ǤϡʸȾʸ϶̤ޤ󡣤ȤСCNcnCnϡɤƱΤȤưޤ
+キーワードの短縮形では、大文字と小文字は区別されません。たとえば、CN、cnおよびCnは、どれも同じものとして扱われます。
 .sp
-ɤλˤϰ̣ꡢƥ֥ݡͥȤϾ˼ǻꤹɬפޤ֥ݡͥȤ򤹤٤ƻꤹɬפϤޤ󡣤ȤСΤ褦˰Υ֥ݡͥȤΤߤǤޤ
+一方、キーワードの指定順序には意味があり、各サブコンポーネントは上に示した順序で指定する必要があります。ただし、サブコンポーネントをすべて指定する必要はありません。たとえば、次のように一部のサブコンポーネントのみを指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -1427,7 +1427,7 @@
 .if n \{\
 .RE
 .\}
-̾ʸͤ˥ޤޤޤˡޥɥ饤ʸꤹȤˤϡΤ褦˥ޤХååʸ(\e)ǥפɬפޤ
+識別名文字列の値にカンマが含まれる場合に、コマンドラインで文字列を指定するときには、次のようにカンマをバックスラッシュ文字(\e)でエスケープする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1438,14 +1438,14 @@
 .if n \{\
 .RE
 .\}
-̾ʸ򥳥ޥɥ饤ǻꤹɬפϤޤ󡣼̾ɬפȤ륳ޥɤ¹ԤȤˡޥɥ饤Ǽ̾ꤷʤäϡƥ֥ݡͥȤϤޤξϡޤХåå(\e)ǥפɬפϤޤ
+識別名文字列をコマンドラインで指定する必要はありません。識別名を必要とするコマンドを実行するときに、コマンドラインで識別名を指定しなかった場合は、各サブコンポーネントの入力を求められます。この場合は、カンマをバックスラッシュ(\e)でエスケープする必要はありません。
 .RE
-.SH "ٹ"
-.SS "ǤΥݡȷٹ"
+.SH "警告"
+.SS "信頼できる証明書のインポート警告"
 .PP
-\fB\fR: ǤȤƾ򥤥ݡȤˡƤ򿵽ŤĴ٤Ƥ
-Windows:.PP
-ޤ\fI\-noprompt\fRץꤻ\fI\-printcert\fRޥɤޤ\fI\-importcert\fRޥɤѤơɽޤɽ줿Υե󥬡ץȤԤե󥬡ץȤȰפ뤳ȤǧޤȤСƤơξ\fI\etmp\ecert\fRȤ̾ǥե˳ǼƤȤޤξϡǤΥꥹȤˤξɲäˡ\fI\-printcert\fRޥɤ¹Ԥƥե󥬡ץȤɽǤޤȤСΤ褦ˤޤ
+\fB重要\fR: 信頼できる証明書として証明書をインポートする前に、証明書の内容を慎重に調べてください。
+Windowsの例:.PP
+まず、\fI\-noprompt\fRオプションを指定せずに\fI\-printcert\fRコマンドまたは\fI\-importcert\fRコマンドを使用して、証明書を表示します。表示された証明書のフィンガープリントが、期待されるフィンガープリントと一致することを確認します。たとえば、証明書が送られてきて、この証明書を\fI\etmp\ecert\fRという名前でファイルに格納しているとします。この場合は、信頼できる証明書のリストにこの証明書を追加する前に、\fI\-printcert\fRコマンドを実行してフィンガープリントを表示できます。たとえば、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -1465,8 +1465,8 @@
 .if n \{\
 .RE
 .\}
-Oracle Solaris:.PP
-ޤ\fI\-noprompt\fRץꤻ\fI\-printcert\fRޥɤޤ\fI\-importcert\fRޥɤѤơɽޤɽ줿Υե󥬡ץȤԤե󥬡ץȤȰפ뤳ȤǧޤȤС桼Ƥơξ\fI/tmp/cert\fRȤ̾ǥե˳ǼƤȤޤξϡǤΥꥹȤˤξɲäˡ\fI\-printcert\fRޥɤ¹Ԥƥե󥬡ץȤɽǤޤȤСΤ褦ˤޤ
+Oracle Solarisの例:.PP
+まず、\fI\-noprompt\fRオプションを指定せずに\fI\-printcert\fRコマンドまたは\fI\-importcert\fRコマンドを使用して、証明書を表示します。表示された証明書のフィンガープリントが、期待されるフィンガープリントと一致することを確認します。たとえば、あるユーザーから証明書が送られてきて、この証明書を\fI/tmp/cert\fRという名前でファイルに格納しているとします。この場合は、信頼できる証明書のリストにこの証明書を追加する前に、\fI\-printcert\fRコマンドを実行してフィンガープリントを表示できます。たとえば、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -1487,32 +1487,32 @@
 .RE
 .\}
 .PP
-ˡʪϢοʪ󼨤ե󥬡ץȤȡΥޥɤɽ줿ե󥬡ץȤȤӤޤե󥬡ץȤפС¾βԤ(Ԥʤ)ˤΤؤԤƤʤȤǧǤޤǤμι⤬ԤƤ硢åԤ鷺˾򥤥ݡȤȡԤˤäƽ̾줿٤ƤΤ(Ūտޤĥ饹եޤJARեʤ)ꤹ뤳Ȥˤʤޤ
+次に、証明書を送信した人物に連絡し、この人物が提示したフィンガープリントと、上のコマンドで表示されたフィンガープリントとを比較します。フィンガープリントが一致すれば、送信途中で他の何者か(攻撃者など)による証明書のすり替えが行われていないことを確認できます。送信途中でこの種の攻撃が行われていた場合、チェックを行わずに証明書をインポートすると、攻撃者によって署名されたすべてのもの(攻撃的意図を持つクラス・ファイルを含んだJARファイルなど)を信頼することになります。
 .PP
-\fB:\fR
-򥤥ݡȤ\fI\-printcert\fRޥɤ¹ԤɬפϤޤ󡣥ȥοǤΥꥹȤ˾ɲäˡ\fI\-importcert\fRޥɤˤäƾξɽ졢ǧåɽ뤿Ǥ桼ϥݡߤǤޤ¹ԤǤΤϡ\fI\-noprompt\fRץꤻ\fI\-importcert\fRޥɤƤӽФΤߤǤ\fI\-noprompt\fRץ󤬻ꤵƤ硢桼ȤäϹԤޤ
-.SS "ѥɷٹ"
+\fB注意:\fR
+証明書をインポートする前に\fI\-printcert\fRコマンドを実行する必要はありません。キーストア内の信頼できる証明書のリストに証明書を追加する前に、\fI\-importcert\fRコマンドによって証明書の情報が表示され、確認を求めるメッセージが表示されるためです。ユーザーはインポート操作を停止できます。ただし、これを実行できるのは、\fI\-noprompt\fRオプションを指定せずに\fI\-importcert\fRコマンドを呼び出す場合のみです。\fI\-noprompt\fRオプションが指定されている場合、ユーザーとの対話は行われません。
+.SS "パスワード警告"
 .PP
-ȥФԤۤȤɤΥޥɤǤϡȥΥѥɤɬפǤޤΥޥɤǤϡ/̩Υѥɤɬפˤʤ뤳Ȥޤѥɤϥޥɥ饤ǻǤޤ(\fI\-storepass\fRץ\fI\-keypass\fRץ)ƥȤŪȤ硢ޤϰǤ뤳Ȥ狼äƤ륷ƥǼ¹Ԥʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤɬפʥѥɤΥץ򥳥ޥɥ饤ǻꤷʤäϡѥɤϤޤ
-.SS "ν˴ؤٹ"
+キーストアに対する操作を行うほとんどのコマンドでは、ストアのパスワードが必要です。また、一部のコマンドでは、非公開/秘密鍵のパスワードが必要になることがあります。パスワードはコマンドラインで指定できます(\fI\-storepass\fRオプションと\fI\-keypass\fRオプションを使用)。ただし、テストを目的とする場合、または安全であることがわかっているシステムで実行する場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。必要なパスワードのオプションをコマンドラインで指定しなかった場合は、パスワードの入力を求められます。
+.SS "証明書の準拠に関する警告"
 .PP
-󥿡ͥåɸRFC 5280ǤϡX\&.509ν˴ؤץե뤬ƤꡢΥեɤӥƥ󥷥ͭͤͤȹ礻ܤƤޤɸˤĤƤϡ
-http://tools\&.ietf\&.org/rfc/rfc5280\&.txt򻲾ȤƤ
+インターネット標準RFC 5280では、X\&.509証明書の準拠に関するプロファイルが定義されており、証明書のフィールドおよびエクステンションに有効な値および値の組合せが記載されています。標準については、
+http://tools\&.ietf\&.org/rfc/rfc5280\&.txtを参照してください
 .PP
-\fIkeytool\fRޥɤǤϡΥ롼뤹٤ƤŬѤ櫓ǤϤʤᡢɸ˽򤷤ʤǤޤɸ˽򤷤ʤϡJRE¾Υץꥱǵݤ뤳Ȥޤ桼ϡ\fI\-dname\fR\fI\-ext\fRʤɤŬʥץꤹ褦ˤƤ
-.SH ""
-.SS "ǤΥݡ"
+\fIkeytool\fRコマンドでは、これらのルールすべてが適用されるわけではないため、標準に準拠しない証明書を生成できます。標準に準拠しない証明書は、JREや他のアプリケーションで拒否されることがあります。ユーザーは、\fI\-dname\fRや\fI\-ext\fRなどで適正なオプションを指定するようにしてください。
+.SH "注意"
+.SS "新しい信頼できる証明書のインポート"
 .PP
-\fIkeytool\fRޥɤϡȥ˾ɲäˡȥˤǤ¸ߤ뿮ǤѤơݡȤ񤫤(롼CA)ʽ̾˻ޤǤοΥιۤߤޤ
+\fIkeytool\fRコマンドは、キーストアに証明書を追加する前に、キーストア内にすでに存在する信頼できる証明書を使用して、インポートする証明書から(ルートCAの)自己署名証明書に至るまでの信頼のチェーンの構築を試みます。
 .PP
-\fI\-trustcacerts\fRץꤷ硢ɲäξϿǤ뤹ʤ\fIcacerts\fRȤ̾Υե˴ޤޤΥȤߤʤޤ
+\fI\-trustcacerts\fRオプションを指定した場合、追加の証明書は信頼できるすなわち\fIcacerts\fRという名前のファイルに含まれる証明書のチェーンとみなされます。
 .PP
-\fIkeytool\fRޥɤݡȤ񤫤鼫ʽ̾(ȥޤ\fIcacerts\fRե˴ޤޤƤ뼫ʽ̾)˻ޤǤοΥѥιۤ˼ԤϡݡȤξɽ桼˳ǧޤξϡɽ줿Υե󥬡ץȤȡ¾Τʤ餫(Ǥ)(νͭԤʤ)ꤷե󥬡ץȤȤӤޤǤȤƾ򥤥ݡȤȤϡͭǤ뤳Ȥ򿵽Ť˳ǧɬפޤǤΥݡȷٹ򻲾ȤƤݡϡǧߤǤޤ\fI\-noprompt\fRץ󤬻ꤵƤ硢桼ȤäϹԤޤ
-.SS "Υݡ"
+\fIkeytool\fRコマンドが、インポートする証明書から自己署名証明書(キーストアまたは\fIcacerts\fRファイルに含まれている自己署名証明書)に至るまでの信頼のパスの構築に失敗した場合は、インポートする証明書の情報を表示し、ユーザーに確認を求めます。この場合は、表示された証明書のフィンガープリントと、他のなんらかの(信頼できる)情報源(証明書の所有者など)から入手したフィンガープリントとを比較します。信頼できる証明書として証明書をインポートするときは、証明書が有効であることを慎重に確認する必要があります。信頼できる証明書のインポート警告を参照してください。インポート操作は、証明書を確認する時点で中止できます。\fI\-noprompt\fRオプションが指定されている場合、ユーザーとの対話は行われません。
+.SS "証明書応答のインポート"
 .PP
-򥤥ݡȤȤϡȥοǤ񡢤(\fI\-trustcacert\fR\fIs\fRץ󤬻ꤵƤ)\fIcacerts\fRȥեǹ줿Ѥƾޤcacertsե򻲾ȤƤ
+証明書応答をインポートするときは、キーストア内の信頼できる証明書、および(\fI\-trustcacert\fR\fIs\fRオプションが指定されている場合は)\fIcacerts\fRキーストア・ファイルで構成された証明書を使用して証明書応答が検査されます。cacerts証明書ファイルを参照してください。
 .PP
-Ǥ뤫ɤꤹˡϼΤȤǤ
+証明書応答が信頼できるかどうかを決定する方法は次のとおりです。
 .sp
 .RS 4
 .ie n \{\
@@ -1522,7 +1522,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ñX\&.509Ǥ硢\fIkeytool\fRޥɤϡ(롼CA)ʽ̾˻ޤǤογΩߤޤȡǧڤ˻Ѥγع¤ϡaliasοޤ󤬳Ωʤ硢ϥݡȤޤ󡣤ξ硢\fIkeytool\fRޥɤϾϤ桼˸ڤץץȤɽޤ桼οȽǤΤ񤷤Ǥ
+証明書応答が単一のX\&.509証明書である場合、\fIkeytool\fRコマンドは、証明書応答から(ルートCAの)自己署名証明書に至るまでの信頼チェーンの確立を試みます。証明書応答と、証明書応答の認証に使用される証明書の階層構造は、aliasの新しい証明書チェーンを形成します。信頼チェーンが確立されない場合、証明書応答はインポートされません。この場合、\fIkeytool\fRコマンドは証明書を出力せず、ユーザーに検証を求めるプロンプトを表示します。ユーザーが証明書応答の信頼性を判断するのは非常に難しいためです。
 .RE
 .sp
 .RS 4
@@ -1533,13 +1533,13 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-PKCS#7ξޤϰϢX\&.509Ǥ硢ϡ桼ξ񤬺ǽˡ0ʾCA񤬤μˤ褦¤٤ޤ󤬼ʽ̾Υ롼CAǽꡢ\fI \-trustcacerts\fRץ󤬻ꤵƤ硢\fIkeytool\fRޥɤϡξȡȥޤ\fIcacerts\fRȥեοǤ뤹٤Ƥξȹ礷褦Ȥޤ󤬼ʽ̾Υ롼CAǽäƤ餺\fI\-trustcacerts\fRץ󤬻ꤵƤ硢\fIkeytool\fRޥɤϡȥޤ\fIcacerts\fRȥեοǤ񤫤鼫ʽ̾Υ롼CA򸫤ĤƤɲä褦Ȥޤξ񤬸Ĥ餺\fI\-noprompt\fRץ󤬻ꤵƤʤϡκǸξξ󤬽Ϥ졢桼ϳǧޤ
+証明書応答がPKCS#7形式の証明書チェーンまたは一連のX\&.509証明書である場合、チェーンは、ユーザーの証明書が最初に、0以上のCA証明書がその次にくるように並べられます。チェーンが自己署名のルートCA証明書で終わり、\fI \-trustcacerts\fRオプションが指定されている場合、\fIkeytool\fRコマンドは、その証明書と、キーストア内または\fIcacerts\fRキーストア・ファイル内の信頼できるすべての証明書を照合しようとします。チェーンが自己署名のルートCA証明書で終わっておらず、\fI\-trustcacerts\fRオプションが指定されている場合、\fIkeytool\fRコマンドは、キーストア内または\fIcacerts\fRキーストア・ファイル内の信頼できる証明書から自己署名のルートCA証明書を見つけてそれをチェーンの末尾に追加しようとします。その証明書が見つからず、\fI\-noprompt\fRオプションが指定されていない場合は、チェーン内の最後の証明書の情報が出力され、ユーザーは確認を求められます。
 .RE
 .PP
-θ\fIalias\fRǤǤ˳ǼƤ桼θ˰פ硢Ť󤬱ο֤ޤξͭ\fIkeypass\fR֤뤳ȤǤΤϡȥ̩ݸ뤿ΥѥɤꤷΤߤǤѥɤꤷƤ餺̩ΥѥɤȥΥѥɤȰۤʤϡ̩ΥѥɤϤޤ
+証明書応答内の公開鍵が\fIalias\fRですでに格納されているユーザーの公開鍵に一致した場合、古い証明書チェーンが応答内の新しい証明書チェーンで置き換えられます。以前の証明書チェーンを有効な\fIkeypass\fRで置き換えることができるのは、エントリの秘密鍵を保護するためのパスワードを指定した場合のみです。パスワードを指定しておらず、秘密鍵のパスワードがキーストアのパスワードと異なる場合は、秘密鍵のパスワードの入力を求められます。
 .PP
-ΥޥɤϡΥ꡼Ǥ\fI\-import\fRȤ̾ǤΥ꡼Ǥϡ³Ť̾ݡȤƤޤϡ̾\fI\-importcert\fRͥ褵ޤ
-.SH "Ϣ"
+このコマンドは、以前のリリースでは\fI\-import\fRという名前でした。このリリースでは、引き続き古い名前がサポートされています。今後は、新しい名前\fI\-importcert\fRが優先されます。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -1571,8 +1571,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlˤ
-֥: Java SEΥƥǽ
+http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlにある
+「コース: Java SEのセキュリティ機能」
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/native2ascii.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/native2ascii.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: native2ascii
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ݲġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 国際化ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "native2ascii" "1" "2013ǯ1121" "JDK 8" "ݲġ"
+.TH "native2ascii" "1" "2013年11月21日" "JDK 8" "国際化ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-native2ascii \- ݡȤƤǤդʸ󥳡ǥ󥰤ʸޤեASCIIUnicodeǥפ줿եѴ(ޤϤε)饤ǽʥץꥱޤ
-.SH ""
+native2ascii \- サポートされている任意の文字エンコーディングの文字を含むファイルを、ASCIIおよびUnicodeでエスケープされたファイルに変換して(またはその逆)、ローカライズ可能なアプリケーションを作成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,34 +64,34 @@
 .PP
 \fIinputfile\fR
 .RS 4
-ASCIIѴ륨󥳡ɤ줿ե롣
+ASCIIに変換するエンコードされたファイル。
 .RE
 .PP
 \fIoutputfile\fR
 .RS 4
-Ѵ줿ASCIIե롣
+変換されたASCIIファイル。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fInative2ascii\fRޥɤϡASCII饯åȤ˴ޤޤʤ٤ƤʸUnicode(\fI\eu\fR\fIxxxx\fR)ɽˡѤơJava Runtime Environment (JRE)ǥݡȤƤ륨󥳡ɤ줿եASCIIǥ󥳡ɤ줿եѴޤΥץϡISO\-8859\-1ʸåȤ˴ޤޤʤʸޤޤƤץѥƥեɬפǤΥġϡεդѴ¹Ԥ뤳ȤǤޤ
+\fInative2ascii\fRコマンドは、ASCIIキャラクタ・セットに含まれないすべての文字にUnicodeエスケープ(\fI\eu\fR\fIxxxx\fR)表記法を使用して、Java Runtime Environment (JRE)でサポートされているエンコードされたファイルを、ASCIIでエンコードされたファイルに変換します。このプロセスは、ISO\-8859\-1文字セットに含まれない文字が含まれているプロパティ・ファイルで必要です。このツールは、その逆の変換を実行することもできます。
 .PP
-\fIoutputfile\fRͤά硢ɸϤ˽Ϥޤˡ\fIinputfile\fRͤά硢ɸϤϤޤ
-.SH "ץ"
+\fIoutputfile\fR値を省略した場合、標準出力に出力されます。さらに、\fIinputfile\fR値を省略した場合、標準入力から入力されます。
+.SH "オプション"
 .PP
 \-reverse
 .RS 4
-դνԤޤĤޤꡢISO\-8859\-1UnicodeפѤƥ󥳡ɤ줿եJREǥݡȤʸ󥳡ǥ󥰤ΥեѴޤ
+逆の処理を行います。つまり、ISO\-8859\-1でUnicodeエスケープを使用してエンコードされたファイルを、JREでサポートされる文字エンコーディングのファイルに変換します。
 .RE
 .PP
 \-encoding \fIencoding_name\fR
 .RS 4
-ѴǻѤʸ󥳡ǥ󥰤̾ꤷޤΥץ¸ߤʤϡǥեȤʸ󥳡ǥ(\fIjava\&.nio\&.charset\&.Charset\&.defaultCharset\fR᥽åɤ줿)Ѥޤ\fIencoding_name\fRʸϡJREǥݡȤƤʸ󥳡ǥ󥰤̾ˤɬפޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/intl/encoding\&.doc\&.htmlˤ
-֥ݡȤƤ륨󥳡ǥ󥰡פ򻲾ȤƤ
+変換処理で使用する文字エンコーディングの名前を指定します。このオプションが存在しない場合は、デフォルトの文字エンコーディング(\fIjava\&.nio\&.charset\&.Charset\&.defaultCharset\fRメソッドで定義された)が使用されます。\fIencoding_name\fR文字列は、JREでサポートされている文字エンコーディングの名前にする必要があります。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/intl/encoding\&.doc\&.htmlにある
+「サポートされているエンコーディング」を参照してください
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ(JVM)\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシン(JVM)に\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/orbd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/orbd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: orbd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "orbd" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "orbd" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-orbd \- CORBAĶΥСˤ³֥Ȥ򥯥饤Ȥ鸡ƸƤӽФ褦ˤޤ
-.SH ""
+orbd \- CORBA環境のサーバーにある永続オブジェクトをクライアントから検索して呼び出せるようにします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,11 +64,11 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIorbd\fRޥɤѤȡCORBAĶΥСˤ³֥Ȥ򥯥饤ȤƩŪ˸ƸƤӽФȤǤޤorbdġ˴ޤޤ륵Сޥ͡Ѥȡ饤ȤCORBAĶǥСˤ³֥ȤƩŪ˸ƸƤӽФȤǤޤ³Сϡ͡ߥ󥰡ӥ˱³֥ȻȤȯԤݡСΥݡֹΤORBDΥݡֹ򥪥֥ȻȤ˴ޤޤ³֥ȻȤΥ֥ȻȤORBDݡֹޤ뤳ȤˤϡΤ褦ޤ
+\fIorbd\fRコマンドを使用すると、CORBA環境のサーバーにある永続オブジェクトをクライアントから透過的に検索して呼び出すことができます。orbdツールに含まれるサーバー・マネージャを使用すると、クライアントはCORBA環境でサーバー上にある永続オブジェクトを透過的に検索して呼び出すことができます。永続サーバーは、ネーミング・サービスに永続オブジェクト参照を発行する際、サーバーのポート番号のかわりにORBDのポート番号をオブジェクト参照に含めます。永続オブジェクト参照のオブジェクト参照にORBDポート番号を含めることには、次のような利点があります。
 .sp
 .RS 4
 .ie n \{\
@@ -78,7 +78,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-͡ߥ󥰡ӥˤ륪֥ȻȤСΥ饤ա̵طˤʤޤȤС֥ȻȤϡƥ󥹥ȡ뤵줿Ȥϥ͡ߥ󥰡ӥΥСˤäƥ͡ߥ󥰡ӥȯԤޤθϡСγϤޤϥåȥβˤ餺ƤӽФ饤ȤORBD֥ȻȤ֤ޤ
+ネーミング・サービスにあるオブジェクト参照が、サーバーのライフ・サイクルと無関係になります。たとえば、オブジェクト参照は、初めてインストールされたときはネーミング・サービスのサーバーによってネーミング・サービスに発行されますが、その後は、サーバーの開始またはシャットダウンの回数にかかわらず、呼び出したクライアントにORBDが正しいオブジェクト参照を返します。
 .RE
 .sp
 .RS 4
@@ -89,57 +89,57 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饤Ȥϰ٤Τߥ͡ߥ󥰡ӥΥ֥ȻȤååפɬפޤθϥСΥ饤աˤѹȤ̵طˤλȤѤ뤳ȤǤޤ
+クライアントは一度のみネーミング・サービスのオブジェクト参照をルックアップする必要がありますが、その後はサーバーのライフ・サイクルによる変更とは無関係にこの参照を利用することができます。
 .RE
 .PP
-ORBDΥСޥ͡˥ˤϡ\fIservertool\fRѤƥСưɬפޤservertoolϡץꥱ󡦥ץޤ³СϿϿưߤԤΥޥɥ饤󡦥󥿥եǤСޥ͡ξܺ٤ϡСޥ͡򻲾ȤƤ
+ORBDのサーバー・マネージャにアクセスするには、\fIservertool\fRを使用してサーバーを起動する必要があります。servertoolは、アプリケーション・プログラマが、永続サーバーの登録、登録解除、起動および停止を行うためのコマンドライン・インタフェースです。サーバー・マネージャの詳細は、サーバー・マネージャを参照してください。
 .PP
-\fIorbd\fRưȡ͡ߥ󥰡ӥⵯưޤ͡ߥ󥰡ӥξܺ١͡ߥ󥰡ӥεưߤ򻲾ȤƤ
-.SH "ץ"
+\fIorbd\fRを起動すると、ネーミング・サービスも起動されます。ネーミング・サービスの詳細。ネーミング・サービスの起動と停止を参照してください。
+.SH "オプション"
 .PP
 \-ORBInitialPort \fInameserverport\fR
 .RS 4
-ɬܡ͡ࡦСưݡȤֹꤷޤ\fIorbd\fRϡưȡΥݡȾ忮ꥯȤꥹ˥󥰤ޤOracle SolarisեȥǤϡ1024꾮ݡȤǥץ򳫻Ϥ硢root桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳Ȥᤷޤ
+必須。ネーム・サーバーを起動するポートの番号を指定します。\fIorbd\fRは、起動されると、このポート上で着信リクエストをリスニングします。Oracle Solarisソフトウェアでは、1024より小さいポートでプロセスを開始する場合、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。
 .RE
-.SS "ɬܤǤʤץ"
+.SS "必須でないオプション"
 .PP
 \-port \fIport\fR
 .RS 4
-ORBDưݡȤꤷޤΥݡȤǡ³֥ȤФꥯȤORBDޤΥݡȤΥǥեͤ1049ǤΥݡֹϡ³Interoperable Object References (IOR)Υݡȡեɤɲäޤ
+ORBDを起動するポートを指定します。このポートで、永続オブジェクトに対するリクエストをORBDが受け取ります。このポートのデフォルト値は1049です。このポート番号は、永続Interoperable Object References (IOR)のポート・フィールドに追加されます。
 .RE
 .PP
 \-defaultdb \fIdirectory\fR
 .RS 4
-ORBD³Ǽǥ쥯ȥ\fIorb\&.db\fR١ǥ쥯ȥꤷޤΥץ󤬻ꤵƤʤ硢ǥեͤ\fI\&./orb\&.db\fRˤʤޤ
+ORBD永続格納ディレクトリ\fIorb\&.db\fRが作成されるベース・ディレクトリを指定します。このオプションが指定されていない場合、デフォルト値は\fI\&./orb\&.db\fRになります。
 .RE
 .PP
 \-serverPollingTime \fImilliseconds\fR
 .RS 4
-\fIservertool\fRѤϿ줿³СΥإ륹֤ORBDåֳ֤ꤷޤǥեͤ1000ߥäǤ\fImilliseconds\fR˻ꤹͤϡͭˤɬפޤ
+\fIservertool\fRを使用して登録された永続サーバーのヘルス状態をORBDがチェックする間隔を指定します。デフォルト値は1000ミリ秒です。\fImilliseconds\fRに指定する値は、有効な正の整数にする必要があります。
 .RE
 .PP
 \-serverStartupDelay milliseconds
 .RS 4
-\fIservertool\fRѤϿ줿³СƵưƤ顢ž㳰ޤǤORBDԵ֤ꤷޤǥեͤ1000ߥäǤ\fImilliseconds\fR˻ꤹͤϡͭˤɬפޤ
+\fIservertool\fRを使用して登録された永続サーバーを再起動してから、位置転送の例外を送信するまでのORBDの待機時間を指定します。デフォルト値は1000ミリ秒です。\fImilliseconds\fRに指定する値は、有効な正の整数にする必要があります。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SS "͡ߥ󥰡ӥεư"
+.SS "ネーミング・サービスの起動と停止"
 .PP
-͡ߥ󥰡ӥϡCORBA֥Ȥ˥͡ߥ󥰤ǽˤCORBAӥǤ͡ߥ󥰤̾򥪥֥ȻȤ˥Хɤ뤳Ȥˤǽˤʤޤ͡ࡦХǥ󥰤͡ߥ󥰡ӥ˳ǼС饤Ȥ̾ꤷŪΥ֥ȻȤǤ褦ˤʤޤ
+ネーミング・サービスは、CORBAオブジェクトにネーミングを可能にするCORBAサービスです。ネーミングは名前をオブジェクト参照にバインドすることにより可能になります。ネーム・バインディングをネーミング・サービスに格納すれば、クライアントが名前を指定して目的のオブジェクト参照を取得できるようになります。
 .PP
-饤ȤޤϥС¹ԤˡORBDưޤORBDˤϡ³͡ߥ󥰡ӥӰ͡ߥ󥰡ӥȤ߹ޤƤޤϤɤCOS͡ߥ󥰡ӥμǤ
+クライアントまたはサーバーを実行する前に、ORBDを起動します。ORBDには、永続ネーミング・サービスおよび一時ネーミング・サービスが組み込まれています。これらはどちらもCOSネーミング・サービスの実装です。
 .PP
-³͡ߥ󥰡ӥϡ͡ߥ󥰡ƥȤФƱ³󶡤ޤĤޤꡢξϡӥߤ䵯ưˤݻ졢ӥ˾㳲ȯǤǤޤORBDƵưȡ³͡ߥ󥰡ӥϥ͡ߥ󥰡ƥȤΥդ٤ƤΥ饤ȤȥС̾ΥХǥ󥰤Τޤ(³Ū)ݻ褦ˤޤ
+永続ネーミング・サービスは、ネーミング・コンテキストに対して永続性を提供します。つまり、この情報は、サービスの停止や起動後にも維持され、サービスに障害が発生した場合でも回復できます。ORBDを再起動すると、永続ネーミング・サービスはネーミング・コンテキストのグラフを復元し、すべてのクライアントとサーバーの名前のバインディングがそのまま(永続的に)保持されるようにします。
 .PP
-̸ߴΤᡢ꡼JDKƱƤ͡ߥ󥰡ӥ\fItnameserv\fRΥ꡼Java SEˤƱƤޤ͡ࡦӥǤϡ͡ࡦӥμ¹ˤΤߥ͡ߥ󥰡ƥȤݻޤӥǤȡ͡ߥ󥰡ƥȡդϼޤ
+下位互換性のため、旧リリースのJDKに同梱されていた一時ネーミング・サービス\fItnameserv\fRが、今回のリリースのJava SEにも同梱されています。一時ネーム・サービスでは、ネーム・サービスの実行中にのみネーミング・コンテキストが保持されます。サービスが中断されると、ネーミング・コンテキスト・グラフは失われます。
 .PP
-\fI\-ORBInitialPort\fRϡ\fIorbd\fRɬܤΥޥɥ饤ǡ͡ߥ󥰡ӥ¹ԤݡȤֹꤹ뤿˻ѤޤμǤϡJava IDL Object Request Broker DaemonѤ˥ݡ1050ѤǤ뤳ȤȤƤޤOracle SolarisեȥѤ硢1024꾮ݡȤǥץ򳫻Ϥˤϡroot桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳ȤᤷޤɬפǤ̤ΥݡȤѹƤ
+\fI\-ORBInitialPort\fR引数は、\fIorbd\fRの必須のコマンドライン引数で、ネーミング・サービスが実行されるポートの番号を設定するために使用されます。次の手順では、Java IDL Object Request Broker Daemon用にポート1050を使用できることを前提としています。Oracle Solarisソフトウェアを使用する場合、1024より小さいポートでプロセスを開始するには、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。必要であれば別のポートに変更してください。
 .PP
-UNIXޥɡ\fIorbd\fRưˤϡΤ褦Ϥޤ
+UNIXコマンド・シェルで\fIorbd\fRを起動するには、次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -151,7 +151,7 @@
 .RE
 .\}
 .PP
-WindowsMS\-DOSƥࡦץץȤǤϡΤ褦Ϥޤ
+WindowsのMS\-DOSシステム・プロンプトでは、次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -163,7 +163,7 @@
 .RE
 .\}
 .PP
-ORBD¹Ԥ졢Сȥ饤ȤΥץꥱ¹ԤǤ褦ˤʤޤ饤ȤȥСΥץꥱϡ¹Իˡ͡ߥ󥰡ӥ¹ԤƤݡȤֹ(ɬפʾϤ˥ޥ̾)ǧƤɬפޤ¸1ĤˡϡΥɤ򥢥ץꥱɲä뤳ȤǤ
+これでORBDが実行され、サーバーとクライアントのアプリケーションを実行できるようになります。クライアントとサーバーのアプリケーションは、実行時に、ネーミング・サービスが実行されているポートの番号(必要な場合はさらにマシン名)を認識している必要があります。これを実現する1つの方法は、次のコードをアプリケーションに追加することです。
 .sp
 .if n \{\
 .RS 4
@@ -178,7 +178,7 @@
 .RE
 .\}
 .PP
-Ǥϡ͡ߥ󥰡ӥϡۥ\fIMyHost\fRΥݡ1050Ǽ¹Ԥޤ̤ˡȤơޥɥ饤󤫤饵Сޤϥ饤ȤΥץꥱ¹ԤȤˡݡֹޤϥޥ̾뤤Ϥξꤹˡ⤢ޤȤСΥޥɥ饤󡦥ץѤơ\fIHelloApplication\fRưǤޤ
+この例では、ネーミング・サービスは、ホスト\fIMyHost\fRのポート1050上で実行されます。別の方法として、コマンドラインからサーバーまたはクライアントのアプリケーションを実行するときに、ポート番号またはマシン名あるいはその両方を指定する方法もあります。たとえば、次のコマンドライン・オプションを使用して、\fIHelloApplication\fRを起動できます。
 .sp
 .if n \{\
 .RS 4
@@ -190,36 +190,36 @@
 .RE
 .\}
 .PP
-͡ߥ󥰡ӥߤˤϡŬڤʥڥ졼ƥ󥰡ƥࡦޥɤѤޤȤСOracle Solaris\fIpkill\fR
-\fIorbd\fR¹Ԥꡢ\fIorbd\fRưDOSɥ\fB[Ctrl]+[C]\fR򲡤ޤ͡ߥ󥰡ӥξϡӥλȡ͡ߥ󥰡ӥϿ줿̾õ礬ޤJava IDL͡ࡦӥϡŪߤޤǼ¹Ԥޤ
+ネーミング・サービスを停止するには、適切なオペレーティング・システム・コマンドを使用します。たとえば、Oracle Solaris上で\fIpkill\fR
+\fIorbd\fRを実行したり、\fIorbd\fRが動作中のDOSウィンドウで\fB[Ctrl]+[C]\fRキーを押します。一時ネーミング・サービスの場合は、サービスが終了されると、ネーミング・サービスに登録された名前が消去される場合があります。Java IDLネーム・サービスは、明示的に停止されるまで実行されます。
 .PP
-ORBD°͡ߥ󥰡ӥξܺ٤ϡ
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlΡNaming Serviceפ򻲾ȤƤ
-.SH "Сޥ͡"
+ORBDに付属するネーミング・サービスの詳細は、
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlの「Naming Service」を参照してください
+.SH "サーバー・マネージャ"
 .PP
-ORBDΥСޥ͡˥ơ³С¹Ԥˤϡ\fIservertool\fRѤƥСưɬפޤservertoolϡץꥱ󡦥ץޤ³СϿϿưߤԤΥޥɥ饤󡦥󥿥եǤ\fIservertool\fRѤƥСưϡ\fIorbd\fR¹ԤƤƱݡȤȥۥȤǵưɬפޤСۤʤݡȤǼ¹Ԥȡ롦ƥѤ˥ǡ١¸Ƥ̵ˤʤꡢӥưޤ
+ORBDのサーバー・マネージャにアクセスして、永続サーバーを実行するには、\fIservertool\fRを使用してサーバーを起動する必要があります。servertoolは、アプリケーション・プログラマが、永続サーバーの登録、登録解除、起動および停止を行うためのコマンドライン・インタフェースです。\fIservertool\fRを使用してサーバーを起動する場合は、\fIorbd\fRが実行されている場所と同じポートとホストで起動する必要があります。サーバーを異なるポートで実行すると、ローカル・コンテキスト用にデータベースに保存されている情報が無効になり、サービスが正しく動作しません。
 .PP
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlExample\&.html
-Java IDL: The "Hello World" Exampleפ򻲾ȤƤ
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlExample\&.htmlの
+「Java IDL: The "Hello World" Example」を参照してください
 .PP
-Ǥϡ塼ȥꥢμ˽ä\fIidlj\fRѥ\fIjavac\fRѥ¹ԤޤORBDΥСޥ͡¹Ԥˤϡμ˽äƥץꥱ¹Ԥޤ
+この例では、チュートリアルの手順に従って\fIidlj\fRコンパイラと\fIjavac\fRコンパイラを実行します。ORBDのサーバー・マネージャを実行するには、次の手順に従ってアプリケーションを実行します。
 .PP
-\fIorbd\fRưޤ
+\fIorbd\fRを起動します。
 .PP
-UNIXޥɡǼΤ褦Ϥޤ:
-\fIorbd \-ORBInitialPort 1050\fR
+UNIXコマンド・シェルで次のように入力します:
+\fIorbd \-ORBInitialPort 1050\fR。
 .PP
-MS\-DOSƥࡦץץ(Windows)ǼΤ褦Ϥޤ:
+MS\-DOSシステム・プロンプト(Windows)で次のように入力します:
 \fIs\fR\fItart orbd \-ORBInitialPort 105\fR\fI0\fR
 .PP
-ݡ1050ϥ͡ࡦС¹ԤݡȤǤ\fI\-ORBInitialPort\fRץɬܥޥɥ饤ǤOracle SolarisեȥѤ硢1024꾮ݡȤǥץ򳫻Ϥˤϡroot桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳Ȥᤷޤ
+ポート1050はネーム・サーバーを実行するポートです。\fI\-ORBInitialPort\fRオプションは必須コマンドライン引数です。Oracle Solarisソフトウェアを使用する場合、1024より小さいポートでプロセスを開始するには、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。
 .PP
-\fIservertool\fRưޤ:
-\fIservertool \-ORBInitialPort 1050\fR
+\fIservertool\fRを起動します:
+\fIservertool \-ORBInitialPort 1050\fR。
 .PP
-μȥ͡ࡦС(\fIorbd\fR)ΥݡȤƱǤ뤳ȤǧޤȤ\fI\-ORBInitialPort 1050\&.\fRΤ褦ˤʤޤ\fIservertool\fRϡ͡ࡦСƱݡȾǵưɬפޤ
+前回の手順とネーム・サーバー(\fIorbd\fR)のポートが同じであることを確認します。たとえば\fI\-ORBInitialPort 1050\&.\fRのようになります。\fIservertool\fRは、ネーム・サーバーと同じポート上で起動する必要があります。
 .PP
-\fIservertool\fRޥɥ饤󡦥󥿥եǡ\fIservertool\fRץץȤ\fIHello\fRСưޤ
+\fIservertool\fRコマンドライン・インタフェースで、\fIservertool\fRプロンプトから\fIHello\fRサーバーを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -232,7 +232,7 @@
 .RE
 .\}
 .PP
-\fIservertool\fRˤäƥСϿơ\fIHelloServerApName\fRȤ̾С˳Ƥ졢ϿƤ뤹٤ƤΥСȤȤ˥СIDɽޤ¾üɥޤϥץץȤ饯饤ȡץꥱ¹Ԥޤ
+\fIservertool\fRによってサーバーが登録されて、\fIHelloServerApName\fRという名前がサーバーに割り当てられ、登録されているすべてのサーバー一覧とともにサーバーIDが表示されます。他の端末ウィンドウまたはプロンプトからクライアント・アプリケーションを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -244,11 +244,11 @@
 .RE
 .\}
 .PP
-\fI\-ORBInitialHost localhost\fRϾά뤳ȤǤޤ͡ࡦС\fIHello\fR饤ȤȤƱۥȾưƤ뤫Ǥ͡ࡦС̤ΥۥȤǼ¹ԤƤϡ\-\fIORBInitialHost nameserverhost\fRץѤIDL͡ࡦС¹ԤƤۥȤꤷޤμǹԤ줿Ȥ˥͡ࡦС(\fIorbd\fR)ݡȤꤷޤ(:
-\fI\-ORBInitialPort 1050\fR)ORBDΥСޥ͡λ顢͡ࡦС(\fIorbd\fR)\fIservertool\fRߤ뤫λƤMS\-DOSץץȤ\fIorbd\fR򥷥åȥ󤹤ˤϡС¹ԤƤ륦ɥ򤷤\fB[Ctrl]+[C]\fR򲡤ޤ
+この例の\fI\-ORBInitialHost localhost\fRは省略することができます。ネーム・サーバーが\fIHello\fRクライアントとして同一ホスト上で動作しているからです。ネーム・サーバーが別のホストで実行されている場合は、\-\fIORBInitialHost nameserverhost\fRオプションを使用してIDLネーム・サーバーが実行されているホストを指定します。前の手順で行われたとおりにネーム・サーバー(\fIorbd\fR)ポートを指定します(例:
+\fI\-ORBInitialPort 1050\fR)。ORBDのサーバー・マネージャの操作が終了したら、ネーム・サーバー(\fIorbd\fR)と\fIservertool\fRを停止するか終了してください。MS\-DOSプロンプトで\fIorbd\fRをシャットダウンするには、サーバーを実行しているウィンドウを選択して\fB[Ctrl]+[C]\fRキーを押します。
 .PP
-Oracle Solaris\fIorbd\fR򥷥åȥ󤹤ˤϡץ򸡺ơ\fIkill\fRޥɤǽλޤСŪߤޤǤϡƽФԵ֤³ޤ\fIservertool\fR򥷥åȥ󤹤ˤϡ\fBquit\fRϤƥܡɤ\fB[Enter]\fR򲡤ޤ
-.SH "Ϣ"
+Oracle Solarisから\fIorbd\fRをシャットダウンするには、プロセスを検索して、\fIkill\fRコマンドで終了します。サーバーを明示的に停止するまでは、呼出し待機状態が続きます。\fIservertool\fRをシャットダウンするには、\fBquit\fRと入力してキーボードの\fB[Enter]\fRキーを押します。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -269,8 +269,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.html
-Naming Service
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlの
+「Naming Service」
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/pack200.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/pack200.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: pack200
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaǥץȡġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaデプロイメント・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "pack200" "1" "2013ǯ1121" "JDK 8" "Javaǥץȡġ"
+.TH "pack200" "1" "2013年11月21日" "JDK 8" "Javaデプロイメント・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-pack200 \- WebǥץȤΤJARեpack200̥ե˥ѥåޤ
-.SH ""
+pack200 \- WebデプロイメントのためにJARファイルをpack200圧縮ファイルにパッケージします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -62,27 +62,27 @@
 .RE
 .\}
 .PP
-ץǤդνǻǤޤޥɥ饤ޤpropertiesե˻ꤵ줿ǸΥץ󤬡˻ꤵ줿٤ƤΥץͥ褵ޤ
+オプションは任意の順序で指定できます。コマンドラインまたはpropertiesファイルに指定された最後のオプションが、それ以前に指定されたすべてのオプションより優先されます。
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIoutput\-file\fR
 .RS 4
-ϥե̾
+出力ファイルの名前。
 .RE
 .PP
 \fIJAR\-file\fR
 .RS 4
-ϥե̾
+入力ファイルの名前。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIpack200\fRޥɤϡJava gzipץåѤJARեpack200̥եѴJavaץꥱǤpack200եϹⰵ̤ΥեǡľܥǥץǤӰɻ֤ṳ̂ǽǤ
+\fIpack200\fRコマンドは、Java gzipコンプレッサを使用してJARファイルをpack200圧縮ファイルに変換するJavaアプリケーションです。pack200ファイルは高圧縮のファイルで、直接デプロイでき、帯域幅の節約やダウンロード時間の短縮が可能です。
 .PP
-\fIpack200\fRޥɤˤϡ̥󥸥ĴԤץ󤬤ޤŪʻˡ򼡤˼ޤ\fImyarchive\&.pack\&.gz\fRǥեȤ\fIpack200\fRޥǺޤ
+\fIpack200\fRコマンドには、圧縮エンジンの設定や微調整を行うオプションがあります。一般的な使用方法を次の例に示します。\fImyarchive\&.pack\&.gz\fRがデフォルトの\fIpack200\fRコマンド設定で作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -93,11 +93,11 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-r, \-\-repack
 .RS 4
-JARեѥå奢ѥåơJARեޤ줿ե\fIjarsigner\fR(1)ġϥեȤƻѤǤޤǤϡmyarchive\&.jarեѥå塢ѥåޤ
+JARファイルをパックした後アンパックして、JARファイルを生成します。生成されたファイルは\fIjarsigner\fR(1)ツールの入力ファイルとして使用できます。次の例では、myarchive\&.jarファイルをパックした後、アンパックします。
 .sp
 .if n \{\
 .RS 4
@@ -109,12 +109,12 @@
 .if n \{\
 .RE
 .\}
-ǤϡϥեΥեνݻޤ
+次の例では、入力ファイル内のファイルの順序を保持します。
 .RE
 .PP
 \-g, \-\-no\-gzip
 .RS 4
-\fIpack200\fRեޤΥץꤹȤϡŬڤʰ̥ġѤɬפޤޤåȡƥǤϡб밵̲ġѤɬפޤ
+\fIpack200\fRファイルを生成します。このオプションを指定するときは、適切な圧縮ツールを使用する必要があります。また、ターゲット・システムでは、対応する圧縮解除ツールを使用する必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -129,104 +129,104 @@
 .PP
 \-G, \-\-strip\-debug
 .RS 4
-ϤǥХå°ޤˤϡ\fISourceFile\fR\fILineNumberTable\fR\fILocalVariableTable\fR\fILocalVariableTypeTable\fRޤޤޤ°Сɤȥ󥹥ȡΥϾʤޤǥХåεǽ¤ޤ
+出力からデバッグ属性を削除します。これには、\fISourceFile\fR、\fILineNumberTable\fR、\fILocalVariableTable\fR、\fILocalVariableTypeTable\fRが含まれます。これらの属性を削除すれば、ダウンロードとインストールのサイズは小さくなりますが、デバッガの機能は制限されます。
 .RE
 .PP
 \-\-keep\-file\-order
 .RS 4
-ϥեΥեνݻޤϡǥեȤưǤ
+入力ファイル内のファイルの順序を保持します。これは、デフォルトの動作です。
 .RE
 .PP
 \-O, \-\-no\-keep\-file\-order
 .RS 4
-ѥåġϡ٤ƤǤ¤ؤޤѥåġϡJARǥ쥯ȥ̾ƥɡ︺뤳ȤǤޤǥåʤɡJARեκŬǽưʤʤ뤳Ȥޤ
+パック・ツールは、すべての要素を並べ替えて送信します。パック・ツールは、JARディレクトリ名を削除してダウンロード・サイズを削減することもできます。ただし、インデックスなど、特定のJARファイルの最適化機能が正常に動作しなくなることがあります。
 .RE
 .PP
 \-S\fIvalue\fR, \-\-segment\-limit=\fIvalue\fR
 .RS 4
-ͤϡƥ֡Ȥͽۥåȡ\fIN\fR
-(Хñ)Ǥñϥեɬץ\fIN\fRХȤĶȡΩȤƤޤüʥȤơͤ\fI\-1\fRξϡ٤Ƥϥեޤ礭ñΥȤ졢ͤ0ξϡ饹Ȥ˥Ȥ1Ĥޤ֡Ȥ礭ʤȡҲʤʤ갵Ψ⤯ʤޤνˤ¿Υ꡼ɬפǤ
+この値は、各アーカイブ・セグメントの予想ターゲット・サイズ\fIN\fR
+(バイト単位)です。単一の入力ファイルの必要サイズが\fIN\fRバイトを超えると、独立したセグメントが割り当てられます。特殊なケースとして、値が\fI\-1\fRの場合は、すべての入力ファイルを含む大きな単一のセグメントが生成され、値が0の場合は、クラスごとにセグメントが1つずつ生成されます。アーカイブ・セグメントが大きくなると、断片化が少なくなり圧縮率が高くなりますが、その処理には多くのメモリーが必要です。
 .sp
-ƥȤΥϡȤѴ뤽줾ϥեΥΤۤ̾¾ץѥƥΥ׻ƿ¬ޤ
+各セグメントのサイズは、セグメントに変換されるそれぞれの入力ファイルのサイズのほか、その名前と他の送信されるプロパティのサイズを計算して推測されます。
 .sp
-ǥեȤ\-1ǤĤޤꡢѥåġñΥȽϥեޤü礭ʽϥե뤬ˤϡϥե򥻥Ȳ(ʬ)Ƥ꾮JARˤ뤳Ȥ򶯤ᤷޤ
+デフォルトは\-1です。つまり、パック・ツールは単一のセグメント出力ファイルを作成します。極端に大きな出力ファイルが生成される場合には、入力ファイルをセグメント化(分割)してより小さなJARにすることを強くお薦めします。
 .sp
-¤ݤƤʤ10 MBJARѥåե̾10%ѥåޤѥåġǤ礭Javaҡ(Ȥ¤10)ɬפȤ⤢ޤ
+この制限が課されていない10 MBのJARパック・ファイルは通常、約10%小さくパックされます。しかし、パック・ツールでより大きなJavaヒープ(セグメントの制限の約10倍)を必要とする場合もあります。
 .RE
 .PP
 \-E\fIvalue\fR, \-\-effort=\fIvalue\fR
 .RS 4
-ñ10ʿͤꤷ硢ѥåġϡꤵ줿Ψǥ֤򰵽̤ޤ٥1ξϡŪû̻֤¿礭Υե뤬ޤ٥9ξϡĹ֤ΤΡ갵Ψι⤤ե뤬ޤü0ꤷϡ\fIpack200\fRޥɤϸJARե򰵽̤ʤľܥԡޤJSR 200ɸǤϡ٤Ƥβץब̤ʾ򥢡ΤΥѥ롼Ȳ᤹褦˵ꤷƤޤ
+単一の10進数値を指定した場合、パック・ツールは、指定された圧縮率でアーカイブを圧縮します。レベル1の場合は、比較的短い圧縮時間で多少大きめのファイルが生成されますが、レベル9の場合は、非常に長い時間がかかるものの、より圧縮率の高いファイルが生成されます。特殊な値0を指定した場合は、\fIpack200\fRコマンドは元のJARファイルを圧縮なしで直接コピーします。JSR 200標準では、すべての解凍プログラムが、この特別な場合をアーカイブ全体のパススルーと解釈するように規定しています。
 .sp
-ǥեȤ5Ǥξ硢ɸŪʻ֤Ŭڤʰ̤Ԥޤ
+デフォルトは5です。この場合、標準的な時間で適切な圧縮が行われます。
 .RE
 .PP
 \-H\fIvalue\fR, \-\-deflate\-hint=\fIvalue\fR
 .RS 4
-Ͼ¸Ȥǥեͤ򥪡С饤ɤޤž륢֤Υ礭ʤ礬ޤǽͤϡ\fItrue\fR\fIfalse\fRޤ\fIkeep\fRǤ
+入力情報を保存するというデフォルト値をオーバーライドします。転送されるアーカイブのサイズは大きくなる場合があります。指定可能な値は、\fItrue\fR、\fIfalse\fRまたは\fIkeep\fRです。
 .sp
-\fIvalue\fR\fItrue\fRޤfalseξ硢\fIpacker200\fRޥɤϻ˽äƥǥե졼󡦥ҥȤϥ֤ꤷޤǤθġΥǥե졼󡦥ҥȤžޤ
+\fIvalue\fRが\fItrue\fRまたはfalseの場合、\fIpacker200\fRコマンドは指定に従ってデフレーション・ヒントを出力アーカイブに設定します。アーカイブ要素の個々のデフレーション・ヒントは転送されません。
 .sp
-\fIkeep\fRͤϡJARdzǧ줿ǥե졼󡦥ҥȤݻޤ줬ǥեȤǤ
+\fIkeep\fR値は、入力JARで確認されたデフレーション・ヒントを保持します。これがデフォルトです。
 .RE
 .PP
 \-m\fIvalue\fR, \-\-modification\-time=\fIvalue\fR
 .RS 4
-ǽͤ\fIlatest\fR\fIkeep\fRǤ
+指定可能な値は\fIlatest\fRと\fIkeep\fRです。
 .sp
-ͤǿξ硢ѥåġϡΥ֤λѲǽʤ٤ƤΥȥΤκǽ狼ΥȤλѲǽʤ٤ƤΥȥκǽꤷ褦ȤޤñͤϥȤΰȤž졢ƥȤȥŬѤޤξ硢٤ƤΥ󥹥ȡ롦եñդꤵȤϤޤ֤ž򾯤뤳ȤǤޤ
+値が最新の場合、パック・ツールは、元のアーカイブの使用可能なすべてのエントリのうちの最終更新時刻か、そのセグメントの使用可能なすべてのエントリの最終更新時刻を特定しようとします。この単一の値はセグメントの一部として転送され、各セグメントの全エントリに適用されます。この場合、すべてのインストール・ファイルに単一の日付が設定されるという問題はありますが、アーカイブの転送サイズを少し小さくすることができます。
 .sp
-ͤ\fIkeep\fRξ硢JARdzǧ줿ѹ֤ݻޤ줬ǥեȤǤ
+値が\fIkeep\fRの場合、入力JARで確認された変更時間が保持されます。これがデフォルトです。
 .RE
 .PP
 \-P\fIfile\fR, \-\-pass\-file=\fIfile\fR
 .RS 4
-ե򰵽̤Хñ̤ž褦˻ꤷޤΥץ֤ѤơʣΥեǤޤƥࡦե롦ѥ졼JARե롦ѥ졼Υå(/)֤ѥ̾ѴϹԤޤ󡣷̤Ȥե̾ϡʸȤΤJARեǤνиȰפƤɬפޤ\fIfile\fR˥ǥ쥯ȥ̾ꤷ硢Υǥ쥯ȥΤ٤ƤΥե뤬žޤ
+ファイルを圧縮せず、バイト単位で転送するように指定します。このオプションを繰返し使用して、複数のファイルを指定できます。システム・ファイル・セパレータがJARファイル・セパレータのスラッシュ(/)に置き換えられる点を除き、パス名の変換は行われません。結果として得られるファイル名は、文字列として正確にJARファイルでの出現と一致している必要があります。\fIfile\fRにディレクトリ名を指定した場合、そのディレクトリ内のすべてのファイルが転送されます。
 .RE
 .PP
 \-U\fIaction\fR, \-\-unknown\-attribute=\fIaction\fR
 .RS 4
-ǥեȤư򥪡С饤ɤޤĤޤꡢ°ޤ९饹ե뤬ꤷ\fIaction\fRˤäϤޤȤƻǽͤϡ\fIerror\fR\fIstrip\fRޤ\fIpass\fRǤ
+デフォルトの動作をオーバーライドします。つまり、不明な属性を含むクラス・ファイルが、指定した\fIaction\fRによって渡されます。アクションとして指定可能な値は、\fIerror\fR、\fIstrip\fRまたは\fIpass\fRです。
 .sp
-ͤ\fIerror\fRξ硢\fIpack200\fRޥΤԤŬڤɽޤ
+値が\fIerror\fRの場合、\fIpack200\fRコマンド操作全体が失敗して適切な説明が表示されます。
 .sp
-ͤ\fIstrip\fRξ硢°ϺޤJavaۥޥ(JVM)ɬ°ȡ饹ξ㳲ȯ뤳Ȥޤ
+値が\fIstrip\fRの場合、属性は削除されます。Java仮想マシン(JVM)必須属性を削除すると、クラス・ローダーの障害が発生することがあります。
 .sp
-ͤ\fIpass\fRξ硢饹Τ1ĤΥ꥽Ȥžޤ
+値が\fIpass\fRの場合、クラス全体が1つのリソースとして転送されます。
 .RE
 .PP
 \-C\fIattribute\-name\fR=\fIlayout\fR, \-\-class\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Υץ򻲾ȤƤ
+次のオプションを参照してください。
 .RE
 .PP
 \-F\fIattribute\-name\fR=\fIlayout\fR, \-\-field\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Υץ򻲾ȤƤ
+次のオプションを参照してください。
 .RE
 .PP
 \-M\fIattribute\-name\fR=\fIlayout\fR, \-\-method\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Υץ򻲾ȤƤ
+次のオプションを参照してください。
 .RE
 .PP
 \-D\fIattribute\-name\fR=\fIlayout\fR, \-\-code\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Ҥ4ĤΥץǤϡ饹ƥƥ\fIclass\-attribute\fR\fIfield\-attribute\fR\fImethod\-attribute\fR\fIcode\-attribute\fRʤɤ°Υ쥤ȤǤޤ\fIattribute\-name\fRˤϡ줫쥤Ȥޤϥ°̾ꤷޤ\fIaction\fRȤƻǽͤϡ\fIsome\-layout\-string\fR\fIerror\fR\fIstrip\fR\fIpass\fRǤ
+前述の4つのオプションでは、クラス・エンティティに\fIclass\-attribute\fR、\fIfield\-attribute\fR、\fImethod\-attribute\fRおよび\fIcode\-attribute\fRなどの属性のレイアウトを指定できます。\fIattribute\-name\fRには、これからレイアウトまたはアクションを定義する属性の名前を指定します。\fIaction\fRとして指定可能な値は、\fIsome\-layout\-string\fR、\fIerror\fR、\fIstrip\fR、\fIpass\fRです。
 .sp
-\fIsome\-layout\-string\fR: 쥤ȸJSR 200ͤƤޤ:
-\fI\-\-class\-attribute=SourceFile=RUH\fR
+\fIsome\-layout\-string\fR: レイアウト言語はJSR 200仕様で定義されています。例:
+\fI\-\-class\-attribute=SourceFile=RUH\fR。
 .sp
-ͤ\fIerror\fRξ硢\fIpack200\fRԤɽޤ
+値が\fIerror\fRの場合、\fIpack200\fR操作が失敗して説明が表示されます。
 .sp
-ͤ\fIstrip\fRξ硢°ϤޤVMɬ°ȥ饹ξ㳲ȯ뤳ȤޤȤС\fI\-\-class\-attribute=CompilationID=pass\fRȤ°ޤ९饹եžޤѥåġϡ¾ΥԤޤ
+値が\fIstrip\fRの場合、属性が出力から削除されます。VM必須属性を削除するとクラス・ローダーの障害が発生することがあります。たとえば、\fI\-\-class\-attribute=CompilationID=pass\fRというこの属性を含むクラス・ファイルを転送します。パック・ツールは、その他のアクションを行いません。
 .sp
-ͤ\fIpass\fRξ硢饹Τ1ĤΥ꥽Ȥžޤ
+値が\fIpass\fRの場合、クラス全体が1つのリソースとして転送されます。
 .RE
 .PP
 \-f \fIpack\&.properties\fR, \-\-config\-file=\fIpack\&.properties\fR
 .RS 4
-ޥɥ饤ˡѥåġ뤿JavaץѥƥޤޤƤ빽եǤޤ
+コマンドラインに、パック・ツールを初期化するためのJavaプロパティが含まれている構成ファイルを指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -251,42 +251,42 @@
 .PP
 \-v, \-\-verbose
 .RS 4
-Ǿ¤ΥåϤޤΥץʣꤹȡĹåޤ
+最小限のメッセージを出力します。このオプションを複数指定すると、より長いメッセージが作成されます。
 .RE
 .PP
 \-q, \-\-quiet
 .RS 4
-åɽư褦˻ꤷޤ
+メッセージを表示せずに動作するように指定します。
 .RE
 .PP
 \-l\fIfilename\fR, \-\-log\-file=\fIfilename\fR
 .RS 4
-ϥåΥեꤷޤ
+出力メッセージのログ・ファイルを指定します。
 .RE
 .PP
 \-?, \-h, \-\-help
 .RS 4
-Υޥɤ˴ؤإ׾Ϥޤ
+このコマンドに関するヘルプ情報を出力します。
 .RE
 .PP
 \-V, \-\-version
 .RS 4
-Υޥɤ˴ؤСϤޤ
+このコマンドに関するバージョン情報を出力します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤵ줿ץJavaۥޥϤޤܺ٤ϡjava(1)ޥɤΥե󥹡ڡ򻲾ȤƤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤ
+指定されたオプションをJava仮想マシンに渡します。詳細は、java(1)コマンドのリファレンス・ページを参照してください。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。
 .RE
-.SH "λơ"
+.SH "終了ステータス"
 .PP
-νλ֤ͤޤ: ェλξ0顼ȯ0礭͡
-.SH ""
+次の終了値が返されます: 正常終了の場合は0、エラーが発生した場合は0より大きい値。
+.SH "注意"
 .PP
-Υޥɤ\fIpack\fR(1)ƱʤǤ\fIpack\fR\fIpack200\fRޥɤϡ̡ʤǤ
+このコマンドと\fIpack\fR(1)を混同しないでください。\fIpack\fRおよび\fIpack200\fRコマンドは、別々の製品です。
 .PP
-JDK°Java SE APIͤȤ㤬Ĥäˤϡͤͥ褷Ƥ
-.SH "Ϣ"
+JDKに付属するJava SE API仕様との相違が見つかった場合には、仕様を優先してください。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/policytool.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/policytool.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: policytool
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ƥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: セキュリティ・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "policytool" "1" "2013ǯ1121" "JDK 8" "ƥġ"
+.TH "policytool" "1" "2013年11月21日" "JDK 8" "セキュリティ・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-policytool \- 桼ƥƥGUIͳǼ桼Ϥ˴Ťơץ졼󡦥ƥȤΥݥꥷեɤ߽񤭤ޤ
-.SH ""
+policytool \- ユーティリティGUI経由で取得したユーザー入力に基づいて、プレーン・テキストのポリシー・ファイルを読み書きします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,17 +64,17 @@
 .PP
 \-file
 .RS 4
-ݥꥷեɤ߹褦\fIpolicytool\fR˻ؼޤ
+ポリシー・ファイルを読み込むように\fIpolicytool\fRに指示します。
 .RE
 .PP
 \fIfilename\fR
 .RS 4
-ɤե̾
+ロードするファイルの名前。
 .RE
 .PP
-\fB\fR:
+\fB例\fR:
 .PP
-ݥꥷġ桼ƥƥ¹Ԥޤ:
+ポリシー・ツール管理ユーティリティを実行します:
 .sp
 .if n \{\
 .RS 4
@@ -86,7 +86,7 @@
 .RE
 .\}
 .PP
-\fIpolicytool\fRޥɤ¹Ԥꤵ줿եɤޤ:
+\fIpolicytool\fRコマンドを実行し、指定されたファイルをロードします:
 .sp
 .if n \{\
 .RS 4
@@ -97,17 +97,17 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "説明"
 .PP
-\fIpolicytool\fRޥɤϡԤGUIƤӽФޤˤꡢƥԤϥ롦ݥꥷեƤǤ褦ˤʤޤݥꥷե\fI\&.policy\fRĥҤĥץ졼ƥȡեǡɥᥤ̤˥⡼ȡꥯ򸢸¥֥Ȥ˥ޥåפޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlˤ
-Default Policy Implementation and Policy File Syntaxפ򻲾ȤƤ
-.SH "ץ"
+\fIpolicytool\fRコマンドは、管理者のGUIを呼び出します。これにより、システム管理者はローカル・ポリシー・ファイルの内容を管理できるようになります。ポリシー・ファイルは\fI\&.policy\fR拡張子を持つプレーンテキスト・ファイルで、ドメイン別にリモート・リクエスタを権限オブジェクトにマップします。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlにある
+「Default Policy Implementation and Policy File Syntax」を参照してください
+.SH "オプション"
 .PP
 \-file
 .RS 4
-ݥꥷեɤ߹褦\fIpolicytool\fR˻ؼޤ
+ポリシー・ファイルを読み込むように\fIpolicytool\fRに指示します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -117,7 +117,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Default Policy Implementation and Policy File Syntax
+「Default Policy Implementation and Policy File Syntax」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.html)
 .RE
 .sp
@@ -129,7 +129,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Policy File Creation and Management
+「Policy File Creation and Management」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyGuide\&.html)
 .RE
 .sp
@@ -141,7 +141,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Permissions in Java SE Development Kit (JDK)
+「Permissions in Java SE Development Kit (JDK)」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/permissions\&.html)
 .RE
 .sp
@@ -153,7 +153,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java Security Overview
+「Java Security Overview」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/overview/jsoverview\&.html)
 .RE
 .sp
@@ -165,7 +165,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java Cryptography Architecture (JCA) Reference Guide
+「Java Cryptography Architecture (JCA) Reference Guide」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html)
 .RE
 .br
--- a/jdk/src/linux/doc/man/ja/rmic.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/rmic.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: rmic
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "rmic" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "rmic" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-rmic \- Java Remote Method Protocol (JRMP)ޤInternet Inter\-Orb protocol (IIOP)Ѥ⡼ȡ֥ȤΥ֡ȥ󤪤Tie饹ޤObject Management Group (OMG)󥿥ե(IDL)ޤ
-.SH ""
+rmic \- Java Remote Method Protocol (JRMP)またはInternet Inter\-Orb protocol (IIOP)を使用するリモート・オブジェクトのスタブ、スケルトンおよびTieクラスを生成します。Object Management Group (OMG)インタフェース定義言語(IDL)も生成します
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,20 +64,20 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤\fIץ\fRץ򻲾ȤƤ
+コマンドライン・\fIオプション\fR。オプションを参照してください。
 .RE
 .PP
 \fIpackage\-qualified\-class\-names\fR
 .RS 4
-ѥåޤ९饹̾:
-\fIjava\&.awt\&.Color\fR
+パッケージを含むクラス名。例:
+\fIjava\&.awt\&.Color\fR。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fB侩˴ؤ:\fR
-Java Remote Method Protocol (JRMP)֤ӥȥŪΥݡȤ侩ˤʤޤưŪJRMP֤򤫤˻ѤơJRMP١ΥץꥱˤΥġѤɬʤȤᤷޤܺ٤ϡ\fIjava\&.rmi\&.server\&.UnicastRemoteObject\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/server/UnicastRemoteObject\&.html)򻲾ȤƤ
+\fB非推奨に関する注意:\fR
+Java Remote Method Protocol (JRMP)スタブおよびスケルトンの静的な生成のサポートは非推奨になりました。動的に生成されるJRMPスタブをかわりに使用して、JRMPベースのアプリケーションにこのツールを使用する必要性をなくすことをお薦めします。詳細は、\fIjava\&.rmi\&.server\&.UnicastRemoteObject\fR仕様(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/server/UnicastRemoteObject\&.html)を参照してください。
 .PP
-\fIrmic\fRѥϡJava Remote Method Protocol (JRMP)ȥ֤Tie饹ե(IIOPץȥ)Ѥơ⡼ȡ֥ȤΥ֤ӥȥ󡦥饹եޤ⡼ȡ֥Ȥμ饹Ǥ뤳Υ饹եϡJavaץߥ󥰸Υ饹򥳥ѥ뤷Ȥޤ⡼ȼ饹ϡ\fIjava\&.rmi\&.Remote\fR󥿥ե륯饹Ǥ\fIrmic\fRޥɤǤΥ饹̾ϡΥ饹\fIjavac\fRޥɤǥѥ뤬ƤơĴѥå̾ǤɬפޤȤС˼饹ե̾\fIHelloImpl\fR\fIrmic\fRޥɤ¹Ԥȡhello֥ǥ쥯ȥ(饹Υѥå̾դ)\fIHelloImpl_Stub\&.class \fRե뤬ޤ
+\fIrmic\fRコンパイラは、Java Remote Method Protocol (JRMP)とスタブおよびTieクラス・ファイル(IIOPプロトコル)を使用して、リモート・オブジェクトのスタブおよびスケルトン・クラス・ファイルを生成します。リモート・オブジェクトの実装クラスであるこれらのクラス・ファイルは、Javaプログラミング言語のクラスをコンパイルしたときに生成されます。リモート実装クラスは、\fIjava\&.rmi\&.Remote\fRインタフェースを実装するクラスです。\fIrmic\fRコマンドでのクラス名は、そのクラスが\fIjavac\fRコマンドでコンパイルが成功していて、かつ完全修飾パッケージ名である必要があります。たとえば、次に示すクラス・ファイル名\fIHelloImpl\fRで\fIrmic\fRコマンドを実行すると、helloサブディレクトリ(クラスのパッケージの名前の付いた)に\fIHelloImpl_Stub\&.class \fRファイルが作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -89,31 +89,31 @@
 .RE
 .\}
 .PP
-⡼ȡ֥ȤΥȥJRMPץȥ롦С¦Υƥƥǡ⡼ȡ֥ȼƤӽФ᥽åɤޤߤޤ
+リモート・オブジェクトのスケルトンはJRMPプロトコル・サーバー側のエンティティで、リモート・オブジェクト実装を呼び出すメソッドを含みます。
 .PP
-⡼ȡ֥ȤTieϡȥƱͤ˥С¦ΥƥƥǤIIOPץȥѤƥ饤Ȥ̿ޤ
+リモート・オブジェクトのTieは、スケルトンと同様にサーバー側のエンティティですが、IIOPプロトコルを使用してクライアントと通信します。
 .PP
-֤Ȥϡ⡼ȡ֥ȤΥ饤¦ǤǤ֤ϡ⡼ȡ֥ȤΥ᥽åɸƽФ򡢼ʪΥ⡼ȡ֥Ȥ󤹤륵С̿ޤäơ饤ȤΥ⡼ȡ֥ȤؤλȤϡºݤϥ롦֤ؤλȤȤʤޤ
+スタブとは、リモート・オブジェクトのクライアント側での代理です。スタブは、リモート・オブジェクトのメソッド呼出しを、実物のリモート・オブジェクトが常駐するサーバーと通信する役割を持ちます。したがって、クライアントのリモート・オブジェクトへの参照は、実際はローカル・スタブへの参照となります。
 .PP
-ǥեȤ\fIrmic\fRޥɤϡ1\&.2 JRMP֡ץȥ롦СΤߤѤ륹֡饹ޤϡ\fI\-v1\&.2\fRץꤷƱưǤ꡼5\&.0Ǥ\fI\-vcompat\fRץ󤬥ǥեȤǤIIOPץȥѤΥ֤Tie饹ˤ\fI\-iiop\fRץѤޤץ򻲾ȤƤ
+デフォルトで\fIrmic\fRコマンドは、1\&.2 JRMPスタブ・プロトコル・バージョンのみを使用するスタブ・クラスを生成します。これは、\fI\-v1\&.2\fRオプションを指定した場合と同じ動作です。リリース5\&.0以前では\fI\-vcompat\fRオプションがデフォルトでした。IIOPプロトコル用のスタブおよびTieクラスを生成するには\fI\-iiop\fRオプションを使用します。オプションを参照してください。
 .PP
-֤ϥ⡼ȡ󥿥եΤߤ⡼ȡ֥Ȥ롦󥿥եϼƤޤJRMP֤ϥ⡼ȡ֥Ȥ⡼ȡ󥿥եƱΤƤΤǡ饤Ȥϡ㥹Ȥ䷿åJavaץߥ󥰸Ȥ߹ޤ줿黻ҤѤ뤳ȤǤޤIIOPξϡ\fIPortableRemoteObject\&.narrow\fR᥽åɤѤɬפޤ
-.SH "ץ"
+スタブはリモート・インタフェースのみを実装し、リモート・オブジェクトが実装するローカル・インタフェースは実装していません。JRMPスタブはリモート・オブジェクトが実装するリモート・インタフェースと同じものを実装しているので、クライアントは、キャストや型チェックにJavaプログラミング言語に組み込まれた演算子を使用することができます。IIOPの場合は、\fIPortableRemoteObject\&.narrow\fRメソッドを使用する必要があります。
+.SH "オプション"
 .PP
 \-bootclasspath \fIpath\fR
 .RS 4
-֡ȥȥåס饹եΰ֤򥪡С饤ɤޤ
+ブートストラップ・クラス・ファイルの位置をオーバーライドします。
 .RE
 .PP
 \-classpath path
 .RS 4
-\fIrmic\fRޥɤ饹õΥѥꤷޤΥץϡǥեȤ\fICLASSPATH\fRĶѿ򥪡С饤ɤޤǥ쥯ȥϥʬ䤷ޤѥΰŪʷ\fI\&.;<your_path>\fRǤ:
+\fIrmic\fRコマンドがクラスを探すためのパスを指定します。このオプションは、デフォルトや\fICLASSPATH\fR環境変数設定をオーバーライドします。ディレクトリはコロンで分割します。パスの一般的な形式は\fI\&.;<your_path>\fRです。例:
 \fI\&.;/usr/local/java/classes\fR
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-줿饹ؤνǥ쥯ȥΥ롼ȤꤷޤΥץѤȡ֡ȥ󡢤TieեǼǥ쥯ȥǤޤȤСΥޥɤMyClassƳФ줿֤ӥȥ󡦥饹ǥ쥯ȥ/java/classes/exampleclass˳Ǽޤ
+生成されたクラス階層の出力先ディレクトリのルートを指定します。このオプションを使用すると、スタブ、スケルトン、およびTieファイルを格納するディレクトリを指定できます。たとえば、次のコマンドはMyClassから導出されたスタブおよびスケルトン・クラスをディレクトリ/java/classes/exampleclassに格納します。
 .sp
 .if n \{\
 .RS 4
@@ -124,25 +124,25 @@
 .if n \{\
 .RE
 .\}
-\fI\-d\fRץ󤬻ꤵƤʤ硢ǥեȤư\fI\-d\fRꤵƤƱǤåȡ饹ΥѥåؤߤΥǥ쥯ȥ˺졢stub/tie/skeletonե뤬ǼޤΥ꡼\fIrmic\fRޥɤǤϡ\fI\-d\fRꤵƤʤϡѥåؤϺ줺ϥեϤ٤ƸߤΥǥ쥯ȥľܳǼƤޤ
+\fI\-d\fRオプションが指定されていない場合、デフォルトの動作は\fI\-d\fRが指定されていた場合と同じです。ターゲット・クラスのパッケージ階層が現在のディレクトリに作成され、stub/tie/skeletonファイルが格納されます。以前のリリースの\fIrmic\fRコマンドでは、\fI\-d\fRが指定されていない場合は、パッケージ階層は作成されず、出力ファイルはすべて現在のディレクトリに直接格納されていました。
 .RE
 .PP
 \-extdirs \fIpath\fR
 .RS 4
-󥹥ȡѳĥǽΰ֤򥪡С饤ɤޤ
+インストール済拡張機能の位置をオーバーライドします。
 .RE
 .PP
 \-g
 .RS 4
-ѿޤह٤ƤΥǥХåޤǥեȤǤϡֹΤޤ
+ローカル変数を含むすべてのデバッグ情報を生成します。デフォルトでは、行番号情報のみ生成されます。
 .RE
 .PP
 \-idl
 .RS 4
-\fIrmic\fRޥɤˤäơꤷ饹ӻȤ줿饹OMG IDLޤIDLǤϡץߥ󥰸˰¸ˡǥ֥ȤAPIꤹ뤳ȤǤޤIDLϡ᥽åɤӥǡλͤȤƻѤޤCORBAХǥ󥰤󶡤Ǥդθǡ᥽åɤӥǡκӸƽФԤȤǤޤθˤϡJavaC++ޤޤƤޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.html
-Java IDL: IDL to Java Language Mappingפ򻲾ȤƤ
+\fIrmic\fRコマンドによって、指定したクラスおよび参照されたクラスのOMG IDLが生成されます。IDLでは、プログラミング言語に依存せずに、宣言するだけでオブジェクトのAPIを指定することができます。IDLは、メソッドおよびデータの仕様として使用します。CORBAバインディングを提供する任意の言語で、メソッドおよびデータの作成および呼出しを行うことができます。これらの言語には、JavaおよびC++が含まれています。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.htmlの
+「Java IDL: IDL to Java Language Mapping」を参照してください
 .sp
-\fI\-idl\fRץѤȤˤϡ¾ΥץǤޤ
+\fI\-idl\fRオプションを使用するときには、他のオプションも指定できます。
 .sp
 .RS 4
 .ie n \{\
@@ -152,7 +152,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-¸Υ/Tie/IDLϥ饹⿷Ǥ⡢\fI\-always\fRޤ\fI\-alwaysgenerate\fRץϺޤ
+既存のスタブ/Tie/IDLが入力クラスよりも新しい場合でも、\fI\-always\fRまたは\fI\-alwaysgenerate\fRオプションは再生成を強制します。
 .RE
 .sp
 .RS 4
@@ -163,7 +163,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-factory\fRץϡ줿IDL\fIfactory\fRɤѤޤ
+\fI\-factory\fRオプションは、生成されたIDLで\fIfactory\fRキーワードを使用します。
 .RE
 .sp
 .RS 4
@@ -204,9 +204,9 @@
 .PP
 \-iiop
 .RS 4
-\fIrmic\fRޥɤˤäơJRMPΥ֤ȥȥ󡦥饹ΤˡIIOPΥ֤Tie饹ޤ֡饹ϡ⡼ȡ֥ȤΥ롦ץǡ饤Ȥ饵С˸ƽФȤ˻Ѥޤƥ⡼ȡ󥿥եˤϥ֡饹ɬפǤ֡饹ˤäƥ⡼ȡ󥿥եޤ饤Ȥǥ⡼ȡ֥Ȥ򻲾ȤȤϡ֤򻲾Ȥ뤳Ȥˤʤޤ饹ϡС¦ƤθƽФŬڤʼ饹˥ǥѥåȤ˻ѤޤƼ饹ˤϡ饹ɬפǤ
+\fIrmic\fRコマンドによって、JRMPのスタブとスケルトン・クラスのかわりに、IIOPのスタブとTieクラスが生成されます。スタブ・クラスは、リモート・オブジェクトのローカル・プロキシで、クライアントからサーバーに呼出しを送信するときに使用されます。各リモート・インタフェースにはスタブ・クラスが必要です。スタブ・クラスによってリモート・インタフェースが実装されます。クライアントでリモート・オブジェクトを参照するときは、スタブを参照することになります。タイ・クラスは、サーバー側で着呼を処理し、その呼出しを適切な実装クラスにディスパッチするときに使用されます。各実装クラスには、タイ・クラスが必要です。
 .sp
-\fI\-iiop\fRѤ\fIrmic\fRޥɤƤӽФȡ̿̾§˽򤷤֤Tieޤ
+\fI\-iiop\fRを使用して\fIrmic\fRコマンドを呼び出すと、次の命名規則に準拠したスタブとTieが生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -227,7 +227,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-iiop\fRץѤȤˤϡ¾ΥץǤޤ
+\fI\-iiop\fRオプションを使用するときには、他のオプションも指定できます。
 .RE
 .sp
 .RS 4
@@ -238,7 +238,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-¸Υ/Tie/IDLϥ饹⿷Ǥ⡢\fI\-always\fRޤ\fI\-alwaysgenerate\fRץϺޤ
+既存のスタブ/Tie/IDLが入力クラスよりも新しい場合でも、\fI\-always\fRまたは\fI\-alwaysgenerate\fRオプションは再生成を強制します。
 .RE
 .sp
 .RS 4
@@ -249,7 +249,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-nolocalstubs\fRץǤϡƱץΥ饤ȤȥС˺Ŭ줿֤Ϻޤ
+\fI\-nolocalstubs\fRオプションでは、同じプロセスのクライアントとサーバーに最適化されたスタブは作成されません。
 .RE
 .sp
 .RS 4
@@ -260,7 +260,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-noValueMethods\fRץ\fI\-idl\fRץȤȤ˻Ѥɬפޤ\fI\-noValueMethods\fRץϡIDL\fIvaluetype\fR᥽åɤӽҤɲäǤʤ褦ˤޤΥ᥽åɤӽҤϡvaluetypeξϥץǤ\fI\-idl\fRץȤȤ\fI\-noValueMethods\fRץꤷʤޤ
+\fI\-noValueMethods\fRオプションは\fI\-idl\fRオプションとともに使用する必要があります。\fI\-noValueMethods\fRオプションは、送信されるIDLに\fIvaluetype\fRメソッドおよび初期化子を追加できないようにします。このメソッドおよび初期化子は、valuetypeの場合はオプションです。\fI\-idl\fRオプションとともに\fI\-noValueMethods\fRオプションを指定しないかぎり生成されます。
 .RE
 .sp
 .RS 4
@@ -271,57 +271,57 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-poa\fRץϷѾ\fIorg\&.omg\&.CORBA_2_3\&.portable\&.ObjectImpl\fR\fIorg\&.omg\&.PortableServer\&.Servant\fRѹޤݡ֥롦֥ȡץ(POA)\fIPortableServer\fR⥸塼ϡͥƥ֤\fIServant\fRޤJavaץߥ󥰸Ǥϡ\fIServant\fRJava\fIorg\&.omg\&.PortableServer\&.Servant\fR饹˥ޥåפޤϡ٤ƤPOAХȼΥ١饹ȤƵǽץꥱ󡦥ץޤƤӽФȤΤǤ뤤ĤΥ᥽åɡPOAˤäƸƤӽФ졢ХȤư椹뤿˥桼С饤ɤǤ᥽åɤ󶡤ޤOMG IDL to Java Language Mapping SpecificationCORBA V 2\&.3\&.1 ptc/00\-01\-08\&.pdf˽򤷤Ƥޤ
+\fI\-poa\fRオプションは継承を\fIorg\&.omg\&.CORBA_2_3\&.portable\&.ObjectImpl\fRから\fIorg\&.omg\&.PortableServer\&.Servant\fRに変更します。ポータブル・オブジェクト・アダプタ(POA)の\fIPortableServer\fRモジュールは、ネイティブの\fIServant\fR型を定義します。Javaプログラミング言語では、\fIServant\fR型はJavaの\fIorg\&.omg\&.PortableServer\&.Servant\fRクラスにマップされます。これは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッド、およびPOAによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドを提供します。OMG IDL to Java Language Mapping Specification、CORBA V 2\&.3\&.1 ptc/00\-01\-08\&.pdfに準拠しています。
 .RE
 .RE
 .PP
 \-J
 .RS 4
-JavaޥɤȤȤ˻Ѥơ\fI\-J\fRץ\fI\-J\fRθ³Java󥿥ץ꥿Ϥޤ(\fI\-J\fRȰδ֤˥ڡޤ)
+Javaコマンドとともに使用して、\fI\-J\fRオプションは\fI\-J\fRの後ろに続く引数をJavaインタプリタに渡します(\fI\-J\fRと引数の間にスペースは入れません)。
 .RE
 .PP
 \-keep or \-keepgenerated
 .RS 4
-֡ȥ󡢤ޤTie饹Τ줿\fI\&.java\fRեݻ\fI\&.class\fRեƱǥ쥯ȥ˽񤭹ߤޤ
+スタブ、スケルトン、またはTieクラスのために生成された\fI\&.java\fRソース・ファイルを保持し、\fI\&.class\fRファイルと同じディレクトリに書き込みます。
 .RE
 .PP
 \-nowarn
 .RS 4
-ٹ򥪥դˤޤ\fI\-nowarn\fRץ󤬻Ѥ硣ѥϷٹɽޤ
+警告をオフにします。\fI\-nowarn\fRオプションが使用される場合。コンパイラは警告を表示しません。
 .RE
 .PP
 \-nowrite
 .RS 4
-ѥ뤷饹ե롦ƥ˽񤭹ߤޤ
+コンパイルしたクラスをファイル・システムに書き込みません。
 .RE
 .PP
-\-vcompat (侩)
+\-vcompat (非推奨)
 .RS 4
-1\&.11\&.2ξJRMP֡ץȥ롦СȸߴΤ륹֤ӥȥ󡦥饹ޤ5\&.0Υ꡼ǤϤΥץ󤬥ǥեȤǤ줿֡饹ϡJDK 1\&.1ۥޥ˥ɤ1\&.1֡ץȥ롦СѤJDK 1\&.2ʹߤβۥޥ˥ɤ1\&.2֡ץȥ롦СѤޤ줿ȥ󡦥饹Ǥϡ1\&.11\&.2ξΥ֡ץȥ롦С򥵥ݡȤޤ줿饹ξ⡼ɤ򥵥ݡȤ뤿ˡ礭ʤޤ:Υץ侩ˤʤޤ򻲾ȤƤ
+1\&.1と1\&.2の両方のJRMPスタブ・プロトコル・バージョンと互換性のあるスタブおよびスケルトン・クラスを作成します。5\&.0以前のリリースではこのオプションがデフォルトでした。生成されたスタブ・クラスは、JDK 1\&.1仮想マシンにロードされると1\&.1スタブ・プロトコル・バージョンを使用し、JDK 1\&.2以降の仮想マシンにロードされると1\&.2スタブ・プロトコル・バージョンを使用します。生成されたスケルトン・クラスでは、1\&.1と1\&.2の両方のスタブ・プロトコル・バージョンをサポートします。生成されたクラスは両方の操作モードをサポートするために、サイズが大きくなります。注意:このオプションは非推奨になりました。説明を参照してください。
 .RE
 .PP
 \-verbose
 .RS 4
-ѥ󥫡ѥ뤵Ƥ륯饹ɤƤ륯饹եˤĤƤΥåɽ褦ˤޤ
+コンパイラやリンカーが、コンパイルされているクラスやロードされているクラス・ファイルについてのメッセージを表示するようにします。
 .RE
 .PP
-\-v1\&.1 (侩)
+\-v1\&.1 (非推奨)
 .RS 4
-1\&.1 JRMP֡ץȥ롦СΤߤΥ֤ӥȥ󡦥饹ޤ\fI\-v1\&.1\fRץѤǤΤϡJDK 1\&.1\fIrmic\fRޥɤ졢åץ졼ɤǤʤ(˥ʥߥå饹ǥ󥰤ѤƤʤ)¸Ūǥץ줿֡饹Фľ󲽸ߴΤ륹֡饹ΤߤǤ:Υץ侩ˤʤޤ򻲾ȤƤ
+1\&.1 JRMPスタブ・プロトコル・バージョンのみのスタブおよびスケルトン・クラスを生成します。\fI\-v1\&.1\fRオプションを使用できるのは、JDK 1\&.1から\fIrmic\fRコマンドで生成され、アップグレードできない(さらにダイナミック・クラス・ローディングを使用していない)、既存の静的デプロイされたスタブ・クラスに対し、直列化互換性のあるスタブ・クラスを生成する場合のみです。注意:このオプションは非推奨になりました。説明を参照してください。
 .RE
 .PP
-\-v1\&.2 (侩)
+\-v1\&.2 (非推奨)
 .RS 4
-(ǥե)1\&.2 JRMP֡ץȥ롦СΤߤΥ֡饹ޤȥ󡦥饹1\&.2֡ץȥ롦СǻѤǤʤᡢȥ󡦥饹ޤ줿֡饹ϡJDK 1\&.1ۥޥ˥ɤƤưޤ:Υץ侩ˤʤޤ򻲾ȤƤ
+(デフォルト)1\&.2 JRMPスタブ・プロトコル・バージョンのみのスタブ・クラスを生成します。スケルトン・クラスは1\&.2スタブ・プロトコル・バージョンで使用できないため、スケルトン・クラスは生成されません。生成されたスタブ・クラスは、JDK 1\&.1仮想マシンにロードされても動作しません。注意:このオプションは非推奨になりました。説明を参照してください。
 .RE
-.SH "Ķѿ"
+.SH "環境変数"
 .PP
 CLASSPATH
 .RS 4
-桼饹ؤΥѥ򥷥ƥ˻ꤷޤǥ쥯ȥϥǶڤޤ:
+ユーザー定義クラスへのパスをシステムに指定します。ディレクトリはコロンで区切られます。例:
 \fI\&.:/usr/local/java/classes\fR
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/rmid.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/rmid.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: rmid
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "rmid" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "rmid" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-rmid \- ưƥࡦǡ򳫻Ϥȡ֥ȤJavaۥޥ(VM)ϿƥƥֲǤ褦ˤʤޤ
-.SH ""
+rmid \- 起動システム・デーモンを開始すると、オブジェクトをJava仮想マシン(VM)に登録してアクティブ化できるようになります。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,13 +64,13 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIrmid\fRޥɤϡưƥࡦǡ򳫻Ϥޤưƥࡦǡ򳫻ϤƤǤʤȡƥֲǽ֥Ȥ򥢥ƥֲƥϿꡢJVMǥƥֲꤹ뤳ȤǤޤ󡣥ƥֲǽʥ֥ȤѤץκˡξܺ٤ϡ\fIƥֲλ\fR˴ؤ塼ȥꥢ(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi/activation/overview\&.html)򻲾ȤƤ
+\fIrmid\fRコマンドは、起動システム・デーモンを開始します。起動システム・デーモンを開始してからでないと、アクティブ化可能オブジェクトをアクティブ化システムに登録したり、JVM内でアクティブ化したりすることができません。アクティブ化可能なオブジェクトを使用するプログラムの作成方法の詳細は、\fIアクティブ化の使用\fRに関するチュートリアル(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi/activation/overview\&.html)を参照してください
 .PP
-\fIrmid\fRޥɤ¹ԤΤ褦˥ƥݥꥷեꤷơǡưޤ
+\fIrmid\fRコマンドを実行し、次のようにセキュリティ・ポリシー・ファイルを指定して、デーモンを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -82,11 +82,11 @@
 .RE
 .\}
 .PP
-\fIrmid\fRޥɤOracleμ¹Ԥ硢ǥեȤǤϡƥݥꥷեꤹɬפޤϡ\fIrmid\fRޥɤư롼ѤJVMư뤿˳\fIActivationGroupDesc\fRξѤǤ뤫ɤ򸡾ڤǤ褦ˤ뤿Ǥäˡ\fIActivationGroupDesc\fR󥹥ȥ饯Ϥ\fICommandEnvironment\fRǤդΥץѥƥˤäƻꤵ륳ޥɤӥץϡ\fIrmid\fRޥɤΥƥݥꥷեŪ˵Ĥ뤳Ȥɬפˤʤޤ\fIsun\&.rmi\&.activation\&.execPolicy\fRץѥƥͤϡư롼ѤJVMư뤿\fIActivationGroupDesc\fRξѤǤ뤫ɤȽǤȤ\fIrmid\fRޥɤѤݥꥷꤷޤܺ٤ϡ\-J\-Dsun\&.rmi\&.activation\&.execPolicy=policyץ򻲾ȤƤ
+\fIrmid\fRコマンドのOracleの実装を実行する場合、デフォルトでは、セキュリティ・ポリシー・ファイルを指定する必要があります。それは、\fIrmid\fRコマンドが起動グループ用にJVMを起動するために各\fIActivationGroupDesc\fR内の情報を使用できるかどうかを検証できるようにするためです特に、\fIActivationGroupDesc\fRコンストラクタに渡される\fICommandEnvironment\fRや任意のプロパティによって指定されるコマンドおよびオプションは、\fIrmid\fRコマンドのセキュリティ・ポリシー・ファイルの中で明示的に許可することが必要になりました。\fIsun\&.rmi\&.activation\&.execPolicy\fRプロパティの値は、起動グループ用にJVMを起動するために\fIActivationGroupDesc\fR内の情報を使用できるかどうかを判断するときに\fIrmid\fRコマンドが使用するポリシーを決定します。詳細は、\-J\-Dsun\&.rmi\&.activation\&.execPolicy=policyオプションの説明を参照してください。
 .PP
-\fIrmid\fRޥɤ¹Ԥȡǥեȡݡ1098ǥƥ١쥸ȥ꤬ư졢\fIActivationSystem\fR쥸ȥ̾\fIjava\&.rmi\&.activation\&.ActivationSystem\fR˥Хɤޤ
+\fIrmid\fRコマンドを実行すると、デフォルト・ポート1098でアクティベータと内部レジストリが起動され、\fIActivationSystem\fRがこの内部レジストリ内の名前\fIjava\&.rmi\&.activation\&.ActivationSystem\fRにバインドされます。
 .PP
-쥸ȥ¾ΥݡȤꤹˤϡ\fIrmid\fRޥɤμ¹Ի\fI\-port\fRץꤹɬפޤȤСΥޥɤϡ쥸ȥΥǥեȡݡ1099ǡưƥࡦǡȥ쥸ȥưޤ
+レジストリに他のポートを指定するには、\fIrmid\fRコマンドの実行時に\fI\-port\fRオプションを指定する必要があります。たとえば、次のコマンドは、レジストリのデフォルト・ポート1099で、起動システム・デーモンとレジストリを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -97,15 +97,15 @@
 .if n \{\
 .RE
 .\}
-.SH "ɬפ˱RMID򳫻"
+.SH "必要に応じてRMIDを開始"
 .PP
-\fIrmid\fR򥳥ޥɥ饤󤫤鳫Ϥˤϡ\fIinetd\fR
-(Oracle Solarisξ)ޤ\fIxinetd\fR
-(Linuxξ)\fIrmid\fRɬפ˱ƳϤˡ⤢ޤ
+\fIrmid\fRをコマンドラインから開始するには、\fIinetd\fR
+(Oracle Solarisの場合)、または\fIxinetd\fR
+(Linuxの場合)を構成して\fIrmid\fRを必要に応じて開始する方法もあります。
 .PP
-RMID򳫻Ϥȡ\fISystem\&.inheritedChannel\fR᥽åɤƤӽФơѾ줿ͥ(\fIinetd\fR/\fIxinetd\fRѾ)褦ȤޤѾ줿ͥ뤬nullǤ뤫\fIjava\&.nio\&.channels\&.ServerSocketChannel\fRΥ󥹥󥹤Ǥʤä硢RMIDϤΥͥ\fIinetd\fR/\fIxinetd\fRˤäƵư줿ΤǤϤʤȽǤҤΤ褦˵ưޤ
+RMIDを開始すると、\fISystem\&.inheritedChannel\fRメソッドを呼び出して、継承されたチャンネル(\fIinetd\fR/\fIxinetd\fRから継承)を取得しようとします。継承されたチャンネルがnullであるか、\fIjava\&.nio\&.channels\&.ServerSocketChannel\fRのインスタンスでなかった場合、RMIDはそのチャンネルは\fIinetd\fR/\fIxinetd\fRによって起動されたものではないと判断し、前述のように起動します。
 .PP
-Ѿ줿ͥ뤬\fIServerSocketChannel\fR󥹥󥹤ǤϡRMIDϥݡȤ⡼ȡ֥ȡĤޤ\fIjava\&.rmi\&.activation\&.ActivationSystem\fRХɤƤ쥸ȥ\fIjava\&.rmi\&.activation\&.Activator\fR⡼ȡ֥ȤФꥯȤ륵СåȤȤơ\fIServerSocketChannel\fR\fIjava\&.net\&.ServerSocket\fRѤޤΥ⡼ɤǤϡRMIDưϡΤȤơޥɥ饤󤫤鵯ưƱǤ
+継承されたチャンネルが\fIServerSocketChannel\fRインスタンスである場合は、RMIDはエクスポートするリモート・オブジェクト、つまり\fIjava\&.rmi\&.activation\&.ActivationSystem\fRがバインドされているレジストリと\fIjava\&.rmi\&.activation\&.Activator\fRリモート・オブジェクトに対するリクエストを受信するサーバー・ソケットとして、\fIServerSocketChannel\fRから取得した\fIjava\&.net\&.ServerSocket\fRを使用します。このモードでは、RMIDの動作は、次のことを除いて、コマンドラインから起動した場合と同じです。
 .sp
 .RS 4
 .ie n \{\
@@ -115,7 +115,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISystem\&.err\fRФϤϡե˥쥯Ȥ롣Υե\fIjava\&.io\&.tmpdir\fRƥࡦץѥƥǻꤵǥ쥯ȥ(̾\fI/var/tmp\fRޤ\fI/tmp\fR)ˤ롣ե̾Ƭ\fIrmid\-err\fRǡ\fItmp\fRǤ롣
+\fISystem\&.err\fRに対する出力は、ファイルにリダイレクトされる。このファイルは\fIjava\&.io\&.tmpdir\fRシステム・プロパティで指定されるディレクトリ(通常は\fI/var/tmp\fRまたは\fI/tmp\fR)にある。ファイル名の接頭辞は\fIrmid\-err\fRで、接尾辞は\fItmp\fRである。
 .RE
 .sp
 .RS 4
@@ -126,7 +126,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-port\fRץϻѤǤޤ󡣤Υץ󤬻ꤵƤ硢RMIDϥ顼åɽƽλޤ
+\fI\-port\fRオプションは使用できません。このオプションが指定されている場合、RMIDはエラー・メッセージが表示されて終了します。
 .RE
 .sp
 .RS 4
@@ -137,17 +137,17 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-log\fRץɬܡΥץ󤬻ꤵƤʤ硢RMIDϥ顼åɽƽλޤ
+\fI\-log\fRオプションは必須。このオプションが指定されていない場合、RMIDはエラー・メッセージが表示されて終了します。
 .RE
 .PP
-ɬפ˱ƥӥ򳫻Ϥ褦˹ˡξܺ٤ϡ\fIinetd\fR
-(Oracle Solarisξ)ޤ\fIxinetd\fR
-(Linux)Υޥ˥奢롦ڡ򻲾ȤƤ
-.SH "ץ"
+必要に応じてサービスを開始するように構成する方法の詳細は、\fIinetd\fR
+(Oracle Solarisの場合)、または\fIxinetd\fR
+(Linux)のマニュアル・ページを参照してください。
+.SH "オプション"
 .PP
-\-C\fIץ\fR
+\-C\fIオプション\fR
 .RS 4
-\fIrmid\fRޥɤλҥץ(ư롼)줿Ȥˡ줾λҥץ˥ޥɥ饤ȤϤ륪ץꤷޤȤСΤ褦˻ꤹȡưƥࡦǡˤäƲۥޥ˥ץѥƥϤȤǤޤ
+\fIrmid\fRコマンドの子プロセス(起動グループ)が作成されたときに、それぞれの子プロセスにコマンドライン引数として渡されるオプションを指定します。たとえば、次のように指定すると、起動システム・デーモンによって生成される各仮想マシンにプロパティを渡すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -158,7 +158,7 @@
 .if n \{\
 .RE
 .\}
-ޥɥ饤ҥץϤǽϡǥХåԤǤȤСΥޥɤǤϡ٤ƤλJVMserver\-call󥰤ǽǤ
+コマンドライン引数を子プロセスに渡す機能は、デバッグを行う場合に便利です。たとえば、次のコマンドでは、すべての子JVMでserver\-callロギングが可能です。
 .sp
 .if n \{\
 .RS 4
@@ -173,7 +173,7 @@
 .PP
 \-J\fIoption\fR
 .RS 4
-RMID¹ԤƤJava󥿥ץ꥿ϤץꤷޤȤС\fIrmid\fRޥɤ\fIrmid\&.policy\fRȤ̾ΥݥꥷեѤ褦˻ꤹˤϡ\fIrmid\fRΥޥɥ饤\fI\-J\fRץѤơ\fIjava\&.security\&.policy\fRץѥƥޤ򼨤ޤ
+RMIDを実行しているJavaインタプリタに渡すオプションを指定します。たとえば、\fIrmid\fRコマンドが\fIrmid\&.policy\fRという名前のポリシー・ファイルを使用するように指定するには、\fIrmid\fRのコマンドラインで\fI\-J\fRオプションを使用して、\fIjava\&.security\&.policy\fRプロパティを定義します。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -188,7 +188,7 @@
 .PP
 \-J\-Dsun\&.rmi\&.activation\&.execPolicy=\fIpolicy\fR
 .RS 4
-ư롼פ¹Ԥ뤳ȤˤʤJVMεư˻Ѥ륳ޥɤӥޥɥ饤󡦥ץå뤿ˡRMIDѤݥꥷꤷޤΥץϡJava RMIưǡOracleμΤߤ¸ߤ뤳ȤդƤޥɥ饤ˤΥץѥƥꤷʤ硢̤\fI\-J\-Dsun\&.rmi\&.activation\&.execPolicy=default\fRꤷƱˤʤޤ\fIpolicy\fR˻ǽͤϡ\fIdefault\fR\fIpolicyClassName\fRޤ\fInone\fRǤ
+起動グループが実行されることになるJVMの起動に使用するコマンドおよびコマンドライン・オプションをチェックするために、RMIDが採用するポリシーを指定します。このオプションは、Java RMI起動デーモンのOracleの実装のみに存在することに注意してください。コマンドラインにこのプロパティを指定しない場合、結果は\fI\-J\-Dsun\&.rmi\&.activation\&.execPolicy=default\fRを指定した場合と同じになります。\fIpolicy\fRに指定可能な値は、\fIdefault\fR、\fIpolicyClassName\fRまたは\fInone\fRです。
 .sp
 .RS 4
 .ie n \{\
@@ -198,35 +198,35 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǥե
+デフォルト
 .sp
-\fIdefault\fRޤ̤ͤ\fIexecPolicy\fRξ硢\fIrmid\fRޥɤ¹ԤǤΤϡ\fIrmid\fRޥɤѤ륻ƥݥꥷեǡ¹Ԥ븢¤\fIrmid\fRͿƤ륳ޥɤӥޥɥ饤󡦥ץΤߤǤǥեȤμ¹ԥݥꥷǻѤǤΤϡǥեȤεư롼׼ΤߤǤ
+\fIdefault\fRまたは未指定値の\fIexecPolicy\fRの場合、\fIrmid\fRコマンドが実行できるのは、\fIrmid\fRコマンドが使用するセキュリティ・ポリシー・ファイルの中で、実行する権限が\fIrmid\fRに与えられているコマンドおよびコマンドライン・オプションのみです。デフォルトの実行ポリシーで使用できるのは、デフォルトの起動グループ実装のみです。
 .sp
-\fIrmid\fRޥɤϡư롼ѤJVMưȤˡΥ롼פˤĤϿ줿ư롼׵һҤǤ\fIActivationGroupDesc\fRξѤޤ롼׵һҤϡ\fIActivationGroupDesc\&.CommandEnvironment\fRꤷޤ(άǽ)ˤϡư롼פ򳫻Ϥ륳ޥɤȡΥޥɥ饤ɲäǤ륳ޥɥ饤󡦥ץ󤬴ޤޤƤޤǥեȤǤϡ\fIrmid\fRޥɤ\fIjava\&.home\fRˤ\fIjava\fRޥɤѤޤ롼׵һҤˤϡޥɥ饤˥ץȤɲäץѥƥС饤ɤޤޤޤ(\fI\-D<property>=<value>\fRȤޤ)\fIcom\&.sun\&.rmi\&.rmid\&.ExecPermission\fR¤\fIrmid\fRޥɤˡư롼פ򳫻Ϥ뤿˥롼׵һҤ\fICommandEnvironment\fRǻꤵ줿ޥɤ¹Ԥ븢¤Ϳޤ\fIcom\&.sun\&.rmi\&.rmid\&.ExecOptionPermission\fR¤ϵư롼פγϻˡ롼׵һҤǥץѥƥС饤ɤȤơޤ\fICommandEnvironment\fRǥץȤƻꤵ줿ޥɥ饤󡦥ץ\fIrmid\fRޥɤѤ뤳ȤĤޤ\fIrmid\fRޥɤ͡ʥޥɤӥץ¹Ԥ븢¤Ϳ硢\fIExecPermission\fR\fIExecOptionPermission\fR򤹤٤ƤΥɡͿɬפޤ
+\fIrmid\fRコマンドは、起動グループ用のJVMを起動するときに、そのグループについて登録された起動グループ記述子である\fIActivationGroupDesc\fR内の情報を使用します。グループ記述子は、\fIActivationGroupDesc\&.CommandEnvironment\fRを指定します(省略可能)。これには、起動グループを開始するコマンドと、そのコマンドラインに追加できるコマンドライン・オプションが含まれています。デフォルトでは、\fIrmid\fRコマンドは\fIjava\&.home\fRにある\fIjava\fRコマンドを使用します。グループ記述子には、コマンドラインにオプションとして追加されるプロパティ・オーバーライドも含まれます(\fI\-D<property>=<value>\fRとして定義されます)。\fIcom\&.sun\&.rmi\&.rmid\&.ExecPermission\fR権限は\fIrmid\fRコマンドに、起動グループを開始するためにグループ記述子の\fICommandEnvironment\fRで指定されたコマンドを実行する権限を付与します。\fIcom\&.sun\&.rmi\&.rmid\&.ExecOptionPermission\fR権限は起動グループの開始時に、グループ記述子でプロパティ・オーバーライドとして、または\fICommandEnvironment\fRでオプションとして指定されたコマンドライン・オプションを、\fIrmid\fRコマンドが使用することを許可します。\fIrmid\fRコマンドに様々なコマンドおよびオプションを実行する権限を付与する場合、権限\fIExecPermission\fRおよび\fIExecOptionPermission\fRをすべてのコード・ソースに付与する必要があります。
 .sp
 \fBExecPermission\fR
 .sp
-\fIExecPermission\fR饹ϡư롼פ򳫻Ϥ뤿\fIrmid\fRޥɤΥޥɤ¹Ԥ븢¤ɽޤ
+\fIExecPermission\fRクラスは、起動グループを開始するために\fIrmid\fRコマンドが特定のコマンドを実行する権限を表します。
 .sp
-\fBʸ\fR:
-\fIExecPermission\fR̾ϡ\fIrmid\fRޥɤ˼¹ԤĤ륳ޥɤΥѥ̾Ǥå(/)ӥꥹ(*)ǽѥ̾ϡΥǥ쥯ȥ˴ޤޤ뤹٤ƤΥե򼨤ޤåϥեڤʸ\fIFile\&.separatorChar\fRǤå(/)ӥޥʥ(\-)ǽѥ̾ϡΥǥ쥯ȥ˴ޤޤ뤹٤ƤΥեȥ֥ǥ쥯ȥ(ƵŪ)򼨤ޤѥ̤̾ʥȡ\fI<<ALL FILES>>\fRꤷϡǤդΥե򼨤ޤ
+\fB構文\fR:
+\fIExecPermission\fRの名前は、\fIrmid\fRコマンドに実行を許可するコマンドのパス名です。スラッシュ(/)およびアスタリスク(*)で終わるパス名は、そのディレクトリに含まれるすべてのファイルを示します。スラッシュはファイル区切り文字\fIFile\&.separatorChar\fRです。スラッシュ(/)およびマイナス符号(\-)で終わるパス名は、そのディレクトリに含まれるすべてのファイルとサブディレクトリ(再帰的に)を示します。パス名に特別なトークン\fI<<ALL FILES>>\fRを指定した場合は、任意のファイルを示します。
 .sp
-ѥ̾˥ꥹ(*)ꤷϡߤΥǥ쥯ȥΤ٤ƤΥե򼨤ޤѥ̾˥ޥʥ(\-)ꤷϡߤΥǥ쥯ȥΤ٤ƤΥե뤪(ƵŪ)ߤΥǥ쥯ȥ˴ޤޤ뤹٤ƤΥեȥ֥ǥ쥯ȥ򼨤ޤ
+パス名にアスタリスク(*)を指定した場合は、現在のディレクトリ内のすべてのファイルを示します。パス名にマイナス符号(\-)を指定した場合は、現在のディレクトリ内のすべてのファイルおよび(再帰的に)現在のディレクトリに含まれるすべてのファイルとサブディレクトリを示します。
 .sp
 \fBExecOptionPermission\fR
 .sp
-\fIExecOptionPermission\fR饹ϡư롼פ򳫻ϤȤ\fIrmid\fRޥɤΥޥɥ饤󡦥ץѤǤ븢¤ɽޤ\fIExecOptionPermission\fR̾ϡޥɥ饤󡦥ץͤǤ
+\fIExecOptionPermission\fRクラスは、起動グループを開始するときに\fIrmid\fRコマンドで特定のコマンドライン・オプションを使用できる権限を表します。\fIExecOptionPermission\fRの名前は、コマンドライン・オプションの値です。
 .sp
-\fBʸ\fR: ץǤϡ磻ɥɤŪ˥ݡȤޤꥹϡ磻ɥɡޥåɽޤꥹ(*)ϡץ̾ΤΤȤƻѤǤޤĤޤꡢǤդΥץɽȤǤޤޤץ̾˻Ѥ뤳ȤǤޤɥå(\&.)(=)ľ˥ꥹ(*)ꤹɬפޤ
+\fB構文\fR: オプションでは、ワイルドカードが限定的にサポートされます。アスタリスクは、ワイルドカード・マッチを表します。アスタリスク(*)は、オプション名そのものとして使用できます。つまり、任意のオプションを表すことができます。また、オプション名の末尾に使用することもできます。ただし、ドット(\&.)か等号(=)の直後にアスタリスク(*)を指定する必要があります。
 .sp
-:
-\fI*\fR\fI\-Dmydir\&.*\fR\fI\-Da\&.b\&.c=*\fRͭǤ\fI*mydir\fR\fI\-Da*b\fR\fIab*\fR̵Ǥ
+例:
+\fI*\fRや\fI\-Dmydir\&.*\fRや\fI\-Da\&.b\&.c=*\fRは有効ですが、\fI*mydir\fRや\fI\-Da*b\fRや\fIab*\fRは無効です。
 .sp
-\fBrmidΥݥꥷե\fR
+\fBrmidのポリシー・ファイル\fR
 .sp
-\fIrmid\fRޥɤ͡ʥޥɤӥץ¹Ԥ븢¤Ĥϡ\fIExecPermission\fR\fIExecOptionPermission\fR򤹤٤ƤΥɡͿɬפޤ(Ū)θ¤åΤ\fIrmid\fRޥɤΤߤʤΤǡθ¤ŪͿƤǤ
+\fIrmid\fRコマンドに様々なコマンドおよびオプションを実行する権限を許可する場合は、権限\fIExecPermission\fRおよび\fIExecOptionPermission\fRをすべてのコード・ソースに付与する必要があります(汎用的に)。これらの権限をチェックするのは\fIrmid\fRコマンドのみなので、これらの権限を汎用的に付与しても安全です。
 .sp
-\fIrmid\fRޥɤ˳Ƽμ¹Ը¤Ϳݥꥷե򡢼˼ޤ
+\fIrmid\fRコマンドに各種の実行権限を付与するポリシー・ファイルの例を、次に示します。
 .sp
 .if n \{\
 .RS 4
@@ -252,11 +252,11 @@
 .if n \{\
 .RE
 .\}
-ǽͿƤ븢¤ϡ\fIrmid\fRޥɤФѥ̾ˤŪ˻ꤵ\fIjava\fRޥɤ1\&.7\&.0꡼μ¹ԤĤޤǥեȤǤϡ\fIjava\&.home\fRˤС\fIjava\fRޥɤѤޤ\fIrmid\fRޥɤѤΤƱС󤬻Ѥ뤿ᡢΥޥɤϡݥꥷեǻꤹɬפϤޤ2ܤθ¤ϡ\fIrmid\fRޥɤФơǥ쥯ȥ\fI/files/apps/rmidcmds\fRǤդΥޥɤμ¹Ը¤Ĥޤ
+最初に付与されている権限は、\fIrmid\fRコマンドに対し、パス名により明示的に指定される\fIjava\fRコマンドの1\&.7\&.0リリースの実行を許可します。デフォルトでは、\fIjava\&.home\fRにあるバージョンの\fIjava\fRコマンドを使用します。\fIrmid\fRコマンドが使用するのと同じバージョンが使用されるため、そのコマンドは、ポリシー・ファイルで指定する必要はありません。2番目の権限は、\fIrmid\fRコマンドに対して、ディレクトリ\fI/files/apps/rmidcmds\fR内の任意のコマンドの実行権限を許可します。
 .sp
-3ܤͿƤ븢\fIExecOptionPermission\fRϡ\fIrmid\fRޥɤФơƥݥꥷե\fI/files/policies/group\&.policy\fRȤƤ뵯ư롼פγϤĤޤθ¤ϡư롼פ\fIjava\&.security\&.debug property\fRѤ뤳ȤĤƤޤǸθ¤ϡư롼פ\fIsun\&.rmi property\fR̾γǤդΥץѥƥѤ뤳ȤĤƤޤ
+3番目に付与されている権限\fIExecOptionPermission\fRは、\fIrmid\fRコマンドに対して、セキュリティ・ポリシー・ファイルを\fI/files/policies/group\&.policy\fRとして定義している起動グループの開始を許可します。次の権限は、起動グループが\fIjava\&.security\&.debug property\fRを使用することを許可しています。最後の権限は、起動グループが\fIsun\&.rmi property\fR名の階層内の任意のプロパティを使用することを許可しています。
 .sp
-ݥꥷեꤷ\fIrmid\fRޥɤưˤϡ\fIrmid\fRΥޥɥ饤\fIjava\&.security\&.policy\fRץѥƥꤹɬפޤ򼨤ޤ
+ポリシー・ファイルを指定して\fIrmid\fRコマンドを起動するには、\fIrmid\fRのコマンドラインで\fIjava\&.security\&.policy\fRプロパティを指定する必要があります。次に例を示します。
 .sp
 \fIrmid \-J\-Djava\&.security\&.policy=rmid\&.policy\fR\&.
 .RE
@@ -271,9 +271,9 @@
 .\}
 <policyClassName>
 .sp
-ǥեȤưǤϽʬʽʤ硢Ԥϡ\fIrmid\fRεưˡ\fIcheckExecCommand\fR᥽åɤ°륯饹̾ꤷơ\fIrmid\fRޥɤ¹Ԥ륳ޥɤå뤳ȤǤޤ
+デフォルトの動作では十分な柔軟性が得られない場合、管理者は、\fIrmid\fRの起動時に、\fIcheckExecCommand\fRメソッドが所属するクラスの名前を指定して、\fIrmid\fRコマンドが実行するコマンドをチェックすることができます。
 .sp
-\fIpolicyClassName\fRˤϡʤΥ󥹥ȥ饯Τ褦\fIcheckExecCommand\fR᥽åɤƤpublic饹ꤷޤ
+\fIpolicyClassName\fRには、引数なしのコンストラクタを持ち、次のような\fIcheckExecCommand\fRメソッドを実装しているpublicクラスを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -285,7 +285,7 @@
 .if n \{\
 .RE
 .\}
-ư롼פ򳫻Ϥˡ\fIrmid\fRޥɤϡݥꥷ\fIcheckExecCommand\fR᥽åɤƤӽФޤΤȤư롼פεһҤȡư롼פ򳫻Ϥ뤿δʥޥɤޤ򤽤Υ᥽åɤϤޤ\fIcheckExecCommand\fR\fISecurityException\fR򥹥ȡ\fIrmid\fRޥɤϤεư롼פ򳫻Ϥ֥ȤεưԤƤƽФ¦ˤ\fIActivationException\fRޤ
+起動グループを開始する前に、\fIrmid\fRコマンドは、ポリシーの\fIcheckExecCommand\fRメソッドを呼び出します。このとき、起動グループの記述子と、起動グループを開始するための完全なコマンドを含む配列をそのメソッドに渡します。\fIcheckExecCommand\fRが\fISecurityException\fRをスローすると、\fIrmid\fRコマンドはその起動グループを開始せず、オブジェクトの起動を試行している呼出し側には\fIActivationException\fRがスローされます。
 .RE
 .sp
 .RS 4
@@ -298,18 +298,18 @@
 .\}
 none
 .sp
-\fIsun\&.rmi\&.activation\&.execPolicy\fRץѥƥͤ\fInone\fRξ硢\fIrmid\fRޥɤϡư롼פ򳫻Ϥ륳ޥɤޤäڤޤ
+\fIsun\&.rmi\&.activation\&.execPolicy\fRプロパティの値が\fInone\fRの場合、\fIrmid\fRコマンドは、起動グループを開始するコマンドをまったく検証しません。
 .RE
 .RE
 .PP
 \-log \fIdir\fR
 .RS 4
-ưƥࡦǡ󤬥ǡ١ӴϢ񤭹Τ˻Ѥǥ쥯ȥ̾ꤷޤǥեȤǤϡ\fIrmid\fRޥɤ¹Ԥǥ쥯ȥˡlogȤǥ쥯ȥ꤬ޤ
+起動システム・デーモンがデータベースおよび関連情報を書き込むのに使用するディレクトリの名前を指定します。デフォルトでは、\fIrmid\fRコマンドを実行したディレクトリに、logというログ・ディレクトリが作成されます。
 .RE
 .PP
 \-port \fIport\fR
 .RS 4
-쥸ȥ꤬ѤݡȤꤷޤưƥࡦǡϡΥ쥸ȥǡ\fIjava\&.rmi\&.activation\&.ActivationSystem\fRȤ̾\fIActivationSystem\fRХɤޤ롦ޥ\fIActivationSystem\fRϡΤ褦\fINaming\&.lookup\fR᥽åɤƤӽФȤˤäƼǤޤ
+レジストリが使用するポートを指定します。起動システム・デーモンは、このレジストリの中で、\fIjava\&.rmi\&.activation\&.ActivationSystem\fRという名前で\fIActivationSystem\fRをバインドします。ローカル・マシン上の\fIActivationSystem\fRは、次のように\fINaming\&.lookup\fRメソッドを呼び出すことによって取得できます。
 .sp
 .if n \{\
 .RS 4
@@ -328,16 +328,16 @@
 .PP
 \-stop
 .RS 4
-\fI\-port\fRץˤäƻꤵ줿ݡȤΡߤ\fIrmid\fRޥɤθƽФߤޤݡȤꤵƤʤϡΥץϥݡ1098Ǽ¹ԤƤ\fIrmid\fRθƽФߤޤ
+\fI\-port\fRオプションによって指定されたポートの、現在の\fIrmid\fRコマンドの呼出しを停止します。ポートが指定されていない場合は、このオプションはポート1098で実行されている\fIrmid\fRの呼出しを停止します。
 .RE
-.SH "Ķѿ"
+.SH "環境変数"
 .PP
 CLASSPATH
 .RS 4
-桼饹ؤΥѥ򥷥ƥ˻ꤷޤǥ쥯ȥϥǶڤޤ:
+ユーザー定義クラスへのパスをシステムに指定します。ディレクトリはコロンで区切られます。例:
 \fI\&.:/usr/local/java/classes\fR
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/rmiregistry.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/rmiregistry.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: rmiregistry
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "rmiregistry" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "rmiregistry" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-rmiregistry \- ߤΥۥȤλꤷݡȾ˥⡼ȡ֥ȡ쥸ȥ򳫻Ϥޤ
-.SH ""
+rmiregistry \- 現在のホストの指定したポート上にリモート・オブジェクト・レジストリを開始します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,11 +64,11 @@
 .PP
 \fIport\fR
 .RS 4
-⡼ȡ֥ȡ쥸ȥ򳫻Ϥ븽ߤΥۥȾ\fIport\fRο
+リモート・オブジェクト・レジストリを開始する現在のホスト上の\fIport\fRの数。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIrmiregistry\fRޥɤϡߤΥۥȤλꤷݡȾ˥⡼ȡ֥ȡ쥸ȥϤޤportλά硢쥸ȥϥݡ1099dzϤޤ\fIrmiregistry\fRޥɤˡϵǽϤޤ̾ϥХå饦ɤǼ¹Ԥޤ򼨤ޤ
+\fIrmiregistry\fRコマンドは、現在のホストの指定したポート上にリモート・オブジェクト・レジストリを作成し、開始します。portの指定を省略した場合、レジストリはポート1099で開始します。\fIrmiregistry\fRコマンドに、出力機能はありません。通常、これはバックグラウンドで実行されます。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -80,20 +80,20 @@
 .RE
 .\}
 .PP
-⡼ȡ֥ȡ쥸ȥϡ֡ȥȥåפΥ͡ࡦӥǤƱۥȤRMIС⡼ȡ֥Ȥ̾˥Хɤ뤿˻Ѥޤˡ뤪ӥ⡼ȡۥȤΥ饤Ȥϥ⡼ȡ֥Ȥ򸡺⡼ȡ᥽åɤθƽФԤޤ
+リモート・オブジェクト・レジストリは、ブートストラップのネーム・サービスです。同一ホストのRMIサーバーが、リモート・オブジェクトを名前にバインドするために使用されます。次に、ローカルおよびリモート・ホストのクライアントはリモート・オブジェクトを検索し、リモート・メソッドの呼出しを行います。
 .PP
-쥸ȥϡŪˡǽΥ⡼ȡ֥Ȥΰ֤ꤷޤǡץꥱϥ᥽åɤƤӽФɬפޤθ塢Υ֥ȤϥץꥱΥݡȤ󶡤¾Υ֥Ȥõޤ
+レジストリは、一般的に、最初のリモート・オブジェクトの位置を指定します。そこで、アプリケーションはメソッドを呼び出す必要があります。その後、そのオブジェクトはアプリケーション指定のサポートを提供し、他のオブジェクトを探します。
 .PP
-\fIjava\&.rmi\&.registry\&.LocateRegistry\fR饹Υ᥽åɤϡ롦ۥȡޤϥ롦ۥȤȥݡȤư쥸ȥ뤿˻Ѥޤ
+\fIjava\&.rmi\&.registry\&.LocateRegistry\fRクラスのメソッドは、ローカル・ホスト、またはローカル・ホストとポートで動作するレジストリを取得するために使用されます。
 .PP
-\fIjava\&.rmi\&.Naming\fR饹URL١᥽åɤϥ쥸ȥФ¹ԤǤդΥۥȤӥ롦ۥȤǤΥ⡼ȡ֥Ȥθ˻ѤǤޤñ̾(ʸ)⡼ȡ֥Ȥ˥Хɤ̾⡼ȡ֥Ȥ˺ƥХɤ(ŤХɤ򥪡С饤)⡼ȡ֥Ȥ򥢥Хɤ쥸ȥ˥ХɤƤURLꥹɽޤ
-.SH "ץ"
+\fIjava\&.rmi\&.Naming\fRクラスのURLベース・メソッドはレジストリに対して操作を実行し、任意のホストおよびローカル・ホストでのリモート・オブジェクトの検索に使用できます。単純名(文字列)をリモート・オブジェクトにバインドし、新しい名前をリモート・オブジェクトに再バインドし(古いバインドをオーバーライド)、リモート・オブジェクトをアンバインドし、レジストリにバインドされているURLをリスト表示します。
+.SH "オプション"
 .PP
 \-J
 .RS 4
-JavaץȤȤ˻Ѥơ\fI\-J\fRθ³ץJava󥿥ץ꥿˰Ϥޤ(\fI\-J\fRȥץδ֤˥ڡޤ)
+Javaオプションとともに使用して、\fI\-J\fRの後ろに続くオプションをJavaインタプリタに引き渡します(\fI\-J\fRとオプションの間にスペースは入れません)。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -114,7 +114,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjava\&.rmi\&.registry\&.LocateRegistry\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/registry/LocateRegistry\&.html)
+\fI「java\&.rmi\&.registry\&.LocateRegistry」\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/registry/LocateRegistry\&.html)
 .RE
 .sp
 .RS 4
@@ -125,7 +125,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjava\&.rmi\&.Naming class description\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/Naming\&.html)
+\fI「java\&.rmi\&.Naming class description」\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/Naming\&.html)
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/schemagen.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/schemagen.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: schemagen
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "schemagen" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "schemagen" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-schemagen \- Java饹ǻȤƤ͡ॹڡȤ˥ޤޤ
-.SH ""
+schemagen \- Javaクラス内で参照されているネームスペースごとにスキーマを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,19 +64,19 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIjava\-files\fR
 .RS 4
-Java饹ե롣
+処理するJavaクラス・ファイル。
 .RE
-.SH ""
+.SH "説明"
 .PP
-ޡͥ졼ϡJava饹ǻȤƤ͡ॹڡȤ1ĤΥޡեޤߡ륹ޡե̾Ǥޤ󡣥ޡե̾椹ϡhttp://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/schemagenTask\&.htmlˤ
-Using SchemaGen with Antפ򻲾ȤƤ
+スキーマ・ジェネレータは、Javaクラス内で参照されているネームスペースごとに1つのスキーマ・ファイルを作成します。現在、生成されるスキーマ・ファイルの名前は制御できません。スキーマ・ファイル名を制御する場合は、http://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/schemagenTask\&.htmlにある
+「Using SchemaGen with Ant」を参照してください
 .PP
-ץåȥեbinǥ쥯ȥˤŬڤ\fIschemagen\fR롦ץȤѤơޡͥ졼ưޤߤΥޡͥ졼ϡJavaեȥ饹եΤǤޤ
+プラットフォームのbinディレクトリにある適切な\fIschemagen\fRシェル・スクリプトを使用して、スキーマ・ジェネレータを起動します。現在のスキーマ・ジェネレータは、Javaソース・ファイルとクラス・ファイルのいずれも処理できます。
 .sp
 .if n \{\
 .RS 4
@@ -89,44 +89,44 @@
 .RE
 .\}
 .PP
-javaե뤬¾Υ饹򻲾ȤƤ硢Υ饹˥ƥ\fICLASSPATH\fRĶѿǥǤɬפޤޤϡ饹ѥץꤷ\fIschemagen\fRޥɡ饤ǻꤹɬפޤץ򻲾ȤƤȤե˥ǤʤޤϻȤե뤬ꤵƤʤ硢ޤ˥顼ɽޤ
-.SH "ץ"
+javaファイルが他のクラスを参照している場合、それらのクラスにシステム\fICLASSPATH\fR環境変数でアクセスできる必要があります。または、クラス・パス・オプションを指定して\fIschemagen\fRコマンド・ラインで指定する必要があります。オプションを参照してください。参照されるファイルにアクセスできない、または参照されるファイルが指定されていない場合、スキーマの生成時にエラーが表示されます。
+.SH "オプション"
 .PP
 \-d \fIpath\fR
 .RS 4
-\fIschemagen\fRޥɤץå\fIjavac\fR饹ե֤ꡣ
+\fIschemagen\fRコマンドがプロセッサ生成および\fIjavac\fR生成クラス・ファイルを配置する場所。
 .RE
 .PP
 \-cp \fIpath\fR
 .RS 4
-\fIschemagen\fRޥɤ桼ե֤ꡣ
+\fIschemagen\fRコマンドがユーザー指定ファイルを配置する場所。
 .RE
 .PP
 \-classpath \fIpath\fR
 .RS 4
-\fIschemagen\fRޥɤ桼ե֤ꡣ
+\fIschemagen\fRコマンドがユーザー指定ファイルを配置する場所。
 .RE
 .PP
 \-encoding \fIencoding\fR
 .RS 4
-\fIapt\fRޤ\fIjavac\fRޥɤθƽФ˻Ѥ륨󥳡ǥ󥰤ꤷޤ
+\fIapt\fRまたは\fIjavac\fRコマンドの呼出しに使用するエンコーディングを指定します。
 .RE
 .PP
 \-episode \fIfile\fR
 .RS 4
-ѥ뤴Ȥ˥ԥɡեޤ
+コンパイルごとにエピソード・ファイルを生成します。
 .RE
 .PP
 \-version
 .RS 4
-꡼ɽޤ
+リリース情報を表示します。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/serialver.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/serialver.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: serialver
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "serialver" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "serialver" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-serialver \- ꤷ饹Υꥢ롦СUIDᤷޤ
-.SH ""
+serialver \- 指定したクラスのシリアル・バージョンUIDを戻します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,35 +64,35 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclassnames\fR
 .RS 4
-\fIserialVersionUID\fR᤹饹Ǥ
+\fIserialVersionUID\fRを戻すクラスです。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIserialver\fRޥɤϡ1İʾΥ饹\fIserialVersionUID\fRŸƤ륯饹إԡΤŬ֤ޤʤǸƤӽФ줿硢\fIserialver\fRޥɤϻΨԤϤޤ
-.SH "ץ"
+\fIserialver\fRコマンドは、1つ以上のクラスの\fIserialVersionUID\fRを、展開しているクラスへコピーするのに適した形式で返します。引数なしで呼び出された場合、\fIserialver\fRコマンドは使用率行を出力します。
+.SH "オプション"
 .PP
 \-classpath \fIpath\-files\fR
 .RS 4
-ץꥱΥ饹ӥ꥽θѥꤷޤ饹ȥ꥽򥳥(:)Ƕڤޤ
+アプリケーションのクラスおよびリソースの検索パスを設定します。クラスとリソースをコロン(:)で区切ります。
 .RE
 .PP
 \-show
 .RS 4
-ñʥ桼󥿥եɽޤΥ饹̾ϤơEnterɽץܥ򲡤\fIserialVersionUID\fRɽޤ
+簡単なユーザー・インタフェースを表示します。完全指定のクラス名を入力して、Enterキーか「表示」ボタンを押し、\fIserialVersionUID\fRを表示します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH ""
+.SH "注意"
 .PP
-\fIserialver\fRޥɤϡꤵ줿饹򤽤βۥޥɤ߹ǽޤǥեȤǤϥƥޥ͡ϹԤޤ󡣿Ǥʤ饹ȤȤ\fIserialver\fRޥɤ¹ԤˤϡΥץѤƥƥޥ͡Ǥޤ
+\fIserialver\fRコマンドは、指定されたクラスをその仮想マシン内に読み込んで初期化しますが、デフォルトではセキュリティ・マネージャの設定は行いません。信頼できないクラスとともに\fIserialver\fRコマンドを実行する場合には、次のオプションを使用してセキュリティ・マネージャを設定できます。
 .sp
 .if n \{\
 .RS 4
@@ -104,7 +104,7 @@
 .RE
 .\}
 .PP
-ɬפǤСΥץѤƥƥݥꥷǤޤ
+必要であれば、次のオプションを使用してセキュリティ・ポリシーを指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -115,7 +115,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -136,8 +136,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/api/java/io/ObjectStreamClass\&.htmlˤ
-\fIjava\&.io\&.ObjectStream\fR饹
+http://docs\&.oracle\&.com/javase/8/docs/api/java/io/ObjectStreamClass\&.htmlにある
+\fIjava\&.io\&.ObjectStream\fRクラス記述
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/servertool.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/servertool.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: servertool
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "servertool" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "servertool" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-servertool \- ȯԤ³СϿϿưߤ뤿λȤ䤹桼󥿥ե󶡤ޤ
-.SH ""
+servertool \- 開発者が永続サーバーを登録、登録解除、起動、停止するための使いやすいユーザー・インタフェースを提供します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,35 +64,35 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 commands
 .RS 4
-ޥɥ饤󡦥ޥɡޥɤ򻲾ȤƤ
+コマンドライン・コマンド。コマンドを参照してください。
 .RE
 .PP
 \fIservertool\fR\fIservertool >\fR\fIservertool >\fR
-.SH ""
+.SH "説明"
 .PP
-\fIservertool\fRޥɤϡȯԤ³СϿϿưߤ뤿Υޥɥ饤󡦥󥿥ե󶡤ޤޥɥ饤󡦥ޥɤѤȡС˴ؤ͡׾Ǥޤޥɤ򻲾ȤƤ
-.SH "ץ"
+\fIservertool\fRコマンドは、開発者が永続サーバーを登録、登録解除、起動、停止するためのコマンドライン・インタフェースを提供します。コマンドライン・コマンドを使用すると、サーバーに関する様々な統計情報を取得できます。コマンドを参照してください。
+.SH "オプション"
 .PP
 \-ORBInitialHost \fInameserverhost\fR
 .RS 4
-ΥץɬܤǤ͡ࡦС¹Ԥ졢忮ꥯȤꥹ˥󥰤ۥȡޥꤷޤ\fInameserverhost\fRͤϡ\fIorb\fR¹Ԥ졢ꥯȤꥹ˥󥰤ƤݡȤꤹɬפޤΥץꤷʤ硢ͤϥǥեȤ\fIlocalhost\fRꤵޤ\fIorbd\fR\fIservertool\fRۤʤޥǼ¹ԤƤϡ\fIorbd\fR¹ԤƤۥȤ̾ޤIPɥ쥹ꤹɬפޤ
+このオプションは必須です。ネーム・サーバーが実行され、着信リクエストをリスニングするホスト・マシンを指定します。\fInameserverhost\fR値は、\fIorb\fRが実行され、リクエストをリスニングしているポートを指定する必要があります。このオプションを指定しない場合、値はデフォルトで\fIlocalhost\fRに設定されます。\fIorbd\fRと\fIservertool\fRが異なるマシン上で実行されている場合は、\fIorbd\fRが実行されているホストの名前またはIPアドレスを指定する必要があります。
 .sp
-\fB:\fR
-Oracle SolarisǤϡ1024꾮ݡȾǥץ򳫻Ϥˤϡroot桼ˤʤɬפޤ\fInameserverport\fRͤˤϡ1024ʾΥݡֹѤ뤳Ȥᤷޤ
+\fB注意:\fR
+Oracle Solarisでは、1024より小さいポート上でプロセスを開始するには、rootユーザーになる必要があります。\fInameserverport\fR値には、1024以上のポート番号を使用することをお薦めします。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ޥ"
+.SH "コマンド"
 .PP
-\fIservertool\fRޥɤϡޥɥ饤󡦥ޥɤѤơޤϻѤ˵ưǤޤ
+\fIservertool\fRコマンドは、コマンドライン・コマンドを使用して、または使用せずに起動できます。
 .sp
 .RS 4
 .ie n \{\
@@ -102,8 +102,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIservertool\fRεư˥ޥɤꤷʤä硢ޥɥ饤󡦥ġ˥ޥϤ\fIservertool\fRץץȤɽޤ:
-\fIservertool >\fR
+\fIservertool\fRの起動時にコマンドを指定しなかった場合、コマンドライン・ツールにコマンド入力を求める\fIservertool\fRプロンプトが表示されます:
+\fIservertool >\fR。
 .RE
 .sp
 .RS 4
@@ -114,75 +114,75 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIservertool\fRεư˥ޥɤꤷ硢Java IDL Server Toolưƥޥɤ¹Ԥλޤ
+\fIservertool\fRの起動時にコマンドを指定した場合、Java IDL Server Toolが起動してコマンドを実行し、終了します。
 .RE
 .PP
 register \-server \fIserver\-class\-name\fR \-classpath \fIclasspath\-to\-server\fR [ \-applicationName \fIapplication\-name\fR \-args \fIargs\-to\-server\fR \-vmargs \fIflags\-for\-JVM\fR ]
 .RS 4
-Object Request Broker Daemon (ORBD)˿³СϿޤС̤Ͽξ硢ϿƥƥֲޤΥޥɤˤäơ\fI\-server\fRץǼ̤륵С\fIᥤ\fR饹ǥ󥹥ȡ롦᥽åɤƤӽФޤΥ󥹥ȡ롦᥽åɤϡ\fIpublic static void install(org\&.omg\&.CORBA\&.ORB)\fRˤʤäƤɬפޤ󥹥ȡ롦᥽åɤϥץǤꡢȯԤϥǡ١ޤκʤȼΥС󥹥ȡưǤޤ
+Object Request Broker Daemon (ORBD)に新規永続サーバーを登録します。サーバーが未登録の場合、登録してアクティブ化します。このコマンドによって、\fI\-server\fRオプションで識別されるサーバーの\fIメイン\fR・クラス内でインストール・メソッドが呼び出されます。このインストール・メソッドは、\fIpublic static void install(org\&.omg\&.CORBA\&.ORB)\fRになっている必要があります。インストール・メソッドはオプションであり、開発者はデータベース・スキーマの作成など独自のサーバー・インストール動作を指定できます。
 .RE
 .PP
 unregister \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR
 .RS 4
-СIDޤϥץꥱ̾ǡСORBDϿޤΥޥɤˤäơ\fI\-server\fRץǼ̤륵С\fIᥤ\fR饹ǥ󥤥󥹥ȡ롦᥽åɤƤӽФޤ
-\fIuninstall\fR᥽åɤϡ\fIpublic static void uninstall(org\&.omg\&.CORBA\&.ORB)\fRˤʤäƤɬפޤ\fIuninstall\fR᥽åɤϥץǤꡢȯԤ\fIinstall\fR᥽åɤưμäʤɡȼΥС󥤥󥹥ȡưǤޤ
+サーバーIDまたはアプリケーション名で、サーバーをORBDから登録解除します。このコマンドによって、\fI\-server\fRオプションで識別されるサーバーの\fIメイン\fR・クラス内でアンインストール・メソッドが呼び出されます。
+\fIuninstall\fRメソッドは、\fIpublic static void uninstall(org\&.omg\&.CORBA\&.ORB)\fRになっている必要があります。\fIuninstall\fRメソッドはオプションであり、開発者は\fIinstall\fRメソッドの動作の取消など、独自のサーバー・アンインストール動作を指定できます。
 .RE
 .PP
 getserverid \-applicationName \fIapplication\-name\fR
 .RS 4
-\fIapplication\-name\fRͤб륵СID֤ޤ
+\fIapplication\-name\fR値に対応するサーバーIDを返します。
 .RE
 .PP
 list
 .RS 4
-ORBDϿƤ뤹٤Ƥα³С˴ؤɽޤ
+ORBDに登録されているすべての永続サーバーに関する情報を一覧表示します。
 .RE
 .PP
 listappnames
 .RS 4
-ORBDϿƤ뤹٤ƤΥСΥץꥱ̾ɽޤ
+現在ORBDに登録されているすべてのサーバーのアプリケーション名を一覧表示します。
 .RE
 .PP
 listactive
 .RS 4
-ORBDˤäƵư졢߼¹ԤƤ뤹٤Ƥα³С˴ؤɽޤ
+ORBDによって起動され、現在実行されているすべての永続サーバーに関する情報を一覧表示します。
 .RE
 .PP
 locate \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR [ \-endpointType \fIendpointType\fR ]
 .RS 4
-Ͽ줿СǺ٤ƤORBΥפˤĤƥɥݥ(ݡ)򸡽ФޤС¹ԤƤʤ硢ƥֲޤ\fIendpointType\fRͤꤵƤʤ硢СORBȤ˴ϢդƤplainפޤnon\-protectedפΥɥݥȤ֤ޤ
+登録されたサーバーで作成したすべてのORBの特定のタイプについてエンドポイント(ポート)を検出します。サーバーが実行されていない場合、アクティブ化されます。\fIendpointType\fR値が指定されていない場合、サーバーのORBごとに関連付けられているplainタイプまたはnon\-protectedタイプのエンドポイントが返されます。
 .RE
 .PP
 locateperorb \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR [ \-orbid \fIORB\-name\fR ]
 .RS 4
-Ͽ줿СObject Request Broker (ORB)Ͽ줿ɥݥ(ݡ)򸡽ФޤС¹ԤƤʤ硢ƥֲޤ\fIorbid\fRꤵƤʤ硢ǥեͤ\fI""\fR\fIorbid\fR˳ƤޤORBʸ\fIorbid\fRǺƤ硢ϿݡȤ٤֤ޤ
+登録されたサーバーの特定のObject Request Broker (ORB)で登録されたエンドポイント(ポート)を検出します。サーバーが実行されていない場合、アクティブ化されます。\fIorbid\fRが指定されていない場合、デフォルト値の\fI""\fRが\fIorbid\fRに割り当てられます。ORBが空文字列の\fIorbid\fRで作成されている場合、登録したポートがすべて返されます。
 .RE
 .PP
 orblist \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR
 .RS 4
-С줿ORB\fIORBId\fRɽޤ\fIORBId\fRϥСǺ줿ORBʸ̾ǤС¹ԤƤʤ硢ƥֲޤ
+サーバー上に定義されたORBの\fIORBId\fRを一覧表示します。\fIORBId\fRはサーバーで作成されたORBの文字列名です。サーバーが実行されていない場合、アクティブ化されます。
 .RE
 .PP
 shutdown \-serverid \fIserver\-id\fR | \-applicationName application\-name
 .RS 4
-ORBDϿ줿ƥ֤ʥСߤޤΥޥɤμ¹ˡ\fI\-serverid\fRѥ᡼ޤ\fI\-applicationName\fRѥ᡼ǻꤵ줿饹줿\fIshutdown\fR᥽åɤƤӽФƥСץߤޤ
+ORBDに登録されたアクティブなサーバーを停止します。このコマンドの実行中に、\fI\-serverid\fRパラメータまたは\fI\-applicationName\fRパラメータで指定されたクラス内に定義された\fIshutdown\fRメソッドも呼び出されてサーバー・プロセスを停止します。
 .RE
 .PP
 startup \-serverid \fIserver\-id\fR | \-applicationName application\-name
 .RS 4
-ORBDϿ줿СưޤϥƥֲޤС¹ԤƤʤ硢ΥޥɤСưޤСǤ˼¹ԤƤϡ顼åɽޤ
+ORBDに登録されたサーバーを起動またはアクティブ化します。サーバーが実行されていない場合、このコマンドがサーバーを起動します。サーバーがすでに実行されている場合は、エラー・メッセージが表示されます。
 .RE
 .PP
 help
 .RS 4
-\fIservertool\fRޥɤ𤷤ƥСѤǤ뤹٤ƤΥޥɤꥹȤޤ
+\fIservertool\fRコマンドを介してサーバーが利用できるすべてのコマンドをリストします。
 .RE
 .PP
 quit
 .RS 4
-\fIservertool\fRޥɤλޤ
+\fIservertool\fRコマンドを終了します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/tnameserv.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/tnameserv.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: tnameserv
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "tnameserv" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "tnameserv" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-tnameserv \- 󥿥ե(IDL)
-.SH ""
+tnameserv \- インタフェース定義言語(IDL)。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,27 +64,27 @@
 .PP
 \-ORBInitialPort \fInameserverport\fR
 .RS 4
-͡ߥ󥰡ӥORB\fIresolve_initial_references\fR᥽åɤ\fIlist_initial_references\fR᥽åɤμ˻Ѥ֡ȥȥåסץȥꥹ˥󥰤ݡȤǤ
+ネーミング・サービスがORBの\fIresolve_initial_references\fRメソッドと\fIlist_initial_references\fRメソッドの実装に使用するブートストラップ・プロトコルをリスニングする初期ポートです。
 .RE
-.SH ""
+.SH "説明"
 .PP
-Java IDLˤϡObject Request Broker Daemon (ORBD)ޤޤޤORBDϡ֡ȥȥåסӥ͡ߥ󥰡ӥ³͡ߥ󥰡ӥӥСޥ͡ޤǡ󡦥ץǤJava IDLΤ٤ƤΥ塼ȥꥢǤORBDѤƤޤ͡ߥ󥰡ӥѤǤϡ\fIorbd\fRΤ\fItnameserv\fRѤǤޤ
+Java IDLには、Object Request Broker Daemon (ORBD)が含まれます。ORBDは、ブートストラップ・サービス、一時ネーミング・サービス、永続ネーミング・サービスおよびサーバー・マネージャを含むデーモン・プロセスです。Java IDLのすべてのチュートリアルではORBDを使用していますが、一時ネーミング・サービスを使用する例では、\fIorbd\fRのかわりに\fItnameserv\fRを使用できます。
 .PP
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlˤ
-orbd(1)ޤϡNaming Serviceפ򻲾ȤƤ
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlにある
+orbd(1)または「Naming Service」を参照してください。
 .PP
-CORBACOS (Common Object Services)͡ߥ󥰡ӥϡե롦ƥबեФƥǥ쥯ȥ깽¤󶡤ƤΤƱ褦ˡ֥ȻȤФƥĥ꡼¤Υǥ쥯ȥ󶡤ޤJava IDLΰ͡ࡦӥǤ\fItnameserv\fRϡCOS͡ࡦӥλͤñʷǼΤǤ
+CORBAのCOS (Common Object Services)ネーミング・サービスは、ファイル・システムがファイルに対してディレクトリ構造を提供しているのと同じように、オブジェクト参照に対してツリー構造のディレクトリを提供します。Java IDLの一時ネーム・サービスである\fItnameserv\fRは、COSネーム・サービスの仕様を単純な形で実装したものです。
 .PP
-֥ȻȤϥ͡ॹڡ̾dzǼ졢֥ȻȤ̾Υڥϡ줾͡ࡦХǥ󥰤ȸƤФޤ͡ࡦХǥ󥰤ϥ͡ߥ󥰡ƥȤȤ߹ळȤǤޤ͡ߥ󥰡ƥȤϥ͡ࡦХǥ󥰤Ǥꡢե롦ƥΥ֥ǥ쥯ȥƱǽޤ٤ƤΥХǥ󥰤Ͻ͡ߥ󥰡ƥȤβ˳Ǽޤ͡ߥ󥰡ƥȤϡ͡ॹڡͣα³Хǥ󥰤ǤJava IDL͡ߥ󥰡ӥץߤƺƵưȡĤΥ͡ॹڡϼޤ
+オブジェクト参照はネームスペースに名前で格納され、オブジェクト参照と名前のペアは、それぞれネーム・バインディングと呼ばれます。ネーム・バインディングはネーミング・コンテキストに組み込むことができます。ネーミング・コンテキストはネーム・バインディングであり、ファイル・システムのサブディレクトリと同じ編成機能を持ちます。すべてのバインディングは初期ネーミング・コンテキストの下に格納されます。初期ネーミング・コンテキストは、ネームスペースの唯一の永続バインディングです。Java IDLネーミング・サービス・プロセスを停止して再起動すると、残りのネームスペースは失われます。
 .PP
-ץåȤޤϥץꥱ󤫤COS͡ߥ󥰡ӥѤ뤿ˤϡORB͡ߥ󥰡ӥưƤۥȤΥݡȤΤäƤ뤫Υ͡ߥ󥰡ӥν͡ߥ󥰡ƥʸ˥Ǥɬפޤ͡ࡦӥϡJava IDLΥ͡ࡦӥǤ⤽¾COSΥ͡ࡦӥǤ⤫ޤޤ
-.SS "͡ߥ󥰡ӥεư"
+アプレットまたはアプリケーションからCOSネーミング・サービスを使用するためには、そのORBがネーミング・サービスが動作しているホストのポートを知っているか、そのネーミング・サービスの初期ネーミング・コンテキスト文字列にアクセスできる必要があります。ネーム・サービスは、Java IDLのネーム・サービスでもその他のCOS準拠のネーム・サービスでもかまいません。
+.SS "ネーミング・サービスの起動"
 .PP
-Java IDL͡ࡦӥϡ͡ࡦӥѤ륢ץꥱޤϥץåȤ˵ưƤɬפޤJava IDLʤ򥤥󥹥ȡ뤹ȡJava IDL͡ߥ󥰡ӥư륹ץ(Oracle Solaris:
-\fItnameserv\fR)ޤϼ¹Բǽե(Windows:
-\fItnameserv\&.exe\fR)ޤХå饦ɤư褦ˡ͡ࡦӥưƤ
+Java IDLネーム・サービスは、ネーム・サービスを使用するアプリケーションまたはアプレットより前に起動しておく必要があります。Java IDL製品をインストールすると、Java IDLネーミング・サービスを起動するスクリプト(Oracle Solaris:
+\fItnameserv\fR)または実行可能ファイル(Windows:
+\fItnameserv\&.exe\fR)が作成されます。バックグラウンドで動作するように、ネーム・サービスを起動してください。
 .PP
-ä˻ꤷʤ硢Java IDL͡ߥ󥰡ӥϡORB\fIresolve_initial_references\fR᥽åɤ\fIlist_initial_references methods\fR᥽åɤμ˻Ѥ֡ȥȥåסץȥФƥݡ900ǥꥹ˥󥰤ޤ
+特に指定しない場合、Java IDLネーミング・サービスは、ORBの\fIresolve_initial_references\fRメソッドと\fIlist_initial_references methods\fRメソッドの実装に使用するブートストラップ・プロトコルに対してポート900でリスニングします。
 .sp
 .if n \{\
 .RS 4
@@ -96,7 +96,7 @@
 .RE
 .\}
 .PP
-͡ࡦСݡȤꤷʤ硢ǥեȤǥݡ900ѤޤOracle Solarisեȥμ¹Ի1024꾮ݡȤǥץ򳫻Ϥϡroot桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳Ȥᤷޤ1050Τ褦̤ΥݡȤꤷ͡ࡦӥХå饦ɤǼ¹ԤˤϡUNIXޥɡǼΤ褦Ϥޤ
+ネーム・サーバー・ポートを指定しない場合、デフォルトでポート900が使用されます。Oracle Solarisソフトウェアの実行時、1024より小さいポートでプロセスを開始する場合は、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。1050のように別のポートを指定し、ネーム・サービスをバックグラウンドで実行するには、UNIXコマンド・シェルで次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -108,7 +108,7 @@
 .RE
 .\}
 .PP
-WindowsMS\-DOSƥࡦץץȤǤϡΤ褦Ϥޤ
+WindowsのMS\-DOSシステム・プロンプトでは、次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -120,20 +120,20 @@
 .RE
 .\}
 .PP
-͡ࡦСΥ饤ȤˤϡݡֹΤ餻ɬפޤԤˤϡORB֥Ȥκ\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRץѥƥ˿ݡֹꤷޤ
-.SS "ۤʤۥȾǤΥСȥ饤Ȥμ¹"
+ネーム・サーバーのクライアントには、新しいポート番号を知らせる必要があります。これを行うには、ORBオブジェクトの作成時に\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRプロパティに新しいポート番号を設定します。
+.SS "異なるホスト上でのサーバーとクライアントの実行"
 .PP
-Java IDLRMI\-IIOPΤۤȤɤΥ塼ȥꥢǤϡ͡ߥ󥰡ӥСӥ饤ȤϤ٤ƳȯѤΥޥǼ¹Ԥޤºݤ˥ǥץȤˤϡ饤ȤȥС򡢥͡ߥ󥰡ӥȤϰۤʤۥȡޥǼ¹Ԥ뤳Ȥ¿ʤޤ
+Java IDLとRMI\-IIOPのほとんどのチュートリアルでは、ネーミング・サービス、サーバーおよびクライアントはすべて開発用のマシン上で実行されます。実際にデプロイメントする場合には、クライアントとサーバーを、ネーミング・サービスとは異なるホスト・マシン上で実行することが多くなります。
 .PP
-饤ȤȥС͡ࡦӥ򸫤Ĥˤϡ饤ȤȥС͡ࡦӥ¹ԤƤݡȤֹȥۥȤǧƤɬפޤΤˤϡ饤ȤȥСΥե\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRץѥƥ\fIorg\&.omg\&.CORBA\&.ORBInitialHost\fRץѥƥ͡ࡦӥ¹ԤƤݡȤֹȥޥ̾ꤷޤϡGetting Started Using RMI\-IIOP
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi\-iiop/rmiiiopexample\&.html)˼Ƥޤ
+クライアントとサーバーがネーム・サービスを見つけるには、クライアントとサーバーが、ネーム・サービスが実行されているポートの番号とホストを認識している必要があります。そのためには、クライアントとサーバーのファイル内の\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRプロパティと\fIorg\&.omg\&.CORBA\&.ORBInitialHost\fRプロパティをネーム・サービスが実行されているポートの番号とマシンの名前に設定します。この例は、「Getting Started Using RMI\-IIOP」
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi\-iiop/rmiiiopexample\&.html)に示されています
 .PP
-ޥɥ饤󡦥ץ\fI\-ORBInitialPort nameserverport#\fR\fI\-ORBInitialHost nameserverhostname\fRѤơ饤ȤȥСФƥ͡ߥ󥰡ӥõꤹ뤳ȤǤޤޥɥ饤󡦥ץѤƤԤˡ1Ĥϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/tutorial/jidl2machines\&.htmlΡJava IDL: The Hello World Example on Two Machines
-򻲾ȤƤ
+コマンドライン・オプション\fI\-ORBInitialPort nameserverport#\fRと\fI\-ORBInitialHost nameserverhostname\fRを使用して、クライアントとサーバーに対してネーミング・サービスを探す場所を指定することもできます。コマンドライン・オプションを使用してこれを行う方法の1つの例は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/tutorial/jidl2machines\&.htmlの「Java IDL: The Hello World Example on Two Machines」
+を参照してください
 .PP
-ȤС͡ࡦӥ\fItnameserv\fRۥ\fInameserverhost\fRΥݡ1050Ǽ¹ԤƤȤޤˡ饤Ȥۥ\fIclienthost\fRǼ¹Ԥ졢Сϥۥ\fIserverhost\fRǼ¹ԤƤȤޤ
+たとえば、一時ネーム・サービス\fItnameserv\fRが、ホスト\fInameserverhost\fRのポート1050上で実行されているとします。さらに、クライアントがホスト\fIclienthost\fR上で実行され、サーバーはホスト\fIserverhost\fR上で実行されているとします。
 .PP
-ۥ\fInameserverhost\fR\fItnameserv\fRưޤ
+ホスト\fInameserverhost\fR上で\fItnameserv\fRを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -145,7 +145,7 @@
 .RE
 .\}
 .PP
-\fIserverhost\fRǥСưޤ
+\fIserverhost\fR上でサーバーを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -158,7 +158,7 @@
 .\}
 .PP
 
-\fIclienthost\fRǥ饤Ȥưޤ
+\fIclienthost\fR上でクライアントを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -169,19 +169,19 @@
 .if n \{\
 .RE
 .\}
-.SS "͡ߥ󥰡ӥ"
+.SS "ネーミング・サービスの停止"
 .PP
-Java IDL͡ߥ󥰡ӥߤˤϡUnixξϡ\fIkill\fRʤɤΥڥ졼ƥ󥰡ƥΥޥɤѤWindowsξϡ\fI[Ctrl]+[C]\fRѤޤ͡ߥ󥰡ӥŪߤޤǤϡƽФԵ֤³ޤӥλȡJava IDL͡ࡦӥϿƤ̾ϼޤ
-.SH "ץ"
+Java IDLネーミング・サービスを停止するには、Unixの場合は、\fIkill\fRなどのオペレーティング・システムのコマンドを使用し、Windowsの場合は、\fI[Ctrl]+[C]\fRキーを使用します。ネーミング・サービスを明示的に停止するまでは、呼出し待機状態が続きます。サービスを終了させると、Java IDLネーム・サービスに登録されている名前は失われます。
+.SH "オプション"
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH ""
-.SS "͡ॹڡؤΥ֥Ȥɲ"
+.SH "例"
+.SS "ネームスペースへのオブジェクトの追加"
 .PP
-Ǥϡ͡ॹڡ̾ɲäˡ򼨤ޤΥץ롦ץϡΤޤޤξ֤Ǵư͡ࡦӥ饤ȤǡΤ褦ñʥĥ꡼ΤǤ
+次の例では、ネームスペースに名前を追加する方法を示します。このサンプル・プログラムは、このままの状態で完全に動作する一時ネーム・サービス・クライアントで、次のような単純なツリーを作成するものです。
 .sp
 .if n \{\
 .RS 4
@@ -197,7 +197,7 @@
 .RE
 .\}
 .PP
-ǡ\fIplans\fRϥ֥Ȼȡ\fIPersonal\fR\fIcalendar\fR\fIschedule\fR2ĤΥ֥ȻȤޤ͡ߥ󥰡ƥȤǤ
+この例で、\fIplans\fRはオブジェクト参照、\fIPersonal\fRは\fIcalendar\fRと\fIschedule\fRの2つのオブジェクト参照を含むネーミング・コンテキストです。
 .sp
 .if n \{\
 .RS 4
@@ -217,7 +217,7 @@
 .RE
 .\}
 .PP
-͡ߥ󥰡ӥεưǡ\fInameserver\fRϥݡ1050ǵưޤΥɤǡΥݡֹ򥯥饤ȡƥΤ餻ޤ
+ネーミング・サービスの起動で、\fInameserver\fRはポート1050で起動されました。次のコードで、このポート番号をクライアント・システムに知らせます。
 .sp
 .if n \{\
 .RS 4
@@ -231,7 +231,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ͡ߥ󥰡ƥȤ\fIctx\fRޤ2ܤǤϡ\fIctx\fRߡΥ֥Ȼ\fIobjref\fR˥ԡޤobjrefˤϡȤ̾͡Ƥƥ͡ॹڡɲäޤ
+次のコードでは、初期ネーミング・コンテキストを取得し、それを\fIctx\fRに代入します。2行目では、\fIctx\fRをダミーのオブジェクト参照\fIobjref\fRにコピーします。このobjrefには、あとで様々な名前を割り当ててネームスペースに追加します。
 .sp
 .if n \{\
 .RS 4
@@ -246,7 +246,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ\fItext\fRפ̾\fIplans\fRߡΥ֥ȻȤ˥Хɤޤθ塢\fIrebind\fR᥽åɤѤƽ͡ߥ󥰡ƥȤβ\fIplans\fRɲäƤޤ\fIrebind\fR᥽åɤѤС\fIbind\fR᥽åɤѤȯ㳰ȯˡΥץ٤֤ⷫ¹ԤǤޤ
+次のコードでは、\fItext\fRタイプの名前\fIplans\fRを作成し、それをダミーのオブジェクト参照にバインドします。その後、\fIrebind\fRメソッドを使用して初期ネーミング・コンテキストの下に\fIplans\fRを追加しています。\fIrebind\fRメソッドを使用すれば、\fIbind\fRメソッドを使用した場合に発生する例外を発生させずに、このプログラムを何度も繰返し実行できます。
 .sp
 .if n \{\
 .RS 4
@@ -261,7 +261,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ\fIdirectory\fRפ\fIPersonal\fRȤ͡ߥ󥰡ƥȤޤη륪֥Ȼ\fIctx2\fR\fIname\fR˥Хɤ͡ߥ󥰡ƥȤɲäޤ
+次のコードでは、\fIdirectory\fRタイプの\fIPersonal\fRというネーミング・コンテキストを作成します。その結果得られるオブジェクト参照\fIctx2\fRを\fIname\fRにバインドし、初期ネーミング・コンテキストに追加します。
 .sp
 .if n \{\
 .RS 4
@@ -276,7 +276,7 @@
 .RE
 .\}
 .PP
-ĤΥɤǤϡߡΥ֥ȻȤ\fIschedule\fR\fIcalendar\fRȤ̾ǥ͡ߥ󥰡ƥ\fIPersonal\fR(\fIctx2\fR)˥Хɤޤ
+残りのコードでは、ダミーのオブジェクト参照を\fIschedule\fRと\fIcalendar\fRという名前でネーミング・コンテキスト\fIPersonal\fR(\fIctx2\fR)にバインドします。
 .sp
 .if n \{\
 .RS 4
@@ -300,9 +300,9 @@
 .if n \{\
 .RE
 .\}
-.SS "͡ॹڡλ"
+.SS "ネームスペースの参照"
 .PP
-Υץ롦ץǤϡ͡ॹڡ֥饦ˡ򼨤ޤ
+次のサンプル・プログラムでは、ネームスペースをブラウズする方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -322,7 +322,7 @@
 .RE
 .\}
 .PP
-͡ߥ󥰡ӥεưǡ\fInameserver\fRϥݡ1050ǵưޤΥɤǡΥݡֹ򥯥饤ȡƥΤ餻ޤ
+ネーミング・サービスの起動で、\fInameserver\fRはポート1050で起動されました。次のコードで、このポート番号をクライアント・システムに知らせます。
 .sp
 .if n \{\
 .RS 4
@@ -336,7 +336,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ͡ߥ󥰡ƥȤƤޤ
+次のコードでは、初期ネーミング・コンテキストを取得しています。
 .sp
 .if n \{\
 .RS 4
@@ -350,7 +350,7 @@
 .RE
 .\}
 .PP
-\fIlist\fR᥽åɤϡ͡ߥ󥰡ƥȤΥХǥ󥰤ꥹȤޤξ硢1000ĤޤǤΥХǥ󥰤͡ߥ󥰡ƥȤ\fIBindingListHolder\fR֤ޤĤΥХǥ󥰤ϡ\fIBindingIteratorHolder\fR֤ޤ
+\fIlist\fRメソッドは、ネーミング・コンテキストのバインディングをリストします。この場合、最大1000個までのバインディングが初期ネーミング・コンテキストから\fIBindingListHolder\fRに返されます。残りのバインディングは、\fIBindingIteratorHolder\fRに返されます。
 .sp
 .if n \{\
 .RS 4
@@ -364,7 +364,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ֤줿\fIBindingListHolder\fRХǥ󥰤ޤХǥ󥰤ʤϡץबλޤ
+次のコードでは、返された\fIBindingListHolder\fRからバインディングの配列を取得します。バインディングがない場合は、プログラムが終了します。
 .sp
 .if n \{\
 .RS 4
@@ -377,7 +377,7 @@
 .RE
 .\}
 .PP
-ĤΥɤǤϡХǥ󥰤Фƥ롼׽Ԥ̾Ϥޤ
+残りのコードでは、バインディングに対してループ処理を行い、名前を出力します。
 .sp
 .if n \{\
 .RS 4
@@ -408,7 +408,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/linux/doc/man/ja/unpack200.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/unpack200.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: unpack200
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaǥץȡġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaデプロイメント・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "unpack200" "1" "2013ǯ1121" "JDK 8" "Javaǥץȡġ"
+.TH "unpack200" "1" "2013年11月21日" "JDK 8" "Javaデプロイメント・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-unpack200 \- pack200(1)Ǻ줿ѥåեWebǥץȤΤJARեѴޤ
-.SH ""
+unpack200 \- pack200(1)で作成されたパック・ファイルを、WebデプロイメントのためにJARファイルに変換します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,21 +64,21 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIinput\-file\fR
 .RS 4
-ϥե̾pack200 gzipե뤫pack200եǤޤϥեˤϡ\fIpack200\fR(1)Ǻ줿JARեꤹ뤳ȤǤޤ(֤\fI0\fRǤ)ξ硢ϥեƤPack2000ޡǽJARե˥ԡޤ
+入力ファイルの名前。pack200 gzipファイルかpack200ファイルを指定できます。入力ファイルには、\fIpack200\fR(1)で作成されたJARファイルを指定することもできます(手間は\fI0\fRです)。この場合、入力ファイルの内容はPack2000マーカーで出力JARファイルにコピーされます。
 .RE
 .PP
 \fIJAR\-file\fR
 .RS 4
-JARե̾
+出力JARファイル名。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIunpack200\fRޥɤϡ\fIpack200\fR\fI(1)\fRǺ줿ѥåեJARեѴͥƥּǤŪʻˡϼΤȤǤǤϡǥեȤ\fIunpack200\fRޥǡ\fImyarchive\&.jar\fRե뤬\fImyarchive\&.pack\&.gz\fRޤ
+\fIunpack200\fRコマンドは、\fIpack200\fR\fI(1)\fRで作成されたパック・ファイルをJARファイルに変換するネイティブ実装です。一般的な使用方法は次のとおりです。次の例では、デフォルトの\fIunpack200\fRコマンド設定で、\fImyarchive\&.jar\fRファイルが\fImyarchive\&.pack\&.gz\fRから作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -89,56 +89,56 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-Hvalue \-\-deflate\-hint=\fIvalue\fR
 .RS 4
-JARեΤ٤ƤΥȥ\fItrue\fR\fIfalse\fRޤ\fIkeep\fRΥǥե졼ꤷޤǥեȡ⡼ɤ\fIkeep\fRǤͤ\fItrue\fRޤ\fIfalse\fR硢\fI\-\-deflate=hint\fRץϥǥեȤư򥪡С饤ɤơJARեΤ٤ƤΥȥΥǥե졼󡦥⡼ɤꤵޤ
+JARファイル内のすべてのエントリに\fItrue\fR、\fIfalse\fRまたは\fIkeep\fRのデフレーションを設定します。デフォルト・モードは\fIkeep\fRです。値が\fItrue\fRまたは\fIfalse\fR場合、\fI\-\-deflate=hint\fRオプションはデフォルトの動作をオーバーライドして、出力JARファイル内のすべてのエントリのデフレーション・モードが設定されます。
 .RE
 .PP
 \-r \-\-remove\-pack\-file
 .RS 4
-ϥѥåեޤ
+入力パック・ファイルを削除します。
 .RE
 .PP
 \-v \-\-verbose
 .RS 4
-Ǿ¤ΥåɽޤΥץʣλͤˤϡܺ٤ʥåɽޤ
+最小限のメッセージが表示されます。このオプションの複数の仕様には、より詳細なメッセージが表示されます。
 .RE
 .PP
 \-q \-\-quiet
 .RS 4
-åɽư褦˻ꤷޤ
+メッセージを表示せずに動作するように指定します。
 .RE
 .PP
 \-lfilename \-\-log\-file=\fIfilename\fR
 .RS 4
-ϥåϿեꤷޤ
+出力メッセージが記録されるログ・ファイルを指定します。
 .RE
 .PP
 \-? \-h \-\-help
 .RS 4
-\fIunpack200\fRޥɤ˴ؤإ׾Ϥޤ
+\fIunpack200\fRコマンドに関するヘルプ情報を出力します。
 .RE
 .PP
 \-V \-\-version
 .RS 4
-\fIunpack200\fRޥɤ˴ؤСϤޤ
+\fIunpack200\fRコマンドに関するバージョン情報を出力します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JavaۥޥoptionϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンにoptionを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH ""
+.SH "注意"
 .PP
-Υޥɤ\fIunpack\fRޥɤƱʤǤʤǤ
+このコマンドと\fIunpack\fRコマンドを混同しないでください。これらは別製品です。
 .PP
-JDK°Java SE APIͤȤ㤬Ĥäˤϡͤͥ褷Ƥ
-.SH "λơ"
+JDKに付属するJava SE API仕様との相違が見つかった場合には、仕様を優先してください。
+.SH "終了ステータス"
 .PP
-νλ֤ͤޤ: ェλξ0顼ȯ0礭͡
-.SH "Ϣ"
+次の終了値が返されます: 正常終了の場合は0、エラーが発生した場合は0より大きい値。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -181,7 +181,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Pack200 and Compression
+「Pack200 and Compression」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/deployment/deployment\-guide/pack200\&.html)
 .RE
 .sp
@@ -193,7 +193,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java SE Technical Documentation
+「Java SE Technical Documentation」
 (http://docs\&.oracle\&.com/javase/)
 .RE
 .br
--- a/jdk/src/linux/doc/man/ja/wsgen.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/wsgen.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: wsgen
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "wsgen" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "wsgen" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-wsgen \- WebӥΥɥݥȼ(SEI)饹ɼꡢWebӥΥǥץȤȸƽФɬפʤ٤ƤΥƥեȤޤ
-.SH ""
+wsgen \- Webサービスのエンドポイント実装(SEI)クラスを読取り、Webサービスのデプロイメントと呼出しに必要なすべてのアーティファクトを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,20 +64,20 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fISEI\fR
 .RS 4
-ɤ߼WebӥΥɥݥȼ饹(SEI)Ǥ
+読み取るWebサービスのエンドポイント実装クラス(SEI)です。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIwsgen\fRޥɤϡJAX\-WS WebӥǻѤJAX\-WSݡ֥롦ƥեȤޤΥġϡWebӥΥɥݥȡ饹ɼꡢWebӥΥǥץȤȸƽФɬפʤ٤ƤΥƥեȤޤJAXWS 2\&.1\&.1 RIǤ\fIwsgen\fR
-Ant󶡤ޤ
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.htmlJAX\-WS (wsgen)ڡTools֤򻲾ȤƤ
+\fIwsgen\fRコマンドは、JAX\-WS Webサービスで使用されるJAX\-WSポータブル・アーティファクトを生成します。このツールは、Webサービスのエンドポイント・クラスを読取り、Webサービスのデプロイメントと呼出しに必要なすべてのアーティファクトを生成します。JAXWS 2\&.1\&.1 RIでは\fIwsgen\fR
+Antタスクも提供されます。
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.htmlのJAX\-WS (wsgen)ページのToolsタブを参照してください。
 .PP
-\fIwsgen\fRޥɤưˤϡԤޤ
+\fIwsgen\fRコマンドを起動するには、次を行います。
 .sp
 .if n \{\
 .RS 4
@@ -89,79 +89,79 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-classpath \fIpath\fR
 .RS 4
-ϥ饹եξꡣ
+入力クラス・ファイルの場所。
 .RE
 .PP
 \-cp \fIpath\fR
 .RS 4
-ϥ饹եξꡣ
+入力クラス・ファイルの場所。
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-줿ϥեǼꡣ
+生成された出力ファイルを格納する場所。
 .RE
 .PP
 \-extension
 .RS 4
-٥ĥѲǽˤޤĥѤȡץꥱΰܿ줿ꡢ¾μϢȤǤʤʤǽޤ
+ベンダー拡張を使用可能にします。拡張を使用すると、アプリケーションの移植性が失われたり、他の実装と連携できなくなる可能性があります。
 .RE
 .PP
 \-help
 .RS 4
-\fIwsgen\fRޥɤ˴ؤإסåɽޤ
+\fIwsgen\fRコマンドに関するヘルプ・メッセージを表示します。
 .RE
 .PP
 \-keep
 .RS 4
-줿ե¸ޤ
+生成されたファイルを保存します。
 .RE
 .PP
 \-r \fIdirectory\fR
 .RS 4
-Υץ\fI\-wsdl\fRץȤȤ˻ѤơWSDLʤ줿꥽ե֤ꤷޤ
+このオプションを\fI\-wsdl\fRオプションとともに使用して、WSDLなど生成されたリソース・ファイルを配置する場所を指定します。
 .RE
 .PP
 \-s \fIdirectory\fR
 .RS 4
-줿եǼꡣ
+生成されたソース・ファイルを格納する場所。
 .RE
 .PP
 \-verbose
 .RS 4
-ѥ顦åɽޤ
+コンパイラ・メッセージを表示します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-wsdl [ :protocol ]
 .RS 4
-ɥݥȤǥץ˳ǧWSDLե륪ץ󡦥ޥɡWSDLեˤϡӥƤӽФˡѥ᡼ɬפ֤͡ǡ¤ˤĤƤΥԥ塼ɼǽʵҤޤޤޤ
+エンドポイントをデプロイする前に確認するWSDLファイルを生成するオプション・コマンド。WSDLファイルには、サービスを呼び出す方法、パラメータに必要な値、返されるデータ構造についてのコンピュータで読取り可能な記述が含まれます。
 .sp
-ǥեȤǤ\fIwsgen\fRޥɤWSDLեޤ\fIprotocol\fRͤϾάǽǤꡢWSDLХǥ(\fIwsdl:binding\fR)ǻѤץȥꤹ뤿˻Ѥޤͭʥץȥϡ\fIsoap1\&.1\fR\fIXsoap1\&.2\fRǤǥեȤ\fIsoap1\&.1\fRǤ\fIXsoap1\&.2\fRץȥɸǤϤʤᡢ\fI\-extension\fRץȤȤˤΤ߻ѲǽǤ
+デフォルトでは\fIwsgen\fRコマンドはWSDLファイルを生成しません。\fIprotocol\fR値は省略可能であり、WSDLバインディング(\fIwsdl:binding\fR)で使用するプロトコルを指定するために使用されます。有効なプロトコルは、\fIsoap1\&.1\fRと\fIXsoap1\&.2\fRです。デフォルトは\fIsoap1\&.1\fRです。\fIXsoap1\&.2\fRプロトコルは標準ではないため、\fI\-extension\fRオプションとともにのみ使用可能です。
 .RE
 .PP
 \-servicename \fIname\fR
 .RS 4
-\fI\-wsdl\fRץȤȤˤΤ߻ѤơWSDLWSDLӥ(\fIwsdl:service\fR)̾ꤷޤ:
-\fI\-servicename "{http://mynamespace/}MyService"\fR
+\fI\-wsdl\fRオプションとともにのみ使用して、WSDLで生成される特定のWSDLサービス(\fIwsdl:service\fR)名を指定します。例:
+\fI\-servicename "{http://mynamespace/}MyService"\fR。
 .RE
 .PP
 \-portname \fIname\fR
 .RS 4
-\fI\-wsdl\fRץȤȤˤΤ߻ѤơWSDLWSDLݡ(\fIwsdl:port\fR)̾ꤷޤ:
-\fI\-portname "{http://mynamespace/}MyPort"\fR
+\fI\-wsdl\fRオプションとともにのみ使用して、WSDLで生成される特定のWSDLポート(\fIwsdl:port\fR)名を指定します。例:
+\fI\-portname "{http://mynamespace/}MyPort"\fR。
 .RE
-.SH ""
+.SH "例"
 .PP
-ǤϡStockǥ쥯ȥ\fI@WebService\fR\fIStockService\fRΥåѡ饹ޤ
+次の例では、Stockディレクトリ内に\fI@WebService\fR注釈を持つ\fIStockService\fRのラッパー・クラスを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -173,7 +173,7 @@
 .RE
 .\}
 .PP
-ǤϡSOAP 1\&.1 WSDL\fI@WebService\fR\fIstock\&.StockService\fR饹Υޤޤ
+次の例では、SOAP 1\&.1 WSDLおよび\fI@WebService\fR注釈を持つ\fIstock\&.StockService\fRクラスのスキーマを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -185,7 +185,7 @@
 .RE
 .\}
 .PP
-ǤϡSOAP 1\&.2 WSDLޤ
+次の例では、SOAP 1\&.2 WSDLを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -197,9 +197,9 @@
 .RE
 .\}
 .PP
-\fB:\fR
-ӥΥǥץJAXWS¹ԻĶWSDL뤿ᡢȯWSDLɬפϤޤ
-.SH "Ϣ"
+\fB注意:\fR
+サービスのデプロイ時にJAXWS実行時環境でWSDLが生成されるため、開発時にWSDLを生成する必要はありません。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -220,8 +220,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.html
-JAX\-WS (wsgen)ڡTools֤򻲾ȤƤ
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.htmlの
+JAX\-WS (wsgen)ページのToolsタブを参照してください。
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/wsimport.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/wsimport.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: wsimport
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "wsimport" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "wsimport" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-wsimport \- Webץꥱ󡦥(WAR)ե˥ѥåǤJAX\-WSݡ֥롦ƥեȤơAntꤷޤ
-.SH ""
+wsimport \- Webアプリケーション・アーカイブ(WAR)ファイルにパッケージできるJAX\-WSポータブル・アーティファクトを生成して、Antタスクを指定します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,18 +64,18 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIwsdl\fR
 .RS 4
-WebӥƤӽФˡѥ᡼ɬפ֤͡ǡ¤ˤĤƤΥԥ塼ɼǽʵҤޤޤޤեǤ
+Webサービスを呼び出す方法、パラメータに必要な値、返されるデータ構造についてのコンピュータで読取り可能な記述が含まれまるファイルです。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIwsimport\fRޥɤϡJAX\-WSݡ֥롦ƥեȤޤΥƥեȤϡǥץWSDLӥޡɥȤӥɥݥȼȤȤˡWARե˥ѥåǤޤ\fIwsimport\fRޥɤǤ\fIwsimport\fR
-Ant󶡤ޤ
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlWsimport Ant TaskڡTools֤򻲾ȤƤ
+\fIwsimport\fRコマンドは、次のJAX\-WSポータブル・アーティファクトを生成します。これらのアーティファクトは、デプロイするWSDLおよびスキーマ・ドキュメントおよびエンドポイント実装とともに、WARファイルにパッケージできます。\fIwsimport\fRコマンドでは\fIwsimport\fR
+Antタスクも提供されます。
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlのWsimport Ant TaskページのToolsタブを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -85,7 +85,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ӥɥݥȡ󥿥ե(SEI)
+サービス・エンドポイント・インタフェース(SEI)
 .RE
 .sp
 .RS 4
@@ -96,7 +96,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}

+サービス
 .RE
 .sp
 .RS 4
@@ -107,7 +107,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-㳰饹\fIwsdl:fault\fRޥåפޤ(¸ߤ)
+例外クラスは\fIwsdl:fault\fRからマップされます(存在する場合)
 .RE
 .sp
 .RS 4
@@ -118,7 +118,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ʊ쥹ݥBeanϥ쥹ݥ\fIwsdl:message\fRޤ(¸ߤ)
+非同期レスポンスBeanはレスポンス\fIwsdl:message\fRから派生します(存在する場合)
 .RE
 .sp
 .RS 4
@@ -129,10 +129,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JAXBͥ(ޤΥפޥåפ줿Java饹)
+JAXBが生成する値タイプ(スキーマのタイプからマップされたJavaクラス)
 .RE
 .PP
-\fIwsgen\fRޥɤưˤϡԤޤ
+\fIwsgen\fRコマンドを起動するには、次を行います。
 .PP
 \fBOracle Solaris/Linux\fR:
 .sp
@@ -146,7 +146,7 @@
 .RE
 .\}
 .PP
-\fBWindows\fRξ:
+\fBWindows\fRの場合:
 .sp
 .if n \{\
 .RS 4
@@ -157,118 +157,118 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-d \fIdirectory\fR
 .RS 4
-ϥեǼꤷޤ
+生成される出力ファイルを格納する場所を指定します。
 .RE
 .PP
 \-b \fIpath\fR
 .RS 4
-JAX\-WSޤJAXBХǥ󥰡եꤷޤ\fI\-b\fRץʣJAX\-WSJAXBХǥ󥰡եǤޤΥեѤơѥå̾Bean̾ʤɤ򥫥ޥǤޤJAX\-WSJAXBХǥ󥰡եξܺ٤ϡ
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlWSDL CustomizationUsers Guide֤򻲾ȤƤ
+外部JAX\-WSまたはJAXBバインディング・ファイルを指定します。\fI\-b\fRオプションで複数のJAX\-WSおよびJAXBバインディング・ファイルを指定できます。これらのファイルを使用して、パッケージ名、Bean名などをカスタマイズできます。JAX\-WSおよびJAXBバインディング・ファイルの詳細は、
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlのWSDL CustomizationのUsers Guideタブを参照してください
 .RE
 .PP
 \-B \fIjaxbOption\fR
 .RS 4
-JAXBޡѥ\fIjaxbOption\fRץϤޤ
+JAXBスキーマ・コンパイラに\fIjaxbOption\fRオプションを渡します。
 .RE
 .PP
 \-catalog
 .RS 4
-ƥƥȤ褹륫եꤷޤ\fI\-catalog\fRץϡTR9401XCatalogOASIS XML CatalogγƷ򥵥ݡȤƤޤhttp://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.html
-Catalog SupportڡUsers Guide֤򻲾ȤƤ
+外部エンティティ参照を解決するカタログ・ファイルを指定します。\fI\-catalog\fRオプションは、TR9401、XCatalog、OASIS XML Catalogの各形式をサポートしています。http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.htmlの
+Catalog SupportページのUsers Guideタブを参照してください。
 .RE
 .PP
 \-extension
 .RS 4
-٥ĥѲǽˤޤĥѤȡץꥱΰܿ줿ꡢ¾μϢȤǤʤʤǽޤ
+ベンダー拡張を使用可能にします。拡張を使用すると、アプリケーションの移植性が失われたり、他の実装と連携できなくなる可能性があります。
 .RE
 .PP
 \-help
 .RS 4
-\fIwsimport\fRޥɤ˴ؤإסåɽޤ
+\fIwsimport\fRコマンドに関するヘルプ・メッセージを表示します。
 .RE
 .PP
 \-httpproxy: \fIhost\fR:\fIport\fR
 .RS 4
-HTTPץСꤷޤǥեȤ8080Ǥ
+HTTPプロキシ・サーバーを指定します。デフォルトは8080です。
 .RE
 .PP
 \-keep
 .RS 4
-줿եݻޤ
+生成されたファイルを保持します
 .RE
 .PP
 \-p \fIname\fR
 .RS 4
-åȡѥå\fIname\fRꤷơWSDLӥޡХǥ󥰤Υޥӻ줿ǥեȤΥ르ꥺ򥪡С饤ɤޤ
+ターゲット・パッケージ\fIname\fRを指定して、WSDLおよびスキーマ・バインディングのカスタマイズ、および仕様部で定義されたデフォルトのアルゴリズムをオーバーライドします。
 .RE
 .PP
 \-s \fIdirectory\fR
 .RS 4
-륽եǼꤷޤ
+生成されるソース・ファイルを格納する場所を指定します
 .RE
 .PP
 \-verbose
 .RS 4
-ѥ顦åɽޤ
+コンパイラ・メッセージを表示します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-wsdllocation \fIlocation\fR
 .RS 4
-\fI@WebServiceClient\&.wsdlLocation\fRͤꤷޤ
+\fI@WebServiceClient\&.wsdlLocation\fRの値を指定します。
 .RE
 .PP
 \-target
 .RS 4
-ꤵ줿JAX\-WSͥС˽äơɤޤС2\&.0ǤϡJAX\-WS 2\&.0ͤ˽򤷤ɤޤ
+指定されたJAX\-WS仕様バージョンに従って、コードを生成します。バージョン2\&.0では、JAX\-WS 2\&.0仕様に準拠したコードを生成します。
 .RE
 .PP
 \-quiet
 .RS 4
-\fIwsimport\fRޥɽϤޤ
+\fIwsimport\fRコマンド出力を抑制します。
 .RE
 .PP
-\fI\-b\fRץѤơʣ\fIJAX\-WS\fR\fIJAXB\fRХǥ󥰡եǤޤΥեѤơѥå̾Bean̾ʤɡ͡ʤΤ򥫥ޥǤޤ\fIJAX\-WS\fR\fIJAXB\fRХǥ󥰡եξܺ٤ϡ
-https://jax\-ws\&.dev\&.java\&.net/nonav/2\&.1\&.1/docs/customizations\&.htmlJAXB֤򻲾ȤƤ
-.SH "ɸ४ץ"
+\fI\-b\fRオプションを使用して、複数の\fIJAX\-WS\fRおよび\fIJAXB\fRバインディング・ファイルを指定できます。これらのファイルを使用して、パッケージ名やBean名など、様々なものをカスタマイズできます。\fIJAX\-WS\fRおよび\fIJAXB\fRバインディング・ファイルの詳細は、
+https://jax\-ws\&.dev\&.java\&.net/nonav/2\&.1\&.1/docs/customizations\&.htmlのJAXBタブを参照してください
+.SH "非標準オプション"
 .PP
 \-XadditionalHeaders
 .RS 4
-ꥯȤޤϥ쥹ݥ󥹡å˥ХɤʤإåJava᥽åɤΥѥ᡼˥ޥåפޤ
+リクエストまたはレスポンス・メッセージにバインドされないヘッダーをJavaメソッドのパラメータにマップします
 .RE
 .PP
 \-Xauthfile \fIfile\fR
 .RS 4
-ǧھޤեꤹWSDL URIǤURIηϼΤȤǤ
+認証情報を含むファイルを指定するWSDL URIです。このURIの形式は次のとおりです。
 .sp
 http://\fIuser\-name\fR:\fIpassword\fR@\fIhost\-name\fR/\fIweb\-service\-name\fR>?wsdl
 .RE
 .PP
 \-Xdebug
 .RS 4
-ǥХåϤޤ
+デバッグ情報を出力します
 .RE
 .PP
 \-Xno\-addressing\-databinding
 .RS 4
-W3C EndpointReferenceTypeJavaΥХǥ󥰤ͭˤޤ
+W3C EndpointReferenceTypeとJavaのバインディングを有効にします。
 .RE
 .PP
 \-Xnocompile
 .RS 4
-줿Javaե򥳥ѥ뤷ޤ
+生成されたJavaファイルをコンパイルしません
 .RE
-.SH ""
+.SH "例"
 .PP
-ǤϡJavaƥեȤ\fIhttp://stockquote\&.example\&.com/quote?wsdl\fR򥤥ݡȤƥƥեȤ򥳥ѥ뤷ޤ
+次の例では、Javaアーティファクトを生成し、\fIhttp://stockquote\&.example\&.com/quote?wsdl\fRをインポートしてアーティファクトをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -279,7 +279,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -300,8 +300,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.html
-Wsimport Ant TaskڡTools
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlの
+Wsimport Ant TaskページのToolsタブ
 .RE
 .sp
 .RS 4
@@ -312,8 +312,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.html
-Catalog SupportڡUsers Guide
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.htmlの
+Catalog SupportページのUsers Guideタブ
 .RE
 .sp
 .RS 4
@@ -324,8 +324,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.html
-WSDL CustomizationڡUsers Guide
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlの
+WSDL CustomizationページのUsers Guideタブ
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/linux/doc/man/ja/xjc.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/linux/doc/man/ja/xjc.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: xjc
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "xjc" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "xjc" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-xjc \- XMLޡեդJava饹˥ѥ뤷ޤ
-.SH ""
+xjc \- XMLスキーマ・ファイルを完全注釈付きのJavaクラスにコンパイルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,23 +64,23 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 schema \fIfile/URL/dir/jar \&.\&.\&.\fR
 .RS 4
-XMLޡեξꡣ\fIdir\fRꤵƤϡ٤ƤΥޡե뤬ѥ뤵ޤ\fIjar\fRꤵƤϡ\fI/META\-INF/sun\-jaxb\&.episode\fRХǥ󥰡ե뤬ѥ뤵ޤ
+XMLスキーマ・ファイルの場所。\fIdir\fRが指定されている場合は、すべてのスキーマ・ファイルがコンパイルされます。\fIjar\fRが指定されている場合は、\fI/META\-INF/sun\-jaxb\&.episode\fRバインディング・ファイルがコンパイルされます。
 .RE
 .PP
 \-b \fIbindinfo\fR
 .RS 4
-Хǥ󥰡եξꡣ
+バインディング・ファイルの場所。
 .RE
-.SH ""
+.SH "説明"
 .PP
-ץåȥեbinǥ쥯ȥˤŬڤ\fIxjc\fR롦ץȤѤơХǥ󥰡ѥưޤХǥ󥰡ѥ¹ԤAnt⤢ޤhttp://jaxb\&.java\&.net/nonav/2\&.1\&.3/docs/xjcTask\&.html
-Using the XJC with Ant򻲾ȤƤ
-.SH "ץ"
+プラットフォームのbinディレクトリにある適切な\fIxjc\fRシェル・スクリプトを使用して、バインディング・コンパイラを起動します。バインディング・コンパイラを実行するAntタスクもあります。http://jaxb\&.java\&.net/nonav/2\&.1\&.3/docs/xjcTask\&.htmlの
+Using the XJC with Antを参照してください
+.SH "オプション"
 .sp
 .RS 4
 .ie n \{\
@@ -90,7 +90,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ⻲ȤƤ
+非標準オプションも参照してください
 .RE
 .sp
 .RS 4
@@ -101,167 +101,167 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-侩Ǻ줿ץ⻲ȤƤ
+非推奨で削除されたオプションも参照してください
 .RE
 .PP
 \-nv
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡޤ˸̩ʸڤ¹ԤޤΥץѤȡ̩ʥ޸ڤ̵ˤʤޤϡХǥ󥰡ѥ餬ڤڼ¹ԤʤȤȤǤϤޤ󡣤긷̩Ǥʤڤ¹ԤȤȤǤ
+デフォルトでは、XJCバインディング・コンパイラは、ソース・スキーマを処理する前に厳密な検証を実行します。このオプションを使用すると、厳密なスキーマ検証か無効になります。これは、バインディング・コンパイラが検証を一切実行しないということではありません。より厳密でない検証を実行するということです。
 .RE
 .PP
 \-extension
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡJAXBͤCompatibilityξϤƤ롼̩˶ޤϿE\&.2ˤϡJAXB v1\&.0ǴˤϥݡȤƤʤϢW3C XML޵ǽƤޤˤäƤϡΥåͭˤʤ\fI\-extension\fR⡼ɤǤεǽѤǤ礬ޤޤǥեȤθ̩ʥ⡼ɤǤϡͤƤХǥ󥰡ޥΤߤѤǤޤ\fI\-extension\fRåꤹСJAXB Vendor ExtensionѤǤޤ
+デフォルトでは、XJCバインディング・コンパイラは、JAXB仕様のCompatibilityの章で説明されているルールを厳密に強制します。付録E\&.2には、JAXB v1\&.0で完全にはサポートされていない一連のW3C XMLスキーマ機能が定義されています。場合によっては、このスイッチで有効になる\fI\-extension\fRモードでそれらの機能が使用できる場合があります。また、デフォルトの厳密なモードでは、仕様に定義されているバインディング・カスタマイズのみが使用できます。\fI\-extension\fRスイッチを指定すれば、JAXB Vendor Extensionを使用できます。
 .RE
 .PP
 \-b \fIfile\fR
 .RS 4
-볰Хǥ󥰡ե1ĤޤʣꤷޤХǥ󥰡ե뤴Ȥ\fI\-b\fRåꤹɬפޤХǥ󥰡եιʸϽǤʣΥޤΥޥޤޤ1ĤΥХǥ󥰡եѤꡢΥޥʣΥХǥ󥰡եʬ䤷Ǥޤ򼨤ޤ\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings123\&.xjb\fR
-\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings1\&.xjb \-b bindings2\&.xjb \-b bindings3\&.xjb\fRޤޥɥ饤˥ޡեȥХǥ󥰡եꤹ֤ǤդǤ
+処理する外部バインディング・ファイルを1つまたは複数指定します。バインディング・ファイルごとに\fI\-b\fRスイッチを指定する必要があります。外部バインディング・ファイルの構文は柔軟です。複数のスキーマのカスタマイズが含まれる1つのバインディング・ファイルを使用したり、それらのカスタマイズを複数のバインディング・ファイルに分割したりできます。次に例を示します。\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings123\&.xjb\fR
+\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings1\&.xjb \-b bindings2\&.xjb \-b bindings3\&.xjb\fRまた、コマンドラインにスキーマ・ファイルとバインディング・ファイルを指定する順番は任意です。
 .RE
 .PP
 \-d \fIdir\fR
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡJavaƥġ饹򸽺ߤΥǥ쥯ȥޤΥץѤȡؽϥǥ쥯ȥǤޤϥǥ쥯ȥϤǤ¸ߤƤɬפޤXJCХǥ󥰡ѥǤϺޤ
+デフォルトでは、XJCバインディング・コンパイラは、Javaコンテンツ・クラスを現在のディレクトリに生成します。このオプションを使用すると、代替出力ディレクトリを指定できます。出力ディレクトリはすでに存在している必要があります。XJCバインディング・コンパイラでは作成されません。
 .RE
 .PP
 \-p \fIpkg\fR
 .RS 4
-Υޥɥ饤󡦥ץǥåȡѥåꤷ硢λƤϡѥå̾Ф뤹٤ƤΥХǥ󥰡ޥ䡢ͤǵꤵƤǥեȤΥѥå̾르ꥺͥ褵ޤ
+このコマンドライン・オプションでターゲット・パッケージを指定した場合、その指定内容は、パッケージ名に対するすべてのバインディング・カスタマイズや、仕様で規定されているデフォルトのパッケージ名アルゴリズムよりも優先されます。
 .RE
 .PP
 \-httpproxy \fIproxy\fR
 .RS 4
-\fI[user[:password]@]proxyHost[:proxyPort]\fRHTTPޤHTTPSץꤷޤŤ\fI\-host\fR\fI\-port\fRץϡ̸ߴΤ˰³RIǥݡȤޤ侩ȤʤޤΥץǻꤵ줿ѥɤϡtopޥɤѤ¾Υ桼ɽǤǤƥˤϡ\fI\-httpproxyfile\fRѤƤ
+\fI[user[:password]@]proxyHost[:proxyPort]\fR形式でHTTPまたはHTTPSプロキシを指定します。古い\fI\-host\fRおよび\fI\-port\fRオプションは、下位互換性のために引き続きRIでサポートされますが、非推奨となりました。このオプションで指定されたパスワードは、topコマンドを使用する他のユーザーが表示できる引数です。セキュリティを高めるには、\fI\-httpproxyfile\fRを使用してください。
 .RE
 .PP
 \-httpproxyfile file
 .RS 4
-եѤơHTTPޤHTTPSץꤷޤ\fI\-httpproxy\fRץƱǤΥե˻ꤵ줿ѥɤ¾Υ桼ɽ뤳ȤϤǤޤ
+ファイルを使用して、HTTPまたはHTTPSプロキシを指定します。形式は\fI\-httpproxy\fRオプションと同じですが、このファイル内に指定されたパスワードを他のユーザーが表示することはできません。
 .RE
 .PP
 \-classpath arg
 .RS 4
-\fIjxb:javaType\fRxjc:\fIsuperClass\fRޥѤ륯饤ȡץꥱΥ饹եθꤷޤ
+\fIjxb:javaType\fRおよびxjc:\fIsuperClass\fRカスタマイズが使用するクライアント・アプリケーションのクラス・ファイルの検索場所を指定します。
 .RE
 .PP
 \-catalog file
 .RS 4
-ƥƥȤ褹륫եꤷޤTR9401XCatalogOASIS XML CatalogγƷݡȤޤhttp://xerces\&.apache\&.org/xml\-commons/components/resolver/resolver\-article\&.html
-XML Entity and URI Resolvers򻲾ȤƤ
+外部エンティティ参照を解決するカタログ・ファイルを指定します。TR9401、XCatalogおよびOASIS XML Catalogの各形式がサポートされます。http://xerces\&.apache\&.org/xml\-commons/components/resolver/resolver\-article\&.htmlの
+XML Entity and URI Resolversを参照してください
 .RE
 .PP
 \-readOnly
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡJavaեߤݸޤ󡣤ΥץѤȡXJCХǥ󥰡ѥJavaŪɼѤˤޤ
+デフォルトでは、XJCバインディング・コンパイラは、生成するJavaソース・ファイルを書込みから保護しません。このオプションを使用すると、XJCバインディング・コンパイラは生成されるJavaソースを強制的に読取り専用にします。
 .RE
 .PP
 \-npa
 .RS 4
-\fI**/package\-info\&.java\fRؤΥѥå٥ޤΥåѤ륳ɤǤϡ᤬¾ѥ饹ޤ
+\fI**/package\-info\&.java\fRへのパッケージ・レベルの注釈の生成を抑制します。このスイッチを使用して生成するコードでは、これらの注釈が他の生成済クラスに内部化されます。
 .RE
 .PP
 \-no\-header
 .RS 4
-¿Υȥॹפޤե롦إåȤޤѤȡ줿ɤ\fIdiff\fRޥɤȤθߴ궯ʤޤ
+多少のメモとタイムスタンプを含むファイル・ヘッダー・コメントの生成を抑制します。これを使用すると、生成されたコードと\fIdiff\fRコマンドとの互換性がより強くなります。
 .RE
 .PP
 \-target 2\&.0
 .RS 4
-JAXB 2\&.1ǽ˰¸륳ɤʤ褦ˤޤˤꡢ줿ɤJAXB 2\&.0󥿥Ķ(Java SE 6ʤ)Ǽ¹ԤǤ褦ˤʤޤ
+JAXB 2\&.1機能に依存するコードを生成しないようにします。これにより、生成されたコードをJAXB 2\&.0ランタイム環境(Java SE 6など)で実行できるようになります。
 .RE
 .PP
 \-xmlschema
 .RS 4
-ϥޤW3C XMLޤȤưޤ(ǥե)Υåꤷʤ硢ϥޤW3C XMLޤƱ褦˰ޤ
+入力スキーマをW3C XMLスキーマとして扱います(デフォルト)。このスイッチを指定しない場合、入力スキーマはW3C XMLスキーマと同じように扱われます。
 .RE
 .PP
 \-relaxing
 .RS 4
-ϥޤRELAX NGȤưޤ(Ṳ̄ݡ)RELAX NGޤΥݡȤJAXB Vendor ExtensionȤ󶡤Ƥޤ
+入力スキーマをRELAX NGとして扱います(試験的および未サポート)。RELAX NGスキーマのサポートはJAXB Vendor Extensionとして提供されています。
 .RE
 .PP
 \-relaxing\-compact
 .RS 4
-ϥޤRELAX NG̹ʸȤƽޤ(Ṳ̄ݡ)RELAX NGޤΥݡȤJAXB Vendor ExtensionȤ󶡤Ƥޤ
+入力スキーマをRELAX NG圧縮構文として処理します(試験的および未サポート)。RELAX NGスキーマのサポートはJAXB Vendor Extensionとして提供されています。
 .RE
 .PP
 \-dtd
 .RS 4
-ϥޤXML DTDȤưޤ(Ṳ̄ݡ)RELAX NGޤΥݡȤJAXB Vendor ExtensionȤ󶡤Ƥޤ
+入力スキーマをXML DTDとして扱います(試験的および未サポート)。RELAX NGスキーマのサポートはJAXB Vendor Extensionとして提供されています。
 .RE
 .PP
 \-wsdl
 .RS 4
-ϤWSDLȤưΥޤ򥳥ѥ뤷ޤ(Ṳ̄ݡ)
+入力をWSDLとして扱い、その内部のスキーマをコンパイルします(試験的および未サポート)。
 .RE
 .PP
 \-quiet
 .RS 4
-ĽٹʤɡѥνϤޤ
+進捗情報や警告など、コンパイラの出力を抑制します。
 .RE
 .PP
 \-verbose
 .RS 4
-åϤΥ顼ȯ˥åȥ졼ɽꤹʤɡƾĹˤʤޤ
+情報メッセージを出力したり特定のエラー発生時にスタック・トレースを表示したりするなど、きわめて冗長になります。
 .RE
 .PP
 \-help
 .RS 4
-ѥ顦åΥޥ꡼ɽޤ
+コンパイラ・スイッチのサマリーを表示します。
 .RE
 .PP
 \-version
 .RS 4
-ѥΥСɽޤ
+コンパイラのバージョン情報を表示します。
 .RE
 .PP
 \fIschema file/URL/dir\fR
 .RS 4
-ѥоݤȤʤ1ĤޤʣΥޡեꤷޤǥ쥯ȥꤹ硢\fIxjc\fRޥɤϤ٤ƤΥޡե򥹥󤷤ƥѥ뤷ޤ
+コンパイル対象となる1つまたは複数のスキーマ・ファイルを指定します。ディレクトリを指定する場合、\fIxjc\fRコマンドはすべてのスキーマ・ファイルをスキャンしてコンパイルします。
 .RE
-.SS "ɸ४ץ"
+.SS "非標準オプション"
 .PP
 \-XLocator
 .RS 4
-줿ɤǤϡ󲽤θJava Bean󥹥󥹤˴ޤޤ륽XML˴ؤSAX Locator󤬸ޤ
+生成されたコードでは、非整列化の後にJava Beanインスタンスに含まれるソースXMLに関するSAX Locator情報が公開されます。
 .RE
 .PP
 \-Xsync\-methods
 .RS 4
-줿٤ƤΥ᥽åɡ˥\fIsynchronized\fRɤޤޤ
+生成されたすべてのメソッド・シグニチャに\fIsynchronized\fRキーワードが含められます。
 .RE
 .PP
 \-mark\-generated
 .RS 4
-줿ɤ\fI@javax\&.annotation\&.Generated\fRդޤ
+生成されたコードに注釈\fI@javax\&.annotation\&.Generated\fRを付けます。
 .RE
 .PP
 \-episode file
 .RS 4
-ѥ뤴Ȥ˻ꤵ줿ԥɡեޤ
+コンパイルごとに指定されたエピソード・ファイルを生成します。
 .RE
-.SS "侩Ǻ줿ץ"
+.SS "非推奨で削除されたオプション"
 .PP
 \-host & \-port
 .RS 4
-Υץ\fI\-httpproxy\fRץ֤ޤΥץϡ̸ߴݤ뤿˥ݡȤޤɥȤˤϵܤ줺Υ꡼Ǻǽ⤢ޤ
+これらのオプションは\fI\-httpproxy\fRオプションで置き換えられました。これらのオプションは、下位互換性を確保するためにサポートされますが、ドキュメントには記載されず、将来のリリースで削除される可能性もあります。
 .RE
 .PP
 \-use\-runtime
 .RS 4
-JAXB 2\&.0ͤǤϡܿΤ󥿥Ķ줿ᡢJAXB RI\fI**/impl/runtime \fRѥåɬפʤʤޤΤᡢΥåפȤʤꡢޤ
+JAXB 2\&.0仕様では、移植性のあるランタイム環境が定義されたため、JAXB RIが\fI**/impl/runtime \fRパッケージを生成する必要がなくなりました。このため、このスイッチは不要となり、削除されました。
 .RE
 .PP
 \-source
 .RS 4
-\fI\-source\fRߴåϡJAXB 2\&.0κǽEarly AccessǤƳޤΥåJAXB 2\&.0κΥ꡼ޤ1\&.0\&.xɤɬפϡ1\&.0\&.xɡ١Υ󥹥ȡѤƤ
+\fI\-source\fR互換性スイッチは、JAXB 2\&.0の最初のEarly Access版で導入されました。このスイッチはJAXB 2\&.0の今後のリリースから削除されます。1\&.0\&.xコードを生成する必要がある場合は、1\&.0\&.xコード・ベースのインストールを使用してください。
 .RE
-.SH "ѥ"
+.SH "コンパイラの制限"
 .PP
-̾ϡϢ뤹٤ƤΥޤƱХǥ󥰡ѥ顦åꤷ1Ĥñ̤Ȥƥѥ뤹ΤǤǤ\fIxjc\fRޥɤμ¹Իˤϡ¥ꥹȤαդƤΤۤȤɤϡ\fIxjc\fRޥɤ٤ƤӽФʣΥޤ򥳥ѥ뤹ˤΤƤϤޤޤ
+通常は、関連するすべてのスキーマを、同じバインディング・コンパイラ・スイッチを指定して1つの単位としてコンパイルするのが最も安全です。\fIxjc\fRコマンドの実行時には、次の制限リストに留意してください。これらの問題のほとんどは、\fIxjc\fRコマンドを何度か呼び出して複数のスキーマをコンパイルする場合にのみ当てはまります。
 .PP
-ʣΥޤƱ˥ѥ뤹ϡåȤJavaѥå̾˼̤ͥΥ롼뤬ŬѤ뤳ȤդƤ
+複数のスキーマを同時にコンパイルする場合は、ターゲットのJavaパッケージ名に次の優先順位のルールが適用されることに注意してください。
 .sp
 .RS 4
 .ie n \{\
@@ -271,7 +271,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-\fI\-p\fRץ󤬺Ǥͥ褵ޤ
+\fI\-p\fRオプションが最も優先されます。
 .RE
 .sp
 .RS 4
@@ -282,7 +282,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-\fIjaxb:package\fRΥޥ
+\fIjaxb:package\fRのカスタマイズ。
 .RE
 .sp
 .RS 4
@@ -293,7 +293,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-\fItargetNamespace\fRƤϡ\fIt\fR\fIargetNamespace\fRͤƤJavaѥå̾Υ르ꥺŬѤޤ
+\fItargetNamespace\fRが宣言されている場合は、\fIt\fR\fIargetNamespace\fRを仕様で定義されているJavaパッケージ名のアルゴリズムに適用します。
 .RE
 .sp
 .RS 4
@@ -304,15 +304,15 @@
 .sp -1
 .IP "  4." 4.2
 .\}
-\fItargetNamespace\fRƤʤϡ\fIgenerated\fRȤ̾Υϡɥɤ줿ѥåѤޤ
+\fItargetNamespace\fRが宣言されていない場合は、\fIgenerated\fRという名前のハードコードされたパッケージを使用します。
 .RE
 .PP
-1ĤΥ͡ॹڡʣ\fIjaxb:schemaBindings\fRĤȤϤǤʤᡢۤʤJavaѥå˥ѥ餵Ʊ쥿åȡ͡ॹڡ2ĤΥޤĤȤϤǤޤ
+1つのネームスペースが複数の\fIjaxb:schemaBindings\fRを持つことはできないため、異なるJavaパッケージにコンパイラされる同一ターゲット・ネームスペースが2つのスキーマを持つことはできません。
 .PP
-ƱJavaѥå˥ѥ餵륹ޤϤ٤ơƱXJCХǥ󥰡ѥɬפޤ̡˥ѥ뤹ȡͽۤɤ˵ǽޤ
+同じJavaパッケージにコンパイラされるスキーマはすべて、同時にXJCバインディング・コンパイラに送信される必要があります。別々にコンパイルすると、予想どおりに機能しません。
 .PP
-ʣΥޡեˤޤִ롼פϡƱ˥ѥ뤹ɬפޤ
-.SH "Ϣ"
+複数のスキーマ・ファイルにまたがる要素置換グループは、同時にコンパイルする必要があります。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -322,7 +322,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/xjc\&.html
+http://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/xjc\&.htmlの
 Binding Compiler (xjc)
 .RE
 .sp
@@ -334,7 +334,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://www\&.oracle\&.com/technetwork/articles/javase/index\-140168\&.html
+http://www\&.oracle\&.com/technetwork/articles/javase/index\-140168\&.htmlの
 Java Architecture for XML Binding (JAXB)
 .RE
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: appletviewer
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "appletviewer" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "appletviewer" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-appletviewer \- Web֥饦γ¦ǥץåȤ¹Ԥޤ
-.SH ""
+appletviewer \- Webブラウザの外側でアプレットを実行します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,39 +64,39 @@
 .PP
 \fIoptions\fR
 .RS 4
-Ƕڤ줿ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+空白で区切られたコマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIurl\fR
 .RS 4
-ɽɥȤޤϥ꥽ξꡣǶڤ줿ʣURLǤޤ
+表示するドキュメントまたはリソースの場所。空白で区切られた複数のURLを指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIappletviewer\fRޥɤ\fIurls\fR˻ꤵ줿ɥȤ뤤ϥ꥽³ơΥɥȤȤ뤽줾ΥץåȤȼΥɥɽޤurlsˤäƻȤ줿ɥȤ\fIOBJECT\fR\fIEMBED\fRޤ\fIAPPLET\fRǤɤΥץåȤ⻲ȤƤʤ硢\fIappletviewer\fRޥɤϲԤޤ\fIappletviewer\fRޥɤǥݡȤHTMLξܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/tools/appletviewertags\&.htmlˤ
-ץåȡӥ塼򻲾ȤƤ
+\fIappletviewer\fRコマンドは\fIurls\fRに指定されたドキュメントあるいはリソースと接続して、そのドキュメントが参照するそれぞれのアプレットを独自のウィンドウで表示します。urlsによって参照されたドキュメントが、\fIOBJECT\fR、\fIEMBED\fRまたは\fIAPPLET\fRタグでどのアプレットも参照していない場合、\fIappletviewer\fRコマンドは何も行いません。\fIappletviewer\fRコマンドでサポートされるHTMLタグの詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/appletviewertags\&.htmlにある
+アプレット・ビューア・タグを参照してください。
 .PP
-\fIappletviewer\fRޥɤϡRFC2396줿סᥫ˥˽äƥ󥳡ɤ줿URLɬפȤޤݡȤΤϡ󥳡ɤ줿URLΤߤǤե̾ˤĤƤϡRFC2396λͤ˽äƥ󥳡ɤƤɬפޤ
+\fIappletviewer\fRコマンドは、RFC2396で定義されたエスケープ・メカニズムに従ってエンコードされたURLを必要とします。サポートされるのは、エンコードされたURLのみです。ただし、ファイル名については、RFC2396の仕様に従ってエンコードを解除しておく必要があります。
 .PP
-\fB:\fR
+\fB注意:\fR
 The
-\fIappletviewer\fRޥɤϳȯѤǤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/samples/aboutCodeSamples\&.htmlˤ
-ץ/ƥȡץꥱ󤪤ӥɤˤĤƤ򻲾ȤƤ
-.SH "ץ"
+\fIappletviewer\fRコマンドは開発専用です。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/aboutCodeSamples\&.htmlにある
+サンプル/テスト・アプリケーションおよびコードについてを参照してください。
+.SH "オプション"
 .PP
 \-debug
 .RS 4
-\fIjdb\fRޥɤѤJavaǥХåǥץåȡӥ塼򳫻ϤơɥΥץåȤǥХåޤ
+\fIjdb\fRコマンドを使用してJavaデバッガでアプレット・ビューアを開始して、ドキュメント中のアプレットをデバッグします。
 .RE
 .PP
 \-encoding \fIencoding\-name\fR
 .RS 4
-HTMLեΥ󥳡ǥ̾ꤷޤ
+入力HTMLファイルのエンコーディング名を指定します。
 .RE
 .PP
 \-J\fIjavaoption\fR
 .RS 4
-ʸ\fIjavaoption\fRϡץåȡӥ塼¹ԤJava󥿥ץ꥿1ĤΰȤϤޤ˥ڡޤʤǤʣΰϡ٤ƤƬ\fI\-J\fRǻϤޤɬפޤϡѥμ¹ԴĶޤϥ꡼ѤĴͭǤ
+文字列\fIjavaoption\fRは、アプレット・ビューアを実行するJavaインタプリタに1つの引数として渡されます。引数にスペースを含めないでください。複数の引数は、すべてが接頭辞\fI\-J\fRで始まる必要があります。これは、コンパイラの実行環境またはメモリー使用の調整に有効です。
 .RE
 .PP
 
--- a/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: idlj
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "idlj" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "idlj" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idlj \- ꤵ줿󥿥ե(IDL)եФJavaХǥ󥰤ޤ
-.SH ""
+idlj \- 指定されたインタフェース定義言語(IDL)ファイルに対してJavaバインディングを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,22 +64,22 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤoptionsν֤ǤդǤ\fIidlfile\fR˻ꤹɬפޤ
+コマンドライン・オプション。オプションを参照してください。optionsの順番は任意ですが、\fIidlfile\fRよりも前に指定する必要があります。
 .RE
 .PP
 \fIidlfile\fR
 .RS 4
-󥿥ե(IDL)ˤޤޤե̾
+インタフェース定義言語(IDL)による定義が含まれるファイルの名前。
 .RE
-.SH ""
+.SH "説明"
 .PP
-IDL\-to\-Javaѥϡꤵ줿IDLեФJavaХǥ󥰤ޤХǥ󥰤ξܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.htmlˤ
-Java IDL: Javaޥåԥ󥰤ؤIDL򻲾ȤƤ
+IDL\-to\-Javaコンパイラは、指定されたIDLファイルに対してJavaバインディングを生成します。バインディングの詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.htmlにある
+Java IDL: Java言語マッピングへのIDLを参照してください。
 .PP
-IDL\-to\-JavaѥΰΥ꡼ˤϡ\fIidltojava\fRȤ̾äΤޤ
-.SS "饤ȡХǥ󥰤ӥСХǥ󥰤ȯ"
+IDL\-to\-Javaコンパイラの以前のリリースの中には、\fIidltojava\fRという名前だったものがあります。
+.SS "クライアント・バインディングおよびサーバー・バインディングの発行"
 .PP
-\fIidlj\fRޥɤϡ饤¦Хǥ󥰤ޤ\fIMy\&.idl\fRȤ̾IDLեޤ
+次の\fIidlj\fRコマンドは、クライアント側バインディングを含む\fIMy\&.idl\fRという名前のIDLファイルを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -91,7 +91,7 @@
 .RE
 .\}
 .PP
-ιʸϼƱǤ
+前の構文は次と同等です。
 .sp
 .if n \{\
 .RS 4
@@ -103,7 +103,7 @@
 .RE
 .\}
 .PP
-ǤϡС¦Хǥ󥰤饤¦Хǥ󥰤ӥȥޤƤꡢϤ٤ơPOA (Ѿǥ)Ǥ
+次の例では、サーバー側バインディングを生成し、クライアント側バインディングおよびスケルトンを含めており、これらはすべて、POA (継承モデル)です。
 .sp
 .if n \{\
 .RS 4
@@ -115,7 +115,7 @@
 .RE
 .\}
 .PP
-饤¦ȥС¦ξΥХǥ󥰤ϡΥޥ(ɤ)Τ1ĤѤޤ
+クライアント側とサーバー側の両方のバインディングを生成する場合は、次のコマンド(どれも等価)のうちの1つを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -128,7 +128,7 @@
 .RE
 .\}
 .PP
-С¦Dzǽʥǥ2ĤޤܿǽХȷѾǥTieǥǤTieѾǥ򻲾ȤƤ
+サーバー側で可能なモデルは2つあります。移殖可能サーバント継承モデルとTieモデルです。Tie委譲モデルを参照してください。
 .if n \{\
 .sp
 .\}
@@ -138,21 +138,21 @@
 .nr an-break-flag 1
 .br
 .ps +1
-\fBܿǽХȷѾǥ\fR
+\fB移殖可能サーバント継承モデル\fR
 .ps -1
 .br
 .PP
-ǥեȤΥС¦ΥǥϡܿǽХȷѾǥǤ\fIMy\&.idl\fR\fIMy\fR󥿥եƤϡ\fIMyPOA\&.java\fRȤե뤬ޤ\fIMy\fR󥿥եμ󶡤ɬפꡢ\fIMy\fR󥿥ե\fIMyPOA\fR饹Ѿɬפޤ\fIMyPOA\&.java\fRϡhttp://docs\&.oracle\&.com/javase/8/docs/api/org/omg/PortableServer/Servant\&.htmlˤ
-\fIorg\&.omg\&.PortableServer\&.Servant\fR饹ĥ륹ȥ꡼١ΥȥǤ
+デフォルトのサーバー側のモデルは、移殖可能サーバント継承モデルです。\fIMy\&.idl\fR内で\fIMy\fRインタフェースが定義されている場合は、\fIMyPOA\&.java\fRというファイルが生成されます。\fIMy\fRインタフェースの実装を提供する必要があり、\fIMy\fRインタフェースは\fIMyPOA\fRクラスから継承する必要があります。\fIMyPOA\&.java\fRは、http://docs\&.oracle\&.com/javase/8/docs/api/org/omg/PortableServer/Servant\&.htmlにある
+\fIorg\&.omg\&.PortableServer\&.Servant\fRクラスを拡張するストリームベースのスケルトンです。
 .PP
-\fIMy\fR󥿥եϡȥ󤬼IDL󥿥ե˴ϢդƤ\fIcallHandler\fR󥿥ե󥿥եޤ
+\fIMy\fRインタフェースは、スケルトンが実装するIDLインタフェースに関連付けられている\fIcallHandler\fRインタフェースと操作インタフェースを実装します。
 .PP
-ݡ֥롦֥ȡץ(POA)\fIPortableServer\fR⥸塼ϡͥƥ֤\fIServant\fRޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/POA\&.htmlˤ
-ݡ֥롦֥ȡץ(POA)򻲾ȤƤ
+ポータブル・オブジェクト・アダプタ(POA)の\fIPortableServer\fRモジュールは、ネイティブの\fIServant\fR型を定義します。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/POA\&.htmlにある
+ポータブル・オブジェクト・アダプタ(POA)を参照してください。
 .PP
-Javaץߥ󥰸Ǥϡ\fIServant\fRJava\fIorg\&.omg\&.PortableServer\&.Servant\fR饹˥ޥåפޤϡ٤ƤPOAХȼΥ١饹ȤƵǽץꥱ󡦥ץޤƤӽФȤΤǤ뤤ĤΥ᥽åɡPOAˤäƸƤӽФ졢ХȤư椹뤿˥桼С饤ɤǤ᥽åɤ󶡤ޤ
+Javaプログラミング言語では、\fIServant\fR型はJavaの\fIorg\&.omg\&.PortableServer\&.Servant\fRクラスにマップされます。これは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッド、およびPOAによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドを提供します。
 .PP
-ѾǥΤ⤦1ĤΥץϡ\fI\-oldImplBase\fRե饰ѤơJava SE 1\&.4Υ꡼Javaץߥ󥰸ȸߴΤ륵С¦Хǥ󥰤뤳ȤǤ\-\fIoldImplBase\fRե饰ɸǡAPI侩ǤΥե饰ѤΤϡJava SE 1\&.3ǵҤ줿¸ΥСȤθߴɬפʾΤߤǤξ硢¸makeեѹơ\fI\-oldImplBase\fRե饰\fIidlj\fRѥɲäɬפޤʳξ硢POA١ΥС¦ޥåԥ󥰤ޤ̸ߴΤ륵С¦Хǥ󥰤ˤϡ¹Ԥޤ
+継承モデルのもう1つのオプションは、\fI\-oldImplBase\fRフラグを使用して、Java SE 1\&.4より前のリリースのJavaプログラミング言語と互換性のあるサーバー側バインディングを生成することです。\-\fIoldImplBase\fRフラグは非標準で、これらのAPIは非推奨です。このフラグを使用するのは、Java SE 1\&.3で記述された既存のサーバーとの互換性が必要な場合のみです。その場合、既存のmakeファイルを変更して、\fI\-oldImplBase\fRフラグを\fIidlj\fRコンパイラに追加する必要があります。それ以外の場合、POAベースのサーバー側マッピングが生成されます。下位互換性のあるサーバー側バインディングを生成するには、次を実行します。
 .sp .5v
 .RE
 .sp
@@ -167,7 +167,7 @@
 .RE
 .\}
 .PP
-\fIMy\&.idl\fR\fIMy\fR󥿥եƤϡ\fI_MyImplBase\&.java\fRȤե뤬ޤ\fIMy\fR󥿥եμ󶡤ɬפꡢ\fIMy\fR󥿥ե\fI_MyImplBase\fR饹Ѿɬפޤ
+\fIMy\&.idl\fR内で\fIMy\fRインタフェースが定義されている場合は、\fI_MyImplBase\&.java\fRというファイルが生成されます。\fIMy\fRインタフェースの実装を提供する必要があり、\fIMy\fRインタフェースは\fI_MyImplBase\fRクラスから継承する必要があります。
 .if n \{\
 .sp
 .\}
@@ -177,11 +177,11 @@
 .nr an-break-flag 1
 .br
 .ps +1
-\fBTieѾǥ\fR
+\fBTie委譲モデル\fR
 .ps -1
 .br
 .PP
-⤦1ĤΥС¦ǥϡTieǥȸƤФΤǤΥС¦ǥϡѾǥǤTieȥȥƱ뤳ȤϤǤʤᡢ̡ɬפޤΥޥɤˤäơTieǥѤΥХǥ󥰤ޤ
+もう1つのサーバー側モデルは、Tieモデルと呼ばれるものです。このサーバー側モデルは、委譲モデルです。Tieとスケルトンを同時に生成することはできないため、それらは別々に生成する必要があります。次のコマンドによって、Tieモデル用のバインディングが生成されます。
 .sp .5v
 .RE
 .sp
@@ -196,7 +196,7 @@
 .RE
 .\}
 .PP
-\fIMy\fR󥿥եξ硢2ܤΥޥɤˤꡢ\fIMyPOATie\&.java\fRޤ\fIMyPOATie\fR饹ؤΥ󥹥ȥ饯ϡdelegateޤǤϡǥեȤPOAǥѤƤ뤿ᡢ󥹥ȥ饯ˤPOAɬפǤdelegateФƼ󶡤ɬפޤμ\fIMyOperations\fR󥿥եѾɬפΤߤǡ¾Υ饹ѾɬפϤޤ󡣤ORBȰ˻ѤˤϡȤмΤ褦\fIMyPOATie\fR饹Ǽåפɬפޤ
+\fIMy\fRインタフェースの場合、2番目のコマンドにより、\fIMyPOATie\&.java\fRが生成されます。\fIMyPOATie\fRクラスへのコンストラクタは、delegateを取ります。この例では、デフォルトのPOAモデルを使用しているため、コンストラクタにもPOAが必要です。delegateに対して実装を提供する必要がありますが、この実装は\fIMyOperations\fRインタフェースから継承する必要があるのみで、その他のクラスから継承する必要はありません。これをORBと一緒に使用するには、たとえば次のように\fIMyPOATie\fRクラス内で実装をラップする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -222,9 +222,9 @@
 .RE
 .\}
 .PP
-¾μѾɬפ硢ɸηѾǥǤϤʤTieǥѤ뤳ȤǤޤJavaξϡ󥿥եηѾθĿ¤Ϥޤ󤬡饹ηѾ˻ѤǤ륹åȤ1ĤΤߤǤѾǥѤϡΥåȤͭޤTieǥѤȡΥåȤѤ줺桼ȼŪǻѤǤޤˡˤϡΥ٥뤬1ƳȤû꤬ޤ᥽åɤƤӽФȤˡ;ʬʥ᥽åɸƽФ1ȯޤ
+他の実装から継承する必要がある場合、標準の継承モデルではなくTieモデルを使用することもできます。Javaの場合は、インタフェースの継承の個数に制限はありませんが、クラスの継承に使用できるスロットは1つのみです。継承モデルを使用した場合は、そのスロットが占有されます。Tieモデルを使用すると、そのスロットが使用されず、ユーザーが独自の目的で使用できます。この方法には、間接性のレベルが1つ導入されるという短所があります。メソッドを呼び出すときに、余分なメソッド呼出しが1回発生します。
 .PP
-С¦ξ硢Java SE 1\&.4ΥСJava˥ޥåԥ󥰤IDLΥСȸߴΤ롢TieǥΥХǥ󥰤Ǥ
+サーバー側の生成の場合、Java SE 1\&.4より前のバージョンのJava言語にマッピングするIDLのバージョンと互換性のある、Tieモデルのバインディングです。
 .sp
 .if n \{\
 .RS 4
@@ -237,7 +237,7 @@
 .RE
 .\}
 .PP
-\fIMy\fR󥿥եξ硢ˤꡢ\fIMy_Tie\&.java\fRޤ\fIMy_Tie\fR饹ؤΥ󥹥ȥ饯ϡ\fIimpl\fR֥Ȥޤ\fIimpl\fRФƼ󶡤ɬפޤμ\fIHelloOperations\fR󥿥եѾɬפΤߤǡ¾Υ饹ѾɬפϤޤ󡣤ORBȰ˻ѤˤϡȤмΤ褦\fIMy_Tie\fRǼåפɬפޤ
+\fIMy\fRインタフェースの場合、これにより、\fIMy_Tie\&.java\fRが生成されます。\fIMy_Tie\fRクラスへのコンストラクタは、\fIimpl\fRオブジェクトを取ります。\fIimpl\fRに対して実装を提供する必要がありますが、その実装は\fIHelloOperations\fRインタフェースから継承する必要があるのみで、その他のクラスから継承する必要はありません。しかし、これをORBと一緒に使用するには、たとえば次のように\fIMy_Tie\fR内で実装をラップする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -258,15 +258,15 @@
 .if n \{\
 .RE
 .\}
-.SS "ȯԤ줿եذ֤λ"
+.SS "発行されたファイルの代替位置の指定"
 .PP
-ȯԤ줿ե򸽺ߤΥǥ쥯ȥʳΥǥ쥯ȥ֤ˤϡ\fIi\fR\fIdlj \-td /altdir My\&.idl\fRΥޥɤǥѥƤӽФޤ
+発行されたファイルを現在のディレクトリ以外のディレクトリに置くには、\fIi\fR\fIdlj \-td /altdir My\&.idl\fRのコマンドでコンパイラを呼び出します。
 .PP
 
-\fIMy\fR󥿥եξ硢Хǥ󥰤ϡ\fI\&./My\&.java\fRǤϤʤ\fI/altdir/My\&.java\fRʤɤȯԤޤ
-.SS "󥯥롼ɡեذ֤λ"
+\fIMy\fRインタフェースの場合、バインディングは、\fI\&./My\&.java\fRではなく、\fI/altdir/My\&.java\fRなどに発行されます。
+.SS "インクルード・ファイルの代替位置の指定"
 .PP
-\fIMy\&.idl\fRե뤬̤\fIidl\fRեǤ\fIMyOther\&.idl\fR򥤥󥯥롼ɤ硢ѥǤϡ\fIMyOther\&.idl\fRե뤬롦ǥ쥯ȥ¸ߤ뤳ȤȤƤޤȤС줬\fI/includes\fRˤϡΤ褦ʥޥɤǥѥƤӽФޤ
+\fIMy\&.idl\fRファイルが別の\fIidl\fRファイルである\fIMyOther\&.idl\fRをインクルードする場合、コンパイラでは、\fIMyOther\&.idl\fRファイルがローカル・ディレクトリに存在することを前提としています。たとえば、それが\fI/includes\fRにある場合は、次のようなコマンドでコンパイラを呼び出します。
 .sp
 .if n \{\
 .RS 4
@@ -278,7 +278,7 @@
 .RE
 .\}
 .PP
-ȤС\fI/moreIncludes\fRˤ\fIAnother\&.idl\fR\fIMy\&.idl\fR˥󥯥롼ɤƤΤǤСΤ褦ʥޥɤǥѥƤӽФޤ
+たとえば、\fI/moreIncludes\fRにある\fIAnother\&.idl\fRも\fIMy\&.idl\fRにインクルードされているのであれば、次のようなコマンドでコンパイラを呼び出します。
 .sp
 .if n \{\
 .RS 4
@@ -290,7 +290,7 @@
 .RE
 .\}
 .PP
-Τ褦ʷ\fIinclude\fRĹʤ뤿ᡢ󥯥롼ɡե򸡺򥳥ѥ˻ؼ뤿̤ˡѰդƤޤˡϡĶѿιͤȻƤޤ\fICLASSPATH\fRѿ˰ɽƤǥ쥯ȥidl\&.configȤ̾Υեޤ\fIidl\&.config\fRˡΤ褦ʷιԤޤ
+このような形式の\fIinclude\fRは長くなるため、インクルード・ファイルを検索する場所をコンパイラに指示するための別の方法が用意されています。この方法は、環境変数の考え方と似ています。\fICLASSPATH\fR変数に一覧表示されているディレクトリ内にidl\&.configという名前のファイルを作成します。その\fIidl\&.config\fRの中に、次のような形式の行を入れます。
 .sp
 .if n \{\
 .RS 4
@@ -302,10 +302,10 @@
 .RE
 .\}
 .PP
-ѥϡΥե򸡺󥯥롼ɡꥹȤɤ߹ߤޤǤϡǥ쥯ȥδ֤ζڤʸϥߥ(;)ˤʤäƤޤζڤʸϡץåȥեˤäưۤʤޤWindowsץåȥեǤϥߥѤUNIXץåȥեǤϥѤʤɤǤ
-.SS "󥯥롼ɡեФХǥ󥰤ȯ"
+コンパイラは、このファイルを検索し、インクルード・リストを読み込みます。この例では、ディレクトリの間の区切り文字はセミコロン(;)になっています。この区切り文字は、プラットフォームによって異なります。Windowsプラットフォームではセミコロンを使用し、UNIXプラットフォームではコロンを使用するなどです。
+.SS "インクルード・ファイルに対するバインディングの発行"
 .PP
-ǥեȤǤϡޥɥ饤˻ꤷ\fIidl\fRեƤ륤󥿥ե乽¤ΤʤɤˤĤƤΤߡJavaХǥ󥰤ޤ󥯥롼ɤ줿եƤ뷿ˤĤƤޤ󡣤ȤС2Ĥ\fIidl\fRեˤĤƹͤƤߤޤ
+デフォルトでは、コマンドラインに指定した\fIidl\fRファイルで定義されているインタフェースや構造体などについてのみ、Javaバインディングが生成されます。インクルードされたファイルで定義されている型については生成されません。たとえば、次の2つの\fIidl\fRファイルについて考えてみます。
 .sp
 .if n \{\
 .RS 4
@@ -328,7 +328,7 @@
 .RE
 .\}
 .PP
-ǥեȤΥ롼˴ؤƷٹ𤬤ޤХ롦פɽ\fI#include\fRʸϡҤΤȤ˽ޤ\fI#include\fRʸϡݡʸȸʤȤǤޤϤޤ줿ɽ\fI#include\fRʸϡΰ̣Ǥ\fI#include\fRʸȤƽޤĤޤꡢ󥯥롼ɤ줿եˤ륳ɤΥեˤΤޤɽƤ뤫Τ褦˽졢ФJavaХǥ󥰤ȯԤޤϤǤ
+デフォルトのルールに関して警告があります。グローバル・スコープに表示される\fI#include\fR文は、前述のとおりに処理されます。これらの\fI#include\fR文は、インポート文と見なすことができます。囲まれたスコープ内に表示される\fI#include\fR文は、本当の意味での\fI#include\fR文として処理されます。つまり、インクルードされたファイルにあるコードが、元のファイルにそのまま表示されているかのように処理され、それに対してJavaバインディングが発行されます。次はその例です。
 .sp
 .if n \{\
 .RS 4
@@ -356,7 +356,7 @@
 .RE
 .\}
 .PP
-\fI idlj My\&.idl \fR¹ԤơJavaեμΥꥹȤޤݡʸȤߤʤ\fI#include\fRƤᡢ\fIMyOther\&.java\fRޤǤΰ̣Ǥ\fI#include\fRƤᡢ\fIE\&.java\fRޤ\fIEmbedded\&.idl\fRե뤬\fIMy\fR󥿥եΥ˥󥯥롼ɤƤ뤿ᡢ\fIMy\fRΥ(Ĥޤꡢ\fIMyPackage\fR)Ƥޤ\fI\-emitAll\fRե饰Ѥ硢󥯥롼ɤ줿٤ƤΥեˤ뤹٤ƤηȯԤޤ
+\fI idlj My\&.idl \fRを実行して、Javaファイルの次のリストを生成します。インポート文とみなされる\fI#include\fRに定義されていたため、\fIMyOther\&.java\fRは生成されませんでした。ただし、本当の意味での\fI#include\fRで定義されていたため、\fIE\&.java\fRは生成されました。\fIEmbedded\&.idl\fRファイルが\fIMy\fRインタフェースのスコープ内にインクルードされているため、\fIMy\fRのスコープ内(つまり、\fIMyPackage\fR内)に生成されています。\fI\-emitAll\fRフラグを使用した場合、インクルードされたすべてのファイルにあるすべての型が発行されます。
 .sp
 .if n \{\
 .RS 4
@@ -374,9 +374,9 @@
 .if n \{\
 .RE
 .\}
-.SS "ѥåƬ"
+.SS "パッケージの接頭辞の挿入"
 .PP
-ABCȤ̾βҤΤ˺ȤƤơΤ褦IDLեۤȤޤ礦
+ABCという名前の会社のために作業していて、次のようなIDLファイルを構築したとしましょう。
 .sp
 .if n \{\
 .RS 4
@@ -394,7 +394,7 @@
 .RE
 .\}
 .PP
-IDL\-to\-Javaѥ𤷤ƤΥե¹Ԥ硢W1W2ФJavaХǥ󥰤ϡ\fIWidgets\fRѥå˳ǼޤȳδˤȡҤΥѥåϡ\fIcom\&.<company name>\fRȤ̾Υѥå֤ȤˤʤäƤޤδ˽ˤϡѥå̾\fIcom\&.abc\&.Widgets\fRˤɬפޤΥѥåƬWidgets⥸塼ղäˤϡΥޥɤ¹Ԥޤ
+IDL\-to\-Javaコンパイラを介してこのファイルを実行した場合、W1およびW2に対するJavaバインディングは、\fIWidgets\fRパッケージ内に格納されます。業界の慣例によると、会社のパッケージは、\fIcom\&.<company name>\fRという名前のパッケージ内に置くことになっています。この慣例に従うには、パッケージ名を\fIcom\&.abc\&.Widgets\fRにする必要があります。このパッケージ接頭辞をWidgetsモジュールに付加するには、次のコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -406,30 +406,30 @@
 .RE
 .\}
 .PP
-Widgets\&.idl򥤥󥯥롼ɤƤIDLե뤬ϡΥޥɤˤ\fI\-pkgPrefix\fRե饰ɬפǤΥե饰ꤷʤȡIDLեϡ\fIcom\&.abc\&.Widgets\fRѥåǤϤʤ\fIWidgets\fRѥå򸡺뤳Ȥˤʤޤ
+Widgets\&.idlをインクルードしているIDLファイルがある場合は、そのコマンドにも\fI\-pkgPrefix\fRフラグが必要です。このフラグを指定しないと、そのIDLファイルは、\fIcom\&.abc\&.Widgets\fRパッケージではなく、\fIWidgets\fRパッケージを検索することになります。
 .PP
-ƬɬפʥѥåĤ⤢ϡҤidl\&.configեƬꤹΤñǤѥåƬγƹԤϡ\fIPkgPrefix\&.<type>=<prefix>\fRηǤɬפޤҤιԤǤϡ\fIPkgPrefix\&.Widgets=com\&.abc\fRˤʤޤΥץϡݥȥIDˤϱƶޤ
-.SS "ѥΥܥ"
+接頭辞が必要なパッケージがいくつもある場合は、前述のidl\&.configファイルで接頭辞を指定するのが簡単です。パッケージ接頭辞の各行は、\fIPkgPrefix\&.<type>=<prefix>\fRの形式である必要があります。前述の例の行では、\fIPkgPrefix\&.Widgets=com\&.abc\fRになります。このオプションは、リポジトリIDには影響しません。
+.SS "コンパイル前のシンボルの定義"
 .PP
-ѥѤΥܥ뤬IDLեƤʤϡΥܥɬפޤϡȤСХǥ˥ǥХåɤȤȤ˻Ѥޤޥ\fIidlj \-d MYDEF My\&.idl \fRϡMy\&.idl˹\fI#define MYDEF\fR֤Ʊˤʤޤ
-.SS "¸ΥХǥ󥰤ݻ"
+コンパイル用のシンボルがIDLファイル内で定義されていない場合は、そのシンボルを定義する必要があります。これは、たとえば、バインディング内にデバッグ・コードを組み入れるときに使用します。コマンド\fIidlj \-d MYDEF My\&.idl \fRは、My\&.idl内に行\fI#define MYDEF\fRを配置した場合と同等になります。
+.SS "既存のバインディングの保持"
 .PP
-JavaХǥ󥰡ե뤬Ǥ¸ߤϡ\fI\-keep\fRե饰ꤹȡѥˤ񤭤ǤޤǥեȤǤϡǤ¸ߤ뤫ɤˤ餺٤ƤΥե뤬ޤΥե򥫥ޥ(ƤΤǤȤʳϥޥ򤱤)\fI\-keep\fRץͭѤǤޥ\fIidlj \-keep My\&.idl\fRϡǤ¸ߤʤ٤ƤΥ饤¦Хǥ󥰤ȯԤޤ
-.SS "ѥοĽɽ"
+Javaバインディング・ファイルがすでに存在する場合は、\fI\-keep\fRフラグを指定すると、コンパイラによる上書きを回避できます。デフォルトでは、すでに存在するかどうかにかかわらず、すべてのファイルが生成されます。これらのファイルをカスタマイズした場合(ただし、それらの内容が正確であるとき以外はカスタマイズは避ける)、\fI\-keep\fRオプションは有用です。コマンド\fIidlj \-keep My\&.idl\fRは、すでに存在しないすべてのクライアント側バインディングを発行します。
+.SS "コンパイルの進捗状況の表示"
 .PP
-IDL\-to\-Javaѥϡ¹ԤγʳǾ֥åޤ\fI\-v\fRץѤơ\fIidlj \-v My\&.idl\fRΤ褦ʾĹ⡼ɤ򥢥ƥֲޤ
+IDL\-to\-Javaコンパイラは、実行の各段階で状態メッセージを生成します。\fI\-v\fRオプションを使用して、\fIidlj \-v My\&.idl\fRのような冗長モードをアクティブ化します。
 .PP
-ǥեȤǤϡѥϾĹ⡼ɤǤϼ¹Ԥޤ
-.SS "Сɽ"
+デフォルトでは、コンパイラは冗長モードでは実行されません。
+.SS "バージョン情報の表示"
 .PP
-IDL\-to\-JavaѥΥӥɡСɽˤϡޥɥ饤\fIidlj \-version\fR\fI\-version\fRץꤷޤ
+IDL\-to\-Javaコンパイラのビルド・バージョンを表示するには、コマンドライン\fIidlj \-version\fRで\fI\-version\fRオプションを指定します。
 .PP
-Сϡѥˤä줿Хǥˤ񤭹ޤƤޤΥץ򥳥ޥɥ饤˻ꤹȡʳΥץꤷƤ⡢٤̵뤵ޤ
-.SH "ץ"
+バージョン情報は、コンパイラによって生成されたバインディング内にも書き込まれています。このオプションをコマンドラインに指定すると、それ以外のオプションを指定しても、すべて無視されます。
+.SH "オプション"
 .PP
 \-d \fIsymbol\fR
 .RS 4
-ΥץϡIDLե˼Τ褦ʹԤɲäǤ
+このオプションは、IDLファイルに次のような行を追加した場合と等価です。
 .sp
 .if n \{\
 .RS 4
@@ -444,46 +444,46 @@
 .PP
 \-demitAll
 .RS 4
-\fI#include\fRեƤΤޤơ٤ƤηȯԤޤ
+\fI#include\fRファイル内で定義されているものも含めて、すべての型を発行します。
 .RE
 .PP
 \-fside
 .RS 4
-ȯԤХǥ󥰤ޤ\fIside\fRѥ᡼ˤϡ\fIclient\fR\fIserver\fR\fIserverTIE\fR\fIall\fRޤ\fIallTIE\fRǤޤ\fI\-fserverTIE\fRޤ\fI\-fallTIE\fRץꤹȡѾǥ롦ȥȯԤޤե饰ꤷʤ硢\fI\-fclient\fR˥ǥեꤵޤ
+発行するバインディングを定義します。\fIside\fRパラメータには、\fIclient\fR、\fIserver\fR、\fIserverTIE\fR、\fIall\fRまたは\fIallTIE\fRを指定できます。\fI\-fserverTIE\fRまたは\fI\-fallTIE\fRオプションを指定すると、委譲モデル・スケルトンが発行されます。フラグを指定しない場合、\fI\-fclient\fRにデフォルト設定されます。
 .RE
 .PP
 \-i \fIinclude\-path\fR
 .RS 4
-ǥեȤǤϡ󥯥롼ɡեϸߤΥǥ쥯ȥ꤫鸡ޤΥץꤹȡ¾Υǥ쥯ȥɲäǤޤ
+デフォルトでは、インクルード・ファイルは現在のディレクトリから検索されます。このオプションを指定すると、他のディレクトリを追加できます。
 .RE
 .PP
 \-i \fIkeep\fR
 .RS 4
-ե뤬Ǥ¸ߤƤϡΥե뤬񤭤ޤ󡣥ǥեȤǤϡ񤭤ޤ
+生成されるファイルがすでに存在している場合は、そのファイルが上書きされません。デフォルトでは、上書きされます。
 .RE
 .PP
 \-noWarn
 .RS 4
-ٹåɽʤ褦ˤޤ
+警告メッセージを表示しないようにします。
 .RE
 .PP
 \-oldImplBase
 .RS 4
-1\&.4JDK ORBȸߴΤ륹ȥޤǥեȤǤϡPOAѾǥΥС¦Хǥ󥰤ޤΥץꤹȡ\fIImplBase\fRѾǥΥ饹Ǥ륵С¦Хǥ󥰤ΤǡΥ꡼Javaץߥ󥰸Ȥβ̸ߴޤ
+1\&.4より前のJDK ORBと互換性のあるスケルトンを生成します。デフォルトでは、POA継承モデルのサーバー側バインディングが生成されます。このオプションを指定すると、\fIImplBase\fR継承モデルのクラスであるサーバー側バインディングが生成されるので、以前のリリースのJavaプログラミング言語との下位互換性が得られます。
 .RE
 .PP
 \-pkgPrefix \fItype\fR \fIprefix\fR
 .RS 4
-\fItype\fRե롦פǸФ줿ϡηФ뤹٤ƤΥեˤĤơJavaѥå̾\fIprefix\fRȤƬղäޤtypeϡȥåץ٥롦⥸塼ñ̾ɤΥ⥸塼⳰¦줿IDLñ̾Τɤ餫Ǥ
+\fItype\fRがファイル・スコープで検出された場合は、その型に対して生成されるすべてのファイルについて、生成されるJavaパッケージ名に\fIprefix\fRという接頭辞が付加されます。typeは、トップレベル・モジュールの単純名か、どのモジュールよりも外側で定義されたIDL型の単純名のどちらかです。
 .RE
 .PP
 \-pkgTranslate \fItype\fR \fIpackage\fR
 .RS 4
-̻Ҥ˥⥸塼̾typeФȡJavaѥåΤ٤ƤΥեˤĤơ̻ҤΤ̾package֤ޤǽ\fIpkgPrefix\fRѹԤޤtypeͤϡȥåץ٥Υ⥸塼ñ̾ޤϤ٤ƤΥ⥸塼γ줿IDLñ̾ǡʥѥå̾Τ˰פɬפޤ
+識別子の中にモジュール名typeが検出されると、生成されるJavaパッケージ内のすべてのファイルについて、識別子の中のその名前がpackageで置き換えられます。最初に\fIpkgPrefix\fRの変更が行われます。typeの値は、トップレベルのモジュールの単純名、またはすべてのモジュールの外部で定義されたIDL型の単純名で、完全なパッケージ名に正確に一致する必要があります。
 .sp
-ʣѴ̻Ҥ˰פ硢˼褦ˡǤĹפ򤵤ޤ
+複数の変換が識別子に一致する場合、次の例に示すように、最も長い一致が選択されます。
 .sp
-\fBޥ\fR:
+\fBコマンド\fR:
 .sp
 .if n \{\
 .RS 4
@@ -494,7 +494,7 @@
 .if n \{\
 .RE
 .\}
-\fB̤Ѵ\fR:
+\fB結果の変換\fR:
 .sp
 .if n \{\
 .RS 4
@@ -508,47 +508,47 @@
 .if n \{\
 .RE
 .\}
-ѥå̾\fIorg\fR\fIorg\fR\&.o\fImg\fRޤ\fIorg\&.omg\fRΥ֥ѥåϡѴǤޤ󡣤Υѥå̾Ѵ褦ȤȡߴΤʤɤ졢\fI\-pkgTranslate\fRθκǽΰȤƤΥѥåѤȡ顼Ȥưޤ
+パッケージ名\fIorg\fR、\fIorg\fR\&.o\fImg\fR、または\fIorg\&.omg\fRのサブパッケージは、変換できません。これらのパッケージ名を変換しようとすると、互換性のないコードが生成され、\fI\-pkgTranslate\fRの後の最初の引数としてそれらのパッケージを使用すると、エラーとして扱われます。
 .RE
 .PP
 \-skeletonName \fIxxx%yyy\fR
 .RS 4
-\fIxxx%yyy\fRȥ̾դѥȤƻѤޤǥեȤϼΤȤǤ\fIPOA\fR١饹ξ\fI%POA\fR
-(\fI\-fserver\fRޤ\fI\-fall\fR)\fIoldImplBase\fR饹ξ\fI_%ImplBase\fR
-(\-\fIoldImplBase\fR)(\fI\-fserver\fRޤ\fI\-fall\fR))
+\fIxxx%yyy\fRが、スケルトンに名前を付けるパターンとして使用されます。デフォルトは次のとおりです。\fIPOA\fRベース・クラスの場合は\fI%POA\fR
+(\fI\-fserver\fRまたは\fI\-fall\fR)、\fIoldImplBase\fRクラスの場合は\fI_%ImplBase\fR
+(\-\fIoldImplBase\fR)および(\fI\-fserver\fRまたは\fI\-fall\fR))。
 .RE
 .PP
 \-td \fIdir\fR
 .RS 4
-ϥǥ쥯ȥȤơߤΥǥ쥯ȥǤϤʤ\fIdir\fRѤޤ
+出力ディレクトリとして、現在のディレクトリではなく、\fIdir\fRが使用されます。
 .RE
 .PP
 \-tieName \fIxxx%yyy\fR
 .RS 4
-ѥ˽äơ\fIxxx%yyy\fRѤޤǥեȤϼΤȤǤ\fIPOA\fR١饹ξ\fI%POA\fR
-(\fI\-fserverTieޤ\-fallTie\fR)\fIoldImplBase\fR
-tie饹ξ\fI_%Tie\fR
-(\-\fIoldImplBase\fR)(\fI\-fserverTie\fRޤ\fI\-fallTie\fR))
+パターンに従って、\fIxxx%yyy\fRを使用します。デフォルトは次のとおりです。\fIPOA\fRベース・クラスの場合は\fI%POA\fR
+(\fI\-fserverTieまたは\-fallTie\fR)、\fIoldImplBase\fR
+tieクラスの場合は\fI_%Tie\fR
+(\-\fIoldImplBase\fR)および(\fI\-fserverTie\fRまたは\fI\-fallTie\fR))。
 .RE
 .PP
-\-nowarn\-verbose
+\-nowarn、\-verbose
 .RS 4
-꡼ɽƽλޤ
+リリース情報を表示して終了します。
 .RE
 .PP
 \-version
 .RS 4
-꡼ɽƽλޤ
+リリース情報を表示して終了します。
 .RE
-.SH "»"
+.SH "制限事項"
 .PP
-Х롦Υפ줿̻ҤϡIDLץߥƥַ\fIObject\fRޤ\fIValueBase\fRƱ֤ˤʤǤϡܥɽμ̻ҤǥץɤƤ뤿ǤκĤȡ񤭤ޤϡ餯ŪǤ
+グローバル・スコープ内のエスケープされた識別子は、IDLプリミティブ型の\fIObject\fRまたは\fIValueBase\fRと同じ綴りにしないでください。これは、シンボル表がこれらの識別子でプリロードされているためです。これらの再定義を許可すると、元の定義が上書きされます。これは、おそらく恒久的な制約です。
 .PP
-\fIfixed\fRȤIDLϥݡȤƤޤ
-.SH "Τ"
+\fIfixed\fRというIDL型はサポートされていません。
+.SH "既知の問題"
 .PP
-Х뼱̻ҤˤĤƥݡȤޤͽʤ\fIimpl\fR֥ȤƤӽФȡ㳰ޤθϡ\fIServerDelegate\fR
-DSI\fINullPointerException\fRˤ褦Ǥ
+グローバル識別子についてインポートが生成されません。予期されないローカル\fIimpl\fRオブジェクトを呼び出すと、例外を受け取ります。しかし、その原因は、\fIServerDelegate\fR
+DSIコード内の\fINullPointerException\fRにあるようです。
 .br
 'pl 8.5i
 'bp
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jar.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jar.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jar
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jar" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jar" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,9 +49,9 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jar \- Java Archive (JAR)եޤ
-.SH ""
-JARեκ
+jar \- Java Archive (JAR)ファイルを操作します。
+.SH "概要"
+JARファイルの作成
 .sp
 .if n \{\
 .RS 4
@@ -62,7 +62,7 @@
 .if n \{\
 .RE
 .\}
-JARեι
+JARファイルの更新
 .sp
 .if n \{\
 .RS 4
@@ -73,7 +73,7 @@
 .if n \{\
 .RE
 .\}
-JARե
+JARファイルの抽出
 .sp
 .if n \{\
 .RS 4
@@ -84,7 +84,7 @@
 .if n \{\
 .RE
 .\}
-JARեΥƥĤΥꥹ
+JARファイルのコンテンツのリスト
 .sp
 .if n \{\
 .RS 4
@@ -95,7 +95,7 @@
 .if n \{\
 .RE
 .\}
-JARեؤκɲ
+JARファイルへの索引の追加
 .sp
 .if n \{\
 .RS 4
@@ -106,48 +106,48 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "説明"
 .PP
-\fIjar\fRޥɤϡZIPZLIB̷˴ŤѤΥ֤Ӱ̥ġǤ\fIjar\fRޥɤϡˤĤJavaץåȤ䥢ץꥱñΥ֤˥ѥå褦߷פޤץåȤ䥢ץꥱΥݡͥ(ե롢᡼ӥ)1ĤΥ֤˷礵ƤȡJava(֥饦ʤ)ϡΥݡͥȤ1HTTPȥ󥶥ǥɤ뤳ȤǤݡͥȤȤ˿³פˤʤޤˤꡢɻ֤ṳ̂ޤޤ\fIjar\fRޥɤϥեΰ̤Ԥᡢɻ֤ṳ̂ޤޤ\fIjar\fRޥɤˤäơեθġΥȥ˥ץåȺԤˤ̾񤭹뤿ᡢ۸ǧڤǽˤʤޤJARեϡ̤Ƥ뤫ɤˤ餺饹ѥΥȥȤƻѤǤޤ
+\fIjar\fRコマンドは、ZIPおよびZLIB圧縮形式に基づく汎用のアーカイブおよび圧縮ツールです。ただし、\fIjar\fRコマンドは、主にいくつかのJavaアプレットやアプリケーションを単一のアーカイブにパッケージ化するように設計されました。アプレットやアプリケーションのコンポーネント(ファイル、イメージ、およびサウンド)が1つのアーカイブに結合されていると、Javaエージェント(ブラウザなど)は、それらのコンポーネントを1回のHTTPトランザクションでダウンロードすることができ、コンポーネントごとに新しい接続が不要になります。これにより、ダウンロード時間が大幅に短縮されます。また、\fIjar\fRコマンドはファイルの圧縮も行うため、ダウンロード時間がさらに短縮されます。また、\fIjar\fRコマンドによって、ファイル内の個々のエントリにアプレット作成者による署名を書き込めるため、配布元の認証が可能になります。JARファイルは、圧縮されているかどうかにかかわらず、クラス・パスのエントリとして使用できます。
 .PP
-\fIjar\fRޥɤιʸϡ\fItar\fRޥɤιʸ˻Ƥޤɬܤ\fIΰ\fR1Ĥ줿ʣ⡼ɤޤ¾ΰϡưѹ\fIץ\fRޤ¹Ԥ뤿ɬפ\fIڥ\fRѤޤ
-.SH "ΰ"
+\fIjar\fRコマンドの構文は、\fItar\fRコマンドの構文に似ています。必須の\fI操作の引数\fRの1つで定義された複数の操作モードがあります。他の引数は、操作の動作を変更する\fIオプション\fR、または操作を実行するために必要な\fIオペランド\fRを使用します。
+.SH "操作の引数"
 .PP
-\fIjar\fRޥɤѤϡΰΤ줫ꤷƼ¹Ԥ򤹤ɬפޤޥɥ饤¾1ʸΥץȺߤ뤳ȤǤޤ̾ΰϻꤵǽΰǤ
+\fIjar\fRコマンドを使用する場合は、次の操作の引数のいずれかを指定して実行される操作を選択する必要があります。コマンドラインで他の1文字のオプションと混在させることができますが、通常、操作の引数は指定される最初の引数です。
 .PP
 c
 .RS 4
-JAR֤ޤ
+新しいJARアーカイブを作成します。
 .RE
 .PP
 i
 .RS 4
-JAR֤κޤ
+JARアーカイブの索引情報を生成します。
 .RE
 .PP
 t
 .RS 4
-JAR֤ΥƥĤꥹȤޤ
+JARアーカイブのコンテンツをリストします。
 .RE
 .PP
 u
 .RS 4
-JAR֤򹹿ޤ
+JARアーカイブを更新します。
 .RE
 .PP
 x
 .RS 4
-JAR֤եФޤ
+JARアーカイブからファイルを抽出します。
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
-ΥץѤơJARեФޤɽˡ򥫥ޥޤ
+次のオプションを使用して、JARファイルを作成、更新、抽出または表示する方法をカスタマイズします。
 .PP
 e
 .RS 4
-\fIentrypoint\fRڥɤǻꤵ륯饹򡢼¹ԲǽJARե˥Хɥ뤵륹ɥJavaץꥱΥȥꡦݥȤꤷޤΥץѤȡޥ˥եȡե\fIMain\-Class\fR°ͤޤϥС饤ɤޤ\fIe\fRץϡJARեκ(\fIc\fR)ޤϹ(\fIu\fR)˻ѤǤޤ
+\fIentrypoint\fRオペランドで指定されるクラスを、実行可能JARファイルにバンドルされるスタンドアロンJavaアプリケーションのエントリ・ポイントに設定します。このオプションを使用すると、マニフェスト・ファイル内の\fIMain\-Class\fR属性値が作成またはオーバーライドされます。\fIe\fRオプションは、JARファイルの作成時(\fIc\fR)または更新時(\fIu\fR)に使用できます。
 .sp
-ȤСΥޥɤǤϡ\fIMain\&.jar\fR֤\fIMain\&.class\fRեȤȤ˺ޤκݡޥ˥ե\fIMain\-Class\fR°ͤ\fIMain\fRꤵޤ
+たとえば、次のコマンドでは、\fIMain\&.jar\fRアーカイブが\fIMain\&.class\fRファイルとともに作成されますが、その際、マニフェスト内の\fIMain\-Class\fR属性値は\fIMain\fRに設定されます。
 .sp
 .if n \{\
 .RS 4
@@ -158,7 +158,7 @@
 .if n \{\
 .RE
 .\}
-Java Runtime Environment (JRE)ϡΥޥɤ¹ԤơΥץꥱľܸƤӽФȤǤޤ
+Java Runtime Environment (JRE)は、次のコマンドを実行して、このアプリケーションを直接呼び出すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -169,7 +169,7 @@
 .if n \{\
 .RE
 .\}
-ѥå˥ȥꡦݥȤΥ饹̾ޤޤƤ硢ɥå(\&.)ޤϥå(/)Τ줫ڤʸȤƻѤǤޤȤС\fIMain\&.class\fR\fImydir\fRȤ̾Υѥå˴ޤޤƤ硢ȥꡦݥȤϼΤ줫ˡǻǤޤ
+あるパッケージ内にエントリ・ポイントのクラス名が含まれている場合、ドット(\&.)またはスラッシュ(/)のいずれかを区切り文字として使用できます。たとえば、\fIMain\&.class\fRが\fImydir\fRという名前のパッケージに含まれている場合、エントリ・ポイントは次のいずれかの方法で指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -197,8 +197,8 @@
 allbox tab(:);
 l.
 T{
-
-Υޥ˥եȤˤ\fIMain\-Class\fR°ޤޤƤ\fIm\fRץ\fIe\fRץξƱ˻ꤹȡ\fIMain\-Class\fRλ꤬ޤˤʤޤΤޤˤäƥ顼ȯ\fIjar\fRޥɤκ乹λޤ
+注意
+特定のマニフェストにも\fIMain\-Class\fR属性が含まれている場合に\fIm\fRオプションと\fIe\fRオプションの両方を同時に指定すると、\fIMain\-Class\fRの指定があいまいになります。このあいまいさによってエラーが発生し、\fIjar\fRコマンドの作成や更新の操作が終了します。
 T}
 .TE
 .sp 1
@@ -208,42 +208,42 @@
 .PP
 f
 .RS 4
-\fIjarfile\fRڥɤǻꤵ줿ե򡢺(\fIc\fR)(\fIu\fR)(\fIx\fR)ޤɽ(\fIt\fR)JARե̾ꤷޤ\fIf\fRץ󤪤\fIjarfile\fRڥɤάȡ\fIjar\fRޥɤˡ\fIstdin\fRJARե̾뤫(\fIx\fR\fIt\fRξ)JARե\fIstdout\fR뤳(\fIc\fR\fIu\fRξ)ؼޤ
+\fIjarfile\fRオペランドで指定されたファイルを、作成(\fIc\fR)、更新(\fIu\fR)、抽出(\fIx\fR)または表示(\fIt\fR)されるJARファイルの名前に設定します。\fIf\fRオプションおよび\fIjarfile\fRオペランドを省略すると、\fIjar\fRコマンドに、\fIstdin\fRからのJARファイル名を受け入れるか(\fIx\fRおよび\fIt\fRの場合)、JARファイルを\fIstdout\fRに送信すること(\fIc\fRおよび\fIu\fRの場合)が指示されます。
 .RE
 .PP
 m
 .RS 4
-(\fIMETA\-INF/MANIFEST\&.MF\fRΥ֤ˤ)
-\fIjar\fRޥɤΥޥ˥եȡե\fImanifest\fRڥɤǻꤵ줿ե뤫顢°̾ͤΥڥޤޤ\fIjar\fRޥɤϡƱ̾Υȥ꤬Ǥ¸ߤ°̾ͤJARեɲäޤƱ̾Υȥ꤬Ǥ¸ߤ硢\fIjar\fRޥɤ°ͤ򹹿ޤ\fIm\fRץϡJARեκ(\fIc\fR)ޤϹ(\fIu\fR)˻ѤǤޤ
+(\fIMETA\-INF/MANIFEST\&.MF\fRのアーカイブにある)
+\fIjar\fRコマンドのマニフェスト・ファイルの\fImanifest\fRオペランドで指定されたファイルから、属性の名前と値のペアを含めます。\fIjar\fRコマンドは、同じ名前のエントリがすでに存在する場合を除き、属性の名前と値をJARファイルに追加します。同じ名前のエントリがすでに存在する場合、\fIjar\fRコマンドは属性の値を更新します。\fIm\fRオプションは、JARファイルの作成時(\fIc\fR)または更新時(\fIu\fR)に使用できます。
 .sp
-ǥեȤΥޥ˥եȡեˤϴޤޤʤޥ˥եȤˡ̤Ū̾\-ͤ°ڥɲäǤޤȤС٥󡢥꡼󡢥ѥå󥰤ꤹ°ޤJAR˥Хɥ뤵줿ץꥱ¹Բǽˤ뤿°ɲäǤޤ\fIm\fRץλϡhttp://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlˤ
-ץΥѥå˴ؤ򻲾ȤƤ
+デフォルトのマニフェスト・ファイルには含まれないマニフェストに、特別な目的の名前\-値の属性ペアを追加できます。たとえば、ベンダー情報、リリース情報、パッケージ・シーリングを指定する属性、またはJARにバンドルされたアプリケーションを実行可能にするための属性を追加できます。\fIm\fRオプションの使用例は、http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlにある
+プログラムのパッケージ化に関する項を参照してください。
 .RE
 .PP
 M
 .RS 4
-ޥ˥եȡե롦ȥʤ(\fIc\fR\fIu\fRξ)ޤϥޥ˥եȡե롦ȥ꤬¸ߤϺޤ(\fIu\fRξ)\fIM\fRץϡJARեκ(\fIc\fR)ޤϹ(\fIu\fR)˻ѤǤޤ
+マニフェスト・ファイル・エントリを作成しない(\fIc\fRおよび\fIu\fRの場合)か、またはマニフェスト・ファイル・エントリが存在する場合は削除します(\fIu\fRの場合)。\fIM\fRオプションは、JARファイルの作成時(\fIc\fR)または更新時(\fIu\fR)に使用できます。
 .RE
 .PP
 n
 .RS 4
-JARեκ(\fIc\fR)ˡΥץϡƥĤpack200(1)ޥɤΥѥåӥѥåαƶʤ褦˥֤ޤѤʤ硢̾դJARν̵̾ˤʤޤ
+JARファイルの作成(\fIc\fR)時に、このオプションは、コンテンツがpack200(1)コマンドのパックおよびアンパック操作の影響を受けないようにアーカイブを正規化します。この正規化を使用しない場合、署名付きJARの署名は無効になります。
 .RE
 .PP
 v
 .RS 4
-ܺ٤ʽϤɸϤޤ򻲾ȤƤ
+詳細な出力を標準出力に生成します。例を参照してください。
 .RE
 .PP
 0
 .RS 4
-() ZIP̤ѤʤJARե(\fIc\fR)ޤϹ(\fIu\fR)ޤ
+(ゼロ) ZIP圧縮を使用しないでJARファイルを作成(\fIc\fR)または更新(\fIu\fR)します。
 .RE
 .PP
 \-C \fIdir\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡΥץ\fIfile\fRڥɤǻꤵ줿եν˥ǥ쥯ȥŪѹޤϡUNIX
-\fItar\fR桼ƥƥ\fI\-C\fRץƱͤˤʤ뤳ȤŪȤƤޤȤСΥޥɤˤäơ\fIclasses\fRǥ쥯ȥѹ졢Υǥ쥯ȥ꤫\fImy\&.jar\fR\fIBar\&.class\fRե뤬ɲäޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、このオプションは\fIfile\fRオペランドで指定されたファイルの処理中にディレクトリを一時的に変更します。この操作は、UNIX
+\fItar\fRユーティリティの\fI\-C\fRオプションと同様になることを目的としています。たとえば、次のコマンドによって、\fIclasses\fRディレクトリに変更され、そのディレクトリから\fImy\&.jar\fRに\fIBar\&.class\fRファイルが追加されます。
 .sp
 .if n \{\
 .RS 4
@@ -254,7 +254,7 @@
 .if n \{\
 .RE
 .\}
-ΥޥɤǤϡ\fIclasses\fRǥ쥯ȥ˰ưclassesǥ쥯ȥΤ٤ƤΥե\fImy\&.jar\fRɲäޤ(JARեˤ\fIclasses\fRǥ쥯ȥޤ)˸Υǥ쥯ȥäƤ顢\fIbin\fRǥ쥯ȥ˰ư\fIXyz\&.class\fR\fImy\&.jar\fRɲäޤ
+次のコマンドでは、\fIclasses\fRディレクトリに移動し、classesディレクトリ内のすべてのファイルを\fImy\&.jar\fRに追加します(JARファイルには\fIclasses\fRディレクトリを作成しません)。次に元のディレクトリに戻ってから、\fIbin\fRディレクトリに移動し、\fIXyz\&.class\fRを\fImy\&.jar\fRに追加します。
 .sp
 .if n \{\
 .RS 4
@@ -265,7 +265,7 @@
 .if n \{\
 .RE
 .\}
-\fIclasses\fR\fIbar1\fRե\fIbar2\fRե뤬ޤޤƤ硢ҤΥޥɤ¹Ԥ塢JARեˤϼΤΤޤޤޤ
+\fIclasses\fRに\fIbar1\fRファイルと\fIbar2\fRファイルが含まれている場合、前述のコマンドを実行した後、JARファイルには次のものが含まれます。
 .sp
 .if n \{\
 .RS 4
@@ -285,41 +285,41 @@
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤷJVMץJREJARե¹Ԥݤ˻Ѥ褦ꤷޤJVMץϡjava(1)ޥɤΥե󥹡ڡƤޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤ
+指定したJVMオプションを、JREがJARファイルを実行する際に使用するように設定します。JVMオプションは、java(1)コマンドのリファレンス・ページで説明されています。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。
 .RE
-.SH "ڥ"
+.SH "オペランド"
 .PP
-Υڥɤϡ\fIjar\fRޥɤǧޤ
+次のオペランドは、\fIjar\fRコマンドで認識されます。
 .PP
 \fIfile\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡ\fIfile\fRڥɤϡ֤ɲäɬפΤեޤϥǥ쥯ȥΥѥ̾ޤJARե(\fIx\fR)ޤϥƥĤΥꥹ(\fIt\fR)ˡ\fIfile\fRڥɤФޤϥꥹȤեΥѥ̾ޤʤȤ1Ĥͭʥեޤϥǥ쥯ȥꤹɬפޤʣ\fIfile\fRڥɤǶڤޤ\fIentrypoint\fR\fIjarfile\fRޤ\fImanifest\fRڥɤѤϡθ\fIfile\fRڥɤꤹɬפޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、\fIfile\fRオペランドは、アーカイブに追加する必要のあるファイルまたはディレクトリのパスと名前を定義します。JARファイルの抽出(\fIx\fR)またはコンテンツのリスト(\fIt\fR)時に、\fIfile\fRオペランドは抽出またはリストするファイルのパスと名前を定義します。少なくとも1つの有効なファイルまたはディレクトリを指定する必要があります。複数の\fIfile\fRオペランドを空白で区切ります。\fIentrypoint\fR、\fIjarfile\fRまたは\fImanifest\fRオペランドが使用される場合は、その後に\fIfile\fRオペランドを指定する必要があります。
 .RE
 .PP
 \fIentrypoint\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡ\fIentrypoint\fRڥɤϡ¹ԲǽJARե˥Хɥ뤵Ƥ륹ɥJavaץꥱΥȥꡦݥȤȤʤ륯饹̾ޤ\fIe\fRץ¸ߤ\fIentrypoint\fRڥɤꤹɬפޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、\fIentrypoint\fRオペランドは、実行可能JARファイルにバンドルされているスタンドアロンJavaアプリケーションのエントリ・ポイントとなるクラスの名前を定義します。\fIe\fRオプションが存在する場合は\fIentrypoint\fRオペランドを指定する必要があります。
 .RE
 .PP
 \fIjarfile\fR
 .RS 4
-(\fIc\fR)(\fIu\fR)(\fIx\fR)ޤɽ(\fIt\fR)ե̾ޤ\fIf\fRץ¸ߤ\fIjarfile\fRڥɤꤹɬפޤ\fIf\fRץ󤪤\fIjarfile\fRڥɤάȡ\fIjar\fRޥɤˡ\fIstdin\fRJARե̾뤫(\fIx\fR\fIt\fRξ)JARե\fIstdout\fR뤳(\fIc\fR\fIu\fRξ)ؼޤ
+作成(\fIc\fR)、更新(\fIu\fR)、抽出(\fIx\fR)または表示(\fIt\fR)するファイルの名前を定義します。\fIf\fRオプションが存在する場合は\fIjarfile\fRオペランドを指定する必要があります。\fIf\fRオプションおよび\fIjarfile\fRオペランドを省略すると、\fIjar\fRコマンドに、\fIstdin\fRからのJARファイル名を受け入れるか(\fIx\fRおよび\fIt\fRの場合)、JARファイルを\fIstdout\fRに送信すること(\fIc\fRおよび\fIu\fRの場合)が指示されます。
 .sp
-JARեդ(\fIi\fR)ϡ\fIf\fRץꤷʤ\fIjarfile\fRڥɤꤷޤ
+JARファイルを索引付け(\fIi\fR)する場合は、\fIf\fRオプションを指定しないで\fIjarfile\fRオペランドを指定します。
 .RE
 .PP
 \fImanifest\fR
 .RS 4
-JARեκ(\fIc\fR)ޤϹ(\fIu\fR)ˡ\fImanifest\fRڥɤJARե\fIMANIFEST\&.MF\fR˴ޤ°̾ͤĴ¸Υޥ˥եȡեޤ\fIf\fRץ¸ߤ\fImanifest\fRڥɤꤹɬפޤ
+JARファイルの作成(\fIc\fR)または更新(\fIu\fR)時に、\fImanifest\fRオペランドはJARファイルの\fIMANIFEST\&.MF\fRに含める属性の名前と値を持つ既存のマニフェスト・ファイルを定義します。\fIf\fRオプションが存在する場合は\fImanifest\fRオペランドを指定する必要があります。
 .RE
 .PP
 \fI@arg\-file\fR
 .RS 4
-\fIjar\fRޥɤṳ̂ޤϴDzˤϡ̤ΥƥȡեΰꤷƬȤƥåȥޡ(@)դ\fIjar\fRޥɤϤȤǤޤ\fIjar\fRޥɤϡåȥޡʸǻϤޤ򸫤ĤȡΥեƤŸưꥹȤޤ
+\fIjar\fRコマンドを短縮または簡素化するには、別のテキスト・ファイル内の引数を指定し、接頭辞としてアットマーク(@)を付けて\fIjar\fRコマンドに渡すことができます。\fIjar\fRコマンドは、アットマーク文字で始まる引数を見つけると、そのファイルの内容を展開して引数リストに挿入します。
 .sp
-եˤϡ\fIjar\fRޥɤΥץȰ(ե򥵥ݡȤʤưġϤ\fI\-J\fRץ)ޤ뤳ȤǤޤեΰϡޤϲʸǶڤ뤳ȤǤޤեΥե̾ϡ\fIjar\fRޥɤ¹ԤǤ븽ߤΥǥ쥯ȥФŪǤꡢեξФƤŪǤϤޤ̾ϥڥ졼ƥ󥰡ƥࡦˤäŸ륢ꥹ(*)ʤɤΥ磻ɥɤŸޤ
+引数ファイルには、\fIjar\fRコマンドのオプションと引数(引数ファイルをサポートしない起動ツールに渡される\fI\-J\fRオプションを除く)を含めることができます。ファイル内の引数は、空白または改行文字で区切ることができます。引数ファイル内のファイル名は、\fIjar\fRコマンドを実行できる現在のディレクトリに対して相対的であり、引数ファイルの場所に対しては相対的ではありません。通常はオペレーティング・システム・シェルによって展開されるアスタリスク(*)などのワイルドカードは展開されません。
 .sp
-ϡ\fIfind\fRޥɤˤ븽ߤΥǥ쥯ȥϤΥե̾\fIclasses\&.list\fRեˡ򼨤ޤ
+次の例は、\fIfind\fRコマンドによる現在のディレクトリ出力からのファイル名で\fIclasses\&.list\fRファイルを作成する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -330,7 +330,7 @@
 .if n \{\
 .RE
 .\}
-\fIjar\fRޥɤ¹Ԥ\fI@arg\-file\fRʸѤ\fIclasses\&.list\fRեϤȤǤޤ
+\fIjar\fRコマンドを実行し、\fI@arg\-file\fR構文を使用して\fIclasses\&.list\fRファイルを渡すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -341,7 +341,7 @@
 .if n \{\
 .RE
 .\}
-եϥѥǤޤХѥҤ줿եΤ٤ƤΥե̾ϡϤ줿ѥФŪǤϤʤ\fIjar\fRޥɤθߤκȥǥ쥯ȥŪȤʤޤȤСΤ褦ˤʤޤ
+引数ファイルはパスを指定できますが、相対パスが記述された引数ファイル内のすべてのファイル名は、渡されたパスに対して相対的ではなく、\fIjar\fRコマンドの現在の作業ディレクトリに相対的となります。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -353,9 +353,9 @@
 .RE
 .\}
 .RE
-.SH ""
+.SH "注意"
 .PP
-\fIe\fR\fIf\fR\fIm\fRץϡ\fIentrypoint\fR\fIjarfile\fR\fImanifest\fRڥɤƱǥޥɥ饤˽иɬפޤ
+\fIe\fR、\fIf\fRおよび\fIm\fRオプションは、\fIentrypoint\fR、\fIjarfile\fRおよび\fImanifest\fRオペランドと同じ順序でコマンドラインに出現する必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -366,9 +366,9 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "例"
 .PP
-\fBExample 1\fR, ĹʽϤˤ븽ߤΥǥ쥯ȥ꤫Τ٤ƤΥեɲ
+\fBExample 1\fR, 冗長な出力による現在のディレクトリからのすべてのファイルの追加
 .RS 4
 .sp
 .if n \{\
@@ -396,7 +396,7 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ֥ǥ쥯ȥ꤫Υեɲ
+\fBExample 2\fR, サブディレクトリからのファイルの追加
 .RS 4
 .sp
 .if n \{\
@@ -427,7 +427,7 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, JARΥƥĤΥꥹ
+\fBExample 3\fR, JARのコンテンツのリスト
 .RS 4
 .sp
 .if n \{\
@@ -460,9 +460,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, ɲ
+\fBExample 4\fR, 索引の追加
 .RS 4
-Υץꥱ߰¸饹\fImain\&.jar\fR\fIbuy\&.jar\fR\fIsell\&.jar\fR3ĤJARեʬ䤹硢\fIi\fRץѤޤ\fImain\&.jar\fRޥ˥ե\fIClass\-Path\fR°ꤹ硢\fIi\fRץѤơץꥱΥ饹ɤ®٤Ǥޤ
+株式取引のアプリケーションの相互依存クラスを、\fImain\&.jar\fR、\fIbuy\&.jar\fRおよび\fIsell\&.jar\fRの3つのJARファイルに分割する場合、\fIi\fRオプションを使用します。\fImain\&.jar\fRマニフェスト内の\fIClass\-Path\fR属性を指定する場合、\fIi\fRオプションを使用して、アプリケーションのクラス・ロードの速度を向上できます。
 .sp
 .if n \{\
 .RS 4
@@ -474,9 +474,9 @@
 .if n \{\
 .RE
 .\}
-\fIINDEX\&.LIST\fRե뤬\fIMETA\-INF\fRǥ쥯ȥޤˤꡢץꥱΥ饹ˤäƥ饹ޤϥ꥽θԤȤˡꤷJARե뤬ɤ褦ˤʤޤ
+\fIINDEX\&.LIST\fRファイルが\fIMETA\-INF\fRディレクトリに挿入されます。これにより、アプリケーションのクラス・ローダーによってクラスまたはリソースの検索が行われるときに、指定したJARファイルがダウンロードされるようになります。
 .sp
-ץꥱΥ饹ϡΥե˳ǼƤѤơΨŪ˥饹ɤޤǥ쥯ȥ򥳥ԡˤϡǽ\fIdir1\fRΥե\fIstdout\fR˰̤Ƥ顢\fIstdin\fR\fIdir2\fR˥ѥץ饤Фޤ(\fI\-f\fRץξ\fIjar\fRޥɤǾάޤ)
+アプリケーションのクラス・ローダーは、このファイルに格納されている情報を使用して、効率的にクラスをロードします。ディレクトリをコピーするには、最初に\fIdir1\fR内のファイルを\fIstdout\fRに圧縮してから、\fIstdin\fRから\fIdir2\fRにパイプラインを作成して抽出します(\fI\-f\fRオプションは両方の\fIjar\fRコマンドで省略します)。
 .sp
 .if n \{\
 .RS 4
@@ -488,7 +488,7 @@
 .RE
 .\}
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -509,8 +509,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlˤ
-Java塼ȥꥢJAR˴ؤ
+http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlにある
+JavaチュートリアルのJARに関する項
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jarsigner
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ƥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: セキュリティ・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jarsigner" "1" "2013ǯ1121" "JDK 8" "ƥġ"
+.TH "jarsigner" "1" "2013年11月21日" "JDK 8" "セキュリティ・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jarsigner \- Java(JAR)եФƽ̾ӸڤԤޤ
-.SH ""
+jarsigner \- Javaアーカイブ(JAR)ファイルに対して署名および検証を行います。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -74,30 +74,30 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \-verify
 .RS 4
-\fI\-verify\fRץǤϡJARե̾θ0İʾΥȥ̾Ǥޤ\fI\-verify\fRץ󤬻ꤵ줿硢\fIjarsigner\fRޥɤǤϡJARեγƽ̾դƥƥθڤ˻Ѥ񤬡줫Υȥ̾˰פ뤳Ȥåޤ̾ϡ\fI\-keystore\fRǻꤵ줿ȥޤϥǥեȤΥȥޤ
+\fI\-verify\fRオプションでは、JARファイル名の後に0個以上のキーストア別名を指定できます。\fI\-verify\fRオプションが指定された場合、\fIjarsigner\fRコマンドでは、JARファイル内の各署名付きエンティティの検証に使用される証明書が、いずれかのキーストア別名に一致することをチェックします。別名は、\fI\-keystore\fRで指定されたキーストア内またはデフォルトのキーストア内に定義されます。
 .sp
-\fI\-strict\fRץꤷ硢\fIjarsigner\fRޥɤˤʷٹ𤬸Фȡåjarڤޤ̾ԥ顼פɽޤ
+\fI\-strict\fRオプションも指定した場合、\fIjarsigner\fRコマンドにより重大な警告が検出されると、メッセージ「jarが検証されました。署名者エラー」が表示されます。
 .RE
 .PP
 \fIjar\-file\fR
 .RS 4
-̾JARե롣
+署名されるJARファイル。
 .sp
-\fI\-strict\fRץꤷ硢\fIjarsigner\fRޥɤˤʷٹ𤬸ФȡåjarϽ̾ޤ \- ̾ԥ顼ޤפȤåɽޤ
+\fI\-strict\fRオプションも指定した場合、\fIjarsigner\fRコマンドにより重大な警告が検出されると、メッセージ「jarは署名されました \- 署名者エラーがあります。」というメッセージが表示されます。
 .RE
 .PP
 \fIalias\fR
 .RS 4
-̾ϡ\fI\-keystore\fRǻꤵ줿ȥޤϥǥեȤΥȥޤ
+別名は、\fI\-keystore\fRで指定されたキーストア内またはデフォルトのキーストア内に定義されます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjarsigner\fRġˤϡ2ĤŪޤ
+\fIjarsigner\fRツールには、次の2つの目的があります。
 .sp
 .RS 4
 .ie n \{\
@@ -107,7 +107,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java(JAR)ե˽̾Ū
+Javaアーカイブ(JAR)ファイルに署名する目的。
 .RE
 .sp
 .RS 4
@@ -118,12 +118,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̾դJARեν̾򸡾ڤŪ
+署名付きJARファイルの署名と整合性を検証する目的。
 .RE
 .PP
-JARǽѤȡ饹ե롢᡼ɤӤ¾Υǥ롦ǡñΥե˥ѥåǤΤǡե®ưפۤǤޤ\fIjar\fRȤ̾ΥġѤơȯԤJARեǤޤ(ŪʴС٤ƤZIPեJARեȤߤʤȤǤޤ\fIjar\fRޥɤˤäƺ줿JARե롢ޤ\fIjarsigner\fRޥɤˤäƽ줿JARեˤϡ\fIMETA\-INF/MANIFEST\&.MF\fRեޤޤƤޤ)
+JAR機能を使用すると、クラス・ファイル、イメージ、サウンドおよびその他のデジタル・データを単一のファイルにパッケージ化できるので、ファイルを迅速かつ容易に配布できます。\fIjar\fRという名前のツールを使用して、開発者はJARファイルを作成できます。(技術的な観点から言えば、すべてのZIPファイルもJARファイルとみなすことができます。ただし、\fIjar\fRコマンドによって作成されたJARファイル、または\fIjarsigner\fRコマンドによって処理されたJARファイルには、\fIMETA\-INF/MANIFEST\&.MF\fRファイルも含まれています。)
 .PP
-ǥ̾ϡʤ餫Υǡ(̾оݤȤʤǡ)ӥƥƥ(͡Ҥʤ)̩׻ӥåȤʸǤ񤭤ν̾Ʊ͡ǥ̾ˤ¿ޤ
+デジタル署名は、なんらかのデータ(署名の対象となるデータ)、およびエンティティ(人、会社など)の秘密鍵から計算されるビットの文字列です。手書きの署名同様、デジタル署名には多くの利点があります。
 .sp
 .RS 4
 .ie n \{\
@@ -133,7 +133,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̾˻Ѥ줿̩бѤ׻ˤäơ줬ʪǤ뤳Ȥ򸡾ڤǤޤ
+署名の生成に使用された秘密鍵に対応する公開鍵を使用する計算によって、それが本物であることを検証できます。
 .RE
 .sp
 .RS 4
@@ -144,7 +144,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̩¾ͤΤʤ¤ꡢǥ̾ε¤ԲǽǤ
+秘密鍵が他人に知られない限り、デジタル署名の偽造は不可能です。
 .RE
 .sp
 .RS 4
@@ -155,7 +155,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ϡ̾դǡεǽǤꡢ¾Υǡν̾Ȥʤ褦׵Ǥޤ
+これは、署名が付いたデータの機能であり、他のデータの署名となるように要求できません。
 .RE
 .sp
 .RS 4
@@ -166,27 +166,27 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̾դǡѹǤޤ󡣥ǡѹ줿硢̾ˤäʪǤȸڤǤޤ
+署名付きデータは変更できません。データが変更された場合、署名によって本物であると検証できません。
 .RE
 .PP
-եФƥƥƥν̾ˤϡޤƥƥϡΥƥƥ˴Ϣ/̩Υڥȡǧڤ1İʾξɬפޤȤϡ륨ƥƥΥǥ̾դʸǡ̤ΥƥƥθͤĤȤ򼨤Ƥޤ
+ファイルに対してエンティティの署名を生成するには、まず、エンティティは、そのエンティティに関連する公開鍵/秘密鍵のペアと、公開鍵を認証する1つ以上の証明書を持つ必要があります。証明書とは、あるエンティティからのデジタル署名付きの文書で、別のエンティティの公開鍵が特定の値を持つことを示しています。
 .PP
-\fIjarsigner\fRޥɤϡȥθȾѤơJARեΥǥ̾ޤȥϡ̩бǧڤ롢̩˴ϢX\&.509Υǡ١Ǥ\fIkeytool\fRޥɤѤơȥӴޤ
+\fIjarsigner\fRコマンドは、キーストアからの鍵と証明書情報を使用して、JARファイルのデジタル署名を生成します。キーストアは、秘密鍵、および対応する公開鍵を認証する、秘密鍵に関連したX\&.509証明書チェーンのデータベースです。\fIkeytool\fRコマンドを使用して、キーストアを作成および管理します。
 .PP
-\fIjarsigner\fRޥɤǤϡƥƥ̩Ѥƽ̾ޤ̾դJARեˤϡäˡեؤν̾˻Ѥ̩бΥȥξΥԡޤޤޤ\fIjarsigner\fRޥɤǤϡ(֥̾åե)ξѤơ̾դJARեΥǥ̾򸡾ڤǤޤ
+\fIjarsigner\fRコマンドでは、エンティティの秘密鍵を使用して署名を生成します。署名付きJARファイルには、特に、ファイルへの署名に使用する秘密鍵に対応する公開鍵のキーストアからの証明書のコピーが含まれます。\fIjarsigner\fRコマンドでは、内部(署名ブロック・ファイル内)の証明書を使用して、署名付きJARファイルのデジタル署名を検証できます。
 .PP
-\fIjarsigner\fRޥɤǤϡ̾ͭJARե뤬̾줿줿ɤ򥷥ƥǥץ(Java Plug\-inޤ)åǤ롢ॹפޤ̾ǤޤˡAPIѤȡץꥱǥॹ׾Ǥޤ
+\fIjarsigner\fRコマンドでは、署名証明書の有効期間中にJARファイルが署名されたされたかどうかをシステムやデプロイヤ(Java Plug\-inを含む)がチェックできる、タイムスタンプを含む署名を生成できます。さらに、APIを使用すると、アプリケーションでタイムスタンプ情報を取得できます。
 .PP
-Ǥϡ\fIjarsigner\fRޥɤǤϡ\fIjar\fRޥɤޤZIPեˤäƺ줿JARեΤߤ˽̾ǤޤJARեZIPեƱǤJARեˤ\fIMETA\-INF/MANIFEST\&.MF\fRեޤޤƤۤʤޤ\fIMETA\-INF/MANIFEST\&.MF\fRեϡ\fIjarsigner\fRޥɤˤäZIPե˽̾ݤ˺ޤ
+現時点では、\fIjarsigner\fRコマンドでは、\fIjar\fRコマンドまたはZIPファイルによって作成されたJARファイルのみに署名できます。JARファイルはZIPファイルと同じですが、JARファイルには\fIMETA\-INF/MANIFEST\&.MF\fRファイルも含まれている点が異なります。\fIMETA\-INF/MANIFEST\&.MF\fRファイルは、\fIjarsigner\fRコマンドによってZIPファイルに署名する際に作成されます。
 .PP
-ǥեȤ\fIjarsigner\fRޥɤưǤϡJARޤZIPե˽̾ޤ\fI\-verify\fRץѤơ̾դJARե򸡾ڤޤ
+デフォルトの\fIjarsigner\fRコマンドの動作では、JARまたはZIPファイルに署名します。\fI\-verify\fRオプションを使用して、署名付きJARファイルを検証します。
 .PP
-\fIjarsigner\fRޥɤϡ̾ޤϸڤθ˽̾ԤξθڤԤޤڥ顼ޤϤ¾꤬ȯȡޥɤˤٹåޤ\fI\-strict\fRץꤷ硢ޥɤˤʷٹ𤬥顼Ȥƽޤ顼ȷٹ򻲾ȤƤ
-.SS "ȥ̾"
+\fIjarsigner\fRコマンドは、署名または検証の後に署名者の証明書の検証も試行します。検証エラーまたはその他の問題が発生すると、コマンドにより警告メッセージが生成されます。\fI\-strict\fRオプションを指定した場合、コマンドにより重大な警告がエラーとして処理されます。エラーと警告を参照してください。
+.SS "キーストアの別名"
 .PP
-ȥΤ٤ƤΥƥƥϡդ̾Ѥƥޤ
+キーストアのすべてのエンティティは、一意の別名を使用してアクセスされます。
 .PP
-\fIjarsigner\fRޥɤѤJARե˽̾Ȥϡ̾ɬפ̩ޤ७ȥȥ̾ꤹɬפޤȤСΥޥɤǤϡ\fIworking\fRǥ쥯ȥ\fImystore\fRȤ̾Υȥ˴ޤޤ̾\fIduke\fR˴Ϣդ줿̩Ѥơ\fIMyJARFile\&.jar\fRȤ̾JARե˽̾ޤϥեϻꤵƤʤᡢ\fIMyJARFile\&.jar\fRϽ̾դJARեˤäƾ񤭤ޤ
+\fIjarsigner\fRコマンドを使用してJARファイルに署名するときは、署名の生成に必要な秘密鍵を含むキーストア・エントリの別名を指定する必要があります。たとえば、次のコマンドでは、\fIworking\fRディレクトリの\fImystore\fRという名前のキーストアに含まれる別名\fIduke\fRに関連付けられた秘密鍵を使用して、\fIMyJARFile\&.jar\fRという名前のJARファイルに署名します。出力ファイルは指定されていないため、\fIMyJARFile\&.jar\fRは署名付きのJARファイルによって上書きされます。
 .sp
 .if n \{\
 .RS 4
@@ -199,36 +199,36 @@
 .RE
 .\}
 .PP
-ȥϥѥɤݸƤΤǡȥΥѥɤꤹɬפޤޥɥ饤ǻꤷʤȡϤޤƱͤˡ̩⥭ȥǥѥɤˤäݸƤ뤿ᡢ̩Υѥɤꤹɬפޤޥɥ饤ǥѥɤꤷƤʤ硢ޤϻꤷѥȤ¸ƤѥɤƱǤϤʤϡѥɤϤޤ
-.SS "ȥξ"
+キーストアはパスワードで保護されているので、ストアのパスワードを指定する必要があります。コマンドラインで指定しないと、入力を求められます。同様に、秘密鍵もキーストア内でパスワードによって保護されているため、秘密鍵のパスワードを指定する必要があります。コマンドラインでパスワードを指定していない場合、または指定したパスワートが保存されているパスワードと同じではない場合は、パスワードの入力を求められます。
+.SS "キーストアの場所"
 .PP
-\fIjarsigner\fRޥɤˤϡѤ륭ȥURLꤹ\fI\-keystore\fRץ󤬤ޤȥϥǥեȤǡ\fIuser\&.home\fRƥࡦץѥƥǷޤ桼Υۡࡦǥ쥯ȥ\fI\&.keystore\fRȤ̾Υե˳Ǽޤ
+\fIjarsigner\fRコマンドには、使用するキーストアのURLを指定する\fI\-keystore\fRオプションがあります。キーストアはデフォルトで、\fIuser\&.home\fRシステム・プロパティで決まるユーザーのホーム・ディレクトリの\fI\&.keystore\fRという名前のファイル内に格納されます。
 .PP
-Oracle Solarisƥξ硢\fIuser\&.home\fRϡ桼Υۡࡦǥ쥯ȥ˥ǥեꤵޤ
+Oracle Solarisシステムの場合、\fIuser\&.home\fRは、ユーザーのホーム・ディレクトリにデフォルト設定されます。
 .PP
-\fI\-keystore\fRץ󤫤ϥȥ꡼ϡ\fIKeyStore\&.load\fR᥽åɤϤޤURLȤ\fINONE\fRꤵƤϡnullΥȥ꡼ब\fIKeyStore\&.load\fR᥽åɤϤޤ\fINONE\fRϡ\fIKeyStore\fR饹ե١ǤϤʤ硢ȤСϡɥȡ󡦥ǥХ֤Ƥ˻ꤷޤ
-.SS "ȥμ"
+\fI\-keystore\fRオプションからの入力ストリームは、\fIKeyStore\&.load\fRメソッドに渡されます。URLとして\fINONE\fRが指定されている場合は、nullのストリームが\fIKeyStore\&.load\fRメソッドに渡されます。\fINONE\fRは、\fIKeyStore\fRクラスがファイルベースではない場合、たとえば、ハードウェア・トークン・デバイスに置かれている場合に指定します。
+.SS "キーストアの実装"
 .PP
-\fIjava\&.security package\fR󶡤Ƥ\fIKeyStore\fR饹ϡȥξؤΥӾѹԤΡΤ줿¿Υ󥿥ե󶡤ޤʣΰۤʤꤹ뤳ȤǤƼΥפΥȥоݤȤޤ
+\fIjava\&.security package\fRで提供されている\fIKeyStore\fRクラスは、キーストア内の情報へのアクセスおよび情報の変更を行うための、明確に定義された多くのインタフェースを提供します。複数の異なる固定実装を指定することができ、各実装は特定のタイプのキーストアを対象とします。
 .PP
-ߡȥμѤ2ĤΥޥɥ饤󡦥ġ(\fIkeytool\fR\fIjarsigner\fR)ӥݥꥷġȤ̾1ĤGUI١Υġ뤬ޤ\fIKeyStore\fR饹ϸƤ뤿ᡢJDK桼ϡѤ¾Υƥץꥱ񤭹ळȤǤޤ
+現在、キーストアの実装を使用する2つのコマンドライン・ツール(\fIkeytool\fRと\fIjarsigner\fR)、およびポリシー・ツールという名前の1つのGUIベースのツールがあります。\fIKeyStore\fRクラスは公開されているため、JDKユーザーは、それを使用する他のセキュリティ・アプリケーションを書き込むことができます。
 .PP
-Oracle󶡤ȹߤΥǥեȤμޤϡJKSȤ̾ȼΥȥ()ѤΤǡȥեȤƼƤޤȹߤμǤϡ̩ϸ̤Υѥɤˤäݸ졢ȥΤ(̩Ȥ̤)ѥɤˤäݸޤ
+Oracleが提供する組込みのデフォルトの実装があります。これは、JKSという名前の独自のキーストア・タイプ(形式)を使用するもので、キーストアをファイルとして実装しています。組込みの実装では、各秘密鍵は個別のパスワードによって保護され、キーストア全体の整合性は(秘密鍵とは別の)パスワードによって保護されます。
 .PP
-ȥμϥץХ١ǡĤޤꡢ\fIKeyStore\fR饹ˤ󶡤륢ץꥱ󡦥󥿥եϡӥץХ󥿥ե(SPI)˴ؤƼޤб\fIKeystoreSpi\fRݥ饹ꡢ\fIjava\&.security package\fR˴ޤޤƤޤΥ饹ץХɬפΤ륵ӥץХ󥿥եΥ᥽åɤƤޤǡץХȤϡJava Security APIˤäƥǽʥӥΥ֥åȤФθ󶡤ѥåޤϥѥåνΤȤǤȥμ󶡤ˤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlˤ
-JavaŹ沽ƥΥץХμˡƤ褦ˡ饤ȤϥץХ\fIKeystoreSpi\fR֥饹μ󶡤ɬפޤ
+キーストアの実装はプロバイダベースで、つまり、\fIKeyStore\fRクラスにより提供されるアプリケーション・インタフェースは、サービス・プロバイダ・インタフェース(SPI)に関して実装されます。対応する\fIKeystoreSpi\fR抽象クラスがあり、これも\fIjava\&.security package\fRに含まれています。このクラスが、プロバイダが実装する必要のあるサービス・プロバイダ・インタフェースのメソッドを定義しています。ここで、プロバイダとは、Java Security APIによってアクセス可能なサービスのサブセットに対し、その固定実装を提供するパッケージまたはパッケージの集合のことです。キーストアの実装を提供するには、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlにある
+Java暗号化アーキテクチャのプロバイダの実装方法で説明しているように、クライアントはプロバイダを実装し、\fIKeystoreSpi\fRサブクラスの実装を提供する必要があります。
 .PP
-ץꥱǤϡ\fIKeyStore\fR饹\fIgetInstance\fRեȥꡦ᥽åɤѤơ͡ʥץХۤʤ륿פΥȥμǤޤȥΥפϡȥγǼȥǡȤȤˡȥ̩ȥȥΤݸ뤿˻Ѥ륢르ꥺޤۤʤ륿פΥȥμˤϡߴϤޤ
+アプリケーションでは、\fIKeyStore\fRクラスの\fIgetInstance\fRファクトリ・メソッドを使用して、様々なプロバイダから異なるタイプのキーストアの実装を選択できます。キーストアのタイプは、キーストア情報の格納形式とデータ形式を定義するとともに、キーストア内の秘密鍵とキーストア自体の整合性を保護するために使用されるアルゴリズムを定義します。異なるタイプのキーストアの実装には、互換性はありません。
 .PP
-\fIjarsigner\fR\fIpolicytool\fRޥɤϡURLѤƻǤǤդξ꤫ե١Υȥɤ߼뤳ȤǤޤޤΥޥɤϡWindowsMSCAPIӤ٤ƤΥץåȥեPKCS11󶡤褦ե١Υȥɤ߼뤳ȤǤޤ
+\fIjarsigner\fRおよび\fIpolicytool\fRコマンドは、URLを使用して指定できる任意の場所からファイルベースのキーストアを読み取ることができます。また、これらのコマンドは、Windows上のMSCAPIおよびすべてのプラットフォーム上のPKCS11で提供されるような非ファイルベースのキーストアを読み取ることができます。
 .PP
-\fIjarsigner\fRޥɤ\fIkeytool\fRޥɤξ硢\fI\-storetype\fRץѤơޥɥ饤ǥȥΥפǤޤݥꥷġξ硢\fB֥ȥ\fR˥塼\fBԽ\fRޥɤѤơȥΥפǤޤ
+\fIjarsigner\fRコマンドおよび\fIkeytool\fRコマンドの場合、\fI\-storetype\fRオプションを使用して、コマンドラインでキーストアのタイプを指定できます。ポリシー・ツールの場合、\fB「キーストア」\fRメニューの\fB「編集」\fRコマンドを使用して、キーストアのタイプを指定できます。
 .PP
-桼ȥΥפŪ˻ꤷʤä硢ƥץѥƥեǻꤵ줿\fIkeystore\&.type\fRץѥƥͤ˴Ťơġˤäƥȥμ򤵤ޤΥƥץѥƥե\fIjava\&.security\fRȸƤФ졢JDKƥץѥƥǥ쥯ȥ\fIjava\&.home/lib/security\fR¸ߤƤޤǡ\fIjava\&.home\fRϼ¹ԻĶΥǥ쥯ȥǤ\fIjre\fRǥ쥯ȥϡJDKޤJava Runtime Environment (JRE)κǾ̤Υǥ쥯ȥˤޤ
+ユーザーがキーストアのタイプを明示的に指定しなかった場合、セキュリティ・プロパティ・ファイルで指定された\fIkeystore\&.type\fRプロパティの値に基づいて、ツールによってキーストアの実装が選択されます。このセキュリティ・プロパティ・ファイルは\fIjava\&.security\fRと呼ばれ、JDKセキュリティ・プロパティ・ディレクトリ\fIjava\&.home/lib/security\fR内に存在しています。ここで、\fIjava\&.home\fRは実行時環境のディレクトリです。\fIjre\fRディレクトリは、JDKまたはJava Runtime Environment (JRE)の最上位のディレクトリにあります。
 .PP
-ƥġϡ\fIkeystore\&.type\fRͤΥפΥȥƤץХĤޤǡ󥹥ȡ뤵Ƥ뤹٤ƤΥץХĴ٤ޤŪΥץХĤȡΥץХΥȥμѤޤ
+各ツールは、\fIkeystore\&.type\fRの値を取得し、そのタイプのキーストアを実装しているプロバイダが見つかるまで、インストールされているすべてのプロバイダを調べます。目的のプロバイダが見つかると、そのプロバイダからのキーストアの実装を使用します。
 .PP
-\fIKeyStore\fR饹Ƥstatic᥽å\fIgetDefaultType\fRѤȡץꥱ䥢ץåȤ\fIkeystore\&.type\fRץѥƥͤǤޤΥɤιԤǤϡ\fIkeystore\&.type property\fRǻꤵ줿ǥեȤΥȥפΥ󥹥󥹤ޤ
+\fIKeyStore\fRクラスに定義されているstaticメソッド\fIgetDefaultType\fRを使用すると、アプリケーションやアプレットから\fIkeystore\&.type\fRプロパティの値を取得できます。次のコードの行では、\fIkeystore\&.type property\fRで指定された、デフォルトのキーストア・タイプのインスタンスを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -240,8 +240,8 @@
 .RE
 .\}
 .PP
-ǥեȤΥȥפϡ\fIjks\fR
-(Oracle󶡤ȼΥפΥȥμ)ǤϡƥץѥƥեμιԤˤäƻꤵƤޤ
+デフォルトのキーストア・タイプは、\fIjks\fR
+(Oracleが提供する独自のタイプのキーストアの実装)です。これは、セキュリティ・プロパティ・ファイル内の次の行によって指定されています。
 .sp
 .if n \{\
 .RS 4
@@ -253,9 +253,9 @@
 .RE
 .\}
 .PP
-ȥΥפλǤϡʸȾʸ϶̤ޤ󡣤ȤС\fIJKS\fR\fIjks\fRƱˤʤޤ
+キーストアのタイプの指定では、大文字と小文字は区別されません。たとえば、\fIJKS\fRは\fIjks\fRと同じになります。
 .PP
-ġǥǥեȰʳΥȥμѤˤϡιԤѹ̤ΥȥΥפꤷޤȤС\fIpkcs12\fRȸƤФ륭ȥΥפΥȥμ󶡤ץХѥå硢Ԥ򼡤Τ褦ѹޤ
+ツールでデフォルト以外のキーストアの実装を使用するには、その行を変更して別のキーストアのタイプを指定します。たとえば、\fIpkcs12\fRと呼ばれるキーストアのタイプのキーストアの実装を提供するプロバイダ・パッケージがある場合、行を次のように変更します。
 .sp
 .if n \{\
 .RS 4
@@ -267,12 +267,12 @@
 .RE
 .\}
 .PP
-\fB:\fR
-PKCS 11ץХѥåѤ硢http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/p11guide\&.htmlˤ
-Java PKCS #11ե󥹡ɤΡKeyToolפӡJarSignerפ򻲾ȤƤ
-.SS "ݡȤ륢르ꥺ"
+\fB注意:\fR
+PKCS 11プロバイダ・パッケージを使用する場合、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/p11guide\&.htmlにある
+Java PKCS #11リファレンス・ガイドの「KeyTool」および「JarSigner」を参照してください。
+.SS "サポートされるアルゴリズム"
 .PP
-ǥեȤǡ\fIjarsigner\fRޥɤǤϼΤ줫Υ르ꥺѤJARե˽̾ޤ
+デフォルトで、\fIjarsigner\fRコマンドでは次のいずれかのアルゴリズムを使用してJARファイルに署名します。
 .sp
 .RS 4
 .ie n \{\
@@ -282,7 +282,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHA1ȡ르ꥺѤǥ̾르ꥺ(DSA)
+SHA1ダイジェスト・アルゴリズムを使用したデジタル署名アルゴリズム(DSA)
 .RE
 .sp
 .RS 4
@@ -293,7 +293,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHA256ȡ르ꥺѤRSA르ꥺࡣ
+SHA256ダイジェスト・アルゴリズムを使用したRSAアルゴリズム。
 .RE
 .sp
 .RS 4
@@ -304,15 +304,15 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHA256ʱ߶ǥ̾르ꥺ(ECDSA)Ѥʱ߶(EC)Ź르ꥺ
+SHA256と楕円曲線デジタル署名アルゴリズム(ECDSA)を使用した楕円曲線(EC)暗号方式アルゴリズム
 .RE
 .PP
-̾Ԥθ̩DSAǤ硢\fIjarsigner\fR\fISHA1withDSA\fR르ꥺѤJARե˽̾ޤ̾ԤθRSAǤ硢\fIjarsigner\fR\fISHA256withRSA\fR르ꥺѤJARե˽̾褦Ȥޤ̾ԤθECǤ硢\fIjarsigner\fR\fISHA256withECDSA\fR르ꥺѤJARե˽̾ޤ
+署名者の公開鍵と秘密鍵がDSA鍵である場合、\fIjarsigner\fRは\fISHA1withDSA\fRアルゴリズムを使用してJARファイルに署名します。署名者の鍵がRSA鍵である場合、\fIjarsigner\fRは\fISHA256withRSA\fRアルゴリズムを使用してJARファイルに署名しようとします。署名者の鍵がEC鍵である場合、\fIjarsigner\fRは\fISHA256withECDSA\fRアルゴリズムを使用してJARファイルに署名します。
 .PP
-ΥǥեȤν̾르ꥺϡ\fI\-sigalg\fRץѤƥС饤ɤǤޤ
-.SS "̾դJARե"
+これらのデフォルトの署名アルゴリズムは、\fI\-sigalg\fRオプションを使用してオーバーライドできます。
+.SS "署名付きJARファイル"
 .PP
-\fIjarsigner\fRޥɤѤJARե˽̾硢Ϥ̾դJARեJARեƱǤ2Ĥɲåե뤬META\-INFǥ쥯ȥ֤ۤʤޤ
+\fIjarsigner\fRコマンドを使用してJARファイルに署名する場合、出力される署名付きJARファイルは入力JARファイルと同じですが、次の2つの追加ファイルがMETA\-INFディレクトリに置かれる点が異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -322,7 +322,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\&.SF\fRĥҤդ̾ե
+\fI\&.SF\fR拡張子の付いた署名ファイル
 .RE
 .sp
 .RS 4
@@ -333,14 +333,14 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\&.DSA\fR\fI\&.RSA\fRޤ\fI\&.EC\fRĥҤդ֥̾åե
+\fI\&.DSA\fR、\fI\&.RSA\fRまたは\fI\&.EC\fR拡張子の付いた署名ブロック・ファイル
 .RE
 .PP
-2ĤΥեΥ١ե̾ϡ\fI\-sigFile\fRץͤޤȤСץ\fI\-sigFile MKSIGN\fRξ硢ե\fIMKSIGN\&.SF\fR\fIMKSIGN\&.DSA\fRȤ̾ˤʤޤ
+これら2つのファイルのベース・ファイル名は、\fI\-sigFile\fRオプションの値から作成されます。たとえば、オプションが\fI\-sigFile MKSIGN\fRの場合、ファイルは\fIMKSIGN\&.SF\fRおよび\fIMKSIGN\&.DSA\fRという名前になります。
 .PP
-ޥɥ饤\fI\-sigfile\fRץꤷʤä硢\fI\&.SF\fRե\fI\&.DSA\fRեΥ١ե̾ϡޥɥ饤ǻꤵ줿̾Ƭ8ʸ򤹤٤ʸѴΤˤʤޤ̾8ʸ̤ξϡ̾Τޤ޻Ѥޤ̾ˡ̾ե̾ǻѤǤʤʸޤޤƤ硢ե̾κˡʸ(_)ʸѴޤͭʸϡե٥åȡӥϥեǤ
-̾ե.PP
-̾ե(\fI\&.SF\fRե)ϡ\fIjarsigner\fRޥɤѤƥե˽̾ݤJARե˾˴ޤޤޥ˥եȡեȻƤޤJARե˴ޤޤƤ륽ե뤴Ȥˡ\fI\&.SF\fRեˤϡޥ˥եȡեˤ褦ʡ˼3ĤιԤޤ
+コマンドラインで\fI\-sigfile\fRオプションを指定しなかった場合、\fI\&.SF\fRファイルと\fI\&.DSA\fRファイルのベース・ファイル名は、コマンドラインで指定された別名の先頭の8文字をすべて大文字に変換したものになります。別名が8文字未満の場合は、別名がそのまま使用されます。別名に、署名ファイル名で使用できない文字が含まれている場合、ファイル名の作成時に、該当する文字が下線(_)文字に変換されます。有効な文字は、アルファベット、数字、下線およびハイフンです。
+署名ファイル.PP
+署名ファイル(\fI\&.SF\fRファイル)は、\fIjarsigner\fRコマンドを使用してファイルに署名する際にJARファイルに常に含まれるマニフェスト・ファイルと似ています。JARファイルに含まれているソース・ファイルごとに、\fI\&.SF\fRファイルには、マニフェスト・ファイルにあるような、次に示す3つの行があります。
 .sp
 .RS 4
 .ie n \{\
@@ -350,7 +350,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ե̾
+ファイル名
 .RE
 .sp
 .RS 4
@@ -361,7 +361,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ȡ르ꥺ(SHA)̾
+ダイジェスト・アルゴリズム(SHA)の名前
 .RE
 .sp
 .RS 4
@@ -372,17 +372,17 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-SHAȤ
+SHAダイジェストの値
 .RE
 .PP
-ޥ˥եȡեǤϡƥեSHAȤͤϡեΥХʥꡦǡΥ(ϥå)ˤʤޤ\fI\&.SF\fRեǤϡꤵ줿եΥȤͤϡեΥޥ˥եȡեΤ3ԤΥϥåˤʤޤ
+マニフェスト・ファイルでは、各ソース・ファイルのSHAダイジェストの値は、ソース・ファイルのバイナリ・データのダイジェスト(ハッシュ)になります。\fI\&.SF\fRファイルでは、指定されたソース・ファイルのダイジェストの値は、ソース・ファイルのマニフェスト・ファイル内のその3行のハッシュになります。
 .PP
-̾եˤϡǥեȤǡޥ˥եȡեΤΥϥå夬Ǽ줿إåޤޤƤޤإåˤϥޥ˥եȡإåΥϥåޤޤƤޤإå¸ߤȡڤκŬͭˤʤޤJARեθڤ򻲾ȤƤ
-֥̾åե.PP
-\fI\&.SF\fRեˤϽ̾դ졢̾Ͻ֥̾åե֤ޤΥեˤϡ̾˻Ѥ줿̩бǧڤ륭ȥξޤϾ⡢ǥ󥳡ɤƴޤޤƤޤեγĥҤϡѤȡ르ꥺ˱ơ\fI\&.DSA\fR\fI\&.RSA\fRޤ\fI\&.EC\fRˤʤޤ
-.SS "̾ॹ"
+署名ファイルには、デフォルトで、マニフェスト・ファイル全体のハッシュが格納されたヘッダーが含まれています。ヘッダーにはマニフェスト・ヘッダーのハッシュも含まれています。ヘッダーが存在すると、検証の最適化が有効になります。JARファイルの検証を参照してください。
+署名ブロック・ファイル.PP
+\fI\&.SF\fRファイルには署名が付けられ、署名は署名ブロック・ファイルに置かれます。このファイルには、署名に使用された秘密鍵に対応する公開鍵を認証するキーストアからの証明書または証明書チェーンも、内部でエンコードされて含まれています。ファイルの拡張子は、使用されるダイジェスト・アルゴリズムに応じて、\fI\&.DSA\fR、\fI\&.RSA\fRまたは\fI\&.EC\fRになります。
+.SS "署名タイムスタンプ"
 .PP
-\fIjarsigner\fRޥɤǤϡJARեν̾˽̾ॹפ¸Ǥޤˡ\fIjarsigner\fRؽ̾򥵥ݡȤޤưϾάǽǡ̾˼γƥץˤä椵ޤץ򻲾ȤƤ
+\fIjarsigner\fRコマンドでは、JARファイルの署名時に署名タイムスタンプを生成および保存できます。さらに、\fIjarsigner\fRは代替署名機構をサポートします。この動作は省略可能で、署名時に次の各オプションによって制御されます。オプションを参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -397,9 +397,9 @@
 .if n \{\
 .RE
 .\}
-.SS "JARեθ"
+.SS "JARファイルの検証"
 .PP
-JARեθڤΤϡ̾ͭǤꡢĽ̾ʹߤJARեΤɤΥեѹƤʤǤJARեθڤϡμǹԤޤ
+JARファイルの検証が成功するのは、署名が有効であり、かつ署名の生成以降にJARファイル内のどのファイルも変更されていない場合です。JARファイルの検証は、次の手順で行われます。
 .sp
 .RS 4
 .ie n \{\
@@ -409,9 +409,9 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-\fI\&.SF\fRեν̾򸡾ڤޤ
+\fI\&.SF\fRファイルの署名を検証します。
 .sp
-ڤǤϡƽ֥̾å(\fI\&.DSA\fR)ե˳Ǽ줿̾(ޤϾ)\fI\&.DSA\fRե˼б̩Ѥ줿Ȥǧޤޤ̾б̾(\fI\&.SF\fR)եͭʽ̾Ǥ뤳Ȥǧ졢ˤꡢ\fI\&.SF\fRե뤬󤵤ƤʤȤǧޤ
+検証では、各署名ブロック(\fI\&.DSA\fR)ファイルに格納された署名が、証明書(または証明書チェーン)も\fI\&.DSA\fRファイルに示される公開鍵に対応する秘密鍵を使用して生成されたことを確認します。また、署名が対応する署名(\fI\&.SF\fR)ファイルの有効な署名であることが確認され、それにより、\fI\&.SF\fRファイルが改ざんされていないことも確認されます。
 .RE
 .sp
 .RS 4
@@ -422,13 +422,13 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-\fI\&.SF\fRեγƥȥ˼Ȥ򡢥ޥ˥եбƥͤ碌Ƹڤޤ
+\fI\&.SF\fRファイル内の各エントリに示されるダイジェストを、マニフェスト内の対応する各セクションと突きあわせて検証します。
 .sp
-\fI\&.SF\fRեˤϡޥ˥եȡեΤΥϥå夬Ǽ줿إåǥեȤǴޤޤƤޤإå¸ߤ硢ڤǤϡإåΥϥå夬ޥ˥եȡեΥϥåȰפ뤫ɤǧ뤿˥åǤޤפ硢ڤϼμ˿ʤߤޤ
+\fI\&.SF\fRファイルには、マニフェスト・ファイル全体のハッシュが格納されたヘッダーがデフォルトで含まれています。ヘッダーが存在する場合、検証では、ヘッダー内のハッシュがマニフェスト・ファイルのハッシュと一致するかどうかを確認するためにチェックできます。一致する場合、検証は次の手順に進みます。
 .sp
-פʤ硢\fI\&.SF\fRեγƥե󥻥Υϥå夬ޥ˥եȡեб륻ΥϥåȰפ뤳Ȥǧ뤿ˡޤŬƤʤڤɬפˤʤޤ̾ե򻲾ȤƤ
+一致しない場合、\fI\&.SF\fRファイル内の各ソース・ファイル情報セクションのハッシュが、マニフェスト・ファイル内の対応するセクションのハッシュと一致することを確認するために、あまり最適化されていない検証が必要になります。署名ファイルを参照してください。
 .sp
-\fI\&.SF\fRեΥإå˳Ǽ줿ޥ˥եȡեΥϥå夬ߤΥޥ˥եȡեΥϥå˰פʤͳ1Ĥϡ̾\fI\&.SF\fRեˡ(\fIjar\fRġѤ)1İʾΥե뤬JARեɲä줿ȤǤ\fIjar\fRġѤƥեɲä硢եѤΥɲä뤳Ȥˤꡢޥ˥եȡեѹޤ\fI\&.SF\fRեѹޤ󡣸ڤޤƤȤߤʤΤϡ̾ʹߤJARեΤɤΥեѹƤʤǤ줬ȯΤϡ\fI\&.SF\fRեΥإåʳΥΥϥå夬ޥ˥եȡեб륻ΥϥåȰפǤ
+\fI\&.SF\fRファイルのヘッダーに格納されたマニフェスト・ファイルのハッシュが、現在のマニフェスト・ファイルのハッシュに一致しない理由の1つは、署名および\fI\&.SF\fRファイルの生成後に、(\fIjar\fRツールを使用して)1つ以上のファイルがJARファイルに追加されたことです。\fIjar\fRツールを使用してファイルを追加した場合、新しいファイル用のセクションが追加されることにより、マニフェスト・ファイルは変更されますが、\fI\&.SF\fRファイルは変更されません。検証がまだ成功しているとみなされるのは、署名の生成以降にJARファイル内のどのファイルも変更されていない場合です。これが発生するのは、\fI\&.SF\fRファイルのヘッダー以外のセクションのハッシュが、マニフェスト・ファイル内の対応するセクションのハッシュと一致する場合です。
 .RE
 .sp
 .RS 4
@@ -439,16 +439,16 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-\fI\&.SF\fRե˥ȥJARեγƥեɤ߼ޤɼ˥եΥȤ׻̤ޥ˥եȡΤΥեΥȤӤޤȤƱǤɬפꡢǤʤϸڤԤޤ
+\fI\&.SF\fRファイル内にエントリを持つJARファイル内の各ファイルを読み取ります。読取り中にファイルのダイジェストを計算し、結果をマニフェスト・セクション内のこのファイルのダイジェストと比較します。ダイジェストは同じである必要があり、そうでない場合は検証が失敗します。
 .sp
-ڥץˤʤ餫νʸڥ顼ȯ硢Υץߤ졢ƥ㳰ޤ\fIjarsigner\fRޥɤǤϡ㳰ªɽޤ
+検証プロセス中になんらかの重大な検証エラーが発生した場合、そのプロセスは停止され、セキュリティ例外がスローされます。\fIjarsigner\fRコマンドでは、例外を捕捉および表示します。
 .RE
 .PP
-\fB:\fR
-ɲäηٹ(ޤϡ\fI\-strict\fRץꤷϥ顼)Ϥ٤ɤɬפޤƱͤˡǤ뤫ꤹ뤿ˡ(\fI\-verbose\fR\fI\-certs\fRץꤷ)Ƥɤɬפޤ
-.SS "1ĤJARեоݤȤʣν̾"
+\fB注意:\fR
+追加の警告(または、\fI\-strict\fRオプションを指定した場合はエラー)はすべて読む必要があります。同様に、証明が信頼できるかを決定するために、(\fI\-verbose\fRおよび\fI\-certs\fRオプションを指定して)証明書の内容も読む必要があります。
+.SS "1つのJARファイルを対象とする複数の署名"
 .PP
-Τ褦ˡ\fIjarsigner\fRޥɤեʣ¹Ԥ¹ԤΤӤ˰ۤʤ桼̾ꤹ뤳Ȥˤäơ1ĤJARեʣΥ桼ν̾դ뤳ȤǤޤ
+次のように、\fIjarsigner\fRコマンドをファイルで複数回実行し、実行のたびに異なるユーザーの別名を指定することによって、1つのJARファイルに複数のユーザーの署名を付けることができます。
 .sp
 .if n \{\
 .RS 4
@@ -461,7 +461,7 @@
 .RE
 .\}
 .PP
-JARե뤬ʣ̾Ƥ硢JARեˤϡʣ\fI\&.SF\fRե\fI\&.DSA\fRե뤬ޤޤƤꡢ1ν̾Ф1ĤΥڥȤʤޤҤǤϡJARեˤϡ̾Υե뤬ޤޤƤޤ
+JARファイルが複数回署名されている場合、そのJARファイルには、複数の\fI\&.SF\fRファイルと\fI\&.DSA\fRファイルが含まれており、1回の署名に対して1つのペアとなります。前述の例では、出力JARファイルには、次の名前のファイルが含まれています。
 .sp
 .if n \{\
 .RS 4
@@ -475,9 +475,9 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
-γƹǤϡ͡\fIjarsigner\fRץˤĤޤɸդƤ
+次の各項では、様々な\fIjarsigner\fRオプションについて説明します。次の標準に注意してください。
 .sp
 .RS 4
 .ie n \{\
@@ -487,7 +487,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɤΥץ̾ˤƬ˥ޥʥ(\-)դޤ
+どのオプション名にも先頭にマイナス記号(\-)が付きます。
 .RE
 .sp
 .RS 4
@@ -498,7 +498,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץǤդνǻǤޤ
+オプションは任意の順序で指定できます。
 .RE
 .sp
 .RS 4
@@ -509,7 +509,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åΤޤϲդι(ץ)μºݤͤϡꤹɬפޤ
+イタリック体または下線付きの項目(オプションの値)の実際の値は、指定する必要があります。
 .RE
 .sp
 .RS 4
@@ -520,18 +520,18 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-storepass\fR\fI\-keypass\fR\fI\-sigfile\fR\fI\-sigalg\fR\fI\-digestalg\fR\fI\-signedjar\fRTSAϢΥץѤǤΤϡJARե˽̾ΤߤǤ̾դJARե򸡾ڤǤϤޤ\fI\-keystore \fRץϡJARեν̾Ӹڤ˴Ϣޤޤ̾ϡJARեν̾Ӹڻ˻ꤷޤ
+\fI\-storepass\fR、\fI\-keypass\fR、\fI\-sigfile\fR、\fI\-sigalg\fR、\fI\-digestalg\fR、\fI\-signedjar\fRおよびTSA関連のオプションを使用できるのは、JARファイルに署名する場合のみです。署名付きJARファイルを検証する場合ではありません。\fI\-keystore \fRオプションは、JARファイルの署名および検証に関連します。また、別名は、JARファイルの署名および検証時に指定します。
 .RE
 .PP
 \-keystore \fIurl\fR
 .RS 4
-ȥξ򼨤URLꤷޤˤꡢ\fIuser\&.home\fRƥࡦץѥƥǷꤵ줿桼Υۡࡦǥ쥯ȥΥե\fI\&.keystore\fR˥ǥեꤵޤ
+キーストアの場所を示すURLを指定します。これにより、\fIuser\&.home\fRシステム・プロパティで決定されたユーザーのホーム・ディレクトリ内のファイル\fI\&.keystore\fRにデフォルト設定されます。
 .sp
-ȥϽ̾ˤɬפǤǥեȤΥȥ¸ߤʤ硢ޤϥǥեȰʳΥȥѤϡȥŪ˻ꤹɬפޤ
+キーストアは署名時には必要です。デフォルトのキーストアが存在しない場合、またはデフォルト以外のキーストアを使用する場合は、キーストアを明示的に指定する必要があります。
 .sp
-ڤȤϥȥɬפޤ󡣤ȥꤵƤ뤫뤤ϥǥեȤΥȥ¸ߤƤơ\fI\-verbose\fRץꤵƤ硢JARեθڤ˻Ѥ񤬤Υȥ1ĤǤޤޤƤ뤫ɤ˴ؤɲþ󤬽Ϥޤ
+検証するときはキーストアは必要ありません。ただし、キーストアが指定されているか、あるいはデフォルトのキーストアが存在していて、さらに\fI\-verbose\fRオプションも指定されていた場合、JARファイルの検証に使用される証明書がそのキーストアに1つでも含まれているかどうかに関する追加情報が出力されます。
 .sp
-\fI\-keystore\fRˤϡURLǤϤʤե̾ȥѥǤξ硢ե: URLƱ褦˽ޤȤСˤ褦˻ꤹƱˤʤޤ
+\fI\-keystore\fR引数には、URLではなくファイル名とパスを指定でき、この場合、ファイル: URLと同じように処理されます。たとえば、次にように指定すると同等になります。
 .sp
 .if n \{\
 .RS 4
@@ -543,8 +543,8 @@
 .if n \{\
 .RE
 .\}
-(JRE\fI$JAVA_HOME/lib/security directory\fRˤ)
-\fIjava\&.security\fRƥץѥƥեSun PKCS #11ץХ줿硢\fIkeytool\fR\fIjarsigner\fRġPKCS#11ȡ˴ŤưǤޤΥץꤷޤ
+(JREの\fI$JAVA_HOME/lib/security directory\fRにある)
+\fIjava\&.security\fRセキュリティ・プロパティ・ファイル内でSun PKCS #11プロバイダが構成された場合、\fIkeytool\fRおよび\fIjarsigner\fRツールはPKCS#11トークンに基づいて動作できます。次のオプションを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -556,7 +556,7 @@
 .if n \{\
 .RE
 .\}
-ȤСΥޥɤϡ줿PKCS#11ȡƤɽޤ
+たとえば、次のコマンドは、構成されたPKCS#11トークンの内容を一覧表示します。
 .sp
 .if n \{\
 .RS 4
@@ -571,17 +571,17 @@
 .PP
 \-storetype \fIstoretype\fR
 .RS 4
-󥹥󥹤륭ȥΥפꤷޤǥեȤΥȥפϡƥץѥƥե\fIkeystore\&.type\fRץѥƥͤǻꤵ줿פǤͤϡ\fIjava\&.security\&.KeyStore\fRstatic
-\fIgetDefaultType\fR᥽åɤˤä֤ޤ
+インスタンスを生成するキーストアのタイプを指定します。デフォルトのキーストア・タイプは、セキュリティ・プロパティ・ファイル内の\fIkeystore\&.type\fRプロパティの値で指定されたタイプです。この値は、\fIjava\&.security\&.KeyStore\fRのstatic
+\fIgetDefaultType\fRメソッドによって返されます。
 .sp
-\fI\-storepass\fRץѤơPCKS #11ȡPINꤹ뤳ȤǤޤꤷʤ硢\fIkeytool\fR\fIjarsigner\fRޥɤˤäơȡPINλޤȡݸ줿ǧڥѥ(ѤPINѥåɤɼ굡ʤ)硢\fI\-protected\fRץꤹɬפޤѥɡץϻǤޤ
+\fI\-storepass\fRオプションを使用して、PCKS #11トークンのPINを指定することもできます。何も指定しない場合、\fIkeytool\fRおよび\fIjarsigner\fRコマンドによって、トークンPINの指定を求められます。トークンに保護された認証パス(専用のPINパッドや生体読取り機など)がある場合、\fI\-protected\fRオプションを指定する必要がありますが、パスワード・オプションは指定できません。
 .RE
 .PP
 \-storepass[:env | :file] \fIargument\fR
 .RS 4
-ȥ˥Τɬפʥѥɤꤷޤ줬ɬפʤΤϡJARե˽̾դȤΤߤǤ(ڤȤˤפǤ)ξ硢\fI\-storepass\fRץ򥳥ޥɥ饤ǻꤷʤȡѥɤϤޤ
+キーストアにアクセスするのに必要なパスワードを指定します。これが必要なのは、JARファイルに署名を付けるときのみです(検証するときには不要です)。その場合、\fI\-storepass\fRオプションをコマンドラインで指定しないと、パスワードの入力を求められます。
 .sp
-\fIenv\fRޤ\fIfile\fRꤵƤʤ硢ѥɤͤ\fIargument\fRˤʤޤʳξ硢ѥɤϼΤ褦ˤƼޤ
+修飾子\fIenv\fRまたは\fIfile\fRが指定されていない場合、パスワードの値は\fIargument\fRになります。それ以外の場合、パスワードは次のようにして取得されます。
 .sp
 .RS 4
 .ie n \{\
@@ -592,7 +592,7 @@
 .IP \(bu 2.3
 .\}
 \fIenv\fR:
-\fIargument\fRȤ̾δĶѿѥɤޤ
+\fIargument\fRという名前の環境変数からパスワードを取得します。
 .RE
 .sp
 .RS 4
@@ -604,18 +604,18 @@
 .IP \(bu 2.3
 .\}
 \fIfile\fR:
-\fIargument\fRȤ̾Υե뤫ѥɤޤ
+\fIargument\fRという名前のファイルからパスワードを取得します。
 .RE
 .sp
-\fB:\fR
-ƥȤŪȤޤϥƥݸ줿ƥѤƤʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤ
+\fB注意:\fR
+テストを目的とする場合またはセキュリティ保護されたシステムを使用している場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。
 .RE
 .PP
 \-keypass [:env | :file] \fIargument\fR
 .RS 4
-ޥɥ饤ǻꤵ줿̾б륭ȥȥ̩ݸΤ˻Ѥѥɤꤷޤ\fIjarsigner\fRѤJARե˽̾դȤϡѥɤɬפǤޥɥ饤ǥѥɤꤵƤ餺ɬפʥѥɤȥΥѥɤȰۤʤϡѥɤϤޤ
+コマンドラインで指定された別名に対応するキーストア・エントリの秘密鍵を保護するのに使用するパスワードを指定します。\fIjarsigner\fRを使用してJARファイルに署名を付けるときは、パスワードが必要です。コマンドラインでパスワードが指定されておらず、必要なパスワードがストアのパスワードと異なる場合は、パスワードの入力を求められます。
 .sp
-\fIenv\fRޤ\fIfile\fRꤵƤʤ硢ѥɤͤ\fIargument\fRˤʤޤʳξ硢ѥɤϼΤ褦ˤƼޤ
+修飾子\fIenv\fRまたは\fIfile\fRが指定されていない場合、パスワードの値は\fIargument\fRになります。それ以外の場合、パスワードは次のようにして取得されます。
 .sp
 .RS 4
 .ie n \{\
@@ -626,7 +626,7 @@
 .IP \(bu 2.3
 .\}
 \fIenv\fR:
-\fIargument\fRȤ̾δĶѿѥɤޤ
+\fIargument\fRという名前の環境変数からパスワードを取得します。
 .RE
 .sp
 .RS 4
@@ -638,84 +638,84 @@
 .IP \(bu 2.3
 .\}
 \fIfile\fR:
-\fIargument\fRȤ̾Υե뤫ѥɤޤ
+\fIargument\fRという名前のファイルからパスワードを取得します。
 .RE
 .sp
-\fB:\fR
-ƥȤŪȤޤϥƥݸ줿ƥѤƤʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤ
+\fB注意:\fR
+テストを目的とする場合またはセキュリティ保護されたシステムを使用している場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。
 .RE
 .PP
 \-sigfile \fIfile\fR
 .RS 4
-줿\fI\&.SF\fRե뤪\fI\&.DSA\fRե˻Ѥ١ե̾ꤷޤȤСե뤬\fIDUKESIGN\fRξ硢\fI\&.SF\fR\fI\&.DSA\fRեϡ\fIDUKESIGN\&.SF\fR\fIDUKESIGN\&.DSA\fRȤ̾ǡ̾դJARե\fIMETA\-INF\fRǥ쥯ȥ˳Ǽޤ
+生成された\fI\&.SF\fRファイルおよび\fI\&.DSA\fRファイルに使用するベース・ファイル名を指定します。たとえば、ファイルが\fIDUKESIGN\fRの場合、生成される\fI\&.SF\fRおよび\fI\&.DSA\fRファイルは、\fIDUKESIGN\&.SF\fRおよび\fIDUKESIGN\&.DSA\fRという名前で、署名付きJARファイルの\fIMETA\-INF\fRディレクトリに格納されます。
 .sp
-եʸϡå\fIa\-zA\-Z0\-9_\-\fRꤵɬפޤե٥åȡӥϥեʸΤߤѤǤޤ\fI\&.SF\fR\fI\&.DSA\fRΥե̾ǤϡʸϤ٤ʸѴޤ
+ファイル内の文字は、セット\fIa\-zA\-Z0\-9_\-\fRから指定される必要があります。アルファベット、数字、下線およびハイフン文字のみを使用できます。\fI\&.SF\fRおよび\fI\&.DSA\fRのファイル名では、小文字はすべて大文字に変換されます。
 .sp
-ޥɥ饤\fI\-sigfile\fRץꤷʤä硢\fI\&.SF\fRե\fI\&.DSA\fRեΥ١ե̾ϡޥɥ饤ǻꤵ줿̾Ƭ8ʸ򤹤٤ʸѴΤˤʤޤ̾8ʸ̤ξϡ̾Τޤ޻Ѥޤ̾ˡ̾ե̵̾ʸޤޤƤ硢ե̾뤿ˡʸ(_)ʸѴޤ
+コマンドラインで\fI\-sigfile\fRオプションを指定しなかった場合、\fI\&.SF\fRファイルと\fI\&.DSA\fRファイルのベース・ファイル名は、コマンドラインで指定された別名の先頭の8文字をすべて大文字に変換したものになります。別名が8文字未満の場合は、別名がそのまま使用されます。別名に、署名ファイル名で無効な文字が含まれている場合、ファイル名を作成するために、該当する文字が下線(_)文字に変換されます。
 .RE
 .PP
 \-sigalg \fIalgorithm\fR
 .RS 4
-JARեν̾˻Ѥ̾르ꥺ̾ꤷޤ
+JARファイルの署名に使用する署名アルゴリズムの名前を指定します。
 .sp
-ɸŪʽ̾르ꥺ̾ΥꥹȤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAˤ
-Java Cryptography Architecture (JCA)ե󥹡ɤΡϿA: ɸ̾פ򻲾ȤƤ
+標準的な署名アルゴリズム名のリストは、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAにある
+Java Cryptography Architecture (JCA)リファレンス・ガイドの「付録A: 標準名」を参照してください。
 .sp
-Υ르ꥺˤϡJARեν̾˻Ѥ̩ȤθߴɬפǤΥץꤷʤ硢̩Υפ˱ơ\fISHA1withDSA\fR\fISHA256withRSA\fRޤ\fISHA256withECDSA\fRѤޤꤵ줿르ꥺμ󶡤ץХŪ˥󥹥ȡ뤵Ƥ뤫\fI\-providerClass\fRץѤƤΤ褦ʥץХ桼ꤹɬפޤǤʤ硢ޥɤϼԤޤ
+このアルゴリズムには、JARファイルの署名に使用する秘密鍵との互換性が必要です。このオプションを指定しない場合、秘密鍵のタイプに応じて、\fISHA1withDSA\fR、\fISHA256withRSA\fRまたは\fISHA256withECDSA\fRが使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\fI\-providerClass\fRオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドは失敗します。
 .RE
 .PP
 \-digestalg \fIalgorithm\fR
 .RS 4
-JARեΥȥȤݤ˻Ѥåȡ르ꥺ̾ꤷޤ
+JARファイルのエントリをダイジェストする際に使用するメッセージ・ダイジェスト・アルゴリズムの名前を指定します。
 .sp
-ɸŪʥåȡ르ꥺ̾ΥꥹȤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAˤ
-Java Cryptography Architecture (JCA)ե󥹡ɤΡϿA: ɸ̾פ򻲾ȤƤ
+標準的なメッセージ・ダイジェスト・アルゴリズム名のリストは、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAにある
+Java Cryptography Architecture (JCA)リファレンス・ガイドの「付録A: 標準名」を参照してください。
 .sp
-Υץꤷʤ硢\fISHA256\fRѤޤꤵ줿르ꥺμ󶡤ץХŪ˥󥹥ȡ뤵Ƥ뤫\fI\-providerClass\fRץѤƤΤ褦ʥץХ桼ꤹɬפޤǤʤ硢ޥɤϼԤޤ
+このオプションを指定しない場合、\fISHA256\fRが使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\fI\-providerClass\fRオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドは失敗します。
 .RE
 .PP
 \-certs
 .RS 4
-ޥɥ饤ǡ\fI\-certs\fRץ\fI\-verify\fR\fI\-verbose\fRץȤȤ˻ꤷ硢JARեγƽ̾Ԥξ󤬽Ϥ˴ޤޤޤξˤϡ̾Ԥθ(\fI\&.DSA\fRե˳Ǽ)Υפ̾ޤޤ졢X\&.509(\fIjava\&.security\&.cert\&.X509Certificate\fRΥ󥹥)ξ硢̾Ԥμ̾ޤޤޤ
+コマンドラインで、\fI\-certs\fRオプションを\fI\-verify\fRおよび\fI\-verbose\fRオプションとともに指定した場合、JARファイルの各署名者の証明書情報が出力に含まれます。この情報には、署名者の公開鍵を証明する証明書(\fI\&.DSA\fRファイルに格納)のタイプの名前が含まれ、証明書がX\&.509証明書(\fIjava\&.security\&.cert\&.X509Certificate\fRのインスタンス)の場合、署名者の識別名が含まれます。
 .sp
-ȥγǧԤޤޥɥ饤ǥȥͤꤵƤʤ硢ǥեȤΥȥե()åޤ̾Ԥθξ񤬥ȥΥȥȰפ硢ν̾ԤΥȥΥȥ̾ݥåɽޤ
+キーストアの確認も行われます。コマンドラインでキーストアの値が指定されていない場合、デフォルトのキーストア・ファイル(ある場合)がチェックされます。署名者の公開鍵の証明書がキーストア内のエントリと一致する場合、その署名者のキーストアのエントリの別名が丸カッコ内に表示されます。
 .RE
 .PP
 \-certchain \fIfile\fR
 .RS 4
-ޥɥ饤ǻꤷ̾ˤäɽ륭ȥȥ̩˴Ϣդ줿󤬴ǤϤʤˡѤꤷޤϡΤݻΤ˽ʬΰ褬ʤϡɥȡ˥ȥǼƤȯޤΥեϰϢϢ뤵줿X\&.509PKCS#7ñǡ֥åΤ줫ȤʤꡢΥ󥳡ǥ󥰷ϥХʥꡦ󥳡ǥ󥰷Internet RFC 1421ɸǵꤵǽ󥳡ǥ󥰷(Base64󥳡ǥ󥰤ȤƤФ)Τ줫ˤʤޤ󥿡ͥåRFC 1421沽ʤhttp://tools\&.ietf\&.org/html/rfc1421򻲾ȤƤ
+コマンドラインで指定した別名によって表されるキーストア・エントリの秘密鍵に関連付けられた証明書チェーンが完全ではない場合に、使用する証明書チェーンを指定します。これは、証明書チェーン全体を保持するのに十分な領域がないハードウェア・トークン上にキーストアが格納されている場合に発生します。このファイルは一連の連結されたX\&.509証明書、PKCS#7形式の単一データ・ブロックのいずれかとなり、そのエンコーディング形式はバイナリ・エンコーディング形式、Internet RFC 1421標準で規定される印刷可能エンコーディング形式(Base64エンコーディングとも呼ばれる)のいずれかになります。インターネットRFC 1421証明書符号化規格およびhttp://tools\&.ietf\&.org/html/rfc1421を参照してください。
 .RE
 .PP
 \-verbose
 .RS 4
-ޥɥ饤\fI\-verbose\fRץꤷ硢Ĺ⡼ɤưΥ⡼ɤǤϡ\fIjarsigner\fRϡJARν̾ޤϸڤοʹԾ˴ؤɲþϤޤ
+コマンドラインで\fI\-verbose\fRオプションを指定した場合、冗長モードで動作し、このモードでは、\fIjarsigner\fRは、JARの署名または検証の進行状況に関する追加情報を出力します。
 .RE
 .PP
 \-internalsf
 .RS 4
-ϡJARեν̾줿\fI\&.DSA\fR
-(֥̾å)եˡ줿\fI\&.SF\fRե(̾ե)Υ󥳡ɤ줿ʥԡޤޤƤޤ ưѹޤJARեΤΥ򾮤뤿ˡǥեȤǤ\fI\&.DSA\fRեˤ\fI\&.SF\fRեΥԡޤޤʤ褦ˤʤäƤޤޥɥ饤\fI\-internalsf\fRꤷ硢Ʊ褦ưޤΥץϡƥȤԤǤºݤˤϡ\fI\-internalsf\fRץϡСإåɤ礭ʤ뤿ᡢѤʤǤ
+以前は、JARファイルの署名時に生成された\fI\&.DSA\fR
+(署名ブロック)ファイルに、生成された\fI\&.SF\fRファイル(署名ファイル)のエンコードされた完全なコピーが含まれていました。 この動作は変更されました。出力JARファイル全体のサイズを小さくするために、デフォルトでは\fI\&.DSA\fRファイルには\fI\&.SF\fRファイルのコピーが含まれないようになっています。コマンドラインで\fI\-internalsf\fRを指定した場合、以前と同じように動作します。このオプションは、テストを行う場合に便利です。実際には、\fI\-internalsf\fRオプションは、オーバーヘッドが大きくなるため、使用しないでください。
 .RE
 .PP
 \-sectionsonly
 .RS 4
-ޥɥ饤\fI\-sectionsonly\fRץꤷ硢JARեν̾\fI\&.SF\fRե(̾ե)ˤϡޥ˥եȡեΤΥϥåޤإåϴޤޤޤ󡣤˴ޤޤΤϡJARեγƥե˴Ϣ󤪤ӥϥåΤߤǤ̾ե򻲾ȤƤ
+コマンドラインで\fI\-sectionsonly\fRオプションを指定した場合、JARファイルの署名時に生成される\fI\&.SF\fRファイル(署名ファイル)には、マニフェスト・ファイル全体のハッシュを含むヘッダーは含まれません。これに含まれるのは、JARファイル内の各ソース・ファイルに関連する情報およびハッシュのみです。署名ファイルを参照してください。
 .sp
-ǥեȤǤϡŬΤˡΥإåɲäޤإå¸ߤ硢JARե򸡾ڤ뤿ӤˡڤǤϡޤإåΥϥå夬ޥ˥եȡեΤΥϥåȰפ뤫ɤǧ뤿˥åǤޤפ硢ڤϼμ˿ʤߤޤפʤ硢\fI\&.SF\fRեγƥե󥻥Υϥå夬ޥ˥եȡեб륻ΥϥåȰפȤޤŬƤʤڤ¹ԤɬפޤJARեθڤ򻲾ȤƤ
+デフォルトでは、最適化のために、このヘッダーが追加されます。ヘッダーが存在する場合、JARファイルを検証するたびに、検証では、まずヘッダー内のハッシュがマニフェスト・ファイル全体のハッシュと一致するかどうかを確認するためにチェックできます。一致する場合、検証は次の手順に進みます。一致しない場合、\fI\&.SF\fRファイル内の各ソース・ファイル情報セクションのハッシュが、マニフェスト・ファイル内の対応するセクションのハッシュと一致するという、あまり最適化されていない検証を実行する必要があります。JARファイルの検証を参照してください。
 .sp
-\fI\-sectionsonly\fRץϡ˥ƥѤ˻ѤޤѤȥСإåɤ礭ʤ뤿ᡢƥѰʳǤϻѤʤǤ
+\fI\-sectionsonly\fRオプションは、主にテスト用に使用されます。これを使用するとオーバーヘッドが大きくなるため、テスト用以外では使用しないでください。
 .RE
 .PP
 \-protected
 .RS 4
-\fItrue\fRޤ\fIfalse\fRΤ줫ͤǤޤPIN꡼ʤɤݸ줿ǧڥѥˤäƥѥɤꤹɬפ硢\fItrue\fRꤷޤ
+\fItrue\fRまたは\fIfalse\fRのいずれかの値を指定できます。専用PINリーダーなどの保護された認証パスによってパスワードを指定する必要がある場合、\fItrue\fRを指定します。
 .RE
 .PP
 \-providerClass \fIprovider\-class\-name\fR
 .RS 4
-Ź沽ӥץХ\fIjava\&.security\fRƥץѥƥե˻ꤵƤʤȤϡΥޥ饹ե̾ꤹȤ˻Ѥޤ
+暗号化サービス・プロバイダが\fIjava\&.security\fRセキュリティ・プロパティ・ファイルに指定されていないときは、そのマスター・クラス・ファイルの名前を指定するときに使用されます。
 .sp
-\fI\-providerArg ConfigFilePath\fRץȤȤ˻Ѥ\fIkeytool\fR\fIjarsigner\fRġϡץХưŪ˥󥹥ȡ뤷ȡեؤΥѥ\fIConfigFilePath\fRѤޤϡOracle PKCS #11ץХƥץѥƥե˹Ƥʤä\fIPKCS #11\fRȥɽ륳ޥɤ򼨤Ƥޤ
+\fI\-providerArg ConfigFilePath\fRオプションとともに使用し、\fIkeytool\fRおよび\fIjarsigner\fRツールは、プロバイダを動的にインストールし、トークン構成ファイルへのパスに\fIConfigFilePath\fRを使用します。次の例は、Oracle PKCS #11プロバイダがセキュリティ・プロパティ・ファイルに構成されていなかった場合に\fIPKCS #11\fRキーストアを一覧表示するコマンドを示しています。
 .sp
 .if n \{\
 .RS 4
@@ -733,9 +733,9 @@
 .PP
 \-providerName \fIproviderName\fR
 .RS 4
-\fIjava\&.security\fRƥץѥƥե2İʾΥץХ줿硢\fI\-providerName\fRץѤơΥץХ󥹥󥹤оݤˤ뤳ȤǤޤΥץΰϡץХ̾Ǥ
+\fIjava\&.security\fRセキュリティ・プロパティ・ファイル内で2つ以上のプロバイダが構成された場合、\fI\-providerName\fRオプションを使用して、特定のプロバイダ・インスタンスを対象にすることができます。このオプションの引数は、プロバイダの名前です。
 .sp
-Oracle PKCS #11ץХξ硢\fIproviderName\fR\fISunPKCS11\-\fR\fITokenName\fRȤˤʤޤǡ°ɽǾܺ٤Ƥ褦ˡ\fITokenName\fRϡץХ󥹥󥹤줿̾ǤȤСΥޥɤϡ̾\fISmartCard\fR\fIPKCS #11\fRȥץХ󥹥󥹤Ƥɽޤ
+Oracle PKCS #11プロバイダの場合、\fIproviderName\fRは\fISunPKCS11\-\fR\fITokenName\fRという形式になります。ここで、構成属性の表で詳細に説明されているように、\fITokenName\fRは、プロバイダ・インスタンスが構成された名前の接尾辞です。たとえば、次のコマンドは、名前接尾辞\fISmartCard\fRの\fIPKCS #11\fRキーストア・プロバイダ・インスタンスの内容を一覧表示します。
 .sp
 .if n \{\
 .RS 4
@@ -752,45 +752,45 @@
 .PP
 \-J\fIjavaoption\fR
 .RS 4
-ꤵ줿\fIjavaoption\fRʸJava󥿥ץ꥿ľϤޤ\fIjarsigner\fRޥɤϡ󥿥ץ꥿ФåѡǤΥץˤϡޤ뤳ȤϤǤޤ󡣤Υץϡ¹ԴĶޤϥ꡼ѤĴǤǤ륤󥿥ץ꥿ץɽˤϡޥɥ饤\fIjava \-h\fRޤ\fIjava \-X\fRϤƤ
+指定された\fIjavaoption\fR文字列をJavaインタプリタに直接渡します。\fIjarsigner\fRコマンドは、インタプリタに対するラッパーです。このオプションには、空白を含めることはできません。このオプションは、実行環境またはメモリー使用を調整する場合に便利です。指定できるインタプリタ・オプションを一覧表示するには、コマンドラインで\fIjava \-h\fRまたは\fIjava \-X\fRと入力してください。
 .RE
 .PP
 \-tsa \fIurl\fR
 .RS 4
-\fI\-tsa http://example\&.tsa\&.url\fRJARեν̾˥ޥɥ饤ˤ硢̾ΥॹפޤURL
-\fIhttp://example\&.tsa\&.url\fRϡTime Stamping Authority (TSA)ξꤷ\fI\-tsacert\fRץꤷƸФ줿URL򥪡С饤ɤޤ\fI\-tsa\fRץǤϡTSAθ򥭡ȥ֤ɬפϤޤ
+\fI\-tsa http://example\&.tsa\&.url\fRがJARファイルの署名時にコマンドラインにある場合、署名のタイムスタンプが生成されます。URL
+\fIhttp://example\&.tsa\&.url\fRは、Time Stamping Authority (TSA)の場所を特定し、\fI\-tsacert\fRオプションを指定して検出されたURLをオーバーライドします。\fI\-tsa\fRオプションでは、TSAの公開鍵証明書をキーストアに配置する必要はありません。
 .sp
-ॹפ뤿ˡ\fIjarsigner\fRϡRFC 3161Ƥ륿ॹסץȥ(TSP)ѤTSA̿ޤȡTSAˤä֤줿ॹסȡϡ֥̾åեν̾ȤȤ¸ޤ
+タイムスタンプを生成するために、\fIjarsigner\fRは、RFC 3161で定義されているタイムスタンプ・プロトコル(TSP)を使用してTSAと通信します。成功すると、TSAによって返されたタイムスタンプ・トークンは、署名ブロック・ファイルの署名とともに保存されます。
 .RE
 .PP
 \-tsacert \fIalias\fR
 .RS 4
-\fI\-tsacert alias\fRJARեν̾˥ޥɥ饤ˤ硢̾Υॹפޤ̾ϡȥͭTSAθꤷޤȥξǡTSAξꤹURLޤSubject Information Accessĥǽǧޤ
+\fI\-tsacert alias\fRがJARファイルの署名時にコマンドラインにある場合、署名のタイムスタンプが生成されます。別名は、キーストア内の有効なTSAの公開鍵証明書を特定します。エントリの証明書で、TSAの場所を特定するURLを含むSubject Information Access拡張機能が確認されます。
 .sp
-\fI\-tsacert\fRץѤϡTSAθ񤬥ȥ֤Ƥɬפޤ
+\fI\-tsacert\fRオプションを使用する場合は、TSAの公開鍵証明書がキーストアに配置されている必要があります。
 .RE
 .PP
 \-tsapolicyid \fIpolicyid\fR
 .RS 4
-TSAСݥꥷID̤륪֥ȼ̻(OID)ꤷޤΥץꤷʤ硢ݥꥷID줺TSAСϥǥեȤΥݥꥷID򤷤ޤ
+TSAサーバーに送信するポリシーIDを識別するオブジェクト識別子(OID)を指定します。このオプションを指定しない場合、ポリシーIDは送信されず、TSAサーバーはデフォルトのポリシーIDを選択します。
 .sp
-֥ȼ̻ҤϡITU Telecommunication Standardization Sector (ITU\-T)ɸǤX\&.696ˤäޤμ̻Ҥϡ̾\fI1\&.2\&.3\&.4\fRʤɤΡǤϤʤΥԥꥪɶڤΥåȤǤ
+オブジェクト識別子は、ITU Telecommunication Standardization Sector (ITU\-T)標準であるX\&.696によって定義されます。これらの識別子は、通常、\fI1\&.2\&.3\&.4\fRなどの、負ではない数字のピリオド区切りのセットです。
 .RE
 .PP
 \-altsigner \fIclass\fR
 .RS 4
-Υץϡؽ̾ᥫ˥ꤷޤ饹̾ϡ\fIcom\&.sun\&.jarsigner\&.ContentSigner\fRݥ饹ĥ륯饹ե̤ޤΥ饹եؤΥѥϡ\fI\-altsignerpath\fRץˤäޤ\fI\-altsigner\fRץѤ硢\fIjarsigner\fRޥɤǤϡꤵ줿饹ˤä󶡤̾ᥫ˥Ѥޤʳξ硢\fIjarsigner\fRޥɤϥǥեȤν̾ᥫ˥Ѥޤ
+このオプションは、代替署名メカニズムを指定します。完全修飾クラス名は、\fIcom\&.sun\&.jarsigner\&.ContentSigner\fR抽象クラスを拡張するクラス・ファイルを識別します。このクラス・ファイルへのパスは、\fI\-altsignerpath\fRオプションによって定義されます。\fI\-altsigner\fRオプションを使用した場合、\fIjarsigner\fRコマンドでは、指定されたクラスによって提供される署名メカニズムを使用します。それ以外の場合、\fIjarsigner\fRコマンドはデフォルトの署名メカニズムを使用します。
 .sp
-ȤС\fIcom\&.sun\&.sun\&.jarsigner\&.AuthSigner\fRȤ̾Υ饹󶡤̾ᥫ˥ѤˤϡjarsignerΥץ\fI\-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fRѤޤ
+たとえば、\fIcom\&.sun\&.sun\&.jarsigner\&.AuthSigner\fRという名前のクラスが提供する署名メカニズムを使用するには、jarsignerのオプション\fI\-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fRを使用します。
 .RE
 .PP
 \-altsignerpath \fIclasspathlist\fR
 .RS 4
-饹ե뤪Ӥ줬¸JARեؤΥѥꤷޤ\fI\-altsigner\fRץѤơ饹ե̾ꤷޤ饹ե뤬JARեˤ硢ΥץǤϡJARեؤΥѥꤷޤ
+クラス・ファイルおよびそれが依存するJARファイルへのパスを指定します。\fI\-altsigner\fRオプションを使用して、クラス・ファイル名を指定します。クラス・ファイルがJARファイル内にある場合、このオプションでは、そのJARファイルへのパスを指定します。
 .sp
-ХѥޤϸߤΥǥ쥯ȥؤХѥǤޤ\fIclasspathlist\fRʣΥѥJARե뤬ޤޤ硢Oracle Solarisξϥ(:)ǡWindowsξϥߥ(;)ǡ줾ڤޤŪΥ饹Ǥ˸ѥˤϡΥץפǤ
+絶対パスまたは現在のディレクトリへの相対パスを指定できます。\fIclasspathlist\fRに複数のパスやJARファイルが含まれる場合、それらを、Oracle Solarisの場合はコロン(:)で、Windowsの場合はセミコロン(;)で、それぞれ区切ります。目的のクラスがすでに検索パス内にある場合は、このオプションは不要です。
 .sp
-Ǥϡ饹եޤJARեؤΥѥꤹˡ򼨤ޤJARե̾ޤޤ
+次の例では、クラス・ファイルを含むJARファイルへのパスを指定する方法を示します。JARファイル名を含めます。
 .sp
 .if n \{\
 .RS 4
@@ -801,7 +801,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ饹եޤJARեؤΥѥꤹˡ򼨤ޤJARե̾άޤ
+次の例では、クラス・ファイルを含むJARファイルへのパスを指定する方法を示します。JARファイル名を省略します。
 .sp
 .if n \{\
 .RS 4
@@ -816,101 +816,101 @@
 .PP
 \-strict
 .RS 4
-̾ޤϸڽˡޥɤˤٹåȯԤ礬ޤΥץꤹȡޥɤˤ긡Ф줿ʷٹåġνλɤȿǤޤ顼ȷٹ򻲾ȤƤ
+署名または検証処理中に、コマンドにより警告メッセージが発行される場合があります。このオプションを指定すると、コマンドにより検出された重大な警告メッセージがツールの終了コードに反映されます。エラーと警告を参照してください。
 .RE
 .PP
 \-verbose \fIsuboptions\fR
 .RS 4
-ڽξ硢\fI\-verbose\fRץˤϡɽ̤ꤹ륵֥ץꤷޤ\fI\-certs\fRץꤷ硢ǥեȡ⡼(ޤϥ֥ץ\fIall\fR)Ǥϡȥ꤬뤿Ӥ˳ƥȥ꤬ɽ졢θJARեγƽ̾Ԥξɽޤ\fI\-certs\fR\fI\-verbose:grouped\fR֥ץꤷ硢Ʊ̾Ծĥȥ꤬ξȤȤˡ롼ײɽޤ\fI\-certs\fR\fI\-verbose:summary\fR֥ץꤷ硢Ʊ̾Ծĥȥ꤬ξȤȤˡ롼ײɽޤƥȥξܺ٤ϡ\fI1ĤΥȥ(ʾ)\fRˤޤȤɽޤ򻲾ȤƤ
+検証処理の場合、\fI\-verbose\fRオプションには、表示する情報の量を決定するサブオプションを指定します。\fI\-certs\fRオプションも指定した場合、デフォルト・モード(またはサブオプション\fIall\fR)では、エントリが処理されるたびに各エントリが表示され、その後にJARファイルの各署名者の証明書情報も表示されます。\fI\-certs\fRおよび\fI\-verbose:grouped\fRサブオプションを指定した場合、同じ署名者情報を持つエントリが、その証明書情報とともに、グループ化されて表示されます。\fI\-certs\fRおよび\fI\-verbose:summary\fRサブオプションを指定した場合、同じ署名者情報を持つエントリが、その証明書情報とともに、グループ化されて表示されます。各エントリの詳細は、\fI1つのエントリ(以上)\fRにまとめられて表示されます。例を参照してください。
 .RE
-.SH "顼ȷٹ"
+.SH "エラーと警告"
 .PP
-̾ޤϸڥץˡ\fIjarsigner\fRޥɤǡ͡ʥ顼ޤϷٹȯԤǽޤ
+署名または検証プロセス中に、\fIjarsigner\fRコマンドで、様々なエラーまたは警告が発行される可能性があります。
 .PP
-㳲硢\fIjarsigner\fRޥɤϥ1ǽλޤ㳲Ϥʤ1İʾνʷٹ𤬤硢\fI\-strict\fRץ󤬻ꤵ\fBʤ\fRϡ\fIjarsigner\fRޥɤϥ0ǽλ\fI\-strict\fRꤵƤϷٹ𥳡ɤORͤǽλޤٹΤߤ롢ޤϷٹ𤬤ޤäʤ硢ޥɤϾ˥0ǽλޤ
+障害がある場合、\fIjarsigner\fRコマンドはコード1で終了します。障害はないが、1つ以上の重大な警告がある場合、\fI\-strict\fRオプションが指定されて\fBいない\fR場合は、\fIjarsigner\fRコマンドはコード0で終了し、\fI\-strict\fRが指定されている場合は警告コードのOR値で終了します。情報警告のみがある、または警告がまったくない場合、コマンドは常にコード0で終了します。
 .PP
-ȤСȥν̾˻Ѥ񤬴ڤǡեν̾ĤʤKeyUsageĥǽѤƤ硢\fI\-strict\fRץ󤬻ꤵƤȡ\fIjarsigner\fRޥɤϥ12 (=4+8)ǽλޤ
+たとえば、エントリの署名に使用される証明書が期限切れで、ファイルの署名を許可しないKeyUsage拡張機能を使用している場合、\fI\-strict\fRオプションが指定されていると、\fIjarsigner\fRコマンドはコード12 (=4+8)で終了します。
 .PP
-\fB:\fR
-UNIX١Υڥ졼ƥ󥰡ƥǤ0255ޤǤͤΤߤͭΤᡢλɤϺѤޤ
+\fB注意:\fR
+UNIXベースのオペレーティング・システムでは0から255までの値のみが有効のため、終了コードは再利用されます。
 .PP
-ΥǤϡ\fIjarsigner\fRޥɤˤȯԤǤ륨顼ӷٹ̾ɡ򵭽Ҥޤ
-.SS "㳲"
+次のセクションでは、\fIjarsigner\fRコマンドにより発行できるエラーおよび警告の名前、コード、説明を記述します。
+.SS "障害"
 .PP
-ޥɥ饤ϥ顼JARե˽̾븰ڥ򸡺ǤʤޤϽ̾դJARեθڼԤʤ(ꤵޤ)\fIjarsigner\fRޥɤμͳ
+コマンドライン解析エラー、JARファイルに署名する鍵ペアを検索できない、または署名付きJARファイルの検証失敗など(限定されません)、\fIjarsigner\fRコマンドの失敗理由。
 .PP
 failure
 .RS 4
-1̾ޤϸڤԤޤ
+コード1。署名または検証が失敗します。
 .RE
-.SS "ʷٹ"
+.SS "重大な警告"
 .PP
-\fB:\fR
-\fI\-strict\fRץꤷ硢ʷٹϥ顼Ȥ𤵤ޤ
+\fB注意:\fR
+\fI\-strict\fRオプションを指定した場合、重大な警告はエラーとして報告されます。
 .PP
-JARեν̾˻Ѥ˥顼롢ޤϽ̾դJARե¾꤬ʤɡ\fIjarsigner\fRޥɤʷٹȯԤͳ
+JARファイルの署名に使用する証明書にエラーがある、または署名付きJARファイルに他の問題があるなど、\fIjarsigner\fRコマンドが重大な警告を発行する理由。
 .PP
 hasExpiredCert
 .RS 4
-4jarˤϡ̾Ծ񤬴ڤΥȥ꤬ޤޤƤޤ
+コード4。このjarには、署名者証明書が期限切れのエントリが含まれています。
 .RE
 .PP
 notYetValidCert
 .RS 4
-4jarˤϡ̾Ծ񤬤ޤͭˤʤäƤʤȥ꤬ޤޤƤޤ
+コード4。このjarには、署名者証明書がまだ有効になっていないエントリが含まれています。
 .RE
 .PP
 chainNotValidated
 .RS 4
-4jarˤϡڤǤʤȥ꤬ޤޤƤޤ
+コード4。このjarには、証明書チェーンが正しく検証できないエントリが含まれています。
 .RE
 .PP
 badKeyUsage
 .RS 4
-8JARˤϡ̾ԾKeyUsageĥǽɽ̾Ĥʤȥ꤬ޤޤƤޤ
+コード8。このJARには、署名者証明書のKeyUsage拡張機能がコード署名を許可しないエントリが含まれています。
 .RE
 .PP
 badExtendedKeyUsage
 .RS 4
-8jarˤϡ̾ԾExtendedKeyUsageĥǽɽ̾Ĥʤȥ꤬ޤޤƤޤ
+コード8。このjarには、署名者証明書のExtendedKeyUsage拡張機能がコード署名を許可しないエントリが含まれています。
 .RE
 .PP
 badNetscapeCertType
 .RS 4
-8jarˤϡ̾ԾNetscapeCertTypeĥǽɽ̾Ĥʤȥ꤬ޤޤƤޤ
+コード8。このjarには、署名者証明書のNetscapeCertType拡張機能がコード署名を許可しないエントリが含まれています。
 .RE
 .PP
 hasUnsignedEntry
 .RS 4
-16jarˤϡå򤷤Ƥʤ̤̾Υȥ꤬ޤޤƤޤ
+コード16。このjarには、整合性チェックをしていない未署名のエントリが含まれています。
 .RE
 .PP
 notSignedByAlias
 .RS 4
-32jarˤϡꤵ줿̾ˤäƽ̾Ƥʤ̾ѥȥ꤬ޤޤƤޤ
+コード32。このjarには、指定された別名によって署名されていない署名済エントリが含まれています。
 .RE
 .PP
 aliasNotInStore
 .RS 4
-32jarˤϡΥȥ̾ˤäƽ̾Ƥʤ̾ѥȥ꤬ޤޤޤ
+コード32。このjarには、このキーストア内の別名によって署名されていない署名済エントリが含まれます。
 .RE
-.SS "ٹ"
+.SS "情報警告"
 .PP
-ٹˤϡ顼ǤϤʤŬڤȤߤʤΤޤޤޤɤϤޤ
+情報警告には、エラーではないが不適切とみなされるものが含まれます。コードはありません。
 .PP
 hasExpiringCert
 .RS 4
-jarˤϡ̾Ծ6˴ڤȤʤ륨ȥ꤬ޤޤƤޤ
+このjarには、署名者証明書が6か月以内に期限切れとなるエントリが含まれています。
 .RE
 .PP
 noTimestamp
 .RS 4
-jarˤϡॹפޤޤʤ̾ޤޤƤޤॹפʤǤϡ̾Ծͭ(\fIYYYY\-MM\-DD\fR)ޤϾμ塢桼ϤJARե򸡾ڤǤʤ礬ޤ
+このjarには、タイムスタンプを含まない署名が含まれています。タイムスタンプなしでは、署名者証明書の有効期限(\fIYYYY\-MM\-DD\fR)後または将来の取消日後、ユーザーはこのJARファイルを検証できない場合があります。
 .RE
-.SH ""
-.SS "JARեν̾"
+.SH "例"
+.SS "JARファイルの署名"
 .PP
-ΥޥɤѤơȥ̾\fIworking\fRǥ쥯ȥ\fImystore\fRȤ̾Υȥˤ\fIjane\fRǤ桼̩bundle\&.jar˽̾̾դJARե\fIsbundle\&.jar\fRȤ̾դޤ
+次のコマンドを使用して、キーストア別名が\fIworking\fRディレクトリの\fImystore\fRという名前のキーストアにある\fIjane\fRであるユーザーの秘密鍵でbundle\&.jarに署名し、署名付きJARファイルに\fIsbundle\&.jar\fRという名前を付けます。
 .sp
 .if n \{\
 .RS 4
@@ -925,9 +925,9 @@
 .RE
 .\}
 .PP
-ҤΥޥɤǤ\fI\-sigfile\fRꤵƤʤᡢ̾դJARե˳Ǽ줿\fI\&.SF\fRե뤪\fI\&.DSA\fRե̾ϡ̾˴ŤǥեȤ̾ˤʤޤϡ̾դ\fIJANE\&.SF\fR\fIJANE\&.DSA\fRǤ
+前述のコマンドでは\fI\-sigfile\fRが指定されていないため、署名付きJARファイルに格納される生成された\fI\&.SF\fRファイルおよび\fI\&.DSA\fRファイルの名前は、別名に基づいたデフォルトの名前になります。これらは、名前付きの\fIJANE\&.SF\fRおよび\fIJANE\&.DSA\fRです。
 .PP
-ȥΥѥɤ̩Υѥɤ硢ҤΥޥɤṳ̂ơΤȤ¹ԤǤޤ
+ストアのパスワードおよび秘密鍵のパスワードを求められる場合、前述のコマンドを短縮して、次のことを実行できます。
 .sp
 .if n \{\
 .RS 4
@@ -940,7 +940,7 @@
 .RE
 .\}
 .PP
-ȥǥեȤΥȥ(ۡࡦǥ쥯ȥ\&.keystore)Ǥ硢˼褦ˡȥꤹɬפޤ
+キーストアがデフォルトのキーストア(ホーム・ディレクトリ内の\&.keystore)である場合、次に示すように、キーストアを指定する必要がありません。
 .sp
 .if n \{\
 .RS 4
@@ -952,7 +952,7 @@
 .RE
 .\}
 .PP
-JARե(bundle\&.jar)̾դJARեǾ񤭤硢Τ褦\fI\-signedjar\fRץꤹɬפϤޤ
+入力JARファイル(bundle\&.jar)を署名付きJARファイルで上書きする場合、次のように\fI\-signedjar\fRオプションを指定する必要はありません。
 .sp
 .if n \{\
 .RS 4
@@ -963,9 +963,9 @@
 .if n \{\
 .RE
 .\}
-.SS "̾դJARեθ"
+.SS "署名付きJARファイルの検証"
 .PP
-̾դJARե򸡾ڤơ̾ͭJARե뤬󤵤ʤäȤǧˤϡΤ褦ʥޥɤѤޤ
+署名付きJARファイルを検証して、署名が有効でJARファイルが改ざんされなかったことを確認するには、次のようなコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -977,7 +977,7 @@
 .RE
 .\}
 .PP
-ڤȡ\fIjar verified\fRɽޤǤʤϡ顼åɽޤ\fI\-verbose\fRץѤȡܺپǤޤ\fIjarsigner\fR\fI\-verbose\fRץȤȤ˻Ѥ륵ץ򡢼˼ޤ
+検証が成功すると、\fIjar verified\fRが表示されます。そうでない場合は、エラー・メッセージが表示されます。\fI\-verbose\fRオプションを使用すると、詳細情報を取得できます。\fIjarsigner\fRを\fI\-verbose\fRオプションとともに使用するサンプルを、次に示します。
 .sp
 .if n \{\
 .RS 4
@@ -1000,9 +1000,9 @@
 .if n \{\
 .RE
 .\}
-.SS "Ѥ"
+.SS "証明書情報を使用した検証"
 .PP
-\fI\-certs\fRץ\fI\-verify\fR\fI\-verbose\fRץȤȤ˻ꤷ硢JARեγƽ̾Ԥξ󤬽Ϥ˴ޤޤޤξˤϡ񥿥ס̾Ԥμ̾(X\&.509ξ)ޤޤ졢ݥåˤϡJARեθ񤬥ȥȥθ˰פν̾ԤΥȥ̾ޤޤޤȤСΤ褦ˤʤޤ
+\fI\-certs\fRオプションを\fI\-verify\fRおよび\fI\-verbose\fRオプションとともに指定した場合、JARファイルの各署名者の証明書情報が出力に含まれます。この情報には、証明書タイプ、署名者の識別名情報(X\&.509証明書の場合)が含まれ、丸カッコ内には、JARファイルの公開鍵証明書がキーストア・エントリの公開鍵証明書に一致する場合の署名者のキーストア別名が含まれます。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1030,8 +1030,8 @@
 .RE
 .\}
 .PP
-̾ԤξX\&.509ǤϤʤ硢̾ɽޤ󡣤ξˤϡΥפ̾ΤߤɽޤȤСPGPǡ̾\fIbob\fRǤ硢\fIPGP, (bob)\fRޤ
-.SH "Ϣ"
+署名者の証明書がX\&.509証明書ではない場合、識別名情報は表示されません。その場合には、証明書のタイプと別名のみが表示されます。たとえば、証明書がPGP証明書で、別名が\fIbob\fRである場合、\fIPGP, (bob)\fRを取得します。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -1063,8 +1063,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlˤ
-֥: Java SEΥƥǽ
+http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlにある
+「コース: Java SEのセキュリティ機能」
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/java.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/java.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: java
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "java" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "java" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-java \- Javaץꥱưޤ
-.SH ""
+java \- Javaアプリケーションを起動します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -74,26 +74,26 @@
 .PP
 \fIoptions\fR
 .RS 4
-Ƕڤ줿ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+空白で区切られたコマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclassname\fR
 .RS 4
-ư륯饹̾
+起動するクラスの名前。
 .RE
 .PP
 \fIfilename\fR
 .RS 4
-ƤӽФJava(JAR)ե̾\fI\-jar\fRץȰˤΤ߻Ѥޤ
+呼び出されるJavaアーカイブ(JAR)ファイルの名前。\fI\-jar\fRオプションと一緒にのみ使用します。
 .RE
 .PP
 \fIargs\fR
 .RS 4
-Ƕڤ줿\fImain()\fR᥽åɤϤ
+空白で区切られた\fImain()\fRメソッドに渡される引数。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjava\fRޥɤJavaץꥱ򳫻ϤޤJava Runtime Environment (JRE)ư塢ꤷ饹ɤΥ饹\fImain()\fR᥽åɤƤӽФȤˤꡢԤޤΥ᥽åɤϡ\fIpublic\fR\fIstatic\fRȤɬפޤޤ֤ͤޤ󡣤ˡ\fIString\fRѥ᡼ȤƻǤɬפޤ᥽åϼηޤߤޤ
+\fIjava\fRコマンドはJavaアプリケーションを開始します。Java Runtime Environment (JRE)を起動した後、指定したクラスをロードし、そのクラスの\fImain()\fRメソッドを呼び出すことにより、これを行います。このメソッドは、\fIpublic\fRおよび\fIstatic\fRとして宣言する必要があります。また、値は返せません。さらに、\fIString\fR配列をパラメータとして指定できる必要があります。メソッド宣言は次の形式を含みます。
 .sp
 .if n \{\
 .RS 4
@@ -105,16 +105,16 @@
 .RE
 .\}
 .PP
-\fIjava\fRޥɤѤơ\fImain()\fR᥽åɤ뤫\fIjavafx\&.application\&.Application\fRĥ륯饹ɤ뤳ȤǡJavaFXץꥱưǤޤԤξ硢ưġ\fIApplication\fR饹Υ󥹥󥹤\fIinit()\fR᥽åɤ򥳡뤷\fIstart(javafx\&.stage\&.Stage)\fR᥽åɤ򥳡뤷ޤ
+\fIjava\fRコマンドを使用して、\fImain()\fRメソッドがあるか\fIjavafx\&.application\&.Application\fRを拡張するクラスをロードすることで、JavaFXアプリケーションを起動できます。後者の場合、起動ツールは\fIApplication\fRクラスのインスタンスを構成し、その\fIinit()\fRメソッドをコールし、\fIstart(javafx\&.stage\&.Stage)\fRメソッドをコールします。
 .PP
-ǥեȤǤϡ\fIjava\fRޥɤΥץǤϤʤǽΰϡƤӽФ륯饹δ̾Ǥ\fI\-jar\fRץꤷ硢ΰϡץꥱΥ饹եȥ꥽եޤJARե̾ˤʤޤư饹ϡɤ\fIMain\-Class\fRޥ˥եȡإåˤäƻꤵɬפޤ
+デフォルトでは、\fIjava\fRコマンドのオプションではない最初の引数は、呼び出されるクラスの完全修飾名です。\fI\-jar\fRオプションを指定した場合、その引数は、アプリケーションのクラス・ファイルとリソース・ファイルを含むJARファイルの名前になります。起動クラスは、ソース・コードの\fIMain\-Class\fRマニフェスト・ヘッダーによって指定される必要があります。
 .PP
-JREϡ֡ȥȥåס饹ѥ󥹥ȡѳĥǽӥ桼Υ饹ѥ3ս꤫顢ư饹(ӥץꥱǻѤƤ¾Υ饹)򸡺ޤ
+JREは、ブートストラップ・クラス・パス、インストール済拡張機能およびユーザーのクラス・パスの3箇所から、起動クラス(およびアプリケーションで使用されている他のクラス)を検索します。
 .PP
-饹ե̾ޤJARե̾θΰϡ\fImain()\fR᥽åɤϤޤ
-.SH "ץ"
+クラス・ファイル名またはJARファイル名の後の引数は、\fImain()\fRメソッドに渡されます。
+.SH "オプション"
 .PP
-\fIjava\fRޥɤϡΥƥʬǤ빭Ϥʥץ򥵥ݡȤƤޤ
+\fIjava\fRコマンドは、次のカテゴリに分類できる広範なオプションをサポートしています。
 .sp
 .RS 4
 .ie n \{\
@@ -124,7 +124,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ
+標準オプション
 .RE
 .sp
 .RS 4
@@ -135,7 +135,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ
+非標準オプション
 .RE
 .sp
 .RS 4
@@ -146,7 +146,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤ʥ󥿥ࡦץ
+高度なランタイム・オプション
 .RE
 .sp
 .RS 4
@@ -157,7 +157,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤JITѥ顦ץ
+高度なJITコンパイラ・オプション
 .RE
 .sp
 .RS 4
@@ -168,7 +168,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤ʥӥӥƥץ
+高度なサービスアビリティ・オプション
 .RE
 .sp
 .RS 4
@@ -179,31 +179,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤ʥ١쥯󡦥ץ
+高度なガベージ・コレクション・オプション
 .RE
 .PP
-ɸΥץϡJava Virtual Machine (JVM)Τ٤ƤμǥݡȤ뤳ȤݾڤޤϡJREΥСγǧ饹ѥꡢĹʽϤͭʤɤΰŪʥ˻Ѥޤ
+標準のオプションは、Java Virtual Machine (JVM)のすべての実装でサポートすることが保証されます。これらは、JREのバージョンの確認、クラス・パスの設定、冗長な出力の有効化などの一般的なアクションに使用されます。
 .PP
-ɸʳΥץϡJava HotSpotۥޥ˸ͭѥץǤ뤿ᡢ٤ƤJVMǥݡȤ뤳Ȥݾڤ줺ѹǽޤΥץ\fI\-X\fRdzϤޤ
+標準以外のオプションは、Java HotSpot仮想マシンに固有の汎用オプションであるため、すべてのJVM実装でサポートされることは保証されず、変更される可能性があります。これらのオプションは\fI\-X\fRで開始します。
 .PP
-ĥץϡѰդ˻ѤʤȤᤷޤϡΥƥ׷ĤȤ¿ƥ๽ѥ᡼ؤøɬפʾ礬Java HotSpotۥޥΰĴ뤿˻Ѥ볫ȯԥץǤϡ٤ƤJVMǥݡȤ뤳Ȥݾڤ줺ѹǽޤĥץ\fI\-XX\fRǻϤޤޤ
+拡張オプションは、不用意に使用しないことをお薦めします。これらは、特定のシステム要件を持つことが多く、システム構成パラメータへの特権アクセスが必要な場合があるJava HotSpot仮想マシン操作の特定の領域を調整するために使用される開発者オプションです。これらは、すべてのJVM実装でサポートされることは保証されず、変更される可能性があります。拡張オプションは\fI\-XX\fRで始まります。
 .PP
-ǿ꡼侩ޤϺ륪ץפ뤿ˡɥȤκǸ侩Ǻ줿ץȤ̾Υ󤬤ޤ
+最新リリースで非推奨または削除されるオプションを追跡するために、ドキュメントの最後に非推奨で削除されたオプションという名前のセクションがあります。
 .PP
-֡롦ץϡǥեȤ̵ˤʤäƤ뵡ǽͭˤꡢǥեȤͭˤʤäƤ뵡ǽ̵ˤ뤿˻ѤޤΤ褦ʥץϡѥ᡼ɬפȤޤ󡣥֡\fI\-XX\fRץϡץ饹(\fI\-XX:+\fR\fIOptionName\fR)Ѥͭˤޥʥ(\fI\-XX:\-\fR\fIOptionName\fR)Ѥ̵ˤޤ
+ブール・オプションは、デフォルトで無効になっている機能を有効にしたり、デフォルトで有効になっている機能を無効にするために使用されます。このようなオプションは、パラメータを必要としません。ブール値\fI\-XX\fRオプションは、プラス記号(\fI\-XX:+\fR\fIOptionName\fR)を使用して有効にし、マイナス記号(\fI\-XX:\-\fR\fIOptionName\fR)を使用して無効にします。
 .PP
-ɬפʥץξ硢ϡץ̾򡢥(:)ޤ(=)ǶڤäΤˤʤ뤫뤤ϰץθľ³⤢ޤ(Τʹʸϳƥץˤäưۤʤޤ)Хñ̤ǻꤹ褦Ƥ硢Ѥʤ뤤ϥХ(KB)ˤ\fIk\fRޤ\fIK\fRᥬХ(MB)ˤ\fIm\fRޤ\fIM\fRХ(GB)ˤ\fIg\fRޤ\fIG\fRѤޤȤС8GBꤹˤϡ\fI8g\fR\fI8192m\fR\fI8388608k\fRޤ\fI8589934592\fRΤ줫ȤƻǤޤѡȤλ꤬ɬפʾϡ01οͤѤޤ(ȤС25%ξ\fI0\&.25\fRꤷޤ)
-.SS "ɸ४ץ"
+引数が必要なオプションの場合、引数は、オプション名を空白、コロン(:)または等号(=)で区切ったものになるか、あるいは引数がオプションの後に直接続く場合もあります(正確な構文は各オプションによって異なります)。サイズをバイト単位で指定するよう求められている場合、接尾辞を使用しないか、あるいはキロバイト(KB)には接尾辞\fIk\fRまたは\fIK\fR、メガバイト(MB)には接尾辞\fIm\fRまたは\fIM\fR、ギガバイト(GB)には接尾辞\fIg\fRまたは\fIG\fRを使用します。たとえば、サイズを8GBに設定するには、\fI8g\fR、\fI8192m\fR、\fI8388608k\fRまたは\fI8589934592\fRのいずれかを引数として指定できます。パーセントの指定が必要な場合は、0から1の数値を使用します(たとえば、25%の場合は\fI0\&.25\fRを指定します)。
+.SS "標準オプション"
 .PP
-ϡJVMΤ٤ƤμǥݡȤǤŪ˻Ѥ륪ץǤ
+これらは、JVMのすべての実装でサポートされる最も一般的に使用されるオプションです。
 .PP
 \-agentlib:\fIlibname\fR[=\fIoptions\fR]
 .RS 4
-ꤷͥƥ֡ȡ饤֥ɤޤ饤֥̾θˡ饤֥˸ͭΥץΥ޶ڤꥹȤѤǤޤ
+指定したネイティブ・エージェント・ライブラリをロードします。ライブラリ名の後に、ライブラリに固有のオプションのカンマ区切りリストを使用できます。
 .sp
-ץ\fI\-agentlib:foo\fRꤷ硢JVMϡ\fILD_LIBRARY_PATH\fRƥѿ(OS XǤϡѿ\fIDYLD_LIBRARY_PATH\fRˤʤޤ)ǻꤵ줿\fIlibfoo\&.so\fRȤ̾Υ饤֥ɤ褦Ȥޤ
+オプション\fI\-agentlib:foo\fRを指定した場合、JVMは、\fILD_LIBRARY_PATH\fRシステム変数(OS Xでは、この変数は\fIDYLD_LIBRARY_PATH\fRになります)で指定された場所に\fIlibfoo\&.so\fRという名前のライブラリをロードしようとします。
 .sp
-Ǥϡåο3ǡ20ߥäȤ˥ҡסץե󥰡ġ(HPROF)饤֥ɤơץCPUˡ򼨤ޤ
+次の例では、スタックの深さ3で、20ミリ秒ごとにヒープ・プロファイリング・ツール(HPROF)ライブラリをロードして、サンプルのCPU情報を取得する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -214,7 +214,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡᥤ󡦥饹ΥJVMߤơJavaǥХå磻䡦ץȥ(JDWP)饤֥ɤơݡ8000ǤΥå³Ѥ˥ꥹ˥󥰤ˡ򼨤ޤ
+次の例では、メイン・クラスのロード前にJVMを一時停止して、Javaデバッグ・ワイヤ・プロトコル(JDWP)ライブラリをロードして、ポート8000でのソケット接続用にリスニングする方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -225,7 +225,7 @@
 .if n \{\
 .RE
 .\}
-ͥƥ֡ȡ饤֥ξܺ٤ϡ򻲾ȤƤ
+ネイティブ・エージェント・ライブラリの詳細は、次を参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -235,7 +235,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlˤ\fIjava\&.lang\&.instrument\fRѥå
+http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlにある\fIjava\&.lang\&.instrument\fRパッケージの説明
 .RE
 .sp
 .RS 4
@@ -246,54 +246,54 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/platform/jvmti/jvmti\&.html#startingˤJVMġ롦󥿥եɤΥȤΥޥɥ饤󡦥ץ˴ؤ
+http://docs\&.oracle\&.com/javase/8/docs/platform/jvmti/jvmti\&.html#startingにあるJVMツール・インタフェース・ガイドのエージェントのコマンドライン・オプションに関する項
 .RE
 .RE
 .PP
 \-agentpath:\fIpathname\fR[=\fIoptions\fR]
 .RS 4
-Хѥ̾ǻꤵ줿ͥƥ֡ȡ饤֥ɤޤΥץ\fI\-agentlib\fRƱǤ饤֥Υե롦ѥӥե̾Ѥޤ
+絶対パス名で指定されたネイティブ・エージェント・ライブラリをロードします。このオプションは\fI\-agentlib\fRと同等ですが、ライブラリのフル・パスおよびファイル名を使用します。
 .RE
 .PP
 \-client
 .RS 4
-Java HotSpot Client VM򤷤ޤ64ӥåȡСJava SE Development Kit (JDK)ǤϡߡΥץ̵뤵졢Server JVMѤޤ
+Java HotSpot Client VMを選択します。64ビット・バージョンのJava SE Development Kit (JDK)では、現在、このオプションは無視され、かわりにServer JVMが使用されます。
 .sp
-ǥեȤJVMϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlˤ
-С饹ޥθФ򻲾ȤƤ
+デフォルトのJVM選択は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlにある
+サーバークラス・マシンの検出を参照してください。
 .RE
 .PP
 \-D\fIproperty\fR=\fIvalue\fR
 .RS 4
-ƥࡦץѥƥͤꤷޤ\fIproperty\fRѿϡץѥƥ̾ɽΤʤʸǤ\fIvalue\fRѿϡץѥƥͤɽʸǤ\fIvalue\fRޤʸξ硢ǰϤߤޤ(:
-\fI\-Dfoo="foo bar"\fR)
+システム・プロパティの値を設定します。\fIproperty\fR変数は、プロパティの名前を表す、空白のない文字列です。\fIvalue\fR変数は、プロパティの値を表す文字列です。\fIvalue\fRが空白を含む文字列の場合、それを引用符で囲みます(例:
+\fI\-Dfoo="foo bar"\fR)。
 .RE
 .PP
 \-d32
 .RS 4
-ץꥱ32ӥåȴĶǼ¹Ԥޤ32ӥåȴĶ󥹥ȡ뤵ƤʤݡȤƤʤϡ顼𤵤ޤǥեȤǤϡ64ӥåȡƥबѤƤץꥱ32ӥåȴĶǼ¹Ԥޤ
+アプリケーションを32ビット環境で実行します。32ビット環境がインストールされていないかサポートされていない場合は、エラーが報告されます。デフォルトでは、64ビット・システムが使用されている場合を除き、アプリケーションは32ビット環境で実行されます。
 .RE
 .PP
 \-d64
 .RS 4
-ץꥱ64ӥåȴĶǼ¹Ԥޤ64ӥåȴĶ󥹥ȡ뤵ƤʤݡȤƤʤϡ顼𤵤ޤǥեȤǤϡ64ӥåȡƥबѤƤץꥱ32ӥåȴĶǼ¹Ԥޤ
+アプリケーションを64ビット環境で実行します。64ビット環境がインストールされていないかサポートされていない場合は、エラーが報告されます。デフォルトでは、64ビット・システムが使用されている場合を除き、アプリケーションは32ビット環境で実行されます。
 .sp
-ߤΤȤJava HotSpot Server VMΤߤ64ӥåȤ򥵥ݡȤƤ뤿ᡢ\fI\-d64\fRѻˤ\fI\-server\fRץ󤬰Ū˻Ѥޤ\fI\-d64\fRѻˤϡ\fI\-client\fRץ̵뤵ޤλͤϡΥ꡼Ǥѹˤʤǽޤ
+現在のところ、Java HotSpot Server VMのみが64ビットの操作をサポートしているため、\fI\-d64\fR使用時には\fI\-server\fRオプションが暗黙的に使用されます。\fI\-d64\fR使用時には、\fI\-client\fRオプションは無視されます。この仕様は、将来のリリースでは変更になる可能性があります。
 .RE
 .PP
 \-disableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR], \-da[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR]
 .RS 4
-̵ˤޤǥեȤǤϡϤ٤ƤΥѥåӥ饹̵ˤʤäƤޤ
+アサーションを無効にします。デフォルトでは、アサーションはすべてのパッケージおよびクラスで無効になっています。
 .sp
-ʤ\fI\-disableassertions\fR
-(\fI\-da\fR)ꤹȡ٤ƤΥѥåӥ饹ǥ̵ˤʤޤ\fI\&.\&.\&.\fRǽ\fIpackagename\fRꤹȡꤷѥåȤΥ֥ѥåǥ̵ˤʤޤȤ\fI\&.\&.\&.\fRΤߤꤹȡߤκȥǥ쥯ȥˤ̾Τʤѥåǥ̵ˤʤޤ\fIclassname\fRꤹȡؤˤäơꤷ饹ǥ̵ˤʤޤ
+引数なしの\fI\-disableassertions\fR
+(\fI\-da\fR)を指定すると、すべてのパッケージおよびクラスでアサーションが無効になります。\fI\&.\&.\&.\fRで終わる\fIpackagename\fR引数を指定すると、指定したパッケージとそのサブパッケージ内でアサーションが無効になります。引数として\fI\&.\&.\&.\fRのみを指定すると、現在の作業ディレクトリにある名前のないパッケージ内でアサーションが無効になります。\fIclassname\fR引数を指定すると、切替えによって、指定したクラス内でアサーションが無効になります。
 .sp
 \fI\-disableassertions\fR
-(\fI\-da\fR)ץϡ٤ƤΥ饹ӥƥࡦ饹ŬѤޤ(ƥࡦ饹ˤϥ饹Ϥޤ)Υ롼ˤ1㳰ޤץΰꤵƤʤϡƥࡦ饹ŬѤޤ󡣤ˤꡢƥࡦ饹٤ƤΥ饹ǥñ̵ˤ뤳ȤǤޤ\fI\-disablesystemassertions\fRץѤȡ٤ƤΥƥࡦ饹ǥ̵ˤ뤳ȤǤޤ
+(\fI\-da\fR)オプションは、すべてのクラス・ローダーおよびシステム・クラスに適用されます(システム・クラスにはクラス・ローダーはありません)。このルールには1つ例外があります。オプションの引数が指定されていない場合は、システム・クラスに適用されません。これにより、システム・クラスを除くすべてのクラスでアサーションを簡単に無効にすることができます。\fI\-disablesystemassertions\fRオプションを使用すると、すべてのシステム・クラスでアサーションを無効にすることができます。
 .sp
-Υѥå䥯饹ǥŪͭˤˤϡ\fI\-enableassertions\fR
-(\fI\-ea\fR)ץѤޤξΥץƱ˻ѤǤޤȤСѥå\fIcom\&.wombat\&.fruitbat\fR
-(ӤΥ֥ѥå)Ǥϥͭˤơ饹\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRǤϥ̵ˤơ\fIMyClass\fRץꥱ¹ԤˤϡΥޥɤѤޤ
+特定のパッケージやクラスでアサーションを明示的に有効にするには、\fI\-enableassertions\fR
+(\fI\-ea\fR)オプションを使用します。両方のオプションを同時に使用できます。たとえば、パッケージ\fIcom\&.wombat\&.fruitbat\fR
+(およびそのサブパッケージ)ではアサーションを有効にして、クラス\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRではアサーションを無効にして、\fIMyClass\fRアプリケーションを実行するには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -308,22 +308,22 @@
 .PP
 \-disablesystemassertions, \-dsa
 .RS 4
-٤ƤΥƥࡦ饹ǥ̵ˤޤ
+すべてのシステム・クラス内でアサーションを無効にします。
 .RE
 .PP
 \-enableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR], \-ea[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR]
 .RS 4
-ͭˤޤǥեȤǤϡϤ٤ƤΥѥåӥ饹̵ˤʤäƤޤ
+アサーションを有効にします。デフォルトでは、アサーションはすべてのパッケージおよびクラスで無効になっています。
 .sp
-ʤ\fI\-enableassertions\fR
-(\fI\-ea\fR)ꤹȡ٤ƤΥѥåӥ饹ǥͭˤʤޤ\fI\&.\&.\&.\fRǽ\fIpackagename\fRꤹȡꤷѥåȤΥ֥ѥåǥͭˤʤޤȤ\fI\&.\&.\&.\fRΤߤꤹȡߤκȥǥ쥯ȥˤ̾Τʤѥåǥͭˤʤޤ\fIclassname\fRꤹȡؤˤäơꤷ饹ǥͭˤʤޤ
+引数なしの\fI\-enableassertions\fR
+(\fI\-ea\fR)を指定すると、すべてのパッケージおよびクラスでアサーションが有効になります。\fI\&.\&.\&.\fRで終わる\fIpackagename\fR引数を指定すると、指定したパッケージとそのサブパッケージ内でアサーションが有効になります。引数として\fI\&.\&.\&.\fRのみを指定すると、現在の作業ディレクトリにある名前のないパッケージ内でアサーションが有効になります。\fIclassname\fR引数を指定すると、切替えによって、指定したクラス内でアサーションが有効になります。
 .sp
 \fI\-enableassertions\fR
-(\fI\-ea\fR)ץϡ٤ƤΥ饹ӥƥࡦ饹ŬѤޤ(ƥࡦ饹ˤϥ饹Ϥޤ)Υ롼ˤ1㳰ޤץΰꤵƤʤϡƥࡦ饹ŬѤޤ󡣤ˤꡢƥࡦ饹٤ƤΥ饹ǥñͭˤ뤳ȤǤޤ\fI\-enablesystemassertions\fRץϡ٤ƤΥƥࡦ饹ǥͭˤ̤Υå󶡤ޤ
+(\fI\-ea\fR)オプションは、すべてのクラス・ローダーおよびシステム・クラスに適用されます(システム・クラスにはクラス・ローダーはありません)。このルールには1つ例外があります。オプションの引数が指定されていない場合は、システム・クラスに適用されません。これにより、システム・クラスを除くすべてのクラスでアサーションを簡単に有効にすることができます。\fI\-enablesystemassertions\fRオプションは、すべてのシステム・クラスでアサーションを有効にする別のスイッチを提供します。
 .sp
-Υѥå䥯饹ǥŪ̵ˤˤϡ\fI\-disableassertions\fR
-(\fI\-da\fR)ץѤޤñ쥳ޥɤˤΥåΥ󥹥󥹤ʣꤷϡꤷå֤˽Ƥ饯饹ɤޤȤСѥå\fIcom\&.wombat\&.fruitbat\fR
-(ӤΥ֥ѥå)ǤΤߥͭˤơ饹\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRǤϥ̵ˤơ\fIMyClass\fRץꥱ¹ԤˤϡΥޥɤѤޤ
+特定のパッケージやクラスでアサーションを明示的に無効にするには、\fI\-disableassertions\fR
+(\fI\-da\fR)オプションを使用します。単一コマンドにこれらのスイッチのインスタンスを複数指定した場合は、指定したスイッチが順番に処理されてからクラスがロードされます。たとえば、パッケージ\fIcom\&.wombat\&.fruitbat\fR
+(およびそのサブパッケージ)でのみアサーションを有効にして、クラス\fIcom\&.wombat\&.fruitbat\&.Brickbat\fRではアサーションを無効にして、\fIMyClass\fRアプリケーションを実行するには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -338,21 +338,21 @@
 .PP
 \-enablesystemassertions, \-esa
 .RS 4
-٤ƤΥƥࡦ饹ǥͭˤޤ
+すべてのシステム・クラス内でアサーションを有効にします。
 .RE
 .PP
 \-help, \-?
 .RS 4
-ºݤJVM¹Ԥˡ\fIjava\fRޥɤλѾɽޤ
+実際にJVMを実行せずに、\fIjava\fRコマンドの使用状況情報を表示します。
 .RE
 .PP
 \-jar \fIfilename\fR
 .RS 4
-JARե˥ץ벽줿ץ¹Ԥޤ\fIfilename\fRϡѤ륢ץꥱγȤƵǽ\fIpublic static void main(String[] args)\fR᥽åɤ롢\fIMain\-Class:\fR\fIclassname\fRȤ1Ԥޤޥ˥եȤJARե̾Ǥ
+JARファイルにカプセル化されたプログラムを実行します。\fIfilename\fR引数は、使用するアプリケーションの開始点として機能する\fIpublic static void main(String[] args)\fRメソッドを定義する、\fIMain\-Class:\fR\fIclassname\fRという形式の1行を含むマニフェストを持つJARファイルの名前です。
 .sp
-\fI\-jar\fRץѤȡꤷJARե뤬٤ƤΥ桼饹Υˤʤꡢ饹ѥ¾̵뤵ޤ
+\fI\-jar\fRオプションを使用すると、指定したJARファイルがすべてのユーザー・クラスのソースになり、クラス・パスの他の設定は無視されます。
 .sp
-JARեξܺ٤ϡΥ꥽򻲾ȤƤ
+JARファイルの詳細は、次のリソースを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -373,7 +373,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jar/index\&.htmlˤJava(JAR)եΥ
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jar/index\&.htmlにあるJavaアーカイブ(JAR)ファイルのガイド
 .RE
 .sp
 .RS 4
@@ -384,42 +384,42 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlˤ
-֥å: JARեΥץΥѥå
+http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.htmlにある
+「レッスン: JARファイルのプログラムのパッケージ化」
 .RE
 .RE
 .PP
 \-javaagent:\fIjarpath\fR[=\fIoptions\fR]
 .RS 4
-ꤷJavaץߥ󥰸쥨ȤɤޤJavaץꥱΥ󥹥ȥȤξܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlˤJava APIɥȤ\fIjava\&.lang\&.instrument\fRѥå򻲾ȤƤ
+指定したJavaプログラミング言語エージェントをロードします。Javaアプリケーションのインストゥルメントの詳細は、http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.htmlにあるJava APIドキュメントの\fIjava\&.lang\&.instrument\fRパッケージの説明を参照してください。
 .RE
 .PP
 \-jre\-restrict\-search
 .RS 4
-桼ץ饤١ȤJREС󸡺˴ޤޤ
+ユーザー・プライベートなJREをバージョン検索に含めます。
 .RE
 .PP
 \-no\-jre\-restrict\-search
 .RS 4
-桼ץ饤١ȤJREС󸡺ޤ
+ユーザー・プライベートなJREをバージョン検索から除外します。
 .RE
 .PP
 \-server
 .RS 4
-Java HotSpot Server VM򤷤ޤ64ӥåȡСJDKǤϡServer VMΤߤ򥵥ݡȤƤ뤿ᡢξ硢ΥץϰŪǤ
+Java HotSpot Server VMを選択します。64ビット・バージョンのJDKでは、Server VMのみをサポートしているため、その場合、このオプションは暗黙的です。
 .sp
-ǥեȤJVMϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlˤ
-С饹ޥθФ򻲾ȤƤ
+デフォルトのJVM選択は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.htmlにある
+サーバークラス・マシンの検出を参照してください。
 .RE
 .PP
 \-showversion
 .RS 4
-Сɽץꥱμ¹Ԥ³ԤޤΥץ\fI\-version\fRץƱǤ\-versionϥСɽJVM˽λؼۤʤޤ
+バージョン情報を表示し、アプリケーションの実行を続行します。このオプションは\fI\-version\fRオプションと同等ですが、\-versionはバージョン情報の表示後にJVMに終了を指示する点が異なります。
 .RE
 .PP
 \-splash:\fIimgname\fR
 .RS 4
-\fIimgname\fRǻꤵ줿᡼ޤॹץå̤ɽޤȤСץꥱεư\fIimages\fRǥ쥯ȥ\fIsplash\&.gif\fRեɽˤϡΥץѤޤ
+\fIimgname\fRで指定されたイメージを含むスプラッシュ画面を表示します。たとえば、アプリケーションの起動時に\fIimages\fRディレクトリの\fIsplash\&.gif\fRファイルを表示するには、次のオプションを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -434,31 +434,31 @@
 .PP
 \-verbose:class
 .RS 4
-ɤ줿ƥ饹˴ؤɽޤ
+ロードされた各クラスに関する情報を表示します。
 .RE
 .PP
 \-verbose:gc
 .RS 4
-ƥ١쥯(GC)٥Ȥ˴ؤɽޤ
+各ガベージ・コレクション(GC)イベントに関する情報を表示します。
 .RE
 .PP
 \-verbose:jni
 .RS 4
-ͥƥ֡᥽åɤλѤӤ¾Java Native Interface (JNI)ƥӥƥ˴ؤɽޤ
+ネイティブ・メソッドの使用およびその他のJava Native Interface (JNI)アクティビティに関する情報を表示します。
 .RE
 .PP
 \-version
 .RS 4
-СɽƤ齪λޤΥץ\fI\-showversion\fRץƱǤ\-showversionϥСɽJVM˽λؼʤۤʤޤ
+バージョン情報を表示してから終了します。このオプションは\fI\-showversion\fRオプションと同等ですが、\-showversionはバージョン情報の表示後にJVMに終了を指示しない点が異なります。
 .RE
 .PP
 \-version:\fIrelease\fR
 .RS 4
-ץꥱμ¹Ԥ˻Ѥ꡼Сꤷޤ뤵줿\fIjava\fRޥɤΥС󤬤λƤŬڤʼƥǸĤäˤϡŬڤʼѤޤ
+アプリケーションの実行に使用するリリース・バージョンを指定します。コールされた\fIjava\fRコマンドのバージョンがこの指定内容を満たさず、かつ適切な実装がシステム上で見つかった場合には、その適切な実装が使用されます。
 .sp
-\fIrelease\fRϡΤʥСʸ󡢤ޤ϶Ƕڤ줿СʸȥСϰϤΥꥹȤꤷޤ\fIСʸ\fRϡηǡȯԤΥСֹꤷޤ:
+\fIrelease\fR引数は、正確なバージョン文字列、または空白で区切られたバージョン文字列とバージョン範囲のリストを指定します。\fIバージョン文字列\fRは、次の形式で、開発者のバージョン番号を指定します:
 \fI1\&.\fR\fIx\fR\fI\&.0_\fR\fIu\fR
-(\fIx\fRϥ᥸㡼Сֹ桢\fIu\fRϹСֹǤ)\fIСϰ\fRϡΥСʹߤꤹˤϥСʸθ˥ץ饹(\fI+\fR)³ΡޤϰפƬޤǤդΥСʸꤹˤϰΥСʸθ˥ꥹ(\fI*\fR)³Τǹޤ\fIOR\fRȹ礻ˤ϶2ĤΥСʸ/ϰϤ\fIAND\fRȹ礻ˤϥѥ(\fI&\fR)ѤơСʸȥСϰϤȤ߹礻뤳ȤǤޤȤС饹ޤJARեμ¹ԤJRE 6u13 (1\&.6\&.0_13)ޤ6u10 (1\&.6\&.0_10)ʹߤǤդJRE 6Τ줫ɬפȤ硢ꤷޤ
+(\fIx\fRはメジャー・バージョン番号、\fIu\fRは更新バージョン番号です)。\fIバージョン範囲\fRは、このバージョン以降を指定するにはバージョン文字列の後にプラス記号(\fI+\fR)を続けたもの、または一致する接頭辞を含む任意のバージョン文字列を指定するには一部のバージョン文字列の後にアスタリスク(\fI*\fR)を続けたもので構成されます。論理\fIOR\fRの組合せには空白、2つのバージョンの文字列/範囲の論理\fIAND\fRの組合せにはアンパサンド(\fI&\fR)を使用して、バージョン文字列とバージョン範囲を組み合せることができます。たとえば、クラスまたはJARファイルの実行にJRE 6u13 (1\&.6\&.0_13)または6u10 (1\&.6\&.0_10)以降の任意のJRE 6のいずれかを必要とする場合、次を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -469,99 +469,99 @@
 .if n \{\
 .RE
 .\}
-䤬ɬפʤΤϡ\fIrelease\fRѥ᡼˶򤬤ΤߤǤ
+引用符が必要なのは、\fIrelease\fRパラメータに空白がある場合のみです。
 .sp
-JARեξϡС׷򥳥ޥɥ饤˻ꤹ⡢JARեΥޥ˥ե˻ꤹ뤳Ȥ侩Ƥޤ
+JARファイルの場合は、バージョン要件をコマンドラインに指定するよりも、JARファイルのマニフェスト内に指定することが推奨されています。
 .RE
-.SS "ɸ४ץ"
+.SS "非標準オプション"
 .PP
-ΥץϡJava HotSpotۥޥ˸ͭѥץǤ
+これらのオプションは、Java HotSpot仮想マシンに固有の汎用オプションです。
 .PP
 \-X
 .RS 4
-Ѳǽʤ٤Ƥ\fI\-X\fRץΥإפɽޤ
+使用可能なすべての\fI\-X\fRオプションのヘルプを表示します。
 .RE
 .PP
 \-Xbatch
 .RS 4
-Хå饦ɡѥ̵ˤޤǥեȤǤϡJVMǤϡХå饦ɡѥ뤬λޤǡ᥽åɤХå饦ɡȤƥѥ뤷󥿥ץ꥿⡼ɤǥ᥽åɤ¹Ԥޤ\fI\-Xbatch\fRե饰ꤹȡХå饦ɡѥ뤬̵ˤʤꡢ٤ƤΥ᥽åɤΥѥ뤬λޤǥե饦ɡȤƽޤ
+バックグラウンド・コンパイルを無効にします。デフォルトでは、JVMでは、バックグラウンド・コンパイルが終了するまで、メソッドをバックグラウンド・タスクとしてコンパイルし、インタプリタ・モードでメソッドを実行します。\fI\-Xbatch\fRフラグを指定すると、バックグラウンド・コンパイルが無効になり、すべてのメソッドのコンパイルが完了するまでフォアグラウンド・タスクとして処理されます。
 .sp
-Υץ\fI\-XX:\-BackgroundCompilation\fRƱǤ
+このオプションは\fI\-XX:\-BackgroundCompilation\fRと同等です。
 .RE
 .PP
 \-Xbootclasspath:\fIpath\fR
 .RS 4
-֡ȡ饹ե򸡺ǥ쥯ȥꡢJARե뤪ZIP֤Ρ(:)Ƕڤ줿ꥹȤꤷޤϡJDK˴ޤޤ֡ȡ饹եΤ˻Ѥޤ
+ブート・クラス・ファイルを検索するディレクトリ、JARファイルおよびZIPアーカイブの、コロン(:)で区切られたリストを指定します。これらは、JDKに含まれるブート・クラス・ファイルのかわりに使用されます。
 .sp
-JREХʥꡦɡ饤󥹤˰ȿ뤿ᡢ\fIrt\&.jar\fRǥ饹򥪡С饤ɤŪǡΥץѤ륢ץꥱǥץʤǤ
+JREバイナリ・コード・ライセンスに違反するため、\fIrt\&.jar\fRでクラスをオーバーライドする目的で、このオプションを使用するアプリケーションをデプロイしないでください。
 .RE
 .PP
 \-Xbootclasspath/a:\fIpath\fR
 .RS 4
-ǥեȤΥ֡ȥȥåס饹ѥκǸɲäǥ쥯ȥꡢJARե뤪ZIP֤Ρ(:)Ƕڤ줿ꥹȤꤷޤ
+デフォルトのブートストラップ・クラス・パスの最後に追加するディレクトリ、JARファイルおよびZIPアーカイブの、コロン(:)で区切られたリストを指定します。
 .sp
-JREХʥꡦɡ饤󥹤˰ȿ뤿ᡢ\fIrt\&.jar\fRǥ饹򥪡С饤ɤŪǡΥץѤ륢ץꥱǥץʤǤ
+JREバイナリ・コード・ライセンスに違反するため、\fIrt\&.jar\fRでクラスをオーバーライドする目的で、このオプションを使用するアプリケーションをデプロイしないでください。
 .RE
 .PP
 \-Xbootclasspath/p:\fIpath\fR
 .RS 4
-ǥեȤΥ֡ȥȥåס饹ѥƬɲäǥ쥯ȥꡢJARե뤪ZIP֤Ρ(:)Ƕڤ줿ꥹȤꤷޤ
+デフォルトのブートストラップ・クラス・パスの先頭に追加するディレクトリ、JARファイルおよびZIPアーカイブの、コロン(:)で区切られたリストを指定します。
 .sp
-JREХʥꡦɡ饤󥹤˰ȿ뤿ᡢ\fIrt\&.jar\fRǥ饹򥪡С饤ɤŪǡΥץѤ륢ץꥱǥץʤǤ
+JREバイナリ・コード・ライセンスに違反するため、\fIrt\&.jar\fRでクラスをオーバーライドする目的で、このオプションを使用するアプリケーションをデプロイしないでください。
 .RE
 .PP
 \-Xboundthreads
 .RS 4
-桼٥Υåɤ򥫡ͥ롦åɤ˥Хɤޤ
+ユーザー・レベルのスレッドをカーネル・スレッドにバインドします。
 .RE
 .PP
 \-Xcheck:jni
 .RS 4
-Java Native Interface (JNI)ǽФɲååԤޤŪˤϡϡJNIꥯȤˡJNIؿϤѥ᡼ȼ¹ԴĶΥǡ򸡾ڤޤ̵ʥǡĤäϡͥƥ֡ɤ꤬뤳Ȥ򼨤Ƥ뤿ᡢJVMϥꥫХǽʥ顼ȯƽλޤΥץѤȡѥեޥ㲼ͽۤޤ
+Java Native Interface (JNI)機能に対して追加チェックを行います。具体的には、これは、JNIリクエストを処理する前に、JNI関数に渡されるパラメータと実行環境のデータを検証します。無効なデータが見つかった場合は、ネイティブ・コードに問題があることを示しているため、JVMはリカバリ不能なエラーを発生して終了します。このオプションを使用すると、パフォーマンス低下が予想されます。
 .RE
 .PP
 \-Xcomp
 .RS 4
-ǽθƽФJavaɤӥѥ롦᥽åɤβ̵ˤޤǥեȤǤϡJITѥϡ10,000βᤵ줿᥽åɸƽФ¹ԤơΨŪʥѥΤξޤΨˤƥѥΥѥեޥ󥹤夵ˤϡ\fI\-Xcomp\fRե饰Ѥơᤵ줿᥽åɸƽФ̵ˤޤ
+最初の呼出しでJavaコードおよびコンパイル・メソッドの解釈を無効にします。デフォルトでは、JITコンパイラは、10,000の解釈されたメソッド呼出しを実行して、効率的なコンパイルのための情報を収集します。効率を犠牲にしてコンパイルのパフォーマンスを向上させるには、\fI\-Xcomp\fRフラグを使用して、解釈されたメソッド呼出しを無効にします。
 .sp
-\fI\-XX:CompileThreshold\fRץѤơѥˡᤵ줿᥽åɸƽФοѹ뤳ȤǤޤ
+\fI\-XX:CompileThreshold\fRオプションを使用して、コンパイルの前に、解釈されたメソッド呼出しの数を変更することもできます。
 .RE
 .PP
 \-Xdebug
 .RS 4
-Ԥޤ󡣲̸ߴΤѰդƤޤ
+何も行いません。下位互換性のために用意されています。
 .RE
 .PP
 \-Xdiag
 .RS 4
-ɲäοǥåɽޤ
+追加の診断メッセージを表示します。
 .RE
 .PP
 \-Xfuture
 .RS 4
-饹եλͤؤν򶯲롢̩ʥ饹եΥåͭˤʤޤΥ꡼Ǥϡ긷̩ʥåǥեȤˤʤ뤿ᡢɤȯȤˤϡȯԤϤΥե饰Ѥ뤳Ȥᤷޤ
+クラス・ファイル形式の仕様への準拠を強化する、厳密なクラス・ファイル形式のチェックが有効になります。将来のリリースでは、より厳密なチェックがデフォルトになるため、新しいコードを開発するときには、開発者はこのフラグを使用することをお薦めします。
 .RE
 .PP
 \-Xincgc
 .RS 4
-ʬGCͭˤޤ
+増分GCを有効にします。
 .RE
 .PP
 \-Xint
 .RS 4
-󥿥ץ꥿ѥ⡼ɤǥץꥱ¹Ԥޤͥƥ֡ɤؤΥѥ̵ˤʤꡢ٤ƤΥХȥɤ󥿥ץ꥿ˤäƼ¹Ԥޤ㥹ȡ󡦥(JIT)ѥ餬󶡤ѥեޥ󥹾ϡΥ⡼ɤǤϼ¸ޤ
+インタプリタ専用モードでアプリケーションを実行します。ネイティブ・コードへのコンパイルは無効になり、すべてのバイトコードがインタプリタによって実行されます。ジャスト・イン・タイム(JIT)コンパイラが提供するパフォーマンス上の利点は、このモードでは実現されません。
 .RE
 .PP
 \-Xinternalversion
 .RS 4
-\fI\-version\fRץܺ٤JVMСɽƤ齪λޤ
+\fI\-version\fRオプションより詳細なJVMバージョン情報を表示してから終了します。
 .RE
 .PP
 \-Xloggc:\fIfilename\fR
 .RS 4
-ܺ٤GC٥ȾѤ˥쥯ȤեꤷޤΥե˽񤭹ޤϡϿ줿ƥ٥Ȥ˹ԤǽGC٥Ȱʹߤ˷вᤷ֤ꤷ\fI\-verbose:gc\fRνϤƤޤ\fI\-Xloggc\fRץ\fI\-verbose:gc\fR򥪡С饤ɤޤ(ξƱ\fIjava\fRޥɤǻꤵ줿)
+詳細なGCイベント情報をロギング用にリダイレクトするファイルを設定します。このファイルに書き込まれる情報は、記録された各イベントの前に行われる最初のGCイベント以降に経過した時間を指定した\fI\-verbose:gc\fRの出力と類似しています。\fI\-Xloggc\fRオプションは\fI\-verbose:gc\fRをオーバーライドします(これらの両方が同じ\fIjava\fRコマンドで指定された場合)。
 .sp
-:
+例:
 .sp
 .if n \{\
 .RS 4
@@ -576,7 +576,7 @@
 .PP
 \-Xmaxjitcodesize=\fIsize\fR
 .RS 4
-JITѥ뤵줿ɤκ祳ɡå塦(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡͤ48MBꤵƤޤ
+JITコンパイルされたコードの最大コード・キャッシュ・サイズ(バイト単位)を指定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、この値は48MBに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -587,21 +587,21 @@
 .if n \{\
 .RE
 .\}
-Υץ\fI\-XX:ReservedCodeCacheSize\fRƱǤ
+このオプションは\fI\-XX:ReservedCodeCacheSize\fRと同等です。
 .RE
 .PP
 \-Xmixed
 .RS 4
-ͥƥ֡ɤ˥ѥ뤵줿ۥåȡ᥽åɤ󥿥ץ꥿ˤäƤ٤ƤΥХȥɤ¹Ԥޤ
+ネイティブ・コードにコンパイルされたホット・メソッドを除き、インタプリタによってすべてのバイトコードを実行します。
 .RE
 .PP
 \-Xmn\fIsize\fR
 .RS 4
-㤤(ʡ)ΥҡפνӺ祵(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤ
+若い世代(ナーサリ)のヒープの初期サイズおよび最大サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。
 .sp
-ҡפμ㤤꡼Ͽ֥Ȥ˻ѤޤGCϡ¾Υ꡼ꤳΥ꡼ǡˤ˼¹Ԥޤ㤤Υ硢¿Υޥʡ١쥯󤬼¹Ԥޤ礭硢ե롦١쥯Τߤ¹ԤޤλޤǤ˻֤뤳Ȥޤ㤤ΥϡΤΥҡסȾʬ4ʬ1δ֤ˤƤȤᤷޤ
+ヒープの若い世代リージョンは新しいオブジェクトに使用されます。GCは、他のリージョンよりこのリージョンで、より頻繁に実行されます。若い世代のサイズが小さすぎる場合、多数のマイナー・ガベージ・コレクションが実行されます。サイズが大きすぎる場合、フル・ガベージ・コレクションのみが実行されますが、完了までに時間がかかることがあります。若い世代のサイズは、全体のヒープ・サイズの半分から4分の1の間にしておくことをお薦めします。
 .sp
-Ǥϡ㤤νӺ祵͡ñ̤Ѥ256MBꤹˡ򼨤ޤ
+次の例では、若い世代の初期サイズおよび最大サイズを様々な単位を使用して256MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -614,14 +614,14 @@
 .if n \{\
 .RE
 .\}
-㤤ΥҡפνȺ祵ξꤹ\fI\-Xmn\fRץΤˡˤ\fI\-XX:NewSize\fR򡢺祵ˤ\fI\-XX:MaxNewSize\fRѤǤޤ
+若い世代のヒープの初期サイズと最大サイズの両方を設定する\fI\-Xmn\fRオプションのかわりに、初期サイズの設定には\fI\-XX:NewSize\fRを、最大サイズの設定には\fI\-XX:MaxNewSize\fRを使用できます。
 .RE
 .PP
 \-Xms\fIsize\fR
 .RS 4
-ҡפν(Хñ)ꤷޤꤹͤϡ1MB礭1024ܿˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤ
+ヒープの初期サイズ(バイト単位)を設定します。指定する値は、1MBより大きい1024の倍数にする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。
 .sp
-ǤϡƤ줿꡼Υ͡ñ̤Ѥ6MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーのサイズを様々な単位を使用して6MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -634,14 +634,14 @@
 .if n \{\
 .RE
 .\}
-Υץꤷʤ硢ϡŤȼ㤤˳Ƥ줿ιפȤꤵޤ㤤Υҡפνϡ\fI\-Xmn\fRץޤ\fI\-XX:NewSize\fRץѤǤޤ
+このオプションを設定しない場合、初期サイズは、古い世代と若い世代に割り当てられたサイズの合計として設定されます。若い世代のヒープの初期サイズは、\fI\-Xmn\fRオプションまたは\fI\-XX:NewSize\fRオプションを使用して設定できます。
 .RE
 .PP
 \-Xmx\fIsize\fR
 .RS 4
-꡼ƥסκ祵(Хñ)ꤷޤꤹͤϡ2MB礭1024ܿˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϡ¹Ի˥ƥ๽˴Ť򤵤ޤСǥץȤǤϡ\fI\-Xms\fR\fI\-Xmx\fR̾Ʊͤꤵޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlˤ륬١쥯르Υߥå򻲾ȤƤ
+メモリー割当てプールの最大サイズ(バイト単位)を指定します。指定する値は、2MBより大きい1024の倍数にする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は、実行時にシステム構成に基づいて選択されます。サーバー・デプロイメントでは、\fI\-Xms\fRおよび\fI\-Xmx\fRは通常同じ値に設定されます。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlにあるガベージ・コレクタ・エルゴノミックを参照してください。
 .sp
-ǤϡƤ줿꡼εĤ祵͡ñ̤Ѥ80MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーの許可される最大サイズを様々な単位を使用して80MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -654,34 +654,34 @@
 .if n \{\
 .RE
 .\}
-\fI\-Xmx\fRץ\fI\-XX:MaxHeapSize\fRƱǤ
+\fI\-Xmx\fRオプションは\fI\-XX:MaxHeapSize\fRと同等です。
 .RE
 .PP
 \-Xnoclassgc
 .RS 4
-饹Υ١쥯(GC)̵ˤޤˤꡢGC֤Ǥץꥱ¹Ǥṳ̂ޤ
+クラスのガベージ・コレクション(GC)を無効にします。これにより、GC時間を節約でき、アプリケーション実行中の中断が短縮されます。
 .sp
-ư\fI\-Xnoclassgc\fRꤹȡץꥱΥ饹֥ȤϡGCδ֤ϤΤޤ޻Ĥꡢ˥饤֤ǤȤߤʤޤˤꡢ¿Υ꡼ʵפͭ뤳ȤˤʤꡢդƻѤʤȡ꡼­㳰ޤ
+起動時に\fI\-Xnoclassgc\fRを指定すると、アプリケーション内のクラス・オブジェクトは、GCの間はそのまま残り、常にライブであるとみなされます。これにより、より多くのメモリーが永久に占有されることになり、注意して使用しないと、メモリー不足の例外がスローされます。
 .RE
 .PP
 \-Xprof
 .RS 4
-¹ΥץΥץեץե롦ǡɸϤޤΥץϡץ೫ȯѤΥ桼ƥƥȤ󶡤ƤޤֲƯƥǤλѤŪȤΤǤϤޤ
+実行中のプログラムのプロファイルを生成し、プロファイル・データを標準出力に送信します。このオプションは、プログラム開発用のユーティリティとして提供されています。本番稼働システムでの使用を目的としたものではありません。
 .RE
 .PP
 \-Xrs
 .RS 4
-JVMˤ륪ڥ졼ƥ󥰡ƥࡦʥλѤ򸺤餷ޤ
+JVMによるオペレーティング・システム・シグナルの使用を減らします。
 .sp
-åȥ󡦥եåϡJVMλǤ⡢åȥ˥桼꡼󥢥åס(ǡ١³Υʤ)¹Ԥ뤳ȤˤäơJavaץꥱΥåȥ֤ͭˤޤ
+シャットダウン・フックは、JVMが突然終了した場合でも、シャットダウン時にユーザー・クリーンアップ・コード(データベース接続のクローズなど)を実行することによって、Javaアプリケーションのシャットダウンを順番に有効にします。
 .sp
-JVMϡͽʤλΥåȥ󡦥եå뤿˥ʥ򥭥åޤJVMϡ\fISIGHUP\fR\fISIGINT\fR\fISIGTERM\fRѤơåȥ󡦥եåμ¹Ԥ򳫻Ϥޤ
+JVMは、予期しない終了のシャットダウン・フックを実装するためにシグナルをキャッチします。JVMは、\fISIGHUP\fR、\fISIGINT\fRおよび\fISIGTERM\fRを使用して、シャットダウン・フックの実行を開始します。
 .sp
-JVMϡǥХåŪǥåɡåפȤǽ¸뤿ˡƱͤΥᥫ˥ѤޤJVMϡåɡפ¹Ԥ뤿\fISIGQUIT\fRѤޤ
+JVMは、デバッグの目的でスレッド・スタックをダンプするという機能を実現するために、同様のメカニズムを使用します。JVMは、スレッド・ダンプを実行するために\fISIGQUIT\fRを使用します。
 .sp
-JVMǤ륢ץꥱϡ\fISIGINT\fR\fISIGTERM\fRʤɤΥʥˤ˥ȥåפɬפꡢη̡JVMΥʥ롦ϥɥȾͤǽޤ\fI\-Xrs\fRץϡн褹뤿˻ѤǤޤ\fI\-Xrs\fRѤƤ硢\fISIGINT\fR\fISIGTERM\fR\fISIGHUP\fR\fISIGQUIT\fRΥʥ롦ޥJVMˤäѹ줺ΥʥΥʥ롦ϥɥϥ󥹥ȡ뤵ޤ
+JVMを埋め込んでいるアプリケーションは、\fISIGINT\fRや\fISIGTERM\fRなどのシグナルを頻繁にトラップする必要があり、その結果、JVMのシグナル・ハンドラと衝突する可能性があります。\fI\-Xrs\fRオプションは、この問題に対処するために使用できます。\fI\-Xrs\fRが使用されている場合、\fISIGINT\fR、\fISIGTERM\fR、\fISIGHUP\fRおよび\fISIGQUIT\fRのシグナル・マスクはJVMによって変更されず、これらのシグナルのシグナル・ハンドラはインストールされません。
 .sp
-\fI\-Xrs\fRꤹȡ2Ĥη̤ޤ:
+\fI\-Xrs\fRを指定すると、次の2つの結果が生じます:
 .sp
 .RS 4
 .ie n \{\
@@ -691,7 +691,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISIGQUIT\fRˤ륹åɡפϻѤǤޤ
+\fISIGQUIT\fRによるスレッド・ダンプは使用できません。
 .RE
 .sp
 .RS 4
@@ -702,63 +702,63 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åȥ󡦥եåμ¹ԤϡJVMλ褦ȤƤ\fISystem\&.exit()\fRƤӽФʤɤơ桼¦ǹԤɬפޤ
+シャットダウン・フック処理の実行は、JVMが終了しようとしている時点で\fISystem\&.exit()\fRを呼び出すなどして、ユーザー・コード側で行う必要があります。
 .RE
 .RE
 .PP
 \-Xshare:\fImode\fR
 .RS 4
-饹ǡͭ⡼ɤꤷޤΥץǻѲǽ\fImode\fRϼΤȤǤ
+クラス・データ共有モードを設定します。このオプションで使用可能な\fImode\fR引数は次のとおりです。
 .PP
 auto
 .RS 4
-ǽʾ硢ͭ饹ΥǡѤޤϡJava HotSpot 32\-Bit Client VMξΥǥեͤǤ
+可能な場合、共有クラスのデータを使用します。これは、Java HotSpot 32\-Bit Client VMの場合のデフォルト値です。
 .RE
 .PP
 on
 .RS 4
-饹ǡͭλѤɬפǤ饹ǡͭѤǤʤ硢顼åϤƽλޤ
+クラス・データ共有の使用が必要です。クラス・データ共有を使用できない場合、エラー・メッセージを出力して終了します。
 .RE
 .PP
 off
 .RS 4
-ͭ饹ǡѤޤ󡣤ϡJava HotSpot 32\-Bit Server VMJava HotSpot 64\-Bit Client VMJava HotSpot 64\-Bit Server VMξΥǥեͤǤ
+共有クラス・データを使用しません。これは、Java HotSpot 32\-Bit Server VM、Java HotSpot 64\-Bit Client VMおよびJava HotSpot 64\-Bit Server VMの場合のデフォルト値です。
 .RE
 .PP
 dump
 .RS 4
-饹ǡ֤ͭưޤ
+クラス・データ共有アーカイブを手動で生成します。
 .RE
 .RE
 .PP
 \-XshowSettings:\fIcategory\fR
 .RS 4
-ɽ³ԤޤΥץǻѲǽ\fIcategory\fRϼΤȤǤ
+設定を表示して続行します。このオプションで使用可能な\fIcategory\fR引数は次のとおりです。
 .PP
 all
 .RS 4
-Τ٤ƤΥƥɽޤ줬ǥեͤǤ
+設定のすべてのカテゴリを表示します。これがデフォルト値です。
 .RE
 .PP
 locale
 .RS 4
-˴Ϣɽޤ
+ロケールに関連する設定を表示します。
 .RE
 .PP
 properties
 .RS 4
-ƥࡦץѥƥ˴Ϣɽޤ
+システム・プロパティに関連する設定を表示します。
 .RE
 .PP
 vm
 .RS 4
-JVMɽޤ
+JVMの設定を表示します。
 .RE
 .RE
 .PP
 \-Xss\fIsize\fR
 .RS 4
-åɤΥå(Хñ)ꤷޤKB򼨤ʸ\fIk\fRޤ\fIK\fRMB򼨤ʸ\fIm\fRޤ\fIM\fRGB򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϥץåȥեˤäưۤʤޤ
+スレッドのスタック・サイズ(バイト単位)を設定します。KBを示す場合は文字\fIk\fRまたは\fIK\fR、MBを示す場合は文字\fIm\fRまたは\fIM\fR、GBを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値はプラットフォームによって異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -768,7 +768,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/ARM (32ӥå): 320KB
+Linux/ARM (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -779,7 +779,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/i386 (32ӥå): 320KB
+Linux/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -790,7 +790,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/x64 (64ӥå): 1024KB
+Linux/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -801,7 +801,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-OS X (64ӥå): 1024KB
+OS X (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -812,7 +812,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/i386 (32ӥå): 320KB
+Oracle Solaris/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -823,7 +823,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/x64 (64ӥå): 1024KB
+Oracle Solaris/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -834,10 +834,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Windows: ۥ꡼ˤäưۤʤޤ
+Windows: 仮想メモリーによって異なります。
 .RE
 .sp
-Ǥϡåɡåۤʤñ̤1024KBꤷޤ
+次の例では、スレッド・スタック・サイズを異なる単位で1024KBに設定します。
 .sp
 .if n \{\
 .RS 4
@@ -850,46 +850,46 @@
 .if n \{\
 .RE
 .\}
-Υץ\fI\-XX:ThreadStackSize\fRƱǤ
+このオプションは\fI\-XX:ThreadStackSize\fRと同等です。
 .RE
 .PP
 \-Xusealtsigs
 .RS 4
-JVMʥ\fISIGUSR1\fR\fISIGUSR2\fRΤˡإʥѤޤΥץ\fI\-XX:+UseAltSigs\fRƱǤ
+JVM内部シグナルの\fISIGUSR1\fRおよび\fISIGUSR2\fRのかわりに、代替シグナルを使用します。このオプションは\fI\-XX:+UseAltSigs\fRと同等です。
 .RE
 .PP
 \-Xverify:\fImode\fR
 .RS 4
-Хȥɡ٥եΥ⡼ɤꤷޤХȥɤθڤϰΥȥ֥륷塼ƥ󥰤Ωޤ¹ΥץꥱؤΥСإåɤ礵ޤΥץǻѲǽ\fImode\fRϼΤȤǤ
+バイトコード・ベリファイアのモードを設定します。バイトコードの検証は一部の問題のトラブルシューティングに役立ちますが、実行中のアプリケーションへのオーバーヘッドを増大させます。このオプションで使用可能な\fImode\fR引数は次のとおりです。
 .PP
 none
 .RS 4
-Хȥɤ򸡾ڤޤ󡣤ˤꡢư֤ṳ̂졢Javaˤä󶡤ݸڸޤ
+バイトコードを検証しません。これにより、起動時間が短縮され、Javaによって提供される保護も軽減されます。
 .RE
 .PP
 remote
 .RS 4
-ͥåȥ𤷤ƥ⡼Ȥǥɤ륯饹Τߤ򸡾ڤޤϡ\fI\-Xverify\fRץꤷʤΥǥեȤưǤ
+ネットワークを介してリモートでロードされるクラスのみを検証します。これは、\fI\-Xverify\fRオプションを指定しない場合のデフォルトの動作です。
 .RE
 .PP
 all
 .RS 4
-٤ƤΥ饹򸡾ڤޤ
+すべてのクラスを検証します。
 .RE
 .RE
-.SS "٤ʥ󥿥ࡦץ"
+.SS "高度なランタイム・オプション"
 .PP
-ΥץϡJava HotSpot VMμ¹Իư椷ޤ
+これらのオプションは、Java HotSpot VMの実行時の動作を制御します。
 .PP
 \-XX:+DisableAttachMechanism
 .RS 4
-JVM˥ġ򥢥åᥫ˥̵ˤ륪ץͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢϡåᥫ˥ͭˤȡ\fIjcmd\fR\fIjstack\fR\fIjmap\fR\fIjinfo\fRʤɤΥġѤǤ뤳Ȥ̣ޤ
+JVMにツールをアタッチするメカニズムを無効にするオプションを有効にします。デフォルトでは、このオプションは無効になっており、これは、アタッチ・メカニズムを有効にすると、\fIjcmd\fR、\fIjstack\fR、\fIjmap\fR、\fIjinfo\fRなどのツールを使用できることを意味します。
 .RE
 .PP
 \-XX:ErrorFile=\fIfilename\fR
 .RS 4
-ꥫХǽʥ顼ȯ˥顼ǡ񤭹ޤѥӥե̾ꤷޤǥեȤǤϡΥեϡߤκȥǥ쥯ȥ˺졢̾\fIhs_err_pid\fR\fIpid\fR\fI\&.log\fR
-(\fIpid\fRϥ顼θȤʤäץμ̻)ˤʤޤǤϡǥեȤΥեꤹˡ򼨤ޤ(ץμ̻Ҥ\fI%p\fRȤƻꤵޤ)
+リカバリ不能なエラーが発生した場合にエラー・データが書き込まれるパスおよびファイル名を指定します。デフォルトでは、このファイルは、現在の作業ディレクトリに作成され、名前は\fIhs_err_pid\fR\fIpid\fR\fI\&.log\fR
+(\fIpid\fRはエラーの原因となったプロセスの識別子)になります。次の例では、デフォルトのログ・ファイルを設定する方法を示します(プロセスの識別子は\fI%p\fRとして指定されます)。
 .sp
 .if n \{\
 .RS 4
@@ -900,7 +900,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ顼\fI/var/log/java/java_error\&.log\fRꤹˡ򼨤ޤ
+次の例では、エラー・ログを\fI/var/log/java/java_error\&.log\fRに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -911,14 +911,14 @@
 .if n \{\
 .RE
 .\}
-(ΰ­¤ޤ̤ˤ)ꤷǥ쥯ȥ˥եǤʤ硢եϥڥ졼ƥ󥰡ƥΰǥ쥯ȥ˺ޤǥ쥯ȥ\fI/tmp\fRǤ
+(領域不足、権限の問題または別の問題により)指定したディレクトリにファイルを作成できない場合、ファイルはオペレーティング・システムの一時ディレクトリに作成されます。一時ディレクトリは\fI/tmp\fRです。
 .RE
 .PP
 \-XX:LargePageSizeInBytes=\fIsize\fR
 .RS 4
-Javaҡפ˻Ѥ礭ڡκ祵(Хñ)ꤷޤ\fIsize\fRϡ2߾(24816\&.\&.\&.)ǤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡ0ꤵ졢ϡJVMǤ礭ڡΥưŪ򤵤Ƥ뤳Ȥ̣ޤ
+Javaヒープに使用される大きいページの最大サイズ(バイト単位)を設定します。\fIsize\fR引数は、2の累乗(2、4、8、16、\&.\&.\&.)である必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、サイズは0に設定され、これは、JVMでは大きいページのサイズが自動的に選択されていることを意味します。
 .sp
-Ǥϡ礭ڡΥ4ᥬХ(MB)ꤹˡ򼨤ޤ
+次の例では、大きいページのサイズを4メガバイト(MB)に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -933,9 +933,9 @@
 .PP
 \-XX:MaxDirectMemorySize=\fIsize\fR
 .RS 4
-I/O (\fIjava\&.nio\fRѥå)ľܥХåեƤκץ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡ0ꤵ졢ϡJVMǤNIOľܥХåեƤΥưŪ򤵤Ƥ뤳Ȥ̣ޤ
+新規I/O (\fIjava\&.nio\fRパッケージ)の直接バッファ割当ての最大合計サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、サイズは0に設定され、これは、JVMではNIOの直接バッファ割当てのサイズが自動的に選択されていることを意味します。
 .sp
-ǤϡNIOۤʤñ̤1024KBꤹˡ򼨤ޤ
+次の例では、NIOサイズを異なる単位で1024KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -952,30 +952,30 @@
 .PP
 \-XX:NativeMemoryTracking=\fImode\fR
 .RS 4
-JVMΥͥƥ֡꡼ѾΥȥå󥰤Υ⡼ɤꤷޤΥץǻѲǽ\fImode\fRϼΤȤǤ
+JVMのネイティブ・メモリー使用状況のトラッキングのモードを指定します。このオプションで使用可能な\fImode\fR引数は次のとおりです。
 .PP
 off
 .RS 4
-JVMΥͥƥ֡꡼Ѿפޤ󡣤ϡ\fI\-XX:NativeMemoryTracking\fRץꤷʤΥǥեȤưǤ
+JVMのネイティブ・メモリー使用状況を追跡しません。これは、\fI\-XX:NativeMemoryTracking\fRオプションを指定しない場合のデフォルトの動作です。
 .RE
 .PP
 summary
 .RS 4
-JVM֥ƥ(Javaҡס饹ɡåɤʤ)ˤ꡼ѾΤפޤ
+JVMサブシステム(Javaヒープ、クラス、コード、スレッドなど)によるメモリー使用状況のみ追跡します。
 .RE
 .PP
 detail
 .RS 4
-JVM֥ƥˤ꡼ѾΥȥå󥰤˲äơġ\fICallSite\fR
-(ġβۥ꡼꡼󤪤ӤΥߥåȺѥ꡼)ˤ꡼Ѿפޤ
+JVMサブシステムによるメモリー使用状況のトラッキングに加えて、個々の\fICallSite\fR
+(個々の仮想メモリー・リージョンおよびそのコミット済リージョン)によるメモリー使用状況を追跡します。
 .RE
 .RE
 .PP
 \-XX:OnError=\fIstring\fR
 .RS 4
-ꥫХǽʥ顼ȯȤ˼¹Ԥ롢ࡦޥɤޤϰϢΥߥڤΥޥɤꤷޤʸ˶򤬴ޤޤƤϡǰϤɬפޤ
+リカバリ不能なエラーが発生したときに実行する、カスタム・コマンドまたは一連のセミコロン区切りのコマンドを設定します。文字列に空白が含まれている場合は、引用符で囲む必要があります。
 .sp
-Ǥϡ\fI\-XX:OnError\fRץѤƥ᡼뤿\fIgcore\fRޥɤ¹ԤˡӥꥫХǽʥ顼ξ˥ǥХåưƥץ³ˡ򼨤ޤ(\fI%p\fRϸߤΥץꤷޤ)
+次の例では、\fI\-XX:OnError\fRオプションを使用してコア・イメージを作成するために\fIgcore\fRコマンドを実行する方法、およびリカバリ不能なエラーの場合にデバッガを起動してプロセスに接続する方法を示します(\fI%p\fRは現在のプロセスを指定します)。
 .sp
 .if n \{\
 .RS 4
@@ -990,27 +990,27 @@
 .PP
 \-XX:OnOutOfMemoryError=\fIstring\fR
 .RS 4
-\fIOutOfMemoryError\fR㳰ǽ˥줿Ȥ˼¹Ԥ롢ࡦޥɤޤϰϢΥߥڤΥޥɤꤷޤʸ˶򤬴ޤޤƤϡǰϤɬפޤޥʸϡ\fI\-XX:OnError\fRץ򻲾ȤƤ
+\fIOutOfMemoryError\fR例外が最初にスローされたときに実行する、カスタム・コマンドまたは一連のセミコロン区切りのコマンドを設定します。文字列に空白が含まれている場合は、引用符で囲む必要があります。コマンド文字列の例は、\fI\-XX:OnError\fRオプションの説明を参照してください。
 .RE
 .PP
 \-XX:+PrintCommandLineFlags
 .RS 4
-ޥɥ饤ɽ줿ʹֹŪ򤷤JVMե饰ΰͭˤޤϡҡΰ襵򤵤줿١쥯ʤɡJVMˤäꤵ줿르ΥߥåͤǧΩޤǥեȤǤϡΥץ̵Ǥꡢե饰ϰޤ
+コマンドラインに表示された、人間工学的に選択したJVMフラグの印刷を有効にします。これは、ヒープ領域サイズや選択されたガベージ・コレクタなど、JVMによって設定されたエルゴノミック値を確認する場合に役立ちます。デフォルトでは、このオプションは無効であり、フラグは印刷されません。
 .RE
 .PP
 \-XX:+PrintNMTStatistics
 .RS 4
-ͥƥ֡꡼Υȥå󥰤ͭʾˡJVMνλ˼줿ͥƥ֡꡼Υȥå󥰡ǡΰͭˤޤ(\fI\-XX:NativeMemoryTracking\fR򻲾ȤƤ)ǥեȤǤϡΥץ̵Ǥꡢͥƥ֡꡼Υȥå󥰡ǡϰޤ
+ネイティブ・メモリーのトラッキングが有効な場合に、JVMの終了時に収集されたネイティブ・メモリーのトラッキング・データの印刷を有効にします(\fI\-XX:NativeMemoryTracking\fRを参照してください)。デフォルトでは、このオプションは無効であり、ネイティブ・メモリーのトラッキング・データは印刷されません。
 .RE
 .PP
 \-XX:+ShowMessageBoxOnError
 .RS 4
-JVMǥꥫХǽʥ顼ȯ硢ܥåɽͭˤޤˤꡢJVM˥ǥХå³ƥ顼θĴǤ褦ˡJVMλʤ褦ˤơץ򥢥ƥ֤ʤޤޤˤޤǥեȤǤϡΥץ̵Ǥ
+JVMでリカバリ不能なエラーが発生した場合、ダイアログ・ボックスの表示を有効にします。これにより、JVMにデバッガを接続してエラーの原因を調査できるように、JVMを終了しないようにして、プロセスをアクティブなままにします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:ThreadStackSize=\fIsize\fR
 .RS 4
-åɤΥå(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϥץåȥեˤäưۤʤޤ
+スレッドのスタック・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値はプラットフォームによって異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -1020,7 +1020,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/ARM (32ӥå): 320KB
+Linux/ARM (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -1031,7 +1031,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/i386 (32ӥå): 320KB
+Linux/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -1042,7 +1042,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Linux/x64 (64ӥå): 1024KB
+Linux/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -1053,7 +1053,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-OS X (64ӥå): 1024KB
+OS X (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -1064,7 +1064,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/i386 (32ӥå): 320KB
+Oracle Solaris/i386 (32ビット): 320KB
 .RE
 .sp
 .RS 4
@@ -1075,7 +1075,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Oracle Solaris/x64 (64ӥå): 1024KB
+Oracle Solaris/x64 (64ビット): 1024KB
 .RE
 .sp
 .RS 4
@@ -1086,10 +1086,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Windows: ۥ꡼ˤäưۤʤޤ
+Windows: 仮想メモリーによって異なります。
 .RE
 .sp
-Ǥϡåɡåۤʤñ̤1024KBꤹˡ򼨤ޤ
+次の例では、スレッド・スタック・サイズを異なる単位で1024KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1102,86 +1102,86 @@
 .if n \{\
 .RE
 .\}
-Υץ\fI\-Xss\fRƱǤ
+このオプションは\fI\-Xss\fRと同等です。
 .RE
 .PP
 \-XX:+TraceClassLoading
 .RS 4
-饹ɤȤΥ饹Υȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢ饹ϥȥ졼ޤ
+クラスがロードされるときのクラスのトレースを有効にします。デフォルトでは、このオプションは無効であり、クラスはトレースされません。
 .RE
 .PP
 \-XX:+TraceClassLoadingPreorder
 .RS 4
-饹Ȥǡɤ줿٤ƤΥ饹Υȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢ饹ϥȥ졼ޤ
+クラスが参照される順序で、ロードされたすべてのクラスのトレースを有効にします。デフォルトでは、このオプションは無効であり、クラスはトレースされません。
 .RE
 .PP
 \-XX:+TraceClassResolution
 .RS 4
-סβΥȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢסβϥȥ졼ޤ
+定数プールの解決のトレースを有効にします。デフォルトでは、このオプションは無効であり、定数プールの解決はトレースされません。
 .RE
 .PP
 \-XX:+TraceClassUnloading
 .RS 4
-饹ɤȤΥ饹Υȥ졼ͭˤޤǥեȤǤϡΥץ̵Ǥꡢ饹ϥȥ졼ޤ
+クラスがアンロードされるときのクラスのトレースを有効にします。デフォルトでは、このオプションは無効であり、クラスはトレースされません。
 .RE
 .PP
 \-XX:+TraceLoaderConstraints
 .RS 4
-εϿΥȥ졼ͭˤޤǥեȤǤϡΥץ̵ǤꡢεϿפޤ
+ローダー制約の記録のトレースを有効にします。デフォルトでは、このオプションは無効であり、ローダー制約の記録は追跡されません。
 .RE
 .PP
 \-XX:+UseAltSigs
 .RS 4
-JVMʥ\fISIGUSR1\fR\fISIGUSR2\fRΤˡإʥλѤͭˤޤǥեȤǤϡΥץ̵ǤꡢإʥϻѤޤ󡣤Υץ\fI\-Xusealtsigs\fRƱǤ
+JVM内部シグナルの\fISIGUSR1\fRおよび\fISIGUSR2\fRのかわりに、代替シグナルの使用を有効にします。デフォルトでは、このオプションは無効であり、代替シグナルは使用されません。このオプションは\fI\-Xusealtsigs\fRと同等です。
 .RE
 .PP
 \-XX:+UseBiasedLocking
 .RS 4
-ХåλѤͭˤޤʤ̤󶥹ƱΥץꥱϡΥե饰ͭˤʹ®¸ޤΥѥΥå륢ץꥱϡ®٤㲼뤳ȤޤХåˡξܺ٤ϡhttp://www\&.oracle\&.com/technetwork/java/tuning\-139912\&.html#section4\&.2\&.5ˤJava塼˥󥰤Υۥ磻ȡڡѡ򻲾ȤƤ
+バイアス・ロックの使用を有効にします。かなりの量の非競合の同期化がある一部のアプリケーションは、このフラグを有効にすると大幅な高速化が実現しますが、特定のパターンのロックがあるアプリケーションは、速度が低下することがあります。バイアス・ロックの方法の詳細は、http://www\&.oracle\&.com/technetwork/java/tuning\-139912\&.html#section4\&.2\&.5にあるJavaチューニングのホワイト・ペーパーの例を参照してください。
 .sp
-ǥեȤǤϡΥץ̵ǤꡢХåϻѤޤ
+デフォルトでは、このオプションは無効であり、バイアス・ロックは使用されません。
 .RE
 .PP
 \-XX:+UseCompressedOops
 .RS 4
-̤줿ݥ󥿤λѤͭˤޤΥץͭˤȡ֥ȻȤϡ64ӥåȤΥݥ󥿤ǤϤʤ32ӥåȤΥեåȤȤɽ졢ˤꡢ32GB꾮JavaҡסΥץꥱμ¹Իˡ̾ѥեޥ󥹤夷ޤΥץϡ64ӥåȤJVMǤΤߵǽޤ
+圧縮されたポインタの使用を有効にします。このオプションを有効にすると、オブジェクト参照は、64ビットのポインタではなく32ビットのオフセットとして表され、これにより、32GBより小さいJavaヒープ・サイズのアプリケーションの実行時に、通常、パフォーマンスが向上します。このオプションは、64ビットのJVMでのみ機能します。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢ̥ݥ󥿤ϻѤޤ
+デフォルトでは、このオプションは無効であり、圧縮ポインタは使用されません。
 .RE
 .PP
 \-XX:+UseLargePages
 .RS 4
-礭ڡΥ꡼λѤͭˤޤΥץϥǥեȤͭˤʤäƤޤ礭ڡΥ꡼λѤ̵ˤˤϡ\fI\-XX:\-UseLargePages\fRꤷޤ
+大きいページのメモリーの使用を有効にします。このオプションはデフォルトで有効になっています。大きいページのメモリーの使用を無効にするには、\fI\-XX:\-UseLargePages\fRを指定します。
 .sp
-ܺ٤ϡhttp://www\&.oracle\&.com/technetwork/java/javase/tech/largememory\-jsp\-137182\&.htmlˤ礭꡼ڡѤJavaݡȤ򻲾ȤƤ
+詳細は、http://www\&.oracle\&.com/technetwork/java/javase/tech/largememory\-jsp\-137182\&.htmlにある大きいメモリー・ページ用のJavaサポートを参照してください。
 .RE
 .PP
 \-XX:+UseMembar
 .RS 4
-åɤξ֤ܤǥСȯԤͭˤޤΥץϡͭˤʤäƤPower PCARMС٤ƤΥץåȥեǡǥեȤǤ̵ˤʤäƤޤPower PCARMΥåɾܤФСȯԤ̵ˤˤϡ\fI\-XX:\-UseMembar\fRꤷޤ
+スレッドの状態の遷移でメンバーの発行を有効にします。このオプションは、有効になっているPower PCおよびARMサーバーを除くすべてのプラットフォーム上で、デフォルトでは無効になっています。Power PCとARMのスレッド状態遷移に対するメンバーの発行を無効にするには、\fI\-XX:\-UseMembar\fRを指定します。
 .RE
 .PP
 \-XX:+UsePerfData
 .RS 4
-\fIperfdata\fRǽͭˤޤΥץϥǥեȤͭˤʤäƤꡢJVMΥ˥󥰤ӥѥեޥ󥹡ƥȤǽˤʤޤ̵ˤȡ\fIhsperfdata_userid\fRǥ쥯ȥκޤ\fIperfdata\fRǽ̵ˤˤϡ\fI\-XX:\-UsePerfData\fRꤷޤ
+\fIperfdata\fR機能を有効にします。このオプションはデフォルトで有効になっており、JVMのモニタリングおよびパフォーマンス・テストが可能になります。これを無効にすると、\fIhsperfdata_userid\fRディレクトリの作成を抑制します。\fIperfdata\fR機能を無効にするには、\fI\-XX:\-UsePerfData\fRを指定します。
 .RE
 .PP
 \-XX:+AllowUserSignalHandlers
 .RS 4
-ץꥱˤ륷ʥ롦ϥɥΥ󥹥ȡͭˤޤǥեȤǤϡΥץ̵Ǥꡢץꥱϥʥ롦ϥɥ򥤥󥹥ȡ뤹뤳ȤϵĤƤޤ
+アプリケーションによるシグナル・ハンドラのインストールを有効にします。デフォルトでは、このオプションは無効であり、アプリケーションはシグナル・ハンドラをインストールすることは許可されていません。
 .RE
-.SS "٤JITѥ顦ץ"
+.SS "高度なJITコンパイラ・オプション"
 .PP
-ΥץϡJava HotSpot VMǼ¹ԤưŪjust\-in\-time (JIT)ѥ椷ޤ
+これらのオプションは、Java HotSpot VMで実行される動的なjust\-in\-time (JIT)コンパイラを制御します。
 .PP
 \-XX:+AggressiveOpts
 .RS 4
-ѶŪʥѥեޥ󥹺ŬǽλѤͭˤޤϺΥ꡼ǥǥեȤˤʤͽǤǥեȤǤϡΥץ̵ǤꡢŪʥѥեޥ󥹵ǽϻѤޤ
+積極的なパフォーマンス最適化機能の使用を有効にします。これは今後のリリースでデフォルトになる予定です。デフォルトでは、このオプションは無効であり、試験的なパフォーマンス機能は使用されません。
 .RE
 .PP
 \-XX:AllocateInstancePrefetchLines=\fIlines\fR
 .RS 4
-󥹥󥹳ƥݥ󥿤˥ץեåԿꤷޤǥեȤǤϡץեåԿ1ꤵƤޤ
+インスタンス割当てポインタの前にプリフェッチする行数を設定します。デフォルトでは、プリフェッチする行数は1に設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1196,7 +1196,7 @@
 .PP
 \-XX:AllocatePrefetchInstr=\fIinstruction\fR
 .RS 4
-ƥݥ󥿤˥ץեåץեå̿ꤷޤѲǽͤ03ޤǤǤͤظˤºݤ̿ϡץåȥեˤäưۤʤޤǥեȤǤϡץեå̿0ꤵƤޤ
+割当てポインタの前にプリフェッチするプリフェッチ命令を設定します。使用可能な値は0から3までです。値の背後にある実際の命令は、プラットフォームによって異なります。デフォルトでは、プリフェッチ命令は0に設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1211,7 +1211,7 @@
 .PP
 \-XX:AllocatePrefetchStepSize=\fIsize\fR
 .RS 4
-缡ץեå̿Υƥåס(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡƥåס16ХȤꤵƤޤ
+順次プリフェッチ命令のステップ・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、ステップ・サイズは16バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1226,12 +1226,12 @@
 .PP
 \-XX:+BackgroundCompilation
 .RS 4
-Хå饦ɡѥͭˤޤΥץϥǥեȤͭˤʤäƤޤХå饦ɡѥ̵ˤˤϡ\fI\-XX:\-BackgroundCompilation\fRꤷޤ(\fI\-Xbatch\fRꤹΤƱǤ)
+バックグラウンド・コンパイルを有効にします。このオプションはデフォルトで有効になっています。バックグラウンド・コンパイルを無効にするには、\fI\-XX:\-BackgroundCompilation\fRを指定します(これは\fI\-Xbatch\fRを指定するのと同等です)。
 .RE
 .PP
 \-XX:CICompilerCount=\fIthreads\fR
 .RS 4
-ѥ˻Ѥ륳ѥ顦åɤοꤷޤǥեȤǤϡåɿϡСJVMξ2饤JVMξ1ꤵƤꡢإѥ뤬ѤƤ硢˹礻ޤǤϡåɤο2ꤹˡ򼨤ޤ
+コンパイルに使用するコンパイラ・スレッドの数を設定します。デフォルトでは、スレッド数は、サーバーJVMの場合は2、クライアントJVMの場合は1に設定されており、層コンパイルが使用されている場合、コア数に合せて増減します。次の例では、スレッドの数を2に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1246,7 +1246,7 @@
 .PP
 \-XX:CodeCacheMinimumFreeSpace=\fIsize\fR
 .RS 4
-ѥɬפʺǾΰ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǾΰ꾯ʤΰ褷ĤäƤʤ硢ѥߤޤǥեȤǤϡΥץ500KBꤵƤޤǤϡǾΰ1024MBꤹˡ򼨤ޤ
+コンパイルに必要な最小空き領域(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。最小空き領域より少ない領域しか残っていない場合、コンパイルは停止します。デフォルトでは、このオプションは500KBに設定されています。次の例では、最小空き領域を1024MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1261,7 +1261,7 @@
 .PP
 \-XX:CompileCommand=\fIcommand\fR,\fImethod\fR[,\fIoption\fR]
 .RS 4
-᥽åɤǼ¹Ԥ륳ޥɤꤷޤȤСѥ븵\fIString\fR饹\fIindexOf()\fR᥽åɤ¹ԤˤϡѤޤ
+メソッドで実行するコマンドを指定します。たとえば、コンパイル元から\fIString\fRクラスの\fIindexOf()\fRメソッドを実行するには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1272,7 +1272,7 @@
 .if n \{\
 .RE
 .\}
-å(\fI/\fR)Ƕڤ줿٤ƤΥѥåӥ֥ѥåޤࡢ饹̾ꤷޤڼŽդưפˤ뤿ˡ\fI\-XX:+PrintCompilation\fRץ󤪤\fI\-XX:+LogCompilation\fRץˤä᥽å̾ηѤ뤳ȤǤޤ
+スラッシュ(\fI/\fR)で区切られたすべてのパッケージおよびサブパッケージを含む、完全クラス名を指定します。切取りと貼付けの操作を容易にするために、\fI\-XX:+PrintCompilation\fRオプションおよび\fI\-XX:+LogCompilation\fRオプションによって生成されるメソッド名の形式を使用することもできます。
 .sp
 .if n \{\
 .RS 4
@@ -1283,7 +1283,7 @@
 .if n \{\
 .RE
 .\}
-̾ʤǥ᥽åɤꤹȡޥɤϻꤷ̾Ĥ٤ƤΥ᥽åɤŬѤޤ饹եǥ᥽åɤν̾ꤹ뤳ȤǤޤȤСѥ븵\fIString\fR饹\fIindexOf(String)\fR᥽åɤΤ߽ˤϡѤޤ
+署名なしでメソッドを指定すると、コマンドは指定した名前を持つすべてのメソッドに適用されます。ただし、クラス・ファイル形式でメソッドの署名を指定することもできます。たとえば、コンパイル元から\fIString\fRクラスの\fIindexOf(String)\fRメソッドのみ除外するには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1294,7 +1294,7 @@
 .if n \{\
 .RE
 .\}
-ޤ饹̾ӥ᥽å̾˥磻ɥɤȤƥꥹ(*)ѤǤޤȤСѥ븵餹٤ƤΥ饹Τ٤Ƥ\fIindexOf()\fR᥽åɤˤϡѤޤ
+また、クラス名およびメソッド名にワイルドカードとしてアスタリスク(*)を使用できます。たとえば、コンパイル元からすべてのクラスのすべての\fIindexOf()\fRメソッドを除外するには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1305,7 +1305,7 @@
 .if n \{\
 .RE
 .\}
-ޤȥԥꥪɤ϶̾ǡˤꡢ𤷤ƥѥ顦ޥɤϤȤưפˤʤޤǰϤळȤǡ򥻥ѥ졼ȤƻѤ\fI\-XX:CompileCommand\fR˰ϤȤǤޤ
+カンマとピリオドは空白の別名で、これにより、シェルを介してコンパイラ・コマンドを渡すことが容易になります。引数を引用符で囲むことで、空白をセパレータとして使用して\fI\-XX:CompileCommand\fRに引数を渡すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -1316,48 +1316,48 @@
 .if n \{\
 .RE
 .\}
-\fI\-XX:CompileCommand\fRץѤƥޥɥ饤Ϥ줿ޥɤϤˡJITѥ\fI\&.hotspot_compiler\fRե뤫饳ޥɤɤ߼ޤΥե˥ޥɤɲä뤫ޤ\fI\-XX:CompileCommandFile\fRץѤ̤Υեꤹ뤳ȤǤޤ
+\fI\-XX:CompileCommand\fRオプションを使用してコマンドラインで渡されたコマンドを解析した後に、JITコンパイラは\fI\&.hotspot_compiler\fRファイルからコマンドを読み取ります。このファイルにコマンドを追加するか、または\fI\-XX:CompileCommandFile\fRオプションを使用して別のファイルを指定することができます。
 .sp
-ʣΥޥɤɲäˤϡ\fI\-XX:CompileCommand\fRץʣꤹ뤫ޤϲԥѥ졼(\fI\en\fR)ѤƳưڤޤΥޥɤѤǤޤ
+複数のコマンドを追加するには、\fI\-XX:CompileCommand\fRオプションを複数回指定するか、または改行セパレータ(\fI\en\fR)を使用して各引数を区切ります。次のコマンドを使用できます。
 .PP
 break
 .RS 4
-ꤷ᥽åɤΥѥκǽߤ뤿ˡJVMΥǥХåΥ֥졼ݥȤꤷޤ
+指定したメソッドのコンパイルの最初に停止するために、JVMのデバッグ時のブレークポイントを設定します。
 .RE
 .PP
 compileonly
 .RS 4
-ꤷ᥽åɤ٤ƤΥ᥽åɤ򡢥ѥ뤫ޤ̤ˡȤơ\fI\-XX:CompileOnly\fRץѤʣΥ᥽åɤǤޤ
+指定したメソッドを除いたすべてのメソッドを、コンパイルから除外します。別の方法として、\fI\-XX:CompileOnly\fRオプションを使用して複数のメソッドを指定できます。
 .RE
 .PP
 dontinline
 .RS 4
-ꤷ᥽åɤ򥤥饤󲽤ʤ褦ˤޤ
+指定したメソッドをインライン化しないようにします。
 .RE
 .PP
 exclude
 .RS 4
-ꤷ᥽åɤ򥳥ѥ뤫ޤ
+指定したメソッドをコンパイルから除外します。
 .RE
 .PP
 help
 .RS 4
-\fI\-XX:CompileCommand\fRץΥإסåޤ
+\fI\-XX:CompileCommand\fRオプションのヘルプ・メッセージを印刷します。
 .RE
 .PP
 inline
 .RS 4
-ꤷ᥽åɤ򥤥饤󲽤褦Ȥޤ
+指定したメソッドをインライン化しようとします。
 .RE
 .PP
 log
 .RS 4
-ꤷ᥽åɤ٤ƤΥ᥽åɤФơ(\fI\-XX:+LogCompilation\fRץѤ)ѥ롦󥰤ޤǥեȤǤϡѥ뤵줿٤ƤΥ᥽åɤ˥󥰤¹Ԥޤ
+指定したメソッドを除くすべてのメソッドに対して、(\fI\-XX:+LogCompilation\fRオプションを使用して)コンパイル・ロギングを除外します。デフォルトでは、コンパイルされたすべてのメソッドにロギングが実行されます。
 .RE
 .PP
 option
 .RS 4
-ΥޥɤϡǸΰ(\fIoption\fR)Τˡꤷ᥽åɤJITѥ롦ץϤ˻ѤǤޤѥ롦ץϡ᥽å̾θꤵޤȤС\fIStringBuffer\fR饹\fIappend()\fR᥽åɤФ\fIBlockLayoutByFrequency\fRץͭˤˤϡѤޤ
+このコマンドは、最後の引数(\fIoption\fR)のかわりに、指定したメソッドにJITコンパイル・オプションを渡すために使用できます。コンパイル・オプションは、メソッド名の後の末尾に設定されます。たとえば、\fIStringBuffer\fRクラスの\fIappend()\fRメソッドに対して\fIBlockLayoutByFrequency\fRオプションを有効にするには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1368,17 +1368,17 @@
 .if n \{\
 .RE
 .\}
-ޤޤ϶ǶڤäơʣΥѥ롦ץǤޤ
+カンマまたは空白で区切って、複数のコンパイル・オプションを指定できます。
 .RE
 .PP
 print
 .RS 4
-ꤷ᥽åɤΥѥ줿֥顦ɤϤޤ
+指定したメソッドのコンパイル後に生成されたアセンブラ・コードを出力します。
 .RE
 .PP
 quiet
 .RS 4
-ѥ롦ޥɤϤޤ󡣥ǥեȤǤϡ\fI\-XX:CompileCommand\fRץѤƻꤷޥɤϤޤȤС\fIString\fR饹\fIindexOf()\fR᥽åɤΥѥ뤫硢ɸϤ˽Ϥޤ
+コンパイル・コマンドを出力しません。デフォルトでは、\fI\-XX:CompileCommand\fRオプションを使用して指定したコマンドが出力されます。たとえば、\fIString\fRクラスの\fIindexOf()\fRメソッドのコンパイルから除外する場合、次が標準出力に出力されます。
 .sp
 .if n \{\
 .RS 4
@@ -1389,15 +1389,15 @@
 .if n \{\
 .RE
 .\}
-¾\fI\-XX:CompileCommand\fRץ\fI\-XX:CompileCommand=quiet\fRץꤹ뤳ȤˤäơǤޤ
+他の\fI\-XX:CompileCommand\fRオプションの前に\fI\-XX:CompileCommand=quiet\fRオプションを指定することによって、これを抑制できます。
 .RE
 .RE
 .PP
 \-XX:CompileCommandFile=\fIfilename\fR
 .RS 4
-JITѥ顦ޥɤɼ긵ΥեꤷޤǥեȤǤϡJITѥˤäƼ¹Ԥ륳ޥɤǼ뤿ˡ\fI\&.hotspot_compiler\fRե뤬Ѥޤ
+JITコンパイラ・コマンドの読取り元のファイルを設定します。デフォルトでは、JITコンパイラによって実行されるコマンドを格納するために、\fI\&.hotspot_compiler\fRファイルが使用されます。
 .sp
-ޥɡեγƹԤϡޥɤѤ륳ޥɡ饹̾ӥ᥽å̾ɽޤȤСιԤϡ\fIString\fR饹\fItoString()\fR᥽åɤФƥ֥ꡦɤϤޤ
+コマンド・ファイルの各行は、コマンドが使用されるコマンド、クラス名およびメソッド名を表します。たとえば、次の行は、\fIString\fRクラスの\fItoString()\fRメソッドに対してアセンブリ・コードを出力します。
 .sp
 .if n \{\
 .RS 4
@@ -1408,12 +1408,12 @@
 .if n \{\
 .RE
 .\}
-᥽åɤǼ¹ԤJITѥΥޥɤλξܺ٤ϡ\fI\-XX:CompileCommand\fRץ򻲾ȤƤ
+メソッドで実行するJITコンパイラのコマンドの指定の詳細は、\fI\-XX:CompileCommand\fRオプションを参照してください。
 .RE
 .PP
 \-XX:CompileOnly=\fImethods\fR
 .RS 4
-ѥ¤(ޤǶڤ줿)᥽åɤΥꥹȤꤷޤꤷ᥽åɤΤߤѥ뤵ޤ饹̾(ѥåӥ֥ѥåޤ)dzƥ᥽åɤꤷޤȤС\fIString\fR饹\fIlength()\fR᥽åɤ\fIList\fR饹\fIsize()\fR᥽åɤΤߤ򥳥ѥ뤹ˤϡѤޤ
+コンパイルを制限する(カンマで区切られた)メソッドのリストを設定します。指定したメソッドのみがコンパイルされます。完全クラス名(パッケージおよびサブパッケージを含む)で各メソッドを指定します。たとえば、\fIString\fRクラスの\fIlength()\fRメソッドおよび\fIList\fRクラスの\fIsize()\fRメソッドのみをコンパイルするには、次を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1424,7 +1424,7 @@
 .if n \{\
 .RE
 .\}
-å(\fI/\fR)Ƕڤ줿٤ƤΥѥåӥ֥ѥåޤࡢ饹̾ꤷޤڼŽդưפˤ뤿ˡ\fI\-XX:+PrintCompilation\fRץ󤪤\fI\-XX:+LogCompilation\fRץˤä᥽å̾ηѤ뤳ȤǤޤ
+スラッシュ(\fI/\fR)で区切られたすべてのパッケージおよびサブパッケージを含む、完全クラス名を指定します。切取りと貼付けの操作を容易にするために、\fI\-XX:+PrintCompilation\fRオプションおよび\fI\-XX:+LogCompilation\fRオプションによって生成されるメソッド名の形式を使用することもできます。
 .sp
 .if n \{\
 .RS 4
@@ -1435,7 +1435,7 @@
 .if n \{\
 .RE
 .\}
-磻ɥɤϥݡȤƤޤ󤬡饹̾ޤϥѥå̾ꤷƥ饹ޤϥѥåΤ٤ƤΥ᥽åɤ򥳥ѥ뤹뤳Ȥ⡢᥽åɤꤷǤդΥ饹Τ̾ĥ᥽åɤ򥳥ѥ뤹뤳ȤǤޤ
+ワイルドカードはサポートされていませんが、クラス名またはパッケージ名だけを指定してクラスまたはパッケージのすべてのメソッドをコンパイルすることも、メソッドだけを指定して任意のクラスのこの名前を持つメソッドをコンパイルすることもできます。
 .sp
 .if n \{\
 .RS 4
@@ -1452,7 +1452,7 @@
 .PP
 \-XX:CompileThreshold=\fIinvocations\fR
 .RS 4
-ѥ˲ᤵ줿᥽åɸƽФοꤷޤǥեȤǤϡСJVMǤϡJITѥϡ10,000βᤵ줿᥽åɸƽФ¹ԤơΨŪʥѥΤξޤ饤JVMξ硢ǥե1,500ƽФǤǤϡᤵ줿᥽åɸƽФο5,000ꤹˡ򼨤ޤ
+コンパイル前に解釈されたメソッド呼出しの数を設定します。デフォルトでは、サーバーJVMでは、JITコンパイラは、10,000の解釈されたメソッド呼出しを実行して、効率的なコンパイルのための情報を収集します。クライアントJVMの場合、デフォルト設定は1,500呼出しです。次の例では、解釈されたメソッド呼出しの数を5,000に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1463,22 +1463,22 @@
 .if n \{\
 .RE
 .\}
-\fI\-Xcomp\fRץꤷơѥˡJava᥽åɤβ̵ˤ뤳ȤǤޤ
+\fI\-Xcomp\fRオプションを指定して、コンパイルの前に、Javaメソッドの解釈を完全に無効にすることができます。
 .RE
 .PP
 \-XX:+DoEscapeAnalysis
 .RS 4
-ʬϤλѤͭˤޤΥץϥǥեȤͭˤʤäƤޤʬϤλѤ̵ˤˤϡ\fI\-XX:\-DoEscapeAnalysis\fRꤷޤ
+エスケープ分析の使用を有効にします。このオプションはデフォルトで有効になっています。エスケープ分析の使用を無効にするには、\fI\-XX:\-DoEscapeAnalysis\fRを指定します。
 .RE
 .PP
 \-XX:+FailOverToOldVerifier
 .RS 4
-סåԤΡŤ٥եؤμưե륪СͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢǶΥХȥɡСѤ饹ˤϡ̵뤵ޤ(Ĥޤꡢ̵Ȥƽޤ)ŤСΥХȥɤѤ饹ˤϡͭǤޤ
+新しいタイプ・チェッカが失敗した場合の、古いベリファイアへの自動フェイルオーバーを有効にします。デフォルトでは、このオプションは無効になっており、最近のバイトコード・バージョンを使用したクラスには、これは無視されます(つまり、無効として処理されます)。古いバージョンのバイトコードを使用したクラスには、これを有効化できます。
 .RE
 .PP
 \-XX:InitialCodeCacheSize=\fIsize\fR
 .RS 4
-ɡå塦(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤ500KBꤵƤޤǤϡɡå塦32KBꤹˡ򼨤ޤ
+初期コード・キャッシュ・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は500KBに設定されています。次の例では、初期コード・キャッシュ・サイズを32KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1493,12 +1493,12 @@
 .PP
 \-XX:+Inline
 .RS 4
-᥽åɤΥ饤󲽤ͭˤޤΥץϡѥեޥ󥹤夵뤿˥ǥեȤͭˤʤäƤޤ᥽åɤΥ饤󲽤̵ˤˤϡ\fI\-XX:\-Inline\fRꤷޤ
+メソッドのインライン化を有効にします。このオプションは、パフォーマンスを向上させるためにデフォルトで有効になっています。メソッドのインライン化を無効にするには、\fI\-XX:\-Inline\fRを指定します。
 .RE
 .PP
 \-XX:InlineSmallCode=\fIsize\fR
 .RS 4
-饤󲽤ɬפʥѥ뤵줿᥽åɤκ祳ɡ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤꤷ꾮Υѥ뤵줿᥽åɤΤߤ饤󲽤ޤǥեȤǤϡ祳ɡ1000ХȤꤵƤޤ
+インライン化が必要なコンパイルされたメソッドの最大コード・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。指定したサイズより小さいサイズのコンパイルされたメソッドのみが、インライン化されます。デフォルトでは、最大コード・サイズは1000バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1513,16 +1513,16 @@
 .PP
 \-XX:+LogCompilation
 .RS 4
-ߤκȥǥ쥯ȥˤ\fIhotspot\&.log\fRȤ̾ΥեؤΥѥ롦ƥӥƥΥ󥰤ͭˤޤ\fI\-XX:LogFile\fRץѤơۤʤե롦ѥ̾Ǥޤ
+現在の作業ディレクトリにある\fIhotspot\&.log\fRという名前のファイルへのコンパイル・アクティビティのロギングを有効にします。\fI\-XX:LogFile\fRオプションを使用して、異なるログ・ファイル・パスと名前を指定できます。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢѥ롦ƥӥƥϵϿޤ\fI\-XX:+LogCompilation\fRץϡJVMץΥå\fI\-XX:UnlockDiagnosticVMOptions\fRץȤȤ˻Ѥɬפޤ
+デフォルトでは、このオプションは無効であり、コンパイル・アクティビティは記録されません。\fI\-XX:+LogCompilation\fRオプションは、診断JVMオプションのロックを解除する\fI\-XX:UnlockDiagnosticVMOptions\fRオプションとともに使用する必要があります。
 .sp
-\fI\-XX:+PrintCompilation\fRץѤơ᥽åɤ򥳥ѥ뤹뤿Ӥˡ󥽡˽Ϥ줿åޤܺ٤ʿǽϤͭǤޤ
+\fI\-XX:+PrintCompilation\fRオプションを使用して、メソッドをコンパイルするたびに、コンソールに出力されたメッセージを含む詳細な診断出力を有効化できます。
 .RE
 .PP
 \-XX:MaxInlineSize=\fIsize\fR
 .RS 4
-饤󲽤᥽åɤκХȥɡ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡХȥɡ35ХȤꤵƤޤ
+インライン化するメソッドの最大バイトコード・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、最大バイトコード・サイズは35バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1537,7 +1537,7 @@
 .PP
 \-XX:MaxNodeLimit=\fInodes\fR
 .RS 4
-ñΥ᥽åɤΥѥ˻ѤΡɤκꤷޤǥեȤǤϡΡɤκ65,000ꤵƤޤ
+単一のメソッドのコンパイル時に使用されるノードの最大数を設定します。デフォルトでは、ノードの最大数は65,000に設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1552,7 +1552,7 @@
 .PP
 \-XX:MaxTrivialSize=\fIsize\fR
 .RS 4
-饤󲽤ñ᥽åɤκХȥɡ(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡñ᥽åɤκХȥɡ6ХȤꤵƤޤ
+インライン化する単純メソッドの最大バイトコード・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、単純メソッドの最大バイトコード・サイズは6バイトに設定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1567,77 +1567,77 @@
 .PP
 \-XX:+OptimizeStringConcat
 .RS 4
-\fIString\fRϢκŬͭˤޤΥץϥǥեȤͭˤʤäƤޤ\fIString\fRϢκŬ̵ˤˤϡ\fI\-XX:\-OptimizeStringConcat\fRꤷޤ
+\fIString\fR連結操作の最適化を有効にします。このオプションはデフォルトで有効になっています。\fIString\fR連結操作の最適化を無効にするには、\fI\-XX:\-OptimizeStringConcat\fRを指定します。
 .RE
 .PP
 \-XX:+PrintAssembly
 .RS 4
-\fIdisassembler\&.so\fR饤֥ѤơХȥɲ줿ͥƥ֤Υ᥽åɤΥ֥ꡦɤνϤͭˤޤˤꡢ줿ɤɽ뤳ȤǤѥեޥ󥹤οǤΩޤ
+外部の\fIdisassembler\&.so\fRライブラリを使用して、バイトコード化されたネイティブのメソッドのアセンブリ・コードの出力を有効にします。これにより、生成されたコードを表示することができ、パフォーマンスの問題の診断に役立ちます。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢ֥ꡦɤϰޤ\fI\-XX:+PrintAssembly\fRץϡJVMץΥå\fI\-XX:UnlockDiagnosticVMOptions\fRץȤȤ˻Ѥɬפޤ
+デフォルトでは、このオプションは無効であり、アセンブリ・コードは印刷されません。\fI\-XX:+PrintAssembly\fRオプションは、診断JVMオプションのロックを解除する\fI\-XX:UnlockDiagnosticVMOptions\fRオプションとともに使用する必要があります。
 .RE
 .PP
 \-XX:+PrintCompilation
 .RS 4
-᥽åɤ򥳥ѥ뤹뤿Ӥˡ󥽡˥åϤ뤳ȤˤäơJVMξܺ٤ʿǽϤͭˤޤˤꡢºݤ˥ѥ뤵᥽åɤǧǤޤǥեȤǤϡΥץ̵ǤꡢǽϤϰޤ
+メソッドをコンパイルするたびに、コンソールにメッセージを出力することによって、JVMからの詳細な診断出力を有効にします。これにより、実際にコンパイルされるメソッドを確認できます。デフォルトでは、このオプションは無効であり、診断出力は印刷されません。
 .sp
-\fI\-XX:+LogCompilation\fRץѤơѥ롦ƥӥƥե˵Ͽ뤳ȤǤޤ
+\fI\-XX:+LogCompilation\fRオプションを使用して、コンパイル・アクティビティをファイルに記録することもできます。
 .RE
 .PP
 \-XX:+PrintInlining
 .RS 4
-饤󲽤ηƤνϤͭˤޤˤꡢ饤󲽤᥽åɤǧǤޤ
+インライン化の決定内容の出力を有効にします。これにより、インライン化されるメソッドを確認できます。
 .sp
-ǥեȤǤϡΥץ̵Ǥꡢ饤󲽾ϽϤޤ\fI\-XX:+PrintInlining\fRץϡJVMץΥå\fI\-XX:+UnlockDiagnosticVMOptions\fRץȤȤ˻Ѥɬפޤ
+デフォルトでは、このオプションは無効であり、インライン化情報は出力されません。\fI\-XX:+PrintInlining\fRオプションは、診断JVMオプションのロックを解除する\fI\-XX:+UnlockDiagnosticVMOptions\fRオプションとともに使用する必要があります。
 .RE
 .PP
 \-XX:+RelaxAccessControlCheck
 .RS 4
-٥եΥå̤򸺤餷ޤǥեȤǤϡΥץ̵ˤʤäƤꡢǶΥХȥɡСѤ饹ˤϡ̵뤵ޤ(Ĥޤꡢ̵Ȥƽޤ)ŤСΥХȥɤѤ饹ˤϡͭǤޤ
+ベリファイア内のアクセス制御チェックの量を減らします。デフォルトでは、このオプションは無効になっており、最近のバイトコード・バージョンを使用したクラスには、これは無視されます(つまり、無効として処理されます)。古いバージョンのバイトコードを使用したクラスには、これを有効化できます。
 .RE
 .PP
 \-XX:ReservedCodeCacheSize=\fIsize\fR
 .RS 4
-JITѥ뤵줿ɤκ祳ɡå塦(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤΥץ\fI\-Xmaxjitcodesize\fRƱǤ
+JITコンパイルされたコードの最大コード・キャッシュ・サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。このオプションは\fI\-Xmaxjitcodesize\fRと同等です。
 .RE
 .PP
 \-XX:+TieredCompilation
 .RS 4
-إѥλѤͭˤޤǥեȤǤϡΥץ̵ǤꡢإѥϻѤޤ
+層コンパイルの使用を有効にします。デフォルトでは、このオプションは無効であり、層コンパイルは使用されません。
 .RE
 .PP
 \-XX:+UseCodeCacheFlushing
 .RS 4
-ѥ򥷥åȥ󤹤ˡɡåΥեåͭˤޤΥץϥǥեȤͭˤʤäƤޤѥ򥷥åȥ󤹤˥ɡåΥեå̵ˤˤ\fI\-XX:\-UseCodeCacheFlushing\fRꤷޤ
+コンパイラをシャットダウンする前に、コード・キャッシュのフラッシュを有効にします。このオプションはデフォルトで有効になっています。コンパイラをシャットダウンする前にコード・キャッシュのフラッシュを無効にするには\fI\-XX:\-UseCodeCacheFlushing\fRを指定します。
 .RE
 .PP
 \-XX:+UseCondCardMark
 .RS 4
-ɽιˡɤǤ˥ޡƤ뤫ɤΥåͭˤޤΥץϡǥեȤǤ̵ˤʤäƤꡢʣΥåȤĥޥǤΤ߻ѤɬפޤˤꡢƱˤʤ¸ƤJavaץꥱΥѥեޥ󥹤夷ޤ
+カード表の更新前に、カードがすでにマークされているかどうかのチェックを有効にします。このオプションは、デフォルトでは無効になっており、複数のソケットを持つマシン上でのみ使用する必要があります。これにより、同時操作にかなり依存しているJavaアプリケーションのパフォーマンスが向上します。
 .RE
 .PP
 \-XX:+UseSuperWord
 .RS 4
-顼黻Υѡɱ黻ؤѴͭˤޤΥץϥǥեȤͭˤʤäƤޤ顼黻Υѡɱ黻ؤѴ̵ˤˤϡ\fI\-XX:\-UseSuperWord\fRꤷޤ
+スカラー演算のスーパーワード演算への変換を有効にします。このオプションはデフォルトで有効になっています。スカラー演算のスーパーワード演算への変換を無効にするには、\fI\-XX:\-UseSuperWord\fRを指定します。
 .RE
-.SS "٤ʥӥӥƥץ"
+.SS "高度なサービスアビリティ・オプション"
 .PP
-Υץϡƥܺ٤ʥǥХå¹Ԥ뵡ǽ󶡤ޤ
+これらのオプションは、システム情報を収集し、詳細なデバッグを実行する機能を提供します。
 .PP
 \-XX:+ExtendedDTraceProbes
 .RS 4
-ѥեޥ󥹤˱ƶͿɲä\fIdtrace\fRġ롦ץ֤ͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢ\fIdtrace\fRɸץ֤Τߤ¹Ԥޤ
+パフォーマンスに影響を与える追加の\fIdtrace\fRツール・プローブを有効にします。デフォルトでは、このオプションは無効になっており、\fIdtrace\fRは標準プローブのみを実行します。
 .RE
 .PP
 \-XX:+HeapDumpOnOutOfMemory
 .RS 4
-\fIjava\&.lang\&.OutOfMemoryError\fR㳰줿ˡҡסץե(HPROF)ѤơߤΥǥ쥯ȥΥեؤJavaҡפΥפͭˤޤ\fI\-XX:HeapDumpPath\fRץѤơҡססեΥѥ̾ŪǤޤǥեȤǤϡΥץ̵Ǥꡢ\fIOutOfMemoryError\fR㳰줿˥ҡפϥפޤ
+\fIjava\&.lang\&.OutOfMemoryError\fR例外がスローされた場合に、ヒープ・プロファイラ(HPROF)を使用して、現在のディレクトリ内のファイルへのJavaヒープのダンプを有効にします。\fI\-XX:HeapDumpPath\fRオプションを使用して、ヒープ・ダンプ・ファイルのパスおよび名前を明示的に設定できます。デフォルトでは、このオプションは無効であり、\fIOutOfMemoryError\fR例外がスローされた場合にヒープはダンプされません。
 .RE
 .PP
 \-XX:HeapDumpPath=\fIpath\fR
 .RS 4
-\fI\-XX:+HeapDumpOnOutOfMemoryError\fRץꤵƤ硢ҡסץե(HPROF)󶡤ҡספ񤭹ѥӥե̾ꤷޤǥեȤǤϡΥեϡߤκȥǥ쥯ȥ˺졢̾\fIjava_pid\fR\fIpid\fR\fI\&.hprof\fR
-(\fIpid\fRϥ顼θȤʤäץμ̻)ˤʤޤǤϡǥեȤΥեŪꤹˡ򼨤ޤ(\fI%p\fRϸߤΥץμ̻Ҥɽޤ)
+\fI\-XX:+HeapDumpOnOutOfMemoryError\fRオプションが設定されている場合、ヒープ・プロファイラ(HPROF)が提供するヒープ・ダンプを書き込むパスおよびファイル名を設定します。デフォルトでは、このファイルは、現在の作業ディレクトリに作成され、名前は\fIjava_pid\fR\fIpid\fR\fI\&.hprof\fR
+(\fIpid\fRはエラーの原因となったプロセスの識別子)になります。次の例では、デフォルトのファイルを明示的に設定する方法を示します(\fI%p\fRは現在のプロセスの識別子を表します)。
 .sp
 .if n \{\
 .RS 4
@@ -1648,7 +1648,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡҡססե\fI/var/log/java/java_heapdump\&.hprof\fRꤹˡ򼨤ޤ
+次の例では、ヒープ・ダンプ・ファイルを\fI/var/log/java/java_heapdump\&.hprof\fRに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1663,9 +1663,9 @@
 .PP
 \-XX:LogFile=\fIpath\fR
 .RS 4
-ǡ񤭹ޤѥӥե̾ꤷޤǥեȤǤϡեϸߤκȥǥ쥯ȥ˺졢̾\fIhotspot\&.log\fRǤ
+ログ・データが書き込まれるパスおよびファイル名を設定します。デフォルトでは、ファイルは現在の作業ディレクトリに作成され、名前は\fIhotspot\&.log\fRです。
 .sp
-Ǥϡե\fI/var/log/java/hotspot\&.log\fRꤹˡ򼨤ޤ
+次の例では、ログ・ファイルを\fI/var/log/java/hotspot\&.log\fRに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1680,39 +1680,39 @@
 .PP
 \-XX:+PrintClassHistogram
 .RS 4
-\fI[Control]+[C]\fR٥(\fISIGTERM\fR)˥饹󥹥󥹤ΥҥȥΰͭˤޤǥեȤǤϡΥץ̵Ǥ
+\fI[Control]+[C]\fRイベント(\fISIGTERM\fR)後にクラス・インスタンスのヒストグラムの印刷を有効にします。デフォルトでは、このオプションは無効です。
 .sp
-Υץꤹȡ\fIjmap \-histo\fRޥɡޤ\fIjcmd \fR\fIpid\fR\fI GC\&.class_histogram\fRޥ(\fIpid\fRϸߤJavaץμ̻)¹ԤƱˤʤޤ
+このオプションを設定すると、\fIjmap \-histo\fRコマンド、または\fIjcmd \fR\fIpid\fR\fI GC\&.class_histogram\fRコマンド(\fIpid\fRは現在のJavaプロセスの識別子)を実行する場合と同じになります。
 .RE
 .PP
 \-XX:+PrintConcurrentLocks
 .RS 4
 .sp
-\fI[Control]+[C]\fR٥(\fISIGTERM\fR)\fIjava\&.util\&.concurrent\fRåΰͭˤޤǥեȤǤϡΥץ̵Ǥ
+\fI[Control]+[C]\fRイベント(\fISIGTERM\fR)後に\fIjava\&.util\&.concurrent\fRロックの印刷を有効にします。デフォルトでは、このオプションは無効です。
 .sp
-Υץꤹȡ\fIjstack \-l\fRޥɡޤ\fIjcmd \fR\fIpid\fR\fI Thread\&.print \-l\fRޥ(\fIpid\fRϸߤJavaץμ̻)¹ԤƱˤʤޤ
+このオプションを設定すると、\fIjstack \-l\fRコマンド、または\fIjcmd \fR\fIpid\fR\fI Thread\&.print \-l\fRコマンド(\fIpid\fRは現在のJavaプロセスの識別子)を実行する場合と同じになります。
 .RE
 .PP
 \-XX:+UnlockDiagnosticVMOptions
 .RS 4
-JVMοǤŪȤץ򥢥åޤǥեȤǤϡΥץ̵ǤꡢǥץϻѤǤޤ
+JVMの診断を目的としたオプションをアンロックします。デフォルトでは、このオプションは無効であり、診断オプションは使用できません。
 .RE
-.SS "٤ʥ١쥯󡦥ץ"
+.SS "高度なガベージ・コレクション・オプション"
 .PP
-Υץϡ١쥯(GC)Java HotSpot VMˤäƤɤΤ褦˼¹Ԥ뤫椷ޤ
+これらのオプションは、ガベージ・コレクション(GC)がJava HotSpot VMによってどのように実行されるかを制御します。
 .PP
 \-XX:+AggressiveHeap
 .RS 4
-JavaҡפκŬͭˤޤˤꡢԥ塼ι(RAMCPU)˴Ťơ͡ʥѥ᡼꡼Ƥ椷Ĺּ¹ԥ֤˺Ŭˤʤ褦ꤵޤǥեȤǤϡΥץ̵ǤꡢҡפϺŬޤ
+Javaヒープの最適化を有効にします。これにより、コンピュータの構成(RAMおよびCPU)に基づいて、様々なパラメータが、メモリー割当てが集中した長時間実行ジョブに最適になるように設定されます。デフォルトでは、このオプションは無効であり、ヒープは最適化されません。
 .RE
 .PP
 \-XX:AllocatePrefetchDistance=\fIsize\fR
 .RS 4
-֥ȳƤΥץեåΥΥ(Хñ)ꤷޤ֥Ȥͤǽ񤭹⤦Ȥ꡼ϡǸ˳Ƥ줿֥ȤΥɥ쥹顢εΥޤǥץեåޤJavaåɤˤȼγƥݥȤޤ
+オブジェクト割当てのプリフェッチ距離のサイズ(バイト単位)を設定します。新規オブジェクトの値で書き込もうとするメモリーは、最後に割り当てられたオブジェクトのアドレスから、この距離までプリフェッチされます。各Javaスレッドには独自の割当てポイントがあります。
 .sp
-ͤϡץեåΥϥץåȥե˴Ť򤵤뤳Ȥ򼨤ޤͤϡץեåХȿǤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤ\-1ꤵƤޤ
+負の値は、プリフェッチ距離はプラットフォームに基づいて選択されることを示します。正の値は、プリフェッチするバイト数です。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は\-1に設定されています。
 .sp
-ǤϡץեåΥ1024ХȤꤹˡ򼨤ޤ
+次の例では、プリフェッチ距離を1024バイトに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1727,9 +1727,9 @@
 .PP
 \-XX:AllocatePrefetchLines=\fIlines\fR
 .RS 4
-ѥ뤵줿ɤץեå̿ѤơǸΥ֥ȳƸ˥ɤ륭åԿꤷޤǸ˳Ƥ줿֥Ȥ󥹥󥹤ξϡǥեͤ1ˤʤꡢξ3ˤʤޤ
+コンパイルされたコードで生成されるプリフェッチ命令を使用して、最後のオブジェクト割当て後にロードするキャッシュ行数を設定します。最後に割り当てられたオブジェクトがインスタンスの場合は、デフォルト値は1になり、配列の場合は3になります。
 .sp
-Ǥϡɤ륭åԿ5ꤹˡ򼨤ޤ
+次の例では、ロードされるキャッシュ行数を5に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1744,42 +1744,42 @@
 .PP
 \-XX:AllocatePrefetchStyle=\fIstyle\fR
 .RS 4
-ץեå̿륳ɡꤷޤ\fIstyle\fRϡ03ޤǤǤ
+プリフェッチ命令に生成されるコード・スタイルを設定します。\fIstyle\fR引数は、0から3までの整数です。
 .PP
 0
 .RS 4
-ץեå̿ޤ
+プリフェッチ命令を生成しません。
 .RE
 .PP
 1
 .RS 4
-ƳƤθǡץեå̿¹ԤޤϥǥեȤΥѥ᡼Ǥ
+各割当ての後で、プリフェッチ命令を実行します。これはデフォルトのパラメータです。
 .RE
 .PP
 2
 .RS 4
-åɡʳƥ֥å(TLAB)ޡݥ󥿤Ѥơץեå̿¹Ԥ륿ߥ󥰤ꤷޤ
+スレッド・ローカルな割当てブロック(TLAB)ウォーターマーク・ポインタを使用して、プリフェッチ命令を実行するタイミングを決定します。
 .RE
 .PP
 3
 .RS 4
-ƥץեåѤSPARCBIS̿Ѥޤ
+割当てプリフェッチ用のSPARCでBIS命令を使用します。
 .RE
 .RE
 .PP
 \-XX:+AlwaysPreTouch
 .RS 4
-JVMνJavaҡ׾Τ٤ƤΥڡΥåͭˤޤˤꡢ\fImain()\fR᥽åɤˡ٤ƤΥڡ꡼˼ޤΥץϡʪ꡼˥ޥåפ줿٤Ƥβۥ꡼ޤĹּ¹ԤΥƥ򥷥ߥ졼ȤƥȤǻѤǤޤǥեȤǤϡΥץ̵ˤʤäƤꡢJVMҡΰ褬äѤˤʤȡ٤ƤΥڡߥåȤޤ
+JVMの初期化中にJavaヒープ上のすべてのページのタッチを有効にします。これにより、\fImain()\fRメソッドの入力前に、すべてのページがメモリーに取得されます。このオプションは、物理メモリーにマップされたすべての仮想メモリーを含む長時間実行のシステムをシミュレートするテストで使用できます。デフォルトでは、このオプションは無効になっており、JVMヒープ領域がいっぱいになると、すべてのページがコミットされます。
 .RE
 .PP
 \-XX:+CMSClassUnloadingEnabled
 .RS 4
-¹ԥޡ(CMS)١쥯Ѥˡɤ륯饹ͭˤޤΥץϥǥեȤͭˤʤäƤޤCMS١쥯Υ饹ɤ̵ˤˤϡ\fI\-XX:\-CMSClassUnloadingEnabled\fRꤷޤ
+並行マークスイープ(CMS)ガベージ・コレクタを使用する場合に、アンロードするクラスを有効にします。このオプションはデフォルトで有効になっています。CMSガベージ・コレクタのクラス・アンロードを無効にするには、\fI\-XX:\-CMSClassUnloadingEnabled\fRを指定します。
 .RE
 .PP
 \-XX:CMSExpAvgFactor=\fIpercent\fR
 .RS 4
-¹ԥ쥯פλؿʿѤ׻ݤˡߤΥץŤդ뤿˻Ѥ֤γ(0100ޤ)ꤷޤǥեȤǤϡؿʿѷ25%ꤵƤޤǤϡ15%ꤹˡ򼨤ޤ
+並行コレクション統計の指数平均を計算する際に、現在のサンプルを重み付けするために使用される時間の割合(0から100まで)を設定します。デフォルトでは、指数平均係数は25%に設定されています。次の例では、係数を15%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1794,9 +1794,9 @@
 .PP
 \-XX:CMSIncrementalDutyCycle=\fIpercent\fR
 .RS 4
-¹ԥ쥯μ¹ԤĤƤޥʡ쥯֤λ֤γ(0100ޤ)ꤷޤ\fI\-XX:+CMSIncrementalPacing\fRͭʾ硢ǥ塼ƥ뤬ưŪꤵ졢ΥץϽͤΤߤꤷޤ
+並行コレクタの実行が許可されているマイナー・コレクション間の時間の割合(0から100まで)を設定します。\fI\-XX:+CMSIncrementalPacing\fRが有効な場合、デューティ・サイクルが自動的に設定され、このオプションは初期値のみを設定します。
 .sp
-ǥեȤǤϡǥ塼ƥ10%ꤵƤޤǤϡǥ塼ƥ20%ꤹˡ򼨤ޤ
+デフォルトでは、デューティ・サイクルは10%に設定されています。次の例では、デューティ・サイクルを20%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1811,7 +1811,7 @@
 .PP
 \-XX:CMSIncrementalDutyCycleMin=\fIpercent\fR
 .RS 4
-\fI\-XX:+CMSIncrementalPacing\fRͭʾ˥ǥ塼ƥβ¤Ǥޥʡ쥯֤λ֤γ(0100ޤ)ꤷޤǥեȤǤϡǥ塼ƥβ¤0%ꤵƤޤǤϡ¤10%ꤹˡ򼨤ޤ
+\fI\-XX:+CMSIncrementalPacing\fRが有効な場合にデューティ・サイクルの下限であるマイナー・コレクション間の時間の割合(0から100まで)を設定します。デフォルトでは、デューティ・サイクルの下限は0%に設定されています。次の例では、下限を10%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1826,12 +1826,12 @@
 .PP
 \-XX:+CMSIncrementalMode
 .RS 4
-CMS쥯ʬ⡼ɤͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ2İʲGCåɤĹˤΤͭˤɬפޤ\fICMSIncremental\fRǻϤޤ뤹٤ƤΥץϡΥץͭʾΤߡŬѤޤ
+CMSコレクタの増分モードを有効にします。このオプションはデフォルトで無効になっており、2つ以下のGCスレッドを持つ構成にのみ有効にする必要があります。\fICMSIncremental\fRで始まるすべてのオプションは、このオプションが有効な場合のみ、適用されます。
 .RE
 .PP
 \-XX:CMSIncrementalOffset=\fIpercent\fR
 .RS 4
-ʬ⡼ɤΥǥ塼ƥޥʡ쥯֤Ǵ˱˰ư֤γ(0100ޤ)ꤷޤǥեȤǤϡեåȤ0%ꤵƤޤǤϡǥ塼ƥΥեåȤ25%ꤹˡ򼨤ޤ
+増分モードのデューティ・サイクルをマイナー・コレクション間で期間内に右に移動する時間の割合(0から100まで)を設定します。デフォルトでは、オフセットは0%に設定されています。次の例では、デューティ・サイクルのオフセットを25%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1846,12 +1846,12 @@
 .PP
 \-XX:+CMSIncrementalPacing
 .RS 4
-JVMμ¹˼줿פ˴Ťơʬ⡼ɤΥǥ塼ƥμưĴͭˤޤΥץϥǥեȤͭˤʤäƤޤʬ⡼ɡǥ塼ƥμưĴ̵ˤˤϡ\fI\-XX:\-CMSIncrementalPacing\fRꤷޤ
+JVMの実行中に収集された統計に基づいて、増分モードのデューティ・サイクルの自動調整を有効にします。このオプションはデフォルトで有効になっています。増分モード・デューティ・サイクルの自動調整を無効にするには、\fI\-XX:\-CMSIncrementalPacing\fRを指定します。
 .RE
 .PP
 \-XX:CMSIncrementalSafetyFactor=\fIpercent\fR
 .RS 4
-ǥ塼ƥ׻ݤˡݼɲä뤿˻Ѥ֤γ(0100ޤ)ꤷޤǥեȤǤϡ10%ꤵƤޤǤϡ5%ꤹˡ򼨤ޤ
+デューティ・サイクルを計算する際に、保守を追加するために使用される時間の割合(0から100まで)を設定します。デフォルトでは、安全係数は10%に設定されています。次の例では、安全係数を5%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1866,9 +1866,9 @@
 .PP
 \-XX:CMSInitiatingOccupancyFraction=\fIpercent\fR
 .RS 4
-CMS򳫻ϤŤͭΨ(0100ޤ)ꤷޤǥեͤ\-1ꤵƤޤ(ǥեȤޤ)ϡ\fI\-XX:CMSTriggerRatio\fRͭΨͤ뤿˻Ѥ뤳Ȥ̣ޤ
+CMS収集サイクルを開始する古い世代の占有率(0から100まで)を設定します。デフォルト値は\-1に設定されています。負の値(デフォルトを含む)は、\fI\-XX:CMSTriggerRatio\fRが開始占有率の値を定義するために使用されることを意味します。
 .sp
-ǤϡͭΨ20%ꤹˡ򼨤ޤ
+次の例では、占有率を20%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1883,14 +1883,14 @@
 .PP
 \-XX:+CMSScavengeBeforeRemark
 .RS 4
-CMSȡƥåפ˥٥󥸤λԤͭˤޤǥեȤǤϡΥץ̵Ǥ
+CMSコメント・ステップの前にスカベンジの試行を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:CMSTriggerRatio=\fIpercent\fR
 .RS 4
-CMS뤬Ϥ˳Ƥ\fI\-XX:MinHeapFreeRatio\fRˤäƻꤵͤγ(0100ޤ)ꤷޤǥեͤ80%ꤵƤޤ
+CMS収集サイクルが開始する前に割り当てられる\fI\-XX:MinHeapFreeRatio\fRによって指定される値の割合(0から100まで)を設定します。デフォルト値は80%に設定されています。
 .sp
-ǤϡͭΨ75%ꤹˡ򼨤ޤ
+次の例では、占有率を75%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1905,9 +1905,9 @@
 .PP
 \-XX:ConcGCThreads=\fIthreads\fR
 .RS 4
-¹GC˻Ѥ륹åɤοꤷޤǥեͤϡJVM˻ѤǤCPUοˤäưۤʤޤ
+並行GCに使用されるスレッドの数を設定します。デフォルト値は、JVMに使用できるCPUの数によって異なります。
 .sp
-ȤС¹GCΥåɿ2ꤹˤϡΥץꤷޤ
+たとえば、並行GCのスレッド数を2に設定するには、次のオプションを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -1922,24 +1922,24 @@
 .PP
 \-XX:+DisableExplicitGC
 .RS 4
-\fISystem\&.gc()\fRθƽФν̵ˤ륪ץͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ\fISystem\&.gc()\fRؤθƽФ뤳Ȥ̣ޤ\fISystem\&.gc()\fRθƽФν̵ˤʤäƤ硢JVMɬפ˱GC¹Ԥޤ
+\fISystem\&.gc()\fRの呼出しの処理を無効にするオプションを有効にします。このオプションはデフォルトで無効になっており、これは\fISystem\&.gc()\fRへの呼出しが処理されることを意味します。\fISystem\&.gc()\fRの呼出しの処理が無効になっている場合、JVMは必要に応じてGCを実行します。
 .RE
 .PP
 \-XX:+ExplicitGCInvokesConcurrent
 .RS 4
-\fISystem\&.gc()\fRꥯȤѤ뤳Ȥˤäơ¹GCθƽФͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ\fI\-XX:+UseConcMarkSweepGC\fRץȤȤ˻ѤΤߡͭˤ뤳ȤǤޤ
+\fISystem\&.gc()\fRリクエストを使用することによって、並行GCの呼出しを有効にします。このオプションはデフォルトで無効になっており、\fI\-XX:+UseConcMarkSweepGC\fRオプションとともに使用する場合のみ、有効にすることができます。
 .RE
 .PP
 \-XX:+ExplicitGCInvokesConcurrentAndUnloadsClasses
 .RS 4
-\fISystem\&.gc()\fRꥯȤѤ¹GC˥饹򥢥ɤ뤳Ȥˤäơ¹GCθƽФͭˤޤΥץϥǥեȤ̵ˤʤäƤꡢ\fI\-XX:+UseConcMarkSweepGC\fRץȤȤ˻ѤΤߡͭˤ뤳ȤǤޤ
+\fISystem\&.gc()\fRリクエストを使用し、並行GCサイクル中にクラスをアンロードすることによって、並行GCの呼出しを有効にします。このオプションはデフォルトで無効になっており、\fI\-XX:+UseConcMarkSweepGC\fRオプションとともに使用する場合のみ、有効にすることができます。
 .RE
 .PP
 \-XX:G1HeapRegionSize=\fIsize\fR
 .RS 4
-١ե(G1)쥯ѤݤJavaҡפʬ꡼Υꤷޤͤˤϡ1MB32MBޤǤǤޤǥեȤΥ꡼󡦥ϡҡס˴ŤƿʹֹŪ˷ꤵޤ
+ガベージファースト(G1)コレクタを使用する際にJavaヒープを細分化するリージョンのサイズを設定します。値には、1MBから32MBまでを指定できます。デフォルトのリージョン・サイズは、ヒープ・サイズに基づいて人間工学的に決定されます。
 .sp
-Ǥϡʬ줿16MBꤹˡ򼨤ޤ
+次の例では、細分化されたサイズを16MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1954,14 +1954,14 @@
 .PP
 \-XX:+G1PrintHeapRegions
 .RS 4
-Ƥ줿꡼󤪤G1쥯ˤäƺ׵ᤵ줿Τ˴ؤΰͭˤޤǥեȤǤϡΥץ̵Ǥ
+割り当てられたリージョンおよびG1コレクタによって再要求されたものに関する情報の印刷を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:G1ReservePercent=\fIpercent\fR
 .RS 4
-G1쥯ξʤԤǽ򸺤餹falseξ¤Ȥͽ󤵤줿ҡפγ(050ޤ)ꤷޤǥեȤǤϡΥץ10%ꤵƤޤ
+G1コレクタの昇格が失敗する可能性を減らすためのfalseの上限として予約されたヒープの割合(0から50まで)を設定します。デフォルトでは、このオプションは10%に設定されています。
 .sp
-Ǥϡͽ󤵤줿ҡפ20%ꤹˡ򼨤ޤ
+次の例では、予約されたヒープを20%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1976,9 +1976,9 @@
 .PP
 \-XX:InitialHeapSize=\fIsize\fR
 .RS 4
-꡼ƥסν(Хñ)ꤷޤꤹͤϡ0ޤ1MB礭1024ܿΤ줫ˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϡ¹Ի˥ƥ๽˴Ť򤵤ޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlˤ륬١쥯르Υߥå򻲾ȤƤ
+メモリー割当てプールの初期サイズ(バイト単位)を設定します。指定する値は、0、または1MBより大きい1024の倍数のいずれかにする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は、実行時にシステム構成に基づいて選択されます。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlにあるガベージ・コレクタ・エルゴノミックを参照してください。
 .sp
-ǤϡƤ줿꡼Υ͡ñ̤Ѥ6MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーのサイズを様々な単位を使用して6MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1991,14 +1991,14 @@
 .if n \{\
 .RE
 .\}
-Υץ0ꤷ硢ϡŤȼ㤤˳Ƥ줿ιפȤꤵޤ㤤ΥҡפΥϡ\fI\-XX:NewSize\fRץѤǤޤ
+このオプションを0に設定した場合、初期サイズは、古い世代と若い世代に割り当てられたサイズの合計として設定されます。若い世代のヒープのサイズは、\fI\-XX:NewSize\fRオプションを使用して設定できます。
 .RE
 .PP
 \-XX:InitialSurvivorRatio=\fIratio\fR
 .RS 4
-롼ץåȡ١쥯Ѥ륵Хΰνꤷޤ(\fI\-XX:+UseParallelGC\fR/ޤ\fI\-XX:+UseParallelOldGC\fRץˤäͭˤʤޤ)\fI\-XX:+UseParallelGC\fRץ󤪤\fI\-XX:+UseParallelOldGC\fRץѤ뤳Ȥˤäơ롼ץåȡ١쥯ŬǥեȤͭˤޤͤϤơץꥱư˽äơХΰ褬ѹޤ(\fI\-XX:\-UseAdaptiveSizePolicy\fRץѤ)Ŭ̵ˤ硢\fI\-XX:SurvivorRatio\fRץѤơץꥱμ¹ΤΥХΰΥꤹɬפޤ
+スループット・ガベージ・コレクタが使用するサバイバ領域の初期比を設定します(\fI\-XX:+UseParallelGC\fRおよび/または\fI\-XX:+UseParallelOldGC\fRオプションによって有効になります)。\fI\-XX:+UseParallelGC\fRオプションおよび\fI\-XX:+UseParallelOldGC\fRオプションを使用することによって、スループット・ガベージ・コレクタで適応サイズ指定をデフォルトで有効にします。初期値から始めて、アプリケーションの動作に従って、サバイバ領域がサイズ変更されます。(\fI\-XX:\-UseAdaptiveSizePolicy\fRオプションを使用して)適応サイズ指定を無効にした場合、\fI\-XX:SurvivorRatio\fRオプションを使用して、アプリケーションの実行全体のサバイバ領域のサイズを設定する必要があります。
 .sp
-μѤơ㤤Υ(Y)ӥХΰν(R)˴ŤơХΰν(S)׻Ǥޤ
+次の式を使用して、若い世代のサイズ(Y)およびサバイバ領域の初期比(R)に基づいて、サバイバ領域の初期サイズ(S)を計算できます。
 .sp
 .if n \{\
 .RS 4
@@ -2009,11 +2009,11 @@
 .if n \{\
 .RE
 .\}
-2ϡ2ĤΥХΰ򼨤ޤХΰν˻ꤹͤ礭ȡХΰνϾʤޤ
+等式内の2は、2つのサバイバ領域を示します。サバイバ領域の初期比に指定する値を大きくすると、サバイバ領域の初期サイズは小さくなります。
 .sp
-ǥեȤǤϡХΰν8ꤵƤޤ㤤ΰ襵Υǥե(2MB)Ѥ硢Хΰν0\&.2MBˤʤޤ
+デフォルトでは、サバイバ領域の初期比は8に設定されています。若い世代の領域サイズのデフォルト値(2MB)を使用した場合、サバイバ領域の初期サイズは0\&.2MBになります。
 .sp
-ǤϡХΰν4ꤹˡ򼨤ޤ
+次の例では、サバイバ領域の初期比を4に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2028,9 +2028,9 @@
 .PP
 \-XX:InitiatingHeapOccupancyPercent=\fIpercent\fR
 .RS 4
-¹GC򳫻ϤҡͭΨ(0100ޤ)ꤷޤϡ1ĤΤ(ȤG1١쥯ʤ)ǤϤʤҡΤͭ˴Ť¹GCȥꥬ륬١쥯ˤäƻѤޤ
+並行GCサイクルを開始するヒープ占有率(0から100まで)を設定します。これは、1つの世代のみ(たとえばG1ガベージ・コレクタなど)ではなく、ヒープ全体の占有に基づいて並行GCサイクルをトリガーするガベージ・コレクタによって使用されます。
 .sp
-ǥեȤǤϡͤ45%ꤵƤޤ0ϡGC뤬ߤʤȤ̣ޤǤϡϥҡͭΨ75%ꤹˡ򼨤ޤ
+デフォルトでは、開始値は45%に設定されています。値0は、GCサイクルが停止しないことを意味します。次の例では、開始ヒープ占有率を75%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2045,9 +2045,9 @@
 .PP
 \-XX:MaxGCPauseMillis=\fItime\fR
 .RS 4
-GCٻ߻(ߥñ)ΥåȤꤷޤϥեȡΤᡢJVMϼ¸Τ˺Ϥ򤷤ޤǥեȤǤϡٻ߻֤κͤϤޤ
+最大GC休止時間(ミリ秒単位)のターゲットを設定します。これはソフト・ゴールのため、JVMは実現のために最善の努力をします。デフォルトでは、休止時間の最大値はありません。
 .sp
-Ǥϡ祿åȵٻ߻֤500ߥäꤹˡ򼨤ޤ
+次の例では、最大ターゲット休止時間を500ミリ秒に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2062,9 +2062,9 @@
 .PP
 \-XX:MaxHeapSize=\fIsize\fR
 .RS 4
-꡼ƥסκ祵(Хñ)ꤷޤꤹͤϡ2MB礭1024ܿˤɬפޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤǥեͤϡ¹Ի˥ƥ๽˴Ť򤵤ޤСǥץȤǤϡ\fI\-XX:InitialHeapSize\fR\fI\-XX:MaxHeapSize\fR̾Ʊͤꤵޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlˤ륬١쥯르Υߥå򻲾ȤƤ
+メモリー割当てプールの最大サイズ(バイト単位)を設定します。指定する値は、2MBより大きい1024の倍数にする必要があります。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。デフォルト値は、実行時にシステム構成に基づいて選択されます。サーバー・デプロイメントでは、\fI\-XX:InitialHeapSize\fRおよび\fI\-XX:MaxHeapSize\fRは通常同じ値に設定されます。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc\-ergonomics\&.htmlにあるガベージ・コレクタ・エルゴノミックを参照してください。
 .sp
-ǤϡƤ줿꡼εĤ祵͡ñ̤Ѥ80MBꤹˡ򼨤ޤ
+次の例では、割り当てられたメモリーの許可される最大サイズを様々な単位を使用して80MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2077,16 +2077,16 @@
 .if n \{\
 .RE
 .\}
-Oracle Solaris 7Oracle Solaris 8 SPARCץåȥեξΤͤξ¤ϡ褽4,000MB饪Сإåɤ̤ΤǤOracle Solaris 2\&.6x86ץåȥեξξ¤ϡ褽2,000MB饪Сإåɤ̤ΤǤLinuxץåȥեξξ¤ϡ褽2,000MB饪Сإåɤ̤ΤǤ
+Oracle Solaris 7およびOracle Solaris 8 SPARCプラットフォームの場合のこの値の上限は、およそ4,000MBからオーバーヘッドの量を引いたものです。Oracle Solaris 2\&.6およびx86プラットフォームの場合の上限は、およそ2,000MBからオーバーヘッドの量を引いたものです。Linuxプラットフォームの場合の上限は、およそ2,000MBからオーバーヘッドの量を引いたものです。
 .sp
-\fI\-XX:MaxHeapSize\fRץ\fI\-Xmx\fRƱǤ
+\fI\-XX:MaxHeapSize\fRオプションは\fI\-Xmx\fRと同等です。
 .RE
 .PP
 \-XX:MaxHeapFreeRatio=\fIpercent\fR
 .RS 4
-GC٥ȸζҡΰεĤƤγ(0100ޤ)ꤷޤҡΰ褬ͤĶƳ礷硢ΥҡפϽ̾ޤǥեȤǤϡͤ70%ꤵƤޤ
+GCイベント後の空きヒープ領域の許可されている最大の割合(0から100まで)を設定します。空きヒープ領域がこの値を超えて拡大した場合、そのヒープは縮小します。デフォルトでは、この値は70%に設定されています。
 .sp
-ǤϡҡפκΨ75%ꤹˡ򼨤ޤ
+次の例では、空きヒープの最大比率を75%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2101,9 +2101,9 @@
 .PP
 \-XX:MaxMetaspaceSize=\fIsize\fR
 .RS 4
-饹᥿ǡ˳Ƥ뤳ȤǤͥƥ֡꡼κ̤ꤷޤǥեȤǤϡΥ¤Ƥޤ󡣥ץꥱΥ᥿ǡ̤ϡץꥱΡ¾μ¹楢ץꥱ󡢤ӥƥǻѲǽʥ꡼̤ˤäưۤʤޤ
+クラス・メタデータに割り当てることができるネイティブ・メモリーの最大量を設定します。デフォルトでは、このサイズは制限されていません。アプリケーションのメタデータの量は、アプリケーション自体、他の実行中アプリケーション、およびシステムで使用可能なメモリーの量によって異なります。
 .sp
-Ǥϡ饹᥿ǡκ祵256MBꤹˡ򼨤ޤ
+次の例では、クラス・メタデータの最大サイズを256MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2118,14 +2118,14 @@
 .PP
 \-XX:MaxNewSize=\fIsize\fR
 .RS 4
-㤤(ʡ)Υҡפκ祵(Хñ)ꤷޤǥեͤϿʹֹŪꤵޤ
+若い世代(ナーサリ)のヒープの最大サイズ(バイト単位)を設定します。デフォルト値は人間工学的に設定されます。
 .RE
 .PP
 \-XX:MaxTenuringThreshold=\fIthreshold\fR
 .RS 4
-ŬGCǻѤƲꤷͤꤷޤͤ15Ǥǥեͤϡѥ(롼ץå)쥯ξ15CMS쥯ξ6Ǥ
+適応GCサイズ指定で使用する最大殿堂入りしきい値を設定します。最大値は15です。デフォルト値は、パラレル(スループット)コレクタの場合は15、CMSコレクタの場合は6です。
 .sp
-ǤϡƲꤷͤ10ꤹˡ򼨤ޤ
+次の例では、最大殿堂入りしきい値を10に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2140,14 +2140,14 @@
 .PP
 \-XX:MetaspaceSize=\fIsize\fR
 .RS 4
-ǽĶȤ˥١쥯ȥꥬ롢Ƥ줿饹᥿ǡΰΥꤷޤΥ١쥯ΤͤϡѤ᥿ǡ̤ˤääޤϸޤǥեȤΥϥץåȥեˤäưۤʤޤ
+最初に超えたときにガベージ・コレクションをトリガーする、割り当てられたクラス・メタデータ領域のサイズを設定します。このガベージ・コレクションのしきい値は、使用されるメタデータの量によって増加または減少します。デフォルトのサイズはプラットフォームによって異なります。
 .RE
 .PP
 \-XX:MinHeapFreeRatio=\fIpercent\fR
 .RS 4
-GC٥ȸζҡΰεĤƤǾγ(0100ޤ)ꤷޤҡΰ褬ͤ򲼲ä硢Υҡפϳ礷ޤǥեȤǤϡͤ40%ꤵƤޤ
+GCイベント後の空きヒープ領域の許可されている最小の割合(0から100まで)を設定します。空きヒープ領域がこの値を下回った場合、そのヒープは拡大します。デフォルトでは、この値は40%に設定されています。
 .sp
-ǤϡҡפκǾΨ25%ꤹˡ򼨤ޤ
+次の例では、空きヒープの最小比率を25%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2162,7 +2162,7 @@
 .PP
 \-XX:NewRatio=\fIratio\fR
 .RS 4
-㤤ΥȸŤΥȤΨꤷޤǥեȤǤϡΥץ2ꤵƤޤǤϡ㤤/ŤΨ1ꤹˡ򼨤ޤ
+若い世代のサイズと古い世代のサイズとの比率を設定します。デフォルトでは、このオプションは2に設定されています。次の例では、若い/古いの比率を1に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2177,11 +2177,11 @@
 .PP
 \-XX:NewSize=\fIsize\fR
 .RS 4
-㤤(ʡ)Υҡפν(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤ
+若い世代(ナーサリ)のヒープの初期サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。
 .sp
-ҡפμ㤤꡼Ͽ֥Ȥ˻ѤޤGCϡ¾Υ꡼ꤳΥ꡼ǡˤ˼¹Ԥޤ㤤Υ硢¿ΥޥʡGC¹Ԥޤ礭硢եGCΤߤ¹ԤޤλޤǤ˻֤뤳Ȥޤ㤤ΥϡΤΥҡסȾʬ4ʬ1δ֤ˤƤȤᤷޤ
+ヒープの若い世代リージョンは新しいオブジェクトに使用されます。GCは、他のリージョンよりこのリージョンで、より頻繁に実行されます。若い世代のサイズが小さすぎる場合、多数のマイナーGCが実行されます。サイズが大きすぎる場合、フルGCのみが実行されますが、完了までに時間がかかることがあります。若い世代のサイズは、全体のヒープ・サイズの半分から4分の1の間にしておくことをお薦めします。
 .sp
-Ǥϡ㤤ν͡ñ̤Ѥ256MBꤹˡ򼨤ޤ
+次の例では、若い世代の初期サイズを様々な単位を使用して256MBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2194,14 +2194,14 @@
 .if n \{\
 .RE
 .\}
-\fI\-XX:NewSize\fRץ\fI\-Xmn\fRƱǤ
+\fI\-XX:NewSize\fRオプションは\fI\-Xmn\fRと同等です。
 .RE
 .PP
 \-XX:ParallelGCThreads=\fIthreads\fR
 .RS 4
-㤤ȸŤǥѥ롦١쥯˻Ѥ륹åɤοꤷޤǥեͤϡJVM˻ѤǤCPUοˤäưۤʤޤ
+若い世代と古い世代でパラレル・ガベージ・コレクションに使用するスレッドの数を設定します。デフォルト値は、JVMに使用できるCPUの数によって異なります。
 .sp
-ȤСѥGCΥåɿ2ꤹˤϡΥץꤷޤ
+たとえば、パラレルGCのスレッド数を2に設定するには、次のオプションを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -2216,52 +2216,52 @@
 .PP
 \-XX:+ParallelRefProcEnabled
 .RS 4
-ѥ뻲ȽͭˤޤǥեȤǤϡΥץ̵Ǥ
+パラレル参照処理を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintAdaptiveSizePolicy
 .RS 4
-Ŭ奵˴ؤνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+適応世代サイズ指定に関する情報の出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGC
 .RS 4
-GCȤΥåνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとのメッセージの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCApplicationConcurrentTime
 .RS 4
-Ǹεٻ(ȤGCٻߤʤ)ʹߤ˷вᤷ֤νϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+最後の休止(たとえばGC休止など)以降に経過した時間の出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCApplicationStoppedTime
 .RS 4
-ٻ(ȤGCٻߤʤ)³֤νϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+休止(たとえばGC休止など)が継続した時間の出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX+PrintGCDateStamp
 .RS 4
-GCȤեפνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとの日付スタンプの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCDetails
 .RS 4
-GCȤξܺ٥åνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとの詳細メッセージの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCTaskTimeStamps
 .RS 4
-ġGCåɡȤΥॹפνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+個々のGCワーカー・スレッド・タスクごとのタイムスタンプの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintGCTimeStamp
 .RS 4
-GCȤΥॹפνϤͭˤޤǥեȤǤϡΥץ̵Ǥ
+GCごとのタイムスタンプの出力を有効にします。デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+PrintTenuringDistribution
 .RS 4
-Ʋ־νϤͭˤޤˡϤ򼨤ޤ
+殿堂入り期間情報の出力を有効にします。次に、出力の例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2276,23 +2276,23 @@
 .if n \{\
 .RE
 .\}
-1֥ȤϡǤ㤤ХФǤ(Υ٥󥸤θ˺졢ǿΥ٥󥸤¸³Edenΰ褫饵Хΰ˰ưޤ)2֥Ȥϡ2ĤΥ٥󥸤¸³ޤ(2ܤΥ٥ˡ륵Хΰ褫鼡ΰ˥ԡޤ)Τ褦³ޤ
+期間1オブジェクトは、最も若いサバイバです(前のスカベンジの後に作成され、最新のスカベンジで存続し、Eden領域からサバイバ領域に移動しました)。期間2オブジェクトは、2つのスカベンジで存続します(2番目のスカベンジ中に、あるサバイバ領域から次の領域にコピーされました)。このように続きます。
 .sp
-ҤǤϡ28,992,024ХȤ1ĤΥ٥󥸤¸³Edenΰ褫饵Хΰ˥ԡޤ1,366,864ХȤϴ2֥ȤʤɤˤͭƤޤƹԤ3ܤͤϡnʲΥ֥ȤѥǤ
+前述の例では、28,992,024バイトが1つのスカベンジで存続し、Eden領域からサバイバ領域にコピーされました。1,366,864バイトは期間2オブジェクトなどにより占有されています。各行の3番目の値は、期間n以下のオブジェクトの累積サイズです。
 .sp
-ǥեȤǤϡΥץ̵Ǥ
+デフォルトでは、このオプションは無効です。
 .RE
 .PP
 \-XX:+ScavengeBeforeFullGC
 .RS 4
-줾ΥեGC˼㤤GCͭˤޤΥץϥǥեȤͭˤʤäƤޤեGC˼㤤Υ٥󥸤ԤȡŤΰ褫㤤ΰؤΥǽʥ֥Ȥο򸺤餹ȤǤ뤿ᡢ̵\fIʤ\fRȤᤷޤƥեGC˼㤤GC̵ˤˤϡ\fI\-XX:\-ScavengeBeforeFullGC\fRꤷޤ
+それぞれのフルGCの前に若い世代のGCを有効にします。このオプションはデフォルトで有効になっています。フルGCの前に若い世代のスカベンジを行うと、古い世代領域から若い世代領域へのアクセスが可能なオブジェクトの数を減らすことができるため、これを無効に\fIしない\fRことをお薦めします。各フルGCの前に若い世代のGCを無効にするには、\fI\-XX:\-ScavengeBeforeFullGC\fRを指定します。
 .RE
 .PP
 \-XX:SoftRefLRUPolicyMSPerMB=\fItime\fR
 .RS 4
-եȡǽʥ֥ȤǸ˻ȤƤҡ׾ǥƥ֤ʤޤޤˤʤäƤ(ߥñ)ꤷޤǥեͤϡҡζᥬХ1丳֤Ǥ\fI\-XX:SoftRefLRUPolicyMSPerMB\fRץϡߤΥҡס(Java HotSpot Client VM)ޤϺǽҡס(Java HotSpot Server VM)1ᥬХΥߥäɽͤޤΰ㤤ϡClient VMϡҡפ礭ΤǤϤʤեȻȤեå夹뷹ΤФServer VMϡեȻȤեå夹ΤǤϤʤҡפ礭뷹뤳Ȥ̣ޤԤξ硢\fI\-Xmx\fRץͤϡեȻȤɤΤ餤®˥١쥯󤵤뤫˽פʱƶڤܤޤ
+ソフト・アクセスが可能なオブジェクトが最後に参照されてからヒープ上でアクティブなままになっている時間(ミリ秒単位)を設定します。デフォルト値は、ヒープ内の空きメガバイト当たりで1秒の存続期間です。\fI\-XX:SoftRefLRUPolicyMSPerMB\fRオプションは、現在のヒープ・サイズ(Java HotSpot Client VM用)または最大可能ヒープ・サイズ(Java HotSpot Server VM用)の1メガバイト当たりのミリ秒を表す整数値を受け入れます。この違いは、Client VMは、ヒープを大きくするのではなく、ソフト参照をフラッシュする傾向があるのに対し、Server VMは、ソフト参照をフラッシュするのではなく、ヒープを大きくする傾向があることを意味します。後者の場合、\fI\-Xmx\fRオプションの値は、ソフト参照がどのくらい迅速にガベージ・コレクションされるかに重要な影響を及ぼします。
 .sp
-Ǥϡͤ2\&.5äꤹˡ򼨤ޤ
+次の例では、値を2\&.5秒に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2307,7 +2307,7 @@
 .PP
 \-XX:SurvivorRatio=\fIratio\fR
 .RS 4
-EdenΰΥȥХΰΥȤΨꤷޤǥեȤǤϡΥץ8ꤵƤޤǤϡEden/ХΰΨ4ꤹˡ򼨤ޤ
+Eden領域のサイズとサバイバ領域のサイズとの比率を設定します。デフォルトでは、このオプションは8に設定されています。次の例では、Eden/サバイバ領域の比率を4に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2322,9 +2322,9 @@
 .PP
 \-XX:TargetSurvivorRatio=\fIpercent\fR
 .RS 4
-㤤١쥯θ˻Ѥ륵ХΰŪγ(0100ޤ)ꤷޤǥեȤǤϡΥץ50%ꤵƤޤ
+若いガベージ・コレクションの後に使用されるサバイバ領域の目的の割合(0から100まで)を設定します。デフォルトでは、このオプションは50%に設定されています。
 .sp
-ǤϡåȤΥХΰΨ30%ꤹˡ򼨤ޤ
+次の例では、ターゲットのサバイバ領域の比率を30%に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2339,9 +2339,9 @@
 .PP
 \-XX:TLABSize=\fIsize\fR
 .RS 4
-åɡʳƥХåե(TLAB)ν(Хñ)ꤷޤХȤ򼨤ʸ\fIk\fRޤ\fIK\fRᥬХȤ򼨤ʸ\fIm\fRޤ\fIM\fRХȤ򼨤ʸ\fIg\fRޤ\fIG\fRɲäޤΥץ0ꤵƤ硢JVMǤϽưŪ򤵤ޤ
+スレッド・ローカルな割当てバッファ(TLAB)の初期サイズ(バイト単位)を設定します。キロバイトを示す場合は文字\fIk\fRまたは\fIK\fR、メガバイトを示す場合は文字\fIm\fRまたは\fIM\fR、ギガバイトを示す場合は文字\fIg\fRまたは\fIG\fRを追加します。このオプションが0に設定されている場合、JVMでは初期サイズが自動的に選択されます。
 .sp
-ǤϡTLABν512KBꤹˡ򼨤ޤ
+次の例では、TLABの初期サイズを512KBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -2356,102 +2356,102 @@
 .PP
 \-XX:+UseAdaptiveSizePolicy
 .RS 4
-Ŭ奵λѤͭˤޤΥץϥǥեȤͭˤʤäƤޤŬ奵̵ˤˤϡ\fI\-XX:\-UseAdaptiveSizePolicy\fRꤷ꡼ƥסΥŪꤷޤ(\fI\-XX:SurvivorRatio\fRץ򻲹ͤˤƤ)
+適応世代サイズ指定の使用を有効にします。このオプションはデフォルトで有効になっています。適応世代サイズ指定を無効にするには、\fI\-XX:\-UseAdaptiveSizePolicy\fRを指定し、メモリー割当てプールのサイズを明示的に設定します(\fI\-XX:SurvivorRatio\fRオプションを参考にしてください)。
 .RE
 .PP
 \-XX:+UseCMSInitiatingOccupancyOnly
 .RS 4
-CMS쥯γϤΤͣδȤƤͭͤλѤͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢ¾δबѤޤ
+CMSコレクタの開始のための唯一の基準としての占有値の使用を有効にします。デフォルトでは、このオプションは無効になっており、他の基準が使用されます。
 .RE
 .PP
 \-XX:+UseConcMarkSweepGC
 .RS 4
-ŤؤCMS١쥯λѤͭˤޤץꥱԵ֤׷򡢥롼ץå(\fI\-XX:+UseParallelGC\fR)١쥯ˤäȤǤʤ硢CMS١쥯Ѥ뤳ȤᤷޤG1١쥯(\fI\-XX:+UseG1GC\fR)̤ؤȤʤޤ
+古い世代へのCMSガベージ・コレクタの使用を有効にします。アプリケーションの待機時間の要件を、スループット(\fI\-XX:+UseParallelGC\fR)ガベージ・コレクタによって満たすことができない場合、CMSガベージ・コレクタを使用することをお薦めします。G1ガベージ・コレクタ(\fI\-XX:+UseG1GC\fR)は別の代替となります。
 .sp
-ǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤΥץͭˤȡ\fI\-XX:+UseParNewGC\fRץ󤬼ưŪꤵޤ
+デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。このオプションを有効にすると、\fI\-XX:+UseParNewGC\fRオプションが自動的に設定されます。
 .RE
 .PP
 \-XX:+UseG1GC
 .RS 4
-G1١쥯λѤͭˤޤϥСΥ١쥯ǡ̤RAMĥޥץåޥоݤȤƤޤ⤤ΨGCٻ߻֤ɸãƱŬڤʥ롼ץåȤݻޤG1쥯ϡGCԵ֤θꤵ줿׷(ꤷͽ¬ǽ0\&.5̤εٻ߻)ġ礭ҡ(6GBʾΥ)ɬפʥץꥱ˿侩ޤ
+G1ガベージ・コレクタの使用を有効にします。これはサーバー形式のガベージ・コレクタで、大量のRAMを持つマルチプロセッサ・マシンを対象としています。高い確率でGC休止時間の目標を達成し、同時に適切なスループットも維持します。G1コレクタは、GC待機時間の限定された要件(安定した予測可能な0\&.5秒未満の休止時間)を持つ、大きいヒープ(約6GB以上のサイズ)が必要なアプリケーションに推奨されます。
 .sp
-ǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤ
+デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。
 .RE
 .PP
 \-XX:+UseGCOverheadLimit
 .RS 4
-\fIOutOfMemoryError\fR㳰ޤǤˡGCJVMˤäפ֤γ¤ݥꥷλѤͭˤޤǥեȤǤϡΥץͭˤʤäƤꡢ١쥯˹׻֤98%¿䤵졢ҡפΥꥫХ꤬2%̤Ǥ硢ѥGCˤä\fIOutOfMemoryError\fRޤҡפ硢εǽϡץꥱĹ֤ۤȤɤޤϤޤäĽʤ¹ԤƤ֤򤹤뤿˻ѤǤޤΥץ̵ˤˤϡ\fI\-XX:\-UseGCOverheadLimit\fRꤷޤ
+\fIOutOfMemoryError\fR例外がスローされるまでに、GCでJVMによって要した時間の割合を制限するポリシーの使用を有効にします。デフォルトでは、このオプションは有効になっており、ガベージ・コレクションに合計時間の98%より多く費やされ、ヒープのリカバリが2%未満である場合、パラレルGCによって\fIOutOfMemoryError\fRがスローされます。ヒープが小さい場合、この機能は、アプリケーションが長期間ほとんどまたはまったく進捗なく実行している状態を回避するために使用できます。このオプションを無効にするには、\fI\-XX:\-UseGCOverheadLimit\fRを指定します。
 .RE
 .PP
 \-XX:+UseNUMA
 .RS 4
-ץꥱûԵ֤Υ꡼λѤä뤳ȤǡԶѰʥ꡼ƥ(NUMA)ѤޥΥץꥱΥѥեޥ󥹺ŬͭˤޤǥեȤǤϡΥץ̵ˤʤäƤꡢNUMAФŬϹԤޤ󡣤Υץϡѥ롦١쥯(\fI\-XX:+UseParallelGC\fR)ѤƤΤ߻ѲǽǤ
+アプリケーションで短い待機時間のメモリーの使用を増加させることで、不均一なメモリー・アーキテクチャ(NUMA)を使用したマシン上のアプリケーションのパフォーマンス最適化を有効にします。デフォルトでは、このオプションは無効になっており、NUMAに対する最適化は行われません。このオプションは、パラレル・ガベージ・コレクタ(\fI\-XX:+UseParallelGC\fR)が使用されている場合のみ使用可能です。
 .RE
 .PP
 \-XX:+UseParallelGC
 .RS 4
-ʣΥץåѤƥץꥱΥѥեޥ󥹤夵롢ѥ롦٥󥸡١쥯(롼ץåȡ쥯ȤƤФ)λѤͭˤޤ
+複数のプロセッサを利用してアプリケーションのパフォーマンスを向上させる、パラレル・スカベンジ・ガベージ・コレクタ(スループット・コレクタとも呼ばれる)の使用を有効にします。
 .sp
-ǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤͭˤ硢Ū̵ˤʤꡢ\fI\-XX:+UseParallelOldGC\fRץ󤬼ưŪͭˤʤޤ
+デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。これを有効にした場合、明示的に無効にしないかぎり、\fI\-XX:+UseParallelOldGC\fRオプションが自動的に有効になります。
 .RE
 .PP
 \-XX:+UseParallelOldGC
 .RS 4
-եGCؤΥѥ롦١쥯λѤͭˤޤǥեȤǤϡΥץ̵Ǥͭˤȡ\fI\-XX:+UseParallelGC\fRץ󤬼ưŪͭˤʤޤ
+フルGCへのパラレル・ガベージ・コレクタの使用を有効にします。デフォルトでは、このオプションは無効です。これを有効にすると、\fI\-XX:+UseParallelGC\fRオプションが自動的に有効になります。
 .RE
 .PP
 \-XX:+UseParNewGC
 .RS 4
-㤤ǤΥ쥯ؤΥѥ롦åɤλѤͭˤޤǥեȤǤϡΥץ̵Ǥ\fI\-XX:+UseConcMarkSweepGC\fRץꤹȡϼưŪͭˤʤޤ
+若い世代でのコレクションへのパラレル・スレッドの使用を有効にします。デフォルトでは、このオプションは無効です。\fI\-XX:+UseConcMarkSweepGC\fRオプションを設定すると、これは自動的に有効になります。
 .RE
 .PP
 \-XX:+UseSerialGC
 .RS 4
-ꥢ롦١쥯λѤͭˤޤ١쥯󤫤̤ʵǽɬפȤʤϤñʥץꥱξˤϡϰ̤˺ŬǤǥեȤǤϡΥץ̵ˤʤäƤꡢ쥯ϡޥιJVMΥפ˴ŤơưŪ򤵤ޤ
+シリアル・ガベージ・コレクタの使用を有効にします。ガベージ・コレクションから特別な機能を必要としない、小規模で単純なアプリケーションの場合には、これは一般に最適な選択です。デフォルトでは、このオプションは無効になっており、コレクタは、マシンの構成およびJVMのタイプに基づいて、自動的に選択されます。
 .RE
 .PP
 \-XX:+UseTLAB
 .RS 4
-㤤ΰǤΥåɡʳƥ֥å(TLAB)λѤͭˤޤΥץϥǥեȤͭˤʤäƤޤTLABλѤ̵ˤˤϡ\fI\-XX:\-UseTLAB\fRꤷޤ
+若い世代の領域でのスレッド・ローカルな割当てブロック(TLAB)の使用を有効にします。このオプションはデフォルトで有効になっています。TLABの使用を無効にするには、\fI\-XX:\-UseTLAB\fRを指定します。
 .RE
-.SS "侩Ǻ줿ץ"
+.SS "非推奨で削除されたオプション"
 .PP
-ΥץϡΥ꡼ˤϴޤޤƤޤʹߤפȤߤʤƤޤ
+これらのオプションは、以前のリリースには含まれていましたが、以降は不要とみなされています。
 .PP
 \-Xrun\fIlibname\fR
 .RS 4
-ꤷǥХå/ץեΥ饤֥ɤޤΥץϡ\fI\-agentlib\fRץ˼äޤ
+指定したデバッグ/プロファイルのライブラリをロードします。このオプションは、\fI\-agentlib\fRオプションに取って代わられました。
 .RE
 .PP
 \-XX:CMSInitiatingPermOccupancyFraction=\fIpercent\fR
 .RS 4
-GC򳫻ϤʵͭΨ(0100ޤ)ꤷޤΥץJDK 8Ǥ侩ǡΤϤޤ
+GCを開始する永久世代占有率(0から100まで)を設定します。このオプションはJDK 8では非推奨で、それに代わるものはありません。
 .RE
 .PP
 \-XX:MaxPermSize=\fIsize\fR
 .RS 4
-ʵΰκ祵(Хñ)ꤷޤΥץϡJDK 8侩ˤʤꡢ\fI\-XX:MaxMetaspaceSize\fRץ˼äޤ
+永久世代領域の最大サイズ(バイト単位)を設定します。このオプションは、JDK 8で非推奨になり、\fI\-XX:MaxMetaspaceSize\fRオプションに取って代わられました。
 .RE
 .PP
 \-XX:PermSize=\fIsize\fR
 .RS 4
-Ķˤϥ١쥯ȥꥬ롢ʵ˳Ƥ줿ΰ(Хñ)ꤷޤΥץϡJDK 8侩ˤʤꡢ\fI\-XX:MetaspaceSize\fRץ˼äޤ
+超えた場合にはガベージ・コレクションをトリガーする、永久世代に割り当てられた領域(バイト単位)を設定します。このオプションは、JDK 8で非推奨になり、\fI\-XX:MetaspaceSize\fRオプションに取って代わられました。
 .RE
 .PP
 \-XX:+UseSplitVerifier
 .RS 4
-ڥץʬͭˤޤǥեȤǤϡΥץϰΥ꡼ǤͭˤʤäƤꡢڤϡ׻(ѥˤäƼ¹)ȡסå(JVM󥿥ˤäƼ¹)2ĤΥեʬ䤵ƤޤΥץJDK 8侩ȤʤꡢڤϥǥեȤʬ䤵졢̵ˤˡϤޤ
+検証プロセスの分割を有効にします。デフォルトでは、このオプションは以前のリリースでは有効になっており、検証は、タイプ参照(コンパイラによって実行)と、タイプ・チェック(JVMランタイムによって実行)の2つのフェーズに分割されていました。このオプションはJDK 8で非推奨となり、検証はデフォルトで分割され、無効にする方法はありません。
 .RE
 .PP
 \-XX:+UseStringCache
 .RS 4
-̤˳Ƥ줿ʸΥå󥰤ͭˤޤΥץJDK 8졢ΤϤޤ
+一般に割り当てられた文字列のキャッシングを有効にします。このオプションはJDK 8から削除され、それに代わるものはありません。
 .RE
-.SH "ѥեޥ󥹡塼˥󥰤"
+.SH "パフォーマンス・チューニングの例"
 .PP
-Ǥϡ롼ץåȤκŬޤϥ쥹ݥ󥹻֤û̲Τ줫ԤΡŪʥ塼˥󥰡ե饰λˡ򼨤ޤ
+次の例では、スループットの最適化またはレスポンス時間の短縮化のいずれかを行うための、試験的なチューニング・フラグの使用方法を示します。
 .PP
-\fBExample 1\fR, 롼ץåȤ夹뤿Υ塼˥
+\fBExample 1\fR, スループットを向上するためのチューニング
 .RS 4
 .sp
 .if n \{\
@@ -2465,7 +2465,7 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, 쥹ݥ󥹻֤®뤿Υ塼˥
+\fBExample 2\fR, レスポンス時間を速くするためのチューニング
 .RS 4
 .sp
 .if n \{\
@@ -2478,9 +2478,9 @@
 .RE
 .\}
 .RE
-.SH "λơ"
+.SH "終了ステータス"
 .PP
-̾νλͤưġ뤫֤ΤϡưʰǸƤӽФ줿ʥ顼ȯ뤤JVMˤ㳰줿ǤJavaץꥱϡAPIƽФ\fISystem\&.exit(exitValue)\fRѤǤդ֤ͤȤ򤹤뤳ȤǤޤͤϼΤȤǤ
+通常、次の終了値が起動ツールから返されるのは、起動元が不正な引数で呼び出されたか、深刻なエラーが発生したか、あるいはJVMにより例外がスローされた場合です。ただし、Javaアプリケーションは、API呼出し\fISystem\&.exit(exitValue)\fRを使用して任意の値を返すことを選択することもできます。値は次のとおりです。
 .sp
 .RS 4
 .ie n \{\
@@ -2490,7 +2490,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI0\fR: ェλ
+\fI0\fR: 正常終了
 .RE
 .sp
 .RS 4
@@ -2501,9 +2501,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI>0\fR: 顼ȯ
+\fI>0\fR: エラー発生
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javac.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javac.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javac
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javac" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "javac" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javac \- Java饹ӥ󥿥եɤ߼ꡢХȥɤӥ饹ե˥ѥ뤷ޤ
-.SH ""
+javac \- Javaクラスおよびインタフェースの定義を読み取り、バイトコードおよびクラス・ファイルにコンパイルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -62,32 +62,32 @@
 .RE
 .\}
 .PP
-ꤹǤդǤ
+引数を指定する順序は任意です。
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIsourcefiles\fR
 .RS 4
-ѥ뤵1İʾΥե(\fIMyClass\&.java\fRʤ)
+コンパイルされる1つ以上のソース・ファイル(\fIMyClass\&.java\fRなど)。
 .RE
 .PP
 \fIclasses\fR
 .RS 4
-νоݤȤʤ1İʾΥ饹(\fIMyPackage\&.MyClass\fRʤ)
+注釈の処理対象となる1つ以上のクラス(\fIMyPackage\&.MyClass\fRなど)。
 .RE
 .PP
 \fI@argfiles\fR
 .RS 4
-ץȥեɽ1İʾΥե롣ΥեǤ\fI\-J\fRץϻǤޤ󡣥ޥɥ饤ե򻲾ȤƤ
+オプションとソース・ファイルを一覧表示する1つ以上のファイル。このファイルの中では\fI\-J\fRオプションは指定できません。コマンドライン引数ファイルを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjavac\fRޥɤϡJavaץߥ󥰸ǵҤ줿饹ȥ󥿥եɤ߼ꡢХȥɤΥ饹ե˥ѥ뤷ޤ\fIjavac\fRޥɤǤϡJavaե뤪ӥ饹νǤޤ
+\fIjavac\fRコマンドは、Javaプログラミング言語で記述されたクラスとインタフェースの定義を読み取り、バイトコードのクラス・ファイルにコンパイルします。\fIjavac\fRコマンドでは、Javaソース・ファイルおよびクラス内の注釈の処理もできます。
 .PP
-ɤΥե̾\fIjavac\fRϤˤϡ2Ĥˡޤ
+ソース・コードのファイル名を\fIjavac\fRに渡すには、2つの方法があります。
 .sp
 .RS 4
 .ie n \{\
@@ -97,7 +97,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-եοʤϡե̾򥳥ޥɥ饤ǻꤷޤ
+ソース・ファイルの数が少ない場合は、ファイル名をコマンドラインで指定します。
 .RE
 .sp
 .RS 4
@@ -108,19 +108,19 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-եο¿ϡեΥե̾ޤϲԤǶڤäƻꤷޤ\fIjavac\fRޥɤǡꥹȡե̾Ƭ˥åȥޡ(@)Ѥޤ
+ソース・ファイルの数が多い場合は、ファイル内のファイル名を空白または改行で区切って指定します。\fIjavac\fRコマンドで、リスト・ファイル名の先頭にアットマーク(@)を使用します。
 .RE
 .PP
-ɤΥե̾\&.javaĥҤ򡢥饹Υե̾\&.classĥҤäƤɬפޤޤեȥ饹եΤɤ⡢륯饹б롼̾äƤɬפޤȤС\fIMyClass\fRȤ̾Υ饹ϡ\fIMyClass\&.java\fRȤ̾Υե˵ҤޤΥեϡ\fIMyClass\&.class\fRȤ̾ΥХȥɡ饹ե˥ѥ뤵ޤ
+ソース・コードのファイル名は\&.java拡張子を、クラスのファイル名は\&.class拡張子を持っている必要があります。また、ソース・ファイルとクラス・ファイルのどちらも、該当するクラスに対応するルート名を持っている必要があります。たとえば、\fIMyClass\fRという名前のクラスは、\fIMyClass\&.java\fRという名前のソース・ファイルに記述されます。このソース・ファイルは、\fIMyClass\&.class\fRという名前のバイトコード・クラス・ファイルにコンパイルされます。
 .PP
-饹ƤȡɲäΥ饹ե뤬ޤΥ饹ե̾ϡ\fIMyClass$MyInnerClass\&.class\fRΤ褦ˡ饹̾ȳ饹̾Ȥ߹礻Τˤʤޤ
+内部クラスが定義されていると、追加のクラス・ファイルが生成されます。これらのクラス・ファイルの名前は、\fIMyClass$MyInnerClass\&.class\fRのように、内部クラス名と外部クラス名を組み合せたものになります。
 .PP
-եϡѥåĥ꡼ȿǤǥ쥯ȥꡦĥ꡼֤ޤȤС٤ƤΥե뤬\fI/workspace\fRˤ硢\fIcom\&.mysoft\&.mypack\&.MyClass\fRΥɤ\fI/workspace/com/mysoft/mypack/MyClass\&.java\fR˳Ǽޤ
+ソース・ファイルは、パッケージ・ツリーを反映したディレクトリ・ツリーに配置します。たとえば、すべてのソース・ファイルが\fI/workspace\fRにある場合、\fIcom\&.mysoft\&.mypack\&.MyClass\fRのソース・コードを、\fI/workspace/com/mysoft/mypack/MyClass\&.java\fRに格納します。
 .PP
-ǥեȤǤϡѥϡƥ饹եб륽եƱǥ쥯ȥ˳Ǽޤ\fI\-d\fRץѤơ̤νǥ쥯ȥǤޤ
-.SH "ץ"
+デフォルトでは、コンパイラは、各クラス・ファイルを対応するソース・ファイルと同じディレクトリに格納します。\fI\-d\fRオプションを使用して、別の出力先ディレクトリを指定できます。
+.SH "オプション"
 .PP
-ѥˤϡߤγȯĶǥݡȤɸ४ץΥåȤޤʳɸ४ץϡߤβۥޥ󤪤ӥѥμ˸ͭΥץǡ衢ѹǽޤɸ४ץϡ\fI\-X\fRץǻϤޤޤ
+コンパイラには、現在の開発環境でサポートされる標準オプションのセットがあります。これ以外の非標準オプションは、現在の仮想マシンおよびコンパイラの実装に固有のオプションで、将来、変更される可能性があります。非標準オプションは、\fI\-X\fRオプションで始まります。
 .sp
 .RS 4
 .ie n \{\
@@ -130,7 +130,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥ롦ץ򻲾ȤƤ
+クロスコンパイル・オプションを参照してください。
 .RE
 .sp
 .RS 4
@@ -141,230 +141,230 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ򻲾ȤƤ
+非標準オプションを参照してください。
 .RE
-.SS "ɸ४ץ"
+.SS "標準オプション"
 .PP
 \-A\fIkey\fR[\fI=value\fR]
 .RS 4
-ץåϤץꤷޤΥץϡ\fIjavac\fRľ᤹ܲΤǤϤʤ줾ΥץåǻѤǤ褦ˤʤޤ\fIkey\fRͤϡ1Ĥޤʣμ̻Ҥɥå(\&.)Ƕڤɬפޤ
+注釈プロセッサに渡すオプションを指定します。これらのオプションは、\fIjavac\fRが直接解釈するのではなく、それぞれのプロセッサで使用できるようになります。\fIkey\fRの値は、1つまたは複数の識別子をドット(\&.)で区切る必要があります。
 .RE
 .PP
 \-cp \fIpath\fR or \-classpath \fIpath\fR
 .RS 4
-桼饹ե롢(ץ)ץåȥե򸡺ꤷޤΥ饹ѥ\fICLASSPATH\fRĶѿΥ桼饹ѥ򥪡С饤ɤޤ\fICLASSPATH\fR\fI\-cp\fR\fI\-classpath\fRΤꤵƤʤ硢桼\fI饹ѥ\fRϡߤΥǥ쥯ȥˤʤޤSetting the Class Path 򻲾ȤƤ
+ユーザー・クラス・ファイル、および(オプションで)注釈プロセッサとソース・ファイルを検索する場所を指定します。このクラス・パスは\fICLASSPATH\fR環境変数のユーザー・クラス・パスをオーバーライドします。\fICLASSPATH\fR、\fI\-cp\fR、\fI\-classpath\fRのいずれも指定されていない場合、ユーザーの\fIクラス・パス\fRは、現在のディレクトリになります。Setting the Class Path を参照してください。
 .sp
-\fI\-sourcepath\fRץ󤬻ꤵƤʤ硢ե桼饹ѥ鸡ޤ
+\fI\-sourcepath\fRオプションが指定されていない場合、ソース・ファイルもユーザー・クラス・パスから検索されます。
 .sp
-\fI\-processorpath\fRץ󤬻ꤵƤʤ硢ץå⥯饹ѥ鸡ޤ
+\fI\-processorpath\fRオプションが指定されていない場合、注釈プロセッサもクラス・パスから検索されます。
 .RE
 .PP
 \-Djava\&.ext\&.dirs=\fIdirectories\fR
 .RS 4
-󥹥ȡѳĥǽΰ֤򥪡С饤ɤޤ
+インストール済拡張機能の位置をオーバーライドします。
 .RE
 .PP
 \-Djava\&.endorsed\&.dirs=\fIdirectories\fR
 .RS 4
-ǧ줿ɸѥΰ֤򥪡С饤ɤޤ
+承認された標準パスの位置をオーバーライドします。
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-饹եνǥ쥯ȥꤷޤΥǥ쥯ȥ\fIjavac\fRǤϺʤᡢǤ¸ߤƤɬפޤ饹ѥåΰǤ硢\fIjavac\fRϡѥå̾ȿǤ֥ǥ쥯ȥ˥饹եǼɬפ˱ƥǥ쥯ȥޤ
+クラス・ファイルの出力先ディレクトリを設定します。そのディレクトリは\fIjavac\fRでは作成されないため、すでに存在している必要があります。クラスがパッケージの一部である場合、\fIjavac\fRは、パッケージ名を反映したサブディレクトリ内にクラス・ファイルを格納し、必要に応じてディレクトリを作成します。
 .sp
 \fI\-d\fR
-\fI/home/myclasses\fRȻꤷ饹̾\fIcom\&.mypackage\&.MyClass\fRǤ硢饹ե\fI/home/myclasses/com/mypackage/MyClass\&.class\fRˤʤޤ
+\fI/home/myclasses\fRと指定し、クラスの名前が\fIcom\&.mypackage\&.MyClass\fRである場合、クラス・ファイルは\fI/home/myclasses/com/mypackage/MyClass\&.class\fRになります。
 .sp
-\fI\-d\fRץ󤬻ꤵʤä硢\fIjavac\fRϡƥ饹ե򡢤Ȥʤ륽եƱǥ쥯ȥ˳Ǽޤ
+\fI\-d\fRオプションが指定されなかった場合、\fIjavac\fRは、各クラス・ファイルを、その生成元となるソース・ファイルと同じディレクトリ内に格納します。
 .sp
-\fB:\fR
-\fI\-d\fRץˤäƻꤵ줿ǥ쥯ȥϡ桼饹ѥ˼ưŪɲäޤ
+\fB注意:\fR
+\fI\-d\fRオプションによって指定されたディレクトリは、ユーザー・クラス・パスに自動的に追加されません。
 .RE
 .PP
 \-deprecation
 .RS 4
-侩ΥСޤϥ饹ѤޤϥС饤ɤ뤿Ӥˡɽޤ\fI\-deprecation\fRץ󤬻ꤵƤʤ硢\fIjavac\fRϡ侩ΥСޤϥ饹ѤޤϥС饤ɤƤ륽եΥޥ꡼ɽޤ\fI\-deprecation\fRץϡ\fI\-Xlint:deprecation\fRξάɽǤ
+非推奨のメンバーまたはクラスが使用またはオーバーライドされるたびに、説明を表示します。\fI\-deprecation\fRオプションが指定されていない場合、\fIjavac\fRは、非推奨のメンバーまたはクラスを使用またはオーバーライドしているソース・ファイルのサマリーを表示します。\fI\-deprecation\fRオプションは、\fI\-Xlint:deprecation\fRの省略表記です。
 .RE
 .PP
 \-encoding \fIencoding\fR
 .RS 4
-եΥ󥳡ǥ̾(EUC\-JPUTF\-8ʤ)ꤷޤ\fI\-encoding\fRץ󤬻ꤵƤʤϡץåȥեΥǥեȡСѤޤ
+ソース・ファイルのエンコーディング名(EUC\-JPやUTF\-8など)を設定します。\fI\-encoding\fRオプションが指定されていない場合は、プラットフォームのデフォルト・コンバータが使用されます。
 .RE
 .PP
 \-endorseddirs \fIdirectories\fR
 .RS 4
-ǧ줿ɸѥΰ֤򥪡С饤ɤޤ
+承認された標準パスの位置をオーバーライドします。
 .RE
 .PP
 \-extdirs \fIdirectories\fR
 .RS 4
-\fIext\fRǥ쥯ȥΰ֤򥪡С饤ɤޤdirectoriesѿˤϡǶڤäǥ쥯ȥΥꥹȤꤷޤꤷǥ쥯ȥγJARե뤫顢饹ե뤬ޤФ줿٤ƤJARեϡ饹ѥΰˤʤޤ
+\fIext\fRディレクトリの位置をオーバーライドします。directories変数には、コロンで区切ったディレクトリのリストを指定します。指定したディレクトリ内の各JARファイルから、クラス・ファイルが検索されます。検出されたすべてのJARファイルは、クラス・パスの一部になります。
 .sp
-ѥ(ۤʤJavaץåȥե˼줿֡ȥȥåס饹ĥǽ饹ФƥѥԤ)¹Ԥ硢Υץˤϳĥǽ饹ޤǥ쥯ȥꤷޤܺ٤ϥѥ롦ץ򻲾ȤƤ
+クロスコンパイル(異なるJavaプラットフォームに実装されたブートストラップ・クラスや拡張機能クラスに対してコンパイルを行う)を実行する場合、このオプションには拡張機能クラスを含むディレクトリを指定します。詳細はクロスコンパイル・オプションを参照してください。
 .RE
 .PP
 \-g
 .RS 4
-ѿޤह٤ƤΥǥХåޤǥեȤǤϡֹ椪ӥեΤߤޤ
+ローカル変数を含むすべてのデバッグ情報を生成します。デフォルトでは、行番号およびソース・ファイル情報のみが生成されます。
 .RE
 .PP
 \-g:none
 .RS 4
-ǥХåޤ
+デバッグ情報を生成しません。
 .RE
 .PP
 \-g:[\fIkeyword list\fR]
 .RS 4
-ޤǶڤ줿ɡꥹȤˤꤵ줿μΥǥХåΤߤޤΥɤͭǤ
+カンマで区切られたキーワード・リストにより指定された、特定の種類のデバッグ情報のみを生成します。次のキーワードが有効です。
 .PP
 source
 .RS 4
-եΥǥХå
+ソース・ファイルのデバッグ情報。
 .RE
 .PP
 lines
 .RS 4
-ֹΥǥХå
+行番号のデバッグ情報。
 .RE
 .PP
 vars
 .RS 4
-ѿΥǥХå
+ローカル変数のデバッグ情報。
 .RE
 .RE
 .PP
 \-help
 .RS 4
-ɸ४ץγפϤޤ
+標準オプションの概要を出力します。
 .RE
 .PP
 \-implicit:[\fIclass, none\fR]
 .RS 4
-Ū˥ɤ줿եФ륯饹ե椷ޤ饹եưˤϡ\fI\-implicit:class\fRѤޤ饹եˤϡ\fI\-implicit:none\fRѤޤΥץ󤬻ꤵʤäΥǥեưϡ饹եμưˤʤޤξ硢Τ褦ʥ饹ե뤬줿¹Ԥȡѥ餫ٹȯԤޤ\fI\-implicit\fRץŪꤵ줿硢ٹȯԤޤ󡣷θ򻲾ȤƤ
+暗黙的にロードされたソース・ファイルに対するクラス・ファイルの生成を制御します。クラス・ファイルを自動生成するには、\fI\-implicit:class\fRを使用します。クラス・ファイルの生成を抑制するには、\fI\-implicit:none\fRを使用します。このオプションが指定されなかった場合のデフォルト動作は、クラス・ファイルの自動生成になります。その場合、そのようなクラス・ファイルが生成された時に注釈処理も実行されると、コンパイラから警告が発行されます。\fI\-implicit\fRオプションが明示的に設定された場合、警告は発行されません。型の検索を参照してください。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ(JVM)\fIoption\fRϤޤoptionˤϡJavaưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシン(JVM)に\fIoption\fRを渡します。optionには、Java起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .sp
-\fB:\fR
-\fICLASSPATH\fR\fI\-classpath\fR\fI\-bootclasspath\fR\fI\-extdirs\fRץϡ\fIjavac\fRμ¹Ԥ˻Ѥ륯饹ꤷޤ󡣤Υץ󤪤ѿѤƥѥμ򥫥ޥ褦Ȥȡꥹ⤯¿ξ硢ɬפʽ¹Ԥޤ󡣥ѥμ򥫥ޥɬפ硢\fI\-J\fRץѤơäȤʤJavaưġ˥ץϤޤ
+\fB注意:\fR
+\fICLASSPATH\fR、\fI\-classpath\fR、\fI\-bootclasspath\fRおよび\fI\-extdirs\fRオプションは、\fIjavac\fRの実行に使用されるクラスを指定しません。これらのオプションおよび変数を使用してコンパイラの実装をカスタマイズしようとすると、リスクが高く、多くの場合、必要な処理が実行されません。コンパイラの実装をカスタマイズする必要がある場合、\fI\-J\fRオプションを使用して、基礎となるJava起動ツールにオプションを渡します。
 .RE
 .PP
 \-nowarn
 .RS 4
-ٹå̵ˤޤΥץϡ\fI\-Xlint:none\fRץƱ褦ưޤ
+警告メッセージを無効にします。このオプションは、\fI\-Xlint:none\fRオプションと同じように動作します。
 .RE
 .PP
 \-parameters
 .RS 4
-ե쥯APIΥ᥽å\fIjava\&.lang\&.reflect\&.Executable\&.getParameters\fRǤ褦ˡ륯饹եΥ󥹥ȥ饯ȥ᥽åɤβѥ᡼̾Ǽޤ
+リフレクションAPIのメソッド\fIjava\&.lang\&.reflect\&.Executable\&.getParameters\fRが取得できるように、生成されるクラス・ファイル内のコンストラクタとメソッドの仮パラメータ名を格納します。
 .RE
 .PP
 \-proc: [\fInone\fR, \fIonly\fR]
 .RS 4
-ӥѥ¹Ԥ뤫椷ޤ\fI\-proc:none\fRϡʤǥѥ뤬¹Ԥ뤳Ȥ̣ޤ\fI\-proc:only\fRϡΤߤ¹Ԥ졢³ΥѥϤޤä¹ԤʤȤ̣ޤ
+注釈処理およびコンパイルを実行するかを制御します。\fI\-proc:none\fRは、注釈処理なしでコンパイルが実行されることを意味します。\fI\-proc:only\fRは、注釈処理のみが実行され、後続のコンパイルはまったく実行されないことを意味します。
 .RE
 .PP
 \-processor \fIclass1\fR [,\fIclass2\fR,\fIclass3\fR\&.\&.\&.]
 .RS 4
-¹Ԥץå̾ꤷ硢ǥեȤθϾάޤ
+実行する注釈プロセッサの名前。これを指定した場合、デフォルトの検索処理は省略されます。
 .RE
 .PP
 \-processorpath \fIpath\fR
 .RS 4
-ץå򸡺ꤷޤΥץ󤬻Ѥʤ硢饹ѥΥץåޤ
+注釈プロセッサを検索する場所を指定します。このオプションが使用されない場合、クラス・パスのプロセッサが検索されます。
 .RE
 .PP
 \-s \fIdir\fR
 .RS 4
-줿եγǼȤʤǥ쥯ȥꤷޤΥǥ쥯ȥ\fIjavac\fRǤϺʤᡢǤ¸ߤƤɬפޤ饹ѥåΰǤ硢ѥϡѥå̾ȿǤ֥ǥ쥯ȥ˥եǼɬפ˱ƥǥ쥯ȥޤ
+生成されたソース・ファイルの格納先となるディレクトリを指定します。そのディレクトリは\fIjavac\fRでは作成されないため、すでに存在している必要があります。クラスがパッケージの一部である場合、コンパイラは、パッケージ名を反映したサブディレクトリ内にソース・ファイルを格納し、必要に応じてディレクトリを作成します。
 .sp
-\fI\-s /home/mysrc\fRȻꤷ饹̾\fIcom\&.mypackage\&.MyClass\fRǤ硢ե\fI/home/mysrc/com/mypackage/MyClass\&.java\fR˳Ǽޤ
+\fI\-s /home/mysrc\fRと指定し、クラスの名前が\fIcom\&.mypackage\&.MyClass\fRである場合、ソース・ファイルは\fI/home/mysrc/com/mypackage/MyClass\&.java\fRに格納されます。
 .RE
 .PP
 \-source \fIrelease\fR
 .RS 4
-դ륽ɤΥСꤷޤ\fIrelease\fRˤϼͤǤޤ
+受け付けるソース・コードのバージョンを指定します。\fIrelease\fRには次の値を指定できます。
 .PP
 1\&.3
 .RS 4
-ΥѥǤϡJava SE 1\&.3ʹߤƳ줿Τޤ¾θ쵡ǽ򥵥ݡȤޤ
+このコンパイラでは、Java SE 1\&.3以降に導入されたアサーション、総称または他の言語機能をサポートしません。
 .RE
 .PP
 1\&.4
 .RS 4
-Java SE 1\&.4Ƴ줿ޤॳɤդޤ
+Java SE 1\&.4で導入された、アサーションを含むコードを受け付けます。
 .RE
 .PP
 1\&.5
 .RS 4
-Java SE 5Ƴ줿Τ¾θ쵡ǽޤɤդޤ
+Java SE 5で導入された総称および他の言語機能を含んだコードを受け付けます。
 .RE
 .PP
 5
 .RS 4
-1\&.5ƱǤ
+1\&.5と同義です。
 .RE
 .PP
 1\&.6
 .RS 4
-Java SE 6ǤϸФѹƳޤǤեΥ󥳡ǥ󥰡顼Java Platform, Standard EditionΰΥ꡼褦ʷٹǤϤʤ顼Ȥ𤵤褦ˤʤޤ
+Java SE 6では言語に対する変更は導入されませんでした。しかし、ソース・ファイル内のエンコーディング・エラーが、Java Platform, Standard Editionの以前のリリースような警告ではなく、エラーとして報告されるようになりました。
 .RE
 .PP
 6
 .RS 4
-1\&.6ƱǤ
+1\&.6と同義です。
 .RE
 .PP
 1\&.7
 .RS 4
-줬ǥեͤǤJava SE 7Ƴ줿ǽޤॳɤդޤ
+これがデフォルト値です。Java SE 7で導入された機能を含むコードを受け付けます。
 .RE
 .PP
 7
 .RS 4
-1\&.7ƱǤ
+1\&.7と同義です。
 .RE
 .RE
 .PP
 \-sourcepath \fIsourcepath\fR
 .RS 4
-饹ޤϥ󥿥ե򸡺륽ɡѥꤷޤ桼饹ѥƱͤˡѥΥȥϡOracle SolarisǤϥ(:)ǡWindowsǤϥߥǶڤꡢˤϡǥ쥯ȥꡢJAR֤ޤZIP֤ǤޤѥåѤƤϡǥ쥯ȥޤϥΥ롦ѥ̾ѥå̾ȿǤƤɬפޤ
+クラスまたはインタフェースの定義を検索するソース・コード・パスを指定します。ユーザー・クラス・パスと同様に、ソース・パスのエントリは、Oracle Solarisではコロン(:)で、Windowsではセミコロンで区切り、ここには、ディレクトリ、JARアーカイブまたはZIPアーカイブを指定できます。パッケージを使用している場合は、ディレクトリまたはアーカイブ内のローカル・パス名がパッケージ名を反映している必要があります。
 .sp
-\fB:\fR
-ե⸫Ĥä硢饹ѥˤ긫Ĥä饹Ϻƥѥ뤵ǽޤθ򻲾ȤƤ
+\fB注意:\fR
+ソース・ファイルも見つかった場合、クラス・パスにより見つかったクラスは再コンパイルされる可能性があります。型の検索を参照してください。
 .RE
 .PP
 \-verbose
 .RS 4
-ɤ륯饹ӥѥ뤵륽ե뤴Ȥξ󤬽Ϥ롢ܺٽϤѤޤ
+ロードされるクラスおよびコンパイルされるソース・ファイルごとの情報が出力される、詳細出力を使用します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-werror
 .RS 4
-ٹȯ˥ѥλޤ
+警告が発生した場合にコンパイルを終了します。
 .RE
 .PP
 \-X
 .RS 4
-ɸ४ץ˴ؤɽƽλޤ
+非標準オプションに関する情報を表示して終了します。
 .RE
-.SS "ѥ롦ץ"
+.SS "クロスコンパイル・オプション"
 .PP
-ǥեȤǤϡ饹Υѥϡ\fIjavac\fRźդƤץåȥեΥ֡ȥȥåס饹ӳĥǽ饹ФƹԤޤ\fIjavac\fRϡۤʤJavaץåȥե˼줿֡ȥȥåס饹ӳĥǽ饹ФƥѥԤѥ⥵ݡȤƤޤѥԤϡ\fI\-bootclasspath\fR\fI\-extdirs\fRץѤ뤳ȤפǤ
+デフォルトでは、クラスのコンパイルは、\fIjavac\fRが添付されているプラットフォームのブートストラップ・クラスおよび拡張機能クラスに対して行われます。ただし、\fIjavac\fRは、異なるJavaプラットフォームに実装されたブートストラップ・クラスおよび拡張機能クラスに対してコンパイルを行うクロスコンパイルもサポートしています。クロスコンパイルを行う場合は、\fI\-bootclasspath\fRおよび\fI\-extdirs\fRオプションを使用することが重要です。
 .PP
 \-target \fIversion\fR
 .RS 4
-ۥޥλꤵ줿꡼оݤȤ륯饹եޤ饹եϡꤵ줿åȰʹߤΥ꡼ǤưޤΥ꡼JVMǤưޤͭʥåȤϡ1\&.11\&.21\&.31\&.41\&.5 (5)1\&.6 (6)1\&.7 (7)Ǥ
+仮想マシンの指定されたリリースを対象とするクラス・ファイルを生成します。クラス・ファイルは、指定されたターゲット以降のリリースでは動作しますが、それより前のリリースのJVMでは動作しません。有効なターゲットは、1\&.1、1\&.2、1\&.3、1\&.4、1\&.5 (5も可)、1\&.6 (6も可)および1\&.7 (7も可)です。
 .sp
-\fI\-target\fRץΥǥեȤϡ\fI\-source\fRץͤˤäưۤʤޤ
+\fI\-target\fRオプションのデフォルトは、\fI\-source\fRオプションの値によって異なります。
 .sp
 .RS 4
 .ie n \{\
@@ -374,7 +374,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ󤬻ꤵƤʤ硢\fI\-target\fRץͤ1\&.7Ǥ
+\fI\-source\fRオプションが指定されていない場合、\fI\-target\fRオプションの値は1\&.7です。
 .RE
 .sp
 .RS 4
@@ -385,7 +385,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.2ξ硢\fI\-target\fRץͤ1\&.4Ǥ
+\fI\-source\fRオプションが1\&.2の場合、\fI\-target\fRオプションの値は1\&.4です。
 .RE
 .sp
 .RS 4
@@ -396,7 +396,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.3ξ硢\fI\-target\fRץͤ1\&.4Ǥ
+\fI\-source\fRオプションが1\&.3の場合、\fI\-target\fRオプションの値は1\&.4です。
 .RE
 .sp
 .RS 4
@@ -407,7 +407,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.5ξ硢\fI\-target\fRץͤ1\&.7Ǥ
+\fI\-source\fRオプションが1\&.5の場合、\fI\-target\fRオプションの値は1\&.7です。
 .RE
 .sp
 .RS 4
@@ -418,7 +418,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ1\&.6ξ硢\fI\-target\fRץͤ1\&.7Ǥ
+\fI\-source\fRオプションが1\&.6の場合、\fI\-target\fRオプションの値は1\&.7です。
 .RE
 .sp
 .RS 4
@@ -429,23 +429,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-source\fRץ¾Τ٤Ƥͤξ硢\fI\-target\fRץͤϡ\fI\-source\fRץͤˤʤޤ
+\fI\-source\fRオプションの他のすべての値の場合、\fI\-target\fRオプションの値は、\fI\-source\fRオプションの値になります。
 .RE
 .RE
 .PP
 \-bootclasspath \fIbootclasspath\fR
 .RS 4
-ꤵ줿ϢΥ֡ȡ饹ФƥѥԤޤ桼饹ѥƱͤˡ֡ȡ饹ѥΥȥϥ(:)Ƕڤꡢˤϡǥ쥯ȥꡢJAR֤ޤZIP֤Ǥޤ
+指定された一連のブート・クラスに対してクロスコンパイルを行います。ユーザー・クラス・パスと同様に、ブート・クラス・パスのエントリはコロン(:)で区切り、ここには、ディレクトリ、JARアーカイブまたはZIPアーカイブを指定できます。
 .RE
-.SS "ѥȡץե롦ץ"
+.SS "コンパクト・プロファイル・オプション"
 .PP
-JDK 8ʹߤ顢\fIjavac\fRѥϥѥȡץե򥵥ݡȤޤѥȡץեѤȡJavaץåȥեΤɬפȤʤץꥱϡǥץǽǡեåȥץȤǼ¹ԤǤޤѥȡץե뵡ǽϡץꥱ󡦥ȥΥץꥱΥɻ֤ṳ̂Τ˻ѤǤޤεǽϡJREХɥ뤹JavaץꥱΡꥳѥȤʥǥץȤΩޤεǽϡǥХǤΩޤ
+JDK 8以降から、\fIjavac\fRコンパイラはコンパクト・プロファイルをサポートします。コンパクト・プロファイルを使用すると、Javaプラットフォーム全体を必要としないアプリケーションは、デプロイ可能で、小さいフットプリントで実行できます。コンパクト・プロファイル機能は、アプリケーション・ストアからのアプリケーションのダウンロード時間を短縮するのに使用できます。この機能は、JREをバンドルするJavaアプリケーションの、よりコンパクトなデプロイメントに役立ちます。この機能は、小さいデバイスでも役立ちます。
 .PP
-ݡȤƤץեͤϡ\fIcompact1\fR\fIcompact2\fR\fIcompact3\fRǤϡɲäΥ쥤䡼Ǥ礭ֹγƥѥȡץեˤϡֹ̾ΥץեΤ٤ƤAPIޤޤޤ
+サポートされているプロファイル値は、\fIcompact1\fR、\fIcompact2\fRおよび\fIcompact3\fRです。これらは、追加のレイヤーです。大きい番号の各コンパクト・プロファイルには、小さい番号の名前のプロファイル内のすべてのAPIが含まれます。
 .PP
 \-profile
 .RS 4
-ѥȡץեѤ硢Υץϡѥ˥ץե̾ꤷޤ򼨤ޤ
+コンパクト・プロファイルを使用する場合、このオプションは、コンパイル時にプロファイル名を指定します。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -456,7 +456,7 @@
 .if n \{\
 .RE
 .\}
-javacϡꤵ줿ץեˤʤǤդJava SE APIѤ륽ɤ򥳥ѥ뤷ޤ󡣤ϡΤ褦ʥɤ򥳥ѥ뤷褦Ȥ뤳Ȥˤä륨顼åǤ
+javacは、指定されたプロファイルにない任意のJava SE APIを使用するソース・コードをコンパイルしません。これは、そのようなソース・コードをコンパイルしようとすることによって生じるエラー・メッセージの例です。
 .sp
 .if n \{\
 .RS 4
@@ -470,32 +470,32 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ\fIApplet\fR饹Ѥʤ褦˥ѹ뤳Ȥˤäơ顼Ǥޤ\-profileץꤻ˥ѥ뤹뤳Ȥˤäơ顼뤳ȤǤޤѥϡJava SE APIδʥåȤФƼ¹Ԥޤ(ɤΥѥȡץեˤ⡢\fIApplet\fR饹ϴޤޤƤޤ)
+この例では、\fIApplet\fRクラスを使用しないようにソースを変更することによって、エラーを修正できます。\-profileオプションを指定せずにコンパイルすることによって、エラーを修正することもできます。コンパイルは、Java SE APIの完全なセットに対して実行されます。(どのコンパクト・プロファイルにも、\fIApplet\fRクラスは含まれていません。)
 .sp
-ѥȡץեѤƥѥ뤹뤿̤ˡȤơ\fI\-bootclasspath\fRץѤơץեΥ᡼ꤹ\fIrt\&.jar\fRեؤΥѥꤷޤ\fI\-profile\fRץѤȡץե롦᡼ϡѥ˥ƥ¸ߤɬפޤ󡣤ϡѥΩޤ
+コンパクト・プロファイルを使用してコンパイルするための別の方法として、\fI\-bootclasspath\fRオプションを使用して、プロファイルのイメージを指定する\fIrt\&.jar\fRファイルへのパスを指定します。かわりに\fI\-profile\fRオプションを使用すると、プロファイル・イメージは、コンパイル時にシステム上に存在する必要がありません。これは、クロスコンパイル時に役立ちます。
 .RE
-.SS "ɸ४ץ"
+.SS "非標準オプション"
 .PP
 \-Xbootclasspath/p:\fIpath\fR
 .RS 4
-֡ȥȥåס饹ѥɲäޤ
+ブートストラップ・クラス・パスに接尾辞を追加します。
 .RE
 .PP
 \-Xbootclasspath/a:\fIpath\fR
 .RS 4
-֡ȥȥåס饹ѥƬɲäޤ
+ブートストラップ・クラス・パスに接頭辞を追加します。
 .RE
 .PP
 \-Xbootclasspath/:\fIpath\fR
 .RS 4
-֡ȥȥåס饹եΰ֤򥪡С饤ɤޤ
+ブートストラップ・クラス・ファイルの位置をオーバーライドします。
 .RE
 .PP
 \-Xdoclint:[\-]\fIgroup\fR [\fI/access\fR]
 .RS 4
-\fIgroup\fRͤ\fIaccessibility\fR\fIsyntax\fR\fIreference\fR\fIhtml\fRޤ\fImissing\fRΤ줫ǤΥå롼פͭޤ̵ˤޤΥå롼פξܺ٤ϡ\fIjavadoc\fRޥɤ\fI\-Xdoclint\fRץ򻲾ȤƤ\fI\-Xdoclint\fRץϡ\fIjavac\fRޥɤǤϥǥեȤ̵ˤʤޤ
+\fIgroup\fRの値が\fIaccessibility\fR、\fIsyntax\fR、\fIreference\fR、\fIhtml\fRまたは\fImissing\fRのいずれかである特定のチェック・グループを有効または無効にします。これらのチェック・グループの詳細は、\fIjavadoc\fRコマンドの\fI\-Xdoclint\fRオプションを参照してください。\fI\-Xdoclint\fRオプションは、\fIjavac\fRコマンドではデフォルトで無効になります。
 .sp
-ѿ\fIaccess\fRϡ\fI\-Xdoclint\fRץ󤬥å륯饹ȥСκǾβĻ٥ꤷޤ\fIpublic\fR\fIprotected\fR\fIpackage\fR\fIprivate\fR(Ļι⤤)1ĤĤȤǤޤȤСΥץϡ(protectedpackagepublicޤ) protectedʾΥ٥ĥ饹ӥС(٤ƤΥå롼פ)åޤ
+変数\fIaccess\fRは、\fI\-Xdoclint\fRオプションがチェックするクラスとメンバーの最小の可視性レベルを指定します。\fIpublic\fR、\fIprotected\fR、\fIpackage\fRおよび\fIprivate\fRの値(可視性の高い順)の1つを持つことができます。たとえば、次のオプションは、(protected、package、publicを含む) protected以上のアクセス・レベルを持つクラスおよびメンバーを(すべてのチェック・グループで)チェックします。
 .sp
 .if n \{\
 .RS 4
@@ -506,7 +506,7 @@
 .if n \{\
 .RE
 .\}
-ΥץϡpackageʾΥ(packagepublicޤ)ĥ饹ӥСФHTML顼åʤȤ٤ƤΥ٥ФƤ٤ƤΥå롼פͭˤޤ
+次のオプションは、package以上のアクセス権(packageおよびpublicを含む)を持つクラスおよびメンバーに対するHTMLエラーをチェックしないことを除き、すべてのアクセス・レベルに対してすべてのチェック・グループを有効にします。
 .sp
 .if n \{\
 .RS 4
@@ -521,103 +521,103 @@
 .PP
 \-Xdoclint:none
 .RS 4
-٤ƤΥå롼פ̵ˤޤ
+すべてのチェック・グループを無効にします。
 .RE
 .PP
 \-Xdoclint:all[\fI/access\fR]
 .RS 4
-٤ƤΥå롼פͭˤޤ
+すべてのチェック・グループを有効にします。
 .RE
 .PP
 \-Xlint
 .RS 4
-侩뤹٤ƤηٹͭˤޤΥ꡼ǤϡѲǽʤ٤Ƥηٹͭˤ뤳Ȥᤷޤ
+推奨されるすべての警告を有効にします。このリリースでは、利用可能なすべての警告を有効にすることをお薦めします。
 .RE
 .PP
 \-Xlint:all
 .RS 4
-侩뤹٤ƤηٹͭˤޤΥ꡼ǤϡѲǽʤ٤Ƥηٹͭˤ뤳Ȥᤷޤ
+推奨されるすべての警告を有効にします。このリリースでは、利用可能なすべての警告を有効にすることをお薦めします。
 .RE
 .PP
 \-Xlint:none
 .RS 4
-٤Ƥηٹ̵ˤޤ
+すべての警告を無効にします。
 .RE
 .PP
 \-Xlint:\fIname\fR
 .RS 4
-ٹ̵̾ˤޤΥץ̵ˤǤٹΥꥹȤϡ\-XlintץѤٹͭޤ̵򻲾ȤƤ
+警告名を無効にします。このオプションで無効にできる警告のリストは、\-Xlintオプションを使用した警告の有効化または無効化を参照してください。
 .RE
 .PP
 \-Xlint:\fI\-name\fR
 .RS 4
-ٹ̵̾ˤޤΥץ̵ˤǤٹΥꥹȤˤϡ\-XlintץѤٹͭޤ̵\-Xlint\fIץѤ\fR򻲾ȤƤ
+警告名を無効にします。このオプションで無効にできる警告のリストを取得するには、\-Xlintオプションを使用した警告の有効化または無効化\-Xlint\fIオプションを使用した\fRを参照してください。
 .RE
 .PP
 \-Xmaxerrs \fInumber\fR
 .RS 4
-륨顼κꤷޤ
+印刷するエラーの最大数を設定します。
 .RE
 .PP
 \-Xmaxwarns \fInumber\fR
 .RS 4
-ٹκꤷޤ
+印刷する警告の最大数を設定します。
 .RE
 .PP
 \-Xstdout \fIfilename\fR
 .RS 4
-ѥΥå򡢻ꤵ줿եޤǥեȤǤϡѥΥå\fISystem\&.err\fRޤ
+コンパイラのメッセージを、指定されたファイルに送信します。デフォルトでは、コンパイラのメッセージは\fISystem\&.err\fRに送られます。
 .RE
 .PP
 \-Xprefer:[\fInewer,source\fR]
 .RS 4
-뷿Фƥեȥ饹եξĤä硢ΤɤΥեɤ߼뤫ꤷޤ(θ򻲾ȤƤ)\fI\-Xprefer:newer\fRץѤ硢뷿Ф륽եȥ饹եΤɤ߼ޤ(ǥե)\fI\-Xprefer:source\fRץѤ硢ե뤬ɤ߼ޤ\fISOURCE\fR¸ݥꥷѤ줿ǤդץåǤ褦ˤϡ\fI\-Xprefer:source\fRѤƤ
+ある型に対してソース・ファイルとクラス・ファイルの両方が見つかった場合、そのどちらのファイルを読み取るかを指定します。(型の検索を参照してください)。\fI\-Xprefer:newer\fRオプションを使用した場合、ある型に対するソース・ファイルとクラス・ファイルのうち新しい方が読み取られます(デフォルト)。\fI\-Xprefer:source\fRオプションを使用した場合、ソース・ファイルが読み取られます。\fISOURCE\fRの保存ポリシーを使用して宣言された注釈に任意の注釈プロセッサがアクセスできるようにする場合は、\fI\-Xprefer:source\fRを使用してください。
 .RE
 .PP
 \-Xpkginfo:[\fIalways\fR,\fIlegacy\fR,\fInonempty\fR]
 .RS 4
-javacpackage\-info\&.javaե뤫\fIpackage\-info\&.class\fRե뤫ɤ椷ޤΥץǻѲǽmodeϼΤȤǤ
+javacがpackage\-info\&.javaファイルから\fIpackage\-info\&.class\fRファイルを生成するかどうかを制御します。このオプションで使用可能なmode引数は次のとおりです。
 .PP
 always
 .RS 4
-٤Ƥ\fIpackage\-info\&.java\fRե\fIpackage\-info\&.class\fRեޤΥץϡ\fI\&.java\fRեб\fI\&.class\fRե뤬뤳ȤǧAntʤɤΥӥɡƥѤΩĤȤޤ
+すべての\fIpackage\-info\&.java\fRファイルの\fIpackage\-info\&.class\fRファイルを常に生成します。このオプションは、各\fI\&.java\fRファイルに対応する\fI\&.class\fRファイルがあることを確認するAntなどのビルド・システムを使用する場合に役立つことがあります。
 .RE
 .PP
 legacy
 .RS 4
-package\-info\&.java᤬ޤޤˤΤ\fIpackage\-info\&.class\fRեޤpackage\-info\&.java˥ȤΤߴޤޤ\fIpackage\-info\&.class\fRեޤ
+package\-info\&.javaに注釈が含まれる場合にのみ\fIpackage\-info\&.class\fRファイルを生成します。package\-info\&.javaにコメントのみ含まれる場合に\fIpackage\-info\&.class\fRファイルを生成しません。
 .sp
-\fB:\fR
-\fIpackage\-info\&.class\fRեǤޤpackage\-info\&.javaեΤ٤Ƥ\fIRetentionPolicy\&.SOURCE\fR϶ˤʤޤ
+\fB注意:\fR
+\fIpackage\-info\&.class\fRファイルは生成できますが、package\-info\&.javaファイル内のすべての注釈に\fIRetentionPolicy\&.SOURCE\fRがある場合は空になります。
 .RE
 .PP
 nonempty
 .RS 4
-package\-info\&.java\fIRetentionPolicy\&.CLASS\fRޤ\fIRetentionPolicy\&.RUNTIME\fRȤȤ᤬ޤޤˤΤ\fIpackage\-info\&.class\fRեޤ
+package\-info\&.javaに\fIRetentionPolicy\&.CLASS\fRまたは\fIRetentionPolicy\&.RUNTIME\fRとともに注釈が含まれる場合にのみ\fIpackage\-info\&.class\fRファイルを生成します。
 .RE
 .RE
 .PP
 \-Xprint
 .RS 4
-ǥХåŪǻꤷΥƥɽϤޤ⥳ѥ¹Ԥޤ󡣽Ϸѹǽޤ
+デバッグ目的で指定した型のテキスト表示を出力します。注釈処理もコンパイルも実行されません。出力形式は変更される可能性があります。
 .RE
 .PP
 \-XprintProcessorInfo
 .RS 4
-ΥץåꤵƤ˴ؤϤޤ
+ある特定のプロセッサが処理を依頼されている注釈に関する情報を出力します。
 .RE
 .PP
 \-XprintRounds
 .RS 4
-󤪤Ӹ³饦ɤ˴ؤϤޤ
+初回および後続の注釈処理ラウンドに関する情報を出力します。
 .RE
-.SH "-XLINTץѤٹͭޤ̵"
+.SH "-XLINTオプションを使用した警告の有効化または無効化"
 .PP
-\fI\-Xlint:name\fRץѤƷٹ\fIname\fRͭˤޤǡ\fIname\fRϼηٹ̾Τ줫ˤʤޤ\fI\-Xlint:\-name:\fRץѤơٹ̵Ǥޤ
+\fI\-Xlint:name\fRオプションを使用して警告\fIname\fRを有効にします。ここで、\fIname\fRは次の警告名のいずれかになります。\fI\-Xlint:\-name:\fRオプションを使用して、警告を無効化できます。
 .PP
 cast
 .RS 4
-פǾĹʥ㥹ȤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+不要で冗長なキャストについて警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -632,12 +632,12 @@
 .PP
 classfile
 .RS 4
-饹եƤ˴ϢˤĤƷٹ𤷤ޤ
+クラス・ファイルの内容に関連した問題について警告します。
 .RE
 .PP
 deprecation
 .RS 4
-侩ιܤλѤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+非推奨の項目の使用について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -649,13 +649,13 @@
 .if n \{\
 .RE
 .\}
-᥽å\fIjava\&.util\&.Date\&.getDay\fRJDK 1\&.1ʹߤ侩ˤʤޤ
+メソッド\fIjava\&.util\&.Date\&.getDay\fRはJDK 1\&.1以降は非推奨になりました。
 .RE
 .PP
 dep\-ann
 .RS 4
 \fI@deprecated\fR
-JavadocȤǥɥȲƤ뤬\fI@Deprecated\fR᤬դƤʤܤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+Javadocコメントでドキュメント化されているが、\fI@Deprecated\fR注釈が付いていない項目について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -674,7 +674,7 @@
 .PP
 divzero
 .RS 4
-0ǽ뤳ȤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+定整数0で除算されることについて警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -689,7 +689,7 @@
 .PP
 empty
 .RS 4
-\fIif \fRʸʹߤʸǤ뤳ȤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+\fIif \fR文以降が空の文であることについて警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -708,7 +708,7 @@
 .PP
 fallthrough
 .RS 4
-fall\-throughswitch֥ååФ줿ΤФƷٹåɽޤFall\-throughϡswitch֥åκǸΥǤΥɤˤbreakʸϴޤޤޤ󡣥ɤμ¹Ԥ򤽤Υ鼡ΥذưޤȤСswitch֥åcase 1٥³ɤϡbreakʸǽäƤޤ
+fall\-throughケースのswitchブロックをチェックし、検出されたものに対して警告メッセージを表示します。Fall\-throughケースは、switchブロック内の最後のケースを除くケースです。このコードにはbreak文は含まれません。コードの実行をそのケースから次のケースへ移動します。たとえば、このswitchブロック内のcase 1ラベルに続くコードは、break文で終わっていません。
 .sp
 .if n \{\
 .RS 4
@@ -725,12 +725,12 @@
 .if n \{\
 .RE
 .\}
-ΥɤΥѥ\fI\-Xlint:fallthrough\fRץ󤬻ѤƤ硢ѥϡˤʤäƤ륱ιֹȤȤˡcasefall\-throughǽ뤳Ȥ򼨤ٹȯԤޤ
+このコードのコンパイル時に\fI\-Xlint:fallthrough\fRオプションが使用されていた場合、コンパイラは、問題になっているケースの行番号とともに、caseにfall\-throughする可能性があることを示す警告を発行します。
 .RE
 .PP
 finally
 .RS 4
-˴λǤʤ\fIfinally\fRˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+正常に完了できない\fIfinally\fR句について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -750,17 +750,17 @@
 .if n \{\
 .RE
 .\}
-Ǥϡѥ\fIfinally\fR֥å˴ؤٹޤ\fIint\fR᥽åɤƤӽФȡ0֤ޤ\fIfinally\fR֥åϡ\fItry\fR֥åλȼ¹ԤޤǤϡ椬\fIcatch\fR֥å˰ܤ줿硢\fIint\fR᥽åɤϽλޤ\fIfinally\fR֥åϼ¹Ԥɬפ뤿ᡢ椬᥽åɤγ˰ܤƤƤ⡢Υ֥åϼ¹Ԥޤ
+この例では、コンパイラは\fIfinally\fRブロックに関する警告を生成します。\fIint\fRメソッドが呼び出されると、値0が返されます。\fIfinally\fRブロックは、\fItry\fRブロックが終了すると実行されます。この例では、制御が\fIcatch\fRブロックに移された場合、\fIint\fRメソッドは終了します。ただし、\fIfinally\fRブロックは実行される必要があるため、制御がメソッドの外部に移されていても、このブロックは実行されます。
 .RE
 .PP
 options
 .RS 4
-ޥɥ饤󡦥ץλѤ˴ؤˤĤƷٹ𤷤ޤѥ롦ץ򻲾ȤƤ
+コマンドライン・オプションの使用に関する問題について警告します。クロスコンパイル・オプションを参照してください。
 .RE
 .PP
 overrides
 .RS 4
-᥽åɤΥС饤ɤ˴ؤˤĤƷٹ𤷤ޤȤС2ĤΥ饹Ȥޤ
+メソッドのオーバーライドに関する問題について警告します。たとえば、次の2つのクラスがあるとします。
 .sp
 .if n \{\
 .RS 4
@@ -778,7 +778,7 @@
 .if n \{\
 .RE
 .\}
-ѥϡΤ褦ʷٹޤ
+コンパイラは、次のような警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -791,12 +791,12 @@
 .if n \{\
 .RE
 .\}
-ѥϡ\fIvarargs\fR᥽åɤ򸡽Фȡ\fIvarargs\fRβѥ᡼Ѵޤ᥽å\fIClassWithVarargsMethod\&.varargsMethod\fRǤϡѥ\fIvarargs\fRβѥ᡼\fIString\&.\&.\&. s\fR򲾥ѥ᡼\fIString[] s\fRѴޤϡ᥽å\fIClassWithOverridingMethod\&.varargsMethod\fRβѥ᡼бǤη̡Ǥϥѥ뤬Ԥޤ
+コンパイラは、\fIvarargs\fRメソッドを検出すると、\fIvarargs\fRの仮パラメータを配列に変換します。メソッド\fIClassWithVarargsMethod\&.varargsMethod\fRでは、コンパイラは\fIvarargs\fRの仮パラメータ\fIString\&.\&.\&. s\fRを仮パラメータ\fIString[] s\fRに変換します。これは、メソッド\fIClassWithOverridingMethod\&.varargsMethod\fRの仮パラメータに対応する配列です。その結果、この例ではコンパイルが行われます。
 .RE
 .PP
 path
 .RS 4
-ޥɥ饤Ǥ̵ʥѥǤ¸ߤʤѥǥ쥯ȥˤĤƷٹ𤷤ޤ(饹ѥѥʤɤΥѥϢ)Τ褦ʷٹ\fI@SuppressWarnings\fR뤳ȤϤǤޤ󡣤ȤСΤ褦ˤʤޤ
+コマンドラインでの無効なパス要素と存在しないパス・ディレクトリについて警告します(クラス・パス、ソース・パスなどのパス関連)。このような警告を\fI@SuppressWarnings\fR注釈で抑制することはできません。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -811,9 +811,9 @@
 .PP
 processing
 .RS 4
-˴ؤˤĤƷٹ𤷤ޤѥ餬ηٹΤϡޤ९饹ȤˡѤƤץåǤΥפ㳰ǤʤǤȤСñץå򼡤˼ޤ
+注釈処理に関する問題について警告します。コンパイラがこの警告を生成するのは、注釈を含むクラスがあるときに、使用している注釈プロセッサでそのタイプの例外を処理できない場合です。たとえば、単純な注釈プロセッサを次に示します。
 .sp
-\fBեAnnocProc\&.java\fR:
+\fBソース・ファイルAnnocProc\&.java\fR:
 .sp
 .if n \{\
 .RS 4
@@ -838,7 +838,7 @@
 .if n \{\
 .RE
 .\}
-\fBեAnnosWithoutProcessors\&.java\fR:
+\fBソース・ファイルAnnosWithoutProcessors\&.java\fR:
 .sp
 .if n \{\
 .RS 4
@@ -852,7 +852,7 @@
 .if n \{\
 .RE
 .\}
-Υޥɤϡץå\fIAnnoProc\fR򥳥ѥ뤷ץå򥽡ե\fIAnnosWithoutProcessors\&.java\fRФƼ¹Ԥޤ
+次のコマンドは、注釈プロセッサ\fIAnnoProc\fRをコンパイルし、この注釈プロセッサをソース・ファイル\fIAnnosWithoutProcessors\&.java\fRに対して実行します。
 .sp
 .if n \{\
 .RS 4
@@ -864,7 +864,7 @@
 .if n \{\
 .RE
 .\}
-ѥ餬ե\fIAnnosWithoutProcessors\&.java\fRФץå¹Ԥȡηٹޤ
+コンパイラがソース・ファイル\fIAnnosWithoutProcessors\&.java\fRに対して注釈プロセッサを実行すると、次の警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -876,12 +876,12 @@
 .if n \{\
 .RE
 .\}
-褹뤿ˡ饹\fIAnnosWithoutProcessors\fRӻѤ̾\fIAnno\fR\fINotAnno\fRѹǤޤ
+この問題を解決するために、クラス\fIAnnosWithoutProcessors\fRで定義および使用される注釈の名前を、\fIAnno\fRから\fINotAnno\fRに変更できます。
 .RE
 .PP
 rawtypes
 .RS 4
-rawФ̤ˤĤƷٹ𤷤ޤʸǤϡ\fIrawtypes\fRٹޤ
+raw型に対する未検査操作について警告します。次の文では、\fIrawtypes\fR警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -892,7 +892,7 @@
 .if n \{\
 .RE
 .\}
-Ǥϡ\fIrawtypes\fRٹޤ
+次の例では、\fIrawtypes\fR警告は生成されません。
 .sp
 .if n \{\
 .RS 4
@@ -903,12 +903,12 @@
 .if n \{\
 .RE
 .\}
-\fIList\fRrawǤ\fIList<?>\fRϡХɷΥ磻ɥɤΥѥ᡼줿Ǥ\fIList\fRϥѥ᡼줿󥿥եǤ뤿ᡢˤηꤷޤǤϡ\fIList\fRβϥХɷΥ磻ɥ(\fI?\fR)ѤƤβѥ᡼ȤƻꤵޤĤޤꡢ\fIcountElements\fR᥽åɤ\fIList\fR󥿥եΤɤΥ󥹥󥹲դ뤳ȤǤޤ
+\fIList\fRはraw型です。ただし、\fIList<?>\fRは、アンバウンド形式のワイルドカードのパラメータ化された型です。\fIList\fRはパラメータ化されたインタフェースであるため、常にその型引数を指定します。この例では、\fIList\fRの仮引数はアンバウンド形式のワイルドカード(\fI?\fR)を使用してその仮型パラメータとして指定されます。つまり、\fIcountElements\fRメソッドは\fIList\fRインタフェースのどのインスタンス化も受け付けることができます。
 .RE
 .PP
 Serial
 .RS 4
-ľ󲽲ǽ饹\fIserialVersionUID\fRʤȤٹ𤷤ޤȤСΤ褦ˤʤޤ
+直列化可能クラスに\fIserialVersionUID\fR定義がないことを警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -930,7 +930,7 @@
 .if n \{\
 .RE
 .\}
-ѥϼηٹޤ
+コンパイラは次の警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -942,12 +942,12 @@
 .if n \{\
 .RE
 .\}
-ľ󲽲ǽ饹\fIserialVersionUID\fRȤ̾ΥեɤŪʤ硢ľ󲽥󥿥ĶǤϡJava֥ľ󲽻͡פƤ褦ˡ饹͡¦̤˴Ťơ饹\fIserialVersionUID\fRΥǥեͤ׻ޤ٤Ƥľ󲽲ǽ饹\fIserialVersionUID\fRͤŪ뤳Ȥ򶯤ᤷޤ ϡ\fIserialVersionUID\fRͤ׻ǥեȤΥץѥμˤäưۤʤǽΤ륯饹ξܺ٤ˤƱƶ䤹η̡ľͽʤ\fIInvalidClassExceptions\fRȯǽ뤿ǤJavaѥμۤʤäƤ\fIserialVersionUID\fRͤΰݤˤˤϡľ󲽲ǽ饹\fIserialVersionUID\fRͤŪɬפޤ
+直列化可能クラスが\fIserialVersionUID\fRという名前のフィールドを明示的に宣言しない場合、直列化ランタイム環境では、「Javaオブジェクト直列化仕様」で説明されているように、クラスの様々な側面に基づいて、クラスの\fIserialVersionUID\fRのデフォルト値を計算します。ただし、すべての直列化可能クラスが\fIserialVersionUID\fR値を明示的に宣言することを強くお薦めします。 これは、\fIserialVersionUID\fR値を計算するデフォルトのプロセスが、コンパイラの実装によって異なる可能性のあるクラスの詳細にきわめて影響を受けやすく、その結果、直列化復元中に予期しない\fIInvalidClassExceptions\fRが発生する可能性があるためです。Javaコンパイラの実装が異なっても\fIserialVersionUID\fR値の一貫性を確保にするには、直列化可能クラスが\fIserialVersionUID\fR値を明示的に宣言する必要があります。
 .RE
 .PP
 static
 .RS 4
-staticλѤ˴ؤˤĤƷٹ𤷤ޤȤСΤ褦ˤʤޤ
+staticの使用に関する問題について警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -961,7 +961,7 @@
 .if n \{\
 .RE
 .\}
-ѥϼηٹޤ
+コンパイラは次の警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -973,7 +973,7 @@
 .if n \{\
 .RE
 .\}
-褹뤿ˡΤ褦\fIstatic\fR᥽å\fIm1\fRƤӽФȤǤޤ
+この問題を解決するために、次のように\fIstatic\fRメソッド\fIm1\fRを呼び出すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -984,12 +984,12 @@
 .if n \{\
 .RE
 .\}
-뤤ϡ\fIstatic\fRɤ᥽å\fIm1\fR뤳ȤǤޤ
+あるいは、\fIstatic\fRキーワードをメソッド\fIm1\fRの宣言から削除することもできます。
 .RE
 .PP
 try
 .RS 4
-try\-with\-resourcesʸޤࡢ\fItry\fR֥åλѤ˴ؤˤĤƷٹ𤷤ޤȤС\fItry\fR֥å줿꥽\fIac\fRѤʤˡʸФƷٹޤ
+try\-with\-resources文を含む、\fItry\fRブロックの使用に関する問題について警告します。たとえば、\fItry\fRブロックで宣言されたリソース\fIac\fRが使用されないために、次の文に対して警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -1004,7 +1004,7 @@
 .PP
 unchecked
 .RS 4
-JavaͤǻꤵƤ̤Ѵٹξܺ٤򼨤ޤȤСΤ褦ˤʤޤ
+Java言語仕様で指定されている未検査変換警告の詳細を示します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1016,19 +1016,19 @@
 .if n \{\
 .RE
 .\}
-ξõˡ\fIArrayList<Number>\fR\fIList<String>\fRϡ줾\fIArrayList\fR\fIList\fRˤʤޤ
+型の消去中に、型\fIArrayList<Number>\fRおよび\fIList<String>\fRは、それぞれ\fIArrayList\fRおよび\fIList\fRになります。
 .sp
-\fIls\fRޥɤˤϡѥ᡼줿\fIList<String>\fRꤵƤޤ\fIl\fRˤäƻȤ\fIList\fR\fIls\fR˳Ƥ줿硢ѥ̤ٹޤѥˡѥ餪JVMϡ\fIl\fR\fIList<String>\fR򻲾Ȥ뤫ɤȽ̤Ǥޤ󡣤ξ硢\fIl\fRϡ\fIList<String>\fR򻲾Ȥޤ󡣤η̡ҡױȯޤ
+\fIls\fRコマンドには、パラメータ化された型\fIList<String>\fRが指定されています。\fIl\fRによって参照される\fIList\fRが\fIls\fRに割り当てられた場合、コンパイラは未検査警告を生成します。コンパイル時に、コンパイラおよびJVMは、\fIl\fRが\fIList<String>\fR型を参照するかどうかを判別できません。この場合、\fIl\fRは、\fIList<String>\fR型を参照しません。その結果、ヒープ汚染が発生します。
 .sp
-ҡױ֤ȯΤϡ\fIList\fR֥\fIl\fR
-(static\fIList<Number>\fR)̤\fIList\fR֥\fIls\fR
-(ۤʤstatic\fIList<String>\fR)ǤѥǤϤ򤤤ޤ˵ĤƤޤΤ򥵥ݡȤʤJava SEΥ꡼Ȥβ̸ߴݤ뤿ˡĤɬפޤõˤꡢ\fIList<Number>\fR\fIList<String>\fRϡξȤ\fIList\fRˤʤޤη̡ѥϥ֥\fIl\fR
-(\fIList\fRȤraw)򥪥֥\fIls\fR뤳ȤĤޤ
+ヒープ汚染状態が発生するのは、\fIList\fRオブジェクト\fIl\fR
+(そのstatic型は\fIList<Number>\fR)が別の\fIList\fRオブジェクト\fIls\fR
+(異なるstatic型\fIList<String>\fRを持つ)に代入される場合です。しかし、コンパイラではこの代入をいまだに許可しています。総称をサポートしないJava SEのリリースとの下位互換性を確保するために、この代入を許可する必要があります。型消去により、\fIList<Number>\fRおよび\fIList<String>\fRは、両方とも\fIList\fRになります。その結果、コンパイラはオブジェクト\fIl\fR
+(\fIList\fRというraw型を持つ)をオブジェクト\fIls\fRに代入することを許可します。
 .RE
 .PP
 varargs
 .RS 4
-Ѱ(\fIvarargs\fR)᥽åɡäݲǽޤΤλѤǤʤȤٹ𤷤ޤȤСΤ褦ˤʤޤ
+可変引数(\fIvarargs\fR)メソッド、特に非具象化可能引数を含むものの使用が安全でないことを警告します。たとえば、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1045,10 +1045,10 @@
 .if n \{\
 .RE
 .\}
-\fB:\fR
-ݲǽϡ󤬼¹Ի˴˻ԲǽʷǤ
+\fB注意:\fR
+非具象化可能型は、型情報が実行時に完全に使用不可能な型です。
 .sp
-ѥϡ᥽å\fIArrayBuilder\&.addToList\fR˴ؤ뼡ηٹޤ
+コンパイラは、メソッド\fIArrayBuilder\&.addToList\fRの定義に関する次の警告を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1059,21 +1059,21 @@
 .if n \{\
 .RE
 .\}
-ѥϡvarargs᥽åɤ򸡽Фȡ\fIvarargs\fRβѥ᡼ѴޤJavaץߥ󥰸Ǥϡѥ᡼줿κĤƤޤ󡣥᥽å\fIArrayBuilder\&.addToList\fRǤϡѥ\fIvarargs\fRβѥ᡼\fIT\&.\&.\&.\fRǤ򲾥ѥ᡼\fIT[]\fR()Ѵޤõˤꡢѥ\fIvarargs\fRβѥ᡼\fIObject[]\fRǤѴޤη̡ҡױȯǽޤ
+コンパイラは、varargsメソッドを検出すると、\fIvarargs\fRの仮パラメータを配列に変換します。しかし、Javaプログラミング言語では、パラメータ化された型の配列の作成を許可していません。メソッド\fIArrayBuilder\&.addToList\fRでは、コンパイラは\fIvarargs\fRの仮パラメータ\fIT\&.\&.\&.\fR要素を仮パラメータ\fIT[]\fR要素(配列)に変換します。しかし、型消去により、コンパイラは\fIvarargs\fRの仮パラメータを\fIObject[]\fR要素に変換します。その結果、ヒープ汚染が発生する可能性があります。
 .RE
-.SH "ޥɥ饤ե"
+.SH "コマンドライン引数ファイル"
 .PP
-\fIjavac\fRޥɤûʷˤꤹ뤿ˡ\fIjavac\fRޥɤФ(\fI\-J\fRץ)ޤ1İʾΥեꤹ뤳ȤǤޤˤꡢɤΥڥ졼ƥ󥰡ƥǤ⡢ǤդĹ\fIjavac\fRޥɤǤޤ
+\fIjavac\fRコマンドを短くしたり簡潔にしたりするために、\fIjavac\fRコマンドに対する引数(\fI\-J\fRオプションを除く)を含む1つ以上のファイルを指定することができます。これにより、どのオペレーティング・システム上でも、任意の長さの\fIjavac\fRコマンドを作成できます。
 .PP
-եˤϡ\fIjavac\fRΥץȥե̾ͳȤ߹礻ƵҤǤޤեΰϡޤϲʸǶڤ뤳ȤǤޤե̾ޤ줿򤬤硢ե̾ΤŰǰϤߤޤ
+引数ファイルには、\fIjavac\fRのオプションとソース・ファイル名を自由に組み合せて記述できます。ファイル内の引数は、空白または改行文字で区切ることができます。ファイル名に埋め込まれた空白がある場合、ファイル名全体を二重引用符で囲みます。
 .PP
-եΥե̾ϡեΰ֤ǤϤʤߤΥǥ쥯ȥŪȤʤޤΥꥹȤǤϡ磻ɥ(*)ϻѤǤޤ(ȤС\fI*\&.java\fRȤϻǤޤ)åȥޡ(@)ѤեκƵŪʲϥݡȤƤޤ󡣤ޤ\fI\-J\fRץ⥵ݡȤƤޤ󡣤ΥץϵưġϤޤưġǤϰե򥵥ݡȤƤʤǤ
+引数ファイル内のファイル名は、引数ファイルの位置ではなく、現在のディレクトリに相対的となります。これらのリストでは、ワイルドカード(*)は使用できません(たとえば、\fI*\&.java\fRとは指定できません)。アットマーク(@)を使用したファイルの再帰的な解釈はサポートされていません。また、\fI\-J\fRオプションもサポートされていません。このオプションは起動ツールに渡されますが、起動ツールでは引数ファイルをサポートしていないからです。
 .PP
-\fIjavac\fRޥɤ¹ԤȤˡưեΥѥ̾Ƭ˥åȥޡ(@)ʸդϤޤ\fIjavac\fRޥɤϡåȥޡ(@)ǻϤޤ򸫤ĤȡΥեƤŸưꥹȤޤ
+\fIjavac\fRコマンドを実行するときに、各引数ファイルのパスと名前の先頭にアットマーク(@)文字を付けて渡します。\fIjavac\fRコマンドは、アットマーク(@)で始まる引数を見つけると、そのファイルの内容を展開して引数リストに挿入します。
 .PP
-\fBExample 1\fR, ñΰե
+\fBExample 1\fR, 単一の引数ファイル
 .RS 4
-\fIargfile\fRȤ̾ñΰեѤơ٤Ƥ\fIjavac\fRǼϡΤ褦˻ꤷޤ
+\fIargfile\fRという名前の単一の引数ファイルを使用して、すべての\fIjavac\fR引数を格納する場合は、次のように指定します。
 .sp
 .if n \{\
 .RS 4
@@ -1084,14 +1084,14 @@
 .if n \{\
 .RE
 .\}
-ΰեˤϡ2ǼƤξΥեƤ뤳ȤǤޤ
+この引数ファイルには、例2で示されている両方のファイルの内容を入れることができます。
 .RE
 .PP
-\fBExample 2\fR, 2Ĥΰե
+\fBExample 2\fR, 2つの引数ファイル
 .RS 4
-\fIjavac\fRץѤȥե̾Ѥˡ2ĤΰեǤޤΥꥹȤˤϡԤη³ʸϤޤ
+\fIjavac\fRオプション用とソース・ファイル名用に、2つの引数ファイルを作成できます。次のリストには、行の継続文字はありません。
 .sp
-ޤoptionsȤ̾Υեޤ
+次を含むoptionsという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -1113,7 +1113,7 @@
 .if n \{\
 .RE
 .\}
-ޤclassesȤ̾Υեޤ
+次を含むclassesという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -1126,7 +1126,7 @@
 .if n \{\
 .RE
 .\}
-줫顢Τ褦\fIjavac\fRޥɤ¹Ԥޤ
+それから、次のように\fIjavac\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -1139,9 +1139,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, ѥѤե
+\fBExample 3\fR, パスを使用した引数ファイル
 .RS 4
-եϥѥǤޤեΤ٤ƤΥե̾ϡ(\fIpath1\fR\fIpath2\fRǤϤʤ)Τ褦˸ߤκȥǥ쥯ȥŪȤʤޤ
+引数ファイルはパスを指定できますが、ファイル内のすべてのファイル名は、(\fIpath1\fRや\fIpath2\fRではなく)次のように現在の作業ディレクトリに相対的となります。
 .sp
 .if n \{\
 .RS 4
@@ -1153,46 +1153,46 @@
 .RE
 .\}
 .RE
-.SH ""
+.SH "注釈処理"
 .PP
-\fIjavac\fRޥɤľܥݡȤƤ뤿ᡢΩޥɤǤ\fIapt\fRѤɬפʤʤޤ
+\fIjavac\fRコマンドが注釈処理を直接サポートしているため、独立した注釈処理コマンドである\fIapt\fRを使用する必要がなくなりました。
 .PP
-ץåAPIϡ\fIjavax\&.annotation\&.processing\fR\fIjavax\&.lang\&.model\fRѥåȤΥ֥ѥåƤޤ
-.SS "Ԥˡ"
+注釈プロセッサのAPIは、\fIjavax\&.annotation\&.processing\fRおよび\fIjavax\&.lang\&.model\fRパッケージとそのサブパッケージ内に定義されています。
+.SS "注釈処理を行う方法"
 .PP
-\fI\-proc:none\fRץˤä̵ʤ¤ꡢѥϻѲǽʤ٤Ƥץå򸡺ޤѥϡ\fI\-processorpath\fRץѤƻǤޤѥꤷʤ硢桼饹ѥѤޤץåθϡѥ\fIMETA\-INF/services/javax\&.annotation\&.processing\fR\&.ProcessorȤ̾ΥӥץХե˴ŤƹԤޤΤ褦ʥեˤϡѤ뤹٤Ƥץå̾1Ԥ1ĤĴޤƤޤ̤ˡȤơ\fI\-processor\fRץѤƥץåŪ˻ꤹ뤳ȤǤޤ
+\fI\-proc:none\fRオプションによって注釈処理が無効化されない限り、コンパイラは使用可能なすべての注釈プロセッサを検索します。検索パスは、\fI\-processorpath\fRオプションを使用して指定できます。パスを指定しない場合、ユーザー・クラス・パスが使用されます。プロセッサの検索は、検索パス上の\fIMETA\-INF/services/javax\&.annotation\&.processing\fR\&.Processorという名前のサービス・プロバイダ構成ファイルに基づいて行われます。このようなファイルには、使用するすべての注釈プロセッサの名前を、1行に1つずつ含めてください。また、別の方法として、\fI\-processor\fRオプションを使用してプロセッサを明示的に指定することもできます。
 .PP
-ѥϡޥɥ饤Υե䥯饹뤳ȤǡɤΤ褦᤬¸ߤƤ뤫ǧȡץåФ礻ԤΥץåɤǤΤǧޤפΤĤä硢ΥץåƤӽФޤƥץåϡȤ׵Ǥޤξ硢Ф̤Υץå򸫤ĤߤϹԤޤ󡣤٤Ƥ᤬׵ᤵȡѥϤʾץåθԤޤ
+コンパイラは、コマンドラインのソース・ファイルやクラスを走査することで、どのような注釈が存在しているかを確認し終わると、プロセッサに対して問合せを行い、それらのプロセッサがどの注釈を処理できるのかを確認します。一致するものが見つかった場合、そのプロセッサが呼び出されます。各プロセッサは、自身が処理する注釈を要求できます。その場合、それらの注釈に対する別のプロセッサを見つける試みは行われません。すべての注釈が要求されると、コンパイラはそれ以上プロセッサの検索を行いません。
 .PP
-줫Υץåˤäƿե뤬ȡ2ܤΥ饦ɤϤޤ줿٤ƤΥե뤬󤵤졢Ʊͤ᤬ޤΥ饦ɤǸƤӽФ줿ץåϤ٤ơ³ΤɤΥ饦ɤǤƤӽФޤ줬ե뤬ʤʤޤ³ޤ
+いずれかのプロセッサによって新しいソース・ファイルが生成されると、注釈処理の2回目のラウンドが開始されます。新しく生成されたすべてのソース・ファイルがスキャンされ、前回と同様に注釈が処理されます。以前のラウンドで呼び出されたプロセッサはすべて、後続のどのラウンドでも呼び出されます。これが、新しいソース・ファイルが生成されなくなるまで続きます。
 .PP
-饦ɤǿե뤬ʤä硢ץå1Τ߸ƤӽФ졢Ĥν¹Ԥ뵡ͿޤǸˡ\fI\-proc:only\fRץ󤬻ѤʤꡢѥϡΥե줿٤ƤΥե򥳥ѥ뤷ޤ
-.SS "Ū˥ɤ줿ե"
+あるラウンドで新しいソース・ファイルが生成されなかった場合、注釈プロセッサがあと1回のみ呼び出され、残りの処理を実行する機会が与えられます。最後に、\fI\-proc:only\fRオプションが使用されないかぎり、コンパイラは、元のソース・ファイルと生成されたすべてのソース・ファイルをコンパイルします。
+.SS "暗黙的にロードされたソース・ファイル"
 .PP
-ѥϡϢΥե򥳥ѥ뤹ݤˡ̤ΥեŪ˥ɤ뤳Ȥɬפʾ礬ޤθ򻲾ȤƤΤ褦ʥեϡǤоݤˤʤޤ󡣥ǥեȤǤϡ¹Ԥ졢İŪ˥ɤ줿ǤդΥե뤬ѥ뤵줿硢ѥϷٹȯԤޤ\fI\-implicit\fRץǤϡٹˡ󶡤ޤ
-.SH "θ"
+コンパイラは、一連のソース・ファイルをコンパイルする際に、別のソース・ファイルを暗黙的にロードすることが必要な場合があります。型の検索を参照してください。そのようなファイルは、現時点では注釈処理の対象になりません。デフォルトでは、注釈処理が実行され、かつ暗黙的にロードされた任意のソース・ファイルがコンパイルされた場合、コンパイラは警告を発行します。\fI\-implicit\fRオプションでは、警告を抑制する方法が提供されます。
+.SH "型の検索"
 .PP
-ե򥳥ѥ뤹뤿ˡѥ̾˴ؤɬפȤޤηϥޥɥ饤ǻꤷեˤޤ󡣥ѥϡեǻѤƤ륯饹ޤϥ󥿥եĥƤ륯饹ޤϥ󥿥ե뤤ϼƤ륯饹ޤϥ󥿥ե٤ƤˤĤơξɬפȤޤˤϡեŪˤϸڤƤʤƤ⡢Ѿ̤ƾ󶡤륯饹ȥ󥿥եޤޤޤ
+ソース・ファイルをコンパイルするために、コンパイラは通常、型に関する情報を必要としますが、その型の定義はコマンドラインで指定したソース・ファイルにありません。コンパイラは、ソース・ファイルで使用されているクラスまたはインタフェース、拡張されているクラスまたはインタフェース、あるいは実装されているクラスまたはインタフェースすべてについて、型の情報を必要とします。これには、ソース・ファイルで明示的には言及されていなくても、継承を通じて情報を提供するクラスとインタフェースも含まれます。
 .PP
-ȤС֥饹\fIjava\&.applet\&.Applet\fRȡ\fIץå\fRΥ饹(\fIjava\&.awt\&.Panel\fR\fIjava\&.awt\&.Container\fR\fIjava\&.awt\&.Component\fR\fIjava\&.lang\&.Object\fR)ѤƤ뤳Ȥˤʤޤ
+たとえば、サブクラス\fIjava\&.applet\&.Applet\fRを作成すると、\fIアプレット\fRの祖先のクラス(\fIjava\&.awt\&.Panel\fR、\fIjava\&.awt\&.Container\fR、\fIjava\&.awt\&.Component\fRおよび\fIjava\&.lang\&.Object\fR)を使用していることにもなります。
 .PP
-ѥϡξɬפˤʤȡηƤ륽եޤϥ饹ե򸡺ޤޤ֡ȥȥåס饹ȳĥǽ饹򸡺³ƥ桼饹ѥ(ǥեȤǤϸߤΥǥ쥯ȥ)򸡺ޤ桼饹ѥϡ\fICLASSPATH\fRĶѿꤷ뤫ޤ\fI\-classpath\fRץѤޤ
+コンパイラは、型の情報が必要になると、その型を定義しているソース・ファイルまたはクラス・ファイルを検索します。まず、ブートストラップ・クラスと拡張機能クラスを検索し、続いてユーザー・クラス・パス(デフォルトでは現在のディレクトリ)を検索します。ユーザー・クラス・パスは、\fICLASSPATH\fR環境変数を設定して定義するか、または\fI\-classpath\fRオプションを使用して定義します。
 .PP
-\fI\-sourcepath\fRץꤵƤ硢ѥϡꤵ줿ѥ饽ե򸡺ޤʳξ硢ѥϡ桼饹ѥ饯饹եȥեξ򸡺ޤ
+\fI\-sourcepath\fRオプションが設定されている場合、コンパイラは、指定されたパスからソース・ファイルを検索します。それ以外の場合、コンパイラは、ユーザー・クラス・パスからクラス・ファイルとソース・ファイルの両方を検索します。
 .PP
-\fI\-bootclasspath\fRץ󤪤\fI\-extdirs\fRץѤơ̤Υ֡ȥȥåס饹ĥǽ饹Ǥޤѥ롦ץ򻲾ȤƤ
+\fI\-bootclasspath\fRオプションおよび\fI\-extdirs\fRオプションを使用して、別のブートストラップ・クラスや拡張機能クラスを指定できます。クロスコンパイル・オプションを参照してください。
 .PP
-θȤ̤ϡ饹ե롢ե롢ޤϤξǤ礬ޤξĤä硢ΤɤѤ뤫\fI\-Xprefer\fRץǥѥ˻ؼǤޤ\fInewer\fRꤵ줿硢ѥ2ĤΥեΤѤޤ\fIsource\fRꤵ줿硢ѥϥեѤޤǥեȤ\fInewer\fRǤ
+型の検索に成功したときに得られる結果は、クラス・ファイル、ソース・ファイル、またはその両方である場合があります。両方が見つかった場合、そのどちらを使用するかを\fI\-Xprefer\fRオプションでコンパイラに指示できます。\fInewer\fRが指定された場合、コンパイラは2つのファイルのうち新しい方を使用します。\fIsource\fRが指定された場合、コンパイラはソース・ファイルを使用します。デフォルトは\fInewer\fRです。
 .PP
-θΤˤäơޤ\fI\-Xprefer\fRץꤵ줿̤ȤɬפʷΥե뤬Ĥä硢ѥϤΥեɤ߼ꡢɬפʾޤǥեȤǤϡѥϥեΥѥԤޤ\fI\-implicit\fRץѤƤưǤޤ\fInone\fRꤵ줿硢եФƥ饹եޤ\fIclass\fRꤵ줿硢եФƥ饹ե뤬ޤ
+型の検索自体によって、または\fI\-Xprefer\fRオプションが設定された結果として必要な型のソース・ファイルが見つかった場合、コンパイラはそのソース・ファイルを読み取り、必要な情報を取得します。デフォルトでは、コンパイラはソース・ファイルのコンパイルも行います。\fI\-implicit\fRオプションを使用してその動作を指定できます。\fInone\fRが指定された場合、ソース・ファイルに対してクラス・ファイルは生成されません。\fIclass\fRが指定された場合、ソース・ファイルに対してクラス・ファイルが生成されます。
 .PP
-ѥϡλޤǡ뷿ɬǧʤ礬ޤ󤬥ե˸Ĥꡢ\fI\-implicit\fRץ󤬻ꤵƤʤ硢ѥˤäơΥե뤬оݤȤʤ餺˥ѥ뤵뤳Ȥٹ𤵤ޤηٹ̵ˤˤϡ(Υե뤬оݤȤʤ褦)Υե򥳥ޥɥ饤˻ꤹ뤫뤤ϤΤ褦ʥեФƥ饹եɬפ뤫ɤ\fI\-implicit\fRץѤƻꤷޤ
-.SH "ץޥƥå󥿥ե"
+コンパイラは、注釈処理が完了するまで、ある型情報の必要性を認識しない場合があります。型情報がソース・ファイル内に見つかり、かつ\fI\-implicit\fRオプションが指定されていない場合、コンパイラによって、そのファイルが注釈処理の対象とならずにコンパイルされることが警告されます。この警告を無効にするには、(そのファイルが注釈処理の対象となるように)そのファイルをコマンドラインに指定するか、あるいはそのようなソース・ファイルに対してクラス・ファイルを生成する必要があるかどうかを\fI\-implicit\fRオプションを使用して指定します。
+.SH "プログラマティック・インタフェース"
 .PP
-\fIjavac\fRޥɤϡ\fIjavax\&.tools\fRѥåΥ饹ȥ󥿥եˤä뿷Java Compiler API򥵥ݡȤޤ
-.SS ""
+\fIjavac\fRコマンドは、\fIjavax\&.tools\fRパッケージ内のクラスとインタフェースによって定義される新しいJava Compiler APIをサポートします。
+.SS "例"
 .PP
-ޥɥ饤ꤹ褦˥ѥ뤹ˤϡιʸѤޤ
+コマンドライン引数を指定するようにコンパイルするには、次の構文を使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1205,15 +1205,15 @@
 .RE
 .\}
 .PP
-ǤϡǤɸϥȥ꡼˽񤭹ߡޥɥ饤󤫤θƽФ\fIjavac\fRꤹ뽪λɤ֤ޤ
+例では、診断を標準出力ストリームに書き込み、コマンドラインからの呼出し時に\fIjavac\fRが指定する終了コードを返します。
 .PP
-\fIjavax\&.tools\&.JavaCompiler\fR󥿥ե¾Υ᥽åɤѤȡǤνեɼ긵/ʤɤԤȤǤޤ
-.SS "켰Υ󥿥ե"
+\fIjavax\&.tools\&.JavaCompiler\fRインタフェースの他のメソッドを使用すると、診断の処理やファイルの読取り元/書込み先の制御などを行うことができます。
+.SS "旧式のインタフェース"
 .PP
-\fB:\fR
-APIϡ̸ߴΤˤΤݻƤޤ٤ƤοɤϡJava Compiler APIѤɬפޤ
+\fB注意:\fR
+このAPIは、下位互換性のためにのみ保持されています。すべての新しいコードは、新しいJava Compiler APIを使用する必要があります。
 .PP
-Τ褦ˡ\fIcom\&.sun\&.tools\&.javac\&.Main\fR饹ˤϡץफ饳ѥƤӽФstatic᥽åɤ2ѰդƤޤ
+次のように、\fIcom\&.sun\&.tools\&.javac\&.Main\fRクラスには、プログラムからコンパイラを呼び出すためのstaticメソッドが2つ用意されています。
 .sp
 .if n \{\
 .RS 4
@@ -1226,21 +1226,21 @@
 .RE
 .\}
 .PP
-\fIargs\fRѥ᡼ϡ̾拾ѥϤǤդΥޥɥ饤ɽƤޤ
+\fIargs\fRパラメータは、通常コンパイラに渡される任意のコマンドライン引数を表しています。
 .PP
-\fIout\fRѥ᡼ϡѥοǽϤΰ򼨤ޤ
+\fIout\fRパラメータは、コンパイラの診断出力の宛先を示します。
 .PP
-\fIreturn\fRͤϡ\fIjavac\fR\fIexit\fRͤƱǤ
+\fIreturn\fR値は、\fIjavac\fRの\fIexit\fR値と同じです。
 .PP
-\fB:\fR
-̾\fIcom\&.sun\&.tools\&.javac\fRǻϤޤѥå(\fIcom\&.sun\&.tools\&.javac\fRΥ֥ѥå)ǸФ¾Τ٤ƤΥ饹ӥ᥽åɤϡѤǤꡢĤǤѹǽޤ
-.SH ""
+\fB注意:\fR
+名前が\fIcom\&.sun\&.tools\&.javac\fRで始まるパッケージ(\fIcom\&.sun\&.tools\&.javac\fRのサブパッケージ)で検出される他のすべてのクラスおよびメソッドは、完全に内部用であり、いつでも変更される可能性があります。
+.SH "例"
 .PP
-\fBExample 1\fR, ñʥץΥѥ
+\fBExample 1\fR, 簡単なプログラムのコンパイル
 .RS 4
-Ǥϡgreetingsǥ쥯ȥ\fIHello\&.java\fRե򥳥ѥ뤹ˡ򼨤Ƥޤ\fIHello\&.java\fR줿饹ϡ\fIgreetings\&.Hello\fRȸƤФޤgreetingsǥ쥯ȥϡեȥ饹եξѥåǥ쥯ȥǡߤΥǥ쥯ȥΤˤޤˤꡢǥեȤΥ桼饹ѥѤǤ褦ˤʤޤޤ\fI\-d\fRץѤ̤νǥ쥯ȥꤹɬפ⤢ޤ
+この例では、greetingsディレクトリで\fIHello\&.java\fRソース・ファイルをコンパイルする方法を示しています。\fIHello\&.java\fRで定義されたクラスは、\fIgreetings\&.Hello\fRと呼ばれます。greetingsディレクトリは、ソース・ファイルとクラス・ファイルの両方があるパッケージ・ディレクトリで、現在のディレクトリのすぐ下にあります。これにより、デフォルトのユーザー・クラス・パスを使用できるようになります。また、\fI\-d\fRオプションを使用して別の出力先ディレクトリを指定する必要もありません。
 .sp
-\fIHello\&.java\fRΥɤϼΤȤǤ
+\fIHello\&.java\fR内のソース・コードは次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -1259,7 +1259,7 @@
 .if n \{\
 .RE
 .\}
-greetings\&.HelloΥѥ:
+greetings\&.Helloのコンパイル:
 .sp
 .if n \{\
 .RS 4
@@ -1270,7 +1270,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\&.Hello\fRμ¹:
+\fIgreetings\&.Hello\fRの実行:
 .sp
 .if n \{\
 .RS 4
@@ -1286,9 +1286,9 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ʣΥեΥѥ
+\fBExample 2\fR, 複数のソース・ファイルのコンパイル
 .RS 4
-Ǥϡ\fIgreetings\fRѥåΥե\fIAloha\&.java\fR\fIGutenTag\&.java\fR\fIHello\&.java\fR\fIHi\&.java\fR򥳥ѥ뤷ޤ
+この例では、\fIgreetings\fRパッケージのソース・ファイル\fIAloha\&.java\fR、\fIGutenTag\&.java\fR、\fIHello\&.java\fRおよび\fIHi\&.java\fRをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1304,9 +1304,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, 桼饹ѥλ
+\fBExample 3\fR, ユーザー・クラス・パスの指定
 .RS 4
-ҤΥեΤ1ĤѹˡΥեƥѥ뤷ޤ
+前述の例のソース・ファイルのうち1つを変更した後に、そのファイルを再コンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1319,7 +1319,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\&.Hi\fR\fIgreetings\fRѥå¾Υ饹򻲾ȤƤ뤿ᡢѥϤ¾Υ饹õɬפޤǥեȤΥ桼饹ѥϥѥåǥ쥯ȥޤǥ쥯ȥǤ뤿ᡢҤưޤߤΥǥ쥯ȥ򵤤ˤˤΥեƥѥ뤹硢\fICLASSPATH\fRꤷơ桼饹ѥΥǥ쥯ȥɲäޤǤϡ\fI\-classpath\fRץѤƤޤ
+\fIgreetings\&.Hi\fRは\fIgreetings\fRパッケージ内の他のクラスを参照しているため、コンパイラはこれらの他のクラスを探す必要があります。デフォルトのユーザー・クラス・パスはパッケージ・ディレクトリを含むディレクトリであるため、前述の例は動作します。現在のディレクトリを気にせずにこのファイルを再コンパイルする場合、\fICLASSPATH\fRを設定して、ユーザー・クラス・パスに例のディレクトリを追加します。この例では、\fI\-classpath\fRオプションを使用しています。
 .sp
 .if n \{\
 .RS 4
@@ -1330,7 +1330,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\&.Hi\fRѹƥХʡ桼ƥƥѤ褦ˤ硢 Υ桼ƥƥ桼饹ѥ̤ƥǤ褦ˤʤäƤɬפޤ
+\fIgreetings\&.Hi\fRを変更してバナー・ユーティリティを使用するようにした場合、 そのユーティリティもユーザー・クラス・パスを通じてアクセスできるようになっている必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1342,7 +1342,7 @@
 .if n \{\
 .RE
 .\}
-\fIgreetings\fRѥåǥ饹¹Ԥˤϡץ\fIgreetings\fRѥå\fIgreetings\fR饹Ѥ륯饹˥ɬפޤ
+\fIgreetings\fRパッケージでクラスを実行するには、プログラムは\fIgreetings\fRパッケージ、および\fIgreetings\fRクラスが使用するクラスにアクセスする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1355,9 +1355,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, եȥ饹եʬΥ
+\fBExample 4\fR, ソース・ファイルとクラス・ファイルの分離
 .RS 4
-Ǥϡ\fIjavac\fRѤơJVM 1\&.6Ǽ¹Ԥ륳ɤ򥳥ѥ뤷ޤ
+次の例では、\fIjavac\fRを使用して、JVM 1\&.6上で実行するコードをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1369,9 +1369,9 @@
 .if n \{\
 .RE
 .\}
-\fI\-source 1\&.6\fRץˤꡢ\fIOldCode\&.java\fRΥѥˤϥ꡼1\&.6(ޤ6)Javaץߥ󥰸줬Ѥޤ\fI\-target 1\&.6\fRץˤꡢJVM 1\&.6ȸߴΤ륯饹ե뤬ޤۤȤɤξ硢\fI\-target\fRץͤ\fI\-source\fRץͤˤʤޤǤϡ\fI\-target\fRץάǤޤ
+\fI\-source 1\&.6\fRオプションにより、\fIOldCode\&.java\fRのコンパイルにはリリース1\&.6(または6)のJavaプログラミング言語が使用されます。\fI\-target 1\&.6\fRオプションにより、JVM 1\&.6と互換性のあるクラス・ファイルが生成されます。ほとんどの場合、\fI\-target\fRオプションの値は\fI\-source\fRオプションの値になります。この例では、\fI\-target\fRオプションを省略できます。
 .sp
-\fI\-bootclasspath\fRץѤơŬڤʥСΥ֡ȥȥåס饹(\fIrt\&.jar\fR饤֥)ꤹɬפޤꤷʤϡѥˤäƼηٹޤ
+\fI\-bootclasspath\fRオプションを使用して、適切なバージョンのブートストラップ・クラス(\fIrt\&.jar\fRライブラリ)を指定する必要があります。指定しない場合は、コンパイラによって次の警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -1384,12 +1384,12 @@
 .if n \{\
 .RE
 .\}
-ŬڤʥСΥ֡ȥȥåס饹ꤷʤ硢ѥϸŤ(ǤϡС1\&.6Javaץߥ󥰸)򿷤֡ȥȥåס饹Ȥ߹礻ƻѤޤη̡¸ߤʤ᥽åɤؤλȤޤޤƤ뤳Ȥ뤿ᡢ饹ե뤬Ťץåȥե(ξJava SE 6)ưʤǽޤ
+適切なバージョンのブートストラップ・クラスを指定しない場合、コンパイラは古い言語仕様(この例では、バージョン1\&.6のJavaプログラミング言語)を新しいブートストラップ・クラスと組み合せて使用します。その結果、存在しないメソッドへの参照が含まれていることがあるため、クラス・ファイルが古いプラットフォーム(この場合はJava SE 6)で動作しない可能性があります。
 .RE
 .PP
-\fBExample 5\fR, ѥ
+\fBExample 5\fR, クロス・コンパイル
 .RS 4
-Ǥϡ\fIjavac\fRѤơJVM 1\&.6Ǽ¹Ԥ륳ɤ򥳥ѥ뤷ޤ
+この例では、\fIjavac\fRを使用して、JVM 1\&.6上で実行するコードをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -1401,9 +1401,9 @@
 .if n \{\
 .RE
 .\}
-The\fI \-source 1\&.6\fRץˤꡢOldCode\&.javaΥѥˤϥ꡼1\&.6(ޤ6)Javaץߥ󥰸줬Ѥޤ\fI\-target 1\&.6\fRץˤꡢJVM 1\&.6ȸߴΤ륯饹ե뤬ޤۤȤɤξ硢\fI\-target\fRͤ\fI\-source\fRͤˤʤޤǤϡ\fI\-target\fRץϾάޤ
+The\fI \-source 1\&.6\fRオプションにより、OldCode\&.javaのコンパイルにはリリース1\&.6(または6)のJavaプログラミング言語が使用されます。\fI\-target 1\&.6\fRオプションにより、JVM 1\&.6と互換性のあるクラス・ファイルが生成されます。ほとんどの場合、\fI\-target\fRの値は\fI\-source\fRの値になります。この例では、\fI\-target\fRオプションは省略されます。
 .sp
-\fI\-bootclasspath\fRץѤơŬڤʥСΥ֡ȥȥåס饹(\fIrt\&.jar\fR饤֥)ꤹɬפޤꤷʤϡѥˤäƼηٹޤ
+\fI\-bootclasspath\fRオプションを使用して、適切なバージョンのブートストラップ・クラス(\fIrt\&.jar\fRライブラリ)を指定する必要があります。指定しない場合は、コンパイラによって次の警告が生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -1415,9 +1415,9 @@
 .if n \{\
 .RE
 .\}
-ŬڤʥСΥ֡ȥȥåס饹ꤷʤ硢ѥϸŤͤ򿷤֡ȥȥåס饹Ȥ߹礻ƻѤޤȹ礻ϡ¸ߤʤ᥽åɤؤλȤޤޤƤ뤳Ȥ뤿ᡢ饹ե뤬Ťץåȥե(ξJava SE 6)ưʤǽޤǤϡѥJavaץߥ󥰸Υ꡼1\&.6Ѥޤ
+適切なバージョンのブートストラップ・クラスを指定しない場合、コンパイラは古い言語仕様を新しいブートストラップ・クラスと組み合せて使用します。この組合せは、存在しないメソッドへの参照が含まれていることがあるため、クラス・ファイルが古いプラットフォーム(この場合はJava SE 6)で動作しない可能性があります。この例では、コンパイラはJavaプログラミング言語のリリース1\&.6を使用します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javadoc
 .\" Language: English
-.\" Date: 2011ǯ510
-.\" SectDesc: ܥġ
+.\" Date: 2011年5月10日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javadoc" "1" "2011ǯ510" "JDK 8" "ܥġ"
+.TH "javadoc" "1" "2011年5月10日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javadoc \- Javaե뤫顢APIɥȤHTMLڡޤ
-.SH ""
+javadoc \- Javaソース・ファイルから、APIドキュメントのHTMLページを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,33 +64,33 @@
 .PP
 \fIpackages\fR
 .RS 4
-\fIjava\&.lang java\&.lang\&.reflect java\&.awt\fRʤɡǶڤäƥɥȲѥå֥̾ѥåɥȲϡ\fI\-subpackages\fRץѤƥѥåꤷޤ
-.sp
-ǥեȤǤϡ\fIjavadoc\fRϡߤΥǥ쥯ȥꤪӥ֥ǥ쥯ȥǻꤵ줿ѥåõޤ\fI\-sourcepath\fRץѤơѥåõǥ쥯ȥΥꥹȤꤷޤ
+\fIjava\&.lang java\&.lang\&.reflect java\&.awt\fRなど、空白で区切ってドキュメント化するパッケージの名前。サブパッケージもドキュメント化する場合は、\fI\-subpackages\fRオプションを使用してパッケージを指定します。
+.sp
+デフォルトでは、\fIjavadoc\fRは、現在のディレクトリおよびサブディレクトリで指定されたパッケージを探します。\fI\-sourcepath\fRオプションを使用して、パッケージを探すディレクトリのリストを指定します。
 .RE
 .PP
 \fIsource\-files\fR
 .RS 4
-\fIClass\&.java Object\&.java Button\&.java\fRΤ褦˶ǶڤäɥȲJavaե̾ǥեȤǤϡ\fIjavadoc\fRϡߤΥǥ쥯ȥǻꤵ줿饹õޤ\fI/home/src/java/awt/Graphics*\&.java\fRΤ褦ˡ饹եΥեѥꤷ磻ɥʸѤǤޤߤΥǥ쥯ȥ꤫ХѥǤޤ
+\fIClass\&.java Object\&.java Button\&.java\fRのように空白で区切った、ドキュメント化するJavaソース・ファイルの名前。デフォルトでは、\fIjavadoc\fRは、現在のディレクトリで指定されたクラスを探します。ただし、\fI/home/src/java/awt/Graphics*\&.java\fRのように、クラス・ファイルのフルパスを指定し、ワイルドカード文字を使用できます。現在のディレクトリからの相対パスも指定できます。
 .RE
 .PP
 \fIoptions\fR
 .RS 4
-Ƕڤ줿ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+空白で区切られたコマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fI@argfiles\fR
 .RS 4
-\fIjavadoc\fRޥɡץ󡢥ѥå̾ӥե̾ΥꥹȤǤդνǴޤե̾
-.RE
-.SH ""
+\fIjavadoc\fRコマンド・オプション、パッケージ名およびソース・ファイル名のリストを任意の順序で含むファイルの名前。
+.RE
+.SH "説明"
 .PP
-\fIjavadoc\fRޥɤϡϢJavaեˤӥɥơ󡦥ȤϤǥեȤǤϡpublic饹protected饹ͥȤ줿饹(ƿ̾饹Ͻ)󥿥ե󥹥ȥ饯᥽åɡӥեɤˤĤƵҤϢHTMLڡޤ\fIjavadoc\fRޥɤϡAPIɥȤ䡢ϢΥեμɥȤ˻ѤǤޤ
+\fIjavadoc\fRコマンドは、一連のJavaソース・ファイルにある宣言およびドキュメンテーション・コメントを解析し、デフォルトでは、publicクラス、protectedクラス、ネストされたクラス(匿名の内部クラスは除く)、インタフェース、コンストラクタ、メソッド、およびフィールドについて記述した一連のHTMLページを生成します。\fIjavadoc\fRコマンドは、APIドキュメントの生成や、一連のソース・ファイルの実装ドキュメントの生成に使用できます。
 .PP
-\fIjavadoc\fRޥɤϡѥåΡġΥե롢ޤϤξФƼ¹ԤǤޤѥåΤΥɥȲԤˤϡ\fI\-subpackages\fRץѤƥǥ쥯ȥꤪӤΥ֥ǥ쥯ȥƵŪˤɤ뤫ѥå̾ŪʥꥹȤϤޤġΥեɥȲˤϡJavaե̾ΥꥹȤϤޤñ򻲾ȤƤ
-.SS "եν"
+\fIjavadoc\fRコマンドは、パッケージ全体、個々のソース・ファイル、またはその両方に対して実行できます。パッケージ全体のドキュメント化を行うには、\fI\-subpackages\fRオプションを使用してディレクトリおよびそのサブディレクトリを再帰的にたどるか、パッケージ名の明示的なリストを渡します。個々のソース・ファイルをドキュメント化するには、Javaソース・ファイル名のリストを渡します。簡単な例を参照してください。
+.SS "ソース・ファイルの処理"
 .PP
-\fIjavadoc\fRޥɤϡǽե롢ӥեƤ뤽¾ΥեޤġΥե̾Ϥ\fIjavadoc\fR¹Ԥ硢ɤΥե뤫Τ˻Ǥޤ¿γȯԤϤˡǤϺȤޤ󡣥ѥå̾ϤۤñǤե̾Ū˻ꤷʤƤ⡢\fIjavadoc\fRޥɤ3ĤˡǼ¹ԤǤޤѥå̾Ϥ\fI\-subpackages\fRץѤ뤫ޤϥե̾˥磻ɥɤѤ뤳ȤǤޤξ硢\fIjavadoc\fRޥɤեνԤΤϡΥե뤬Τ٤Ƥ׷ΤߤǤ
+\fIjavadoc\fRコマンドは、ソースで終わるファイル、およびソース・ファイルで説明しているその他のファイルを処理します。個々のソース・ファイル名を渡して\fIjavadoc\fRを実行する場合、どのソース・ファイルを処理するかを正確に指定できます。ただし、多くの開発者はこの方法では作業しません。パッケージ名を渡すほうが簡単だからです。ソース・ファイル名を明示的に指定しなくても、\fIjavadoc\fRコマンドは3つの方法で実行できます。パッケージ名を渡し、\fI\-subpackages\fRオプションを使用するか、またはソース・ファイル名にワイルドカードを使用することができます。これらの場合、\fIjavadoc\fRコマンドがソース・ファイルの処理を行うのは、そのファイルが次のすべての要件を満たす場合のみです。
 .sp
 .RS 4
 .ie n \{\
@@ -100,7 +100,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ե̾Ƭ(\fI\&.java\fR)ͭʥ饹̾Ǥ롣
+ファイル名の接頭辞(\fI\&.java\fRを削除)が有効なクラス名である。
 .RE
 .sp
 .RS 4
@@ -111,7 +111,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ĥ꡼Υ롼ȤŪʥѥ̾ڤʸɥåȤѴȡͭʥѥå̾ˤʤ롣
+ソース・ツリーのルートからの相対的なパス名が、区切り文字をドットに変換すると、有効なパッケージ名になる。
 .RE
 .sp
 .RS 4
@@ -122,10 +122,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåʸͭʥѥå̾ޤޤƤ롣
-.RE
-󥯤ν.PP
-μ¹ˡ\fIjavadoc\fRޥɤϡμ¹ԤǥɥȲѥå饹ӥС̾Фơ߻ȥ󥯤ɲäޤ󥯤ϡξɽޤ@ˤĤƤϡjavadoc򻲾ȤƤ
+パッケージ文に有効なパッケージ名が含まれている。
+.RE
+リンクの処理.PP
+処理の実行中に、\fIjavadoc\fRコマンドは、その実行でドキュメント化されるパッケージ、クラス、およびメンバーの名前に対して、相互参照リンクを追加します。リンクは、次の場所に表示されます。@タグの説明については、javadocタグを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -135,7 +135,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-(ͤηηեɤη)
+宣言(戻り値の型、引数の型、フィールドの型)。
 .RE
 .sp
 .RS 4
@@ -146,7 +146,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI@see\fR줿\fIϢ\fRץ
+\fI@see\fRタグから生成された「\fI関連項目\fR」セクション。
 .RE
 .sp
 .RS 4
@@ -157,7 +157,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI{@link}\fR줿饤󡦥ƥȡ
+\fI{@link}\fRタグから生成されたインライン・テキスト。
 .RE
 .sp
 .RS 4
@@ -168,7 +168,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI@throws\fR줿㳰̾
+\fI@throws\fRタグから生成された例外の名前。
 .RE
 .sp
 .RS 4
@@ -179,7 +179,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-󥿥եΥСФ\fI\fRץ󥯤ȡ饹ΥСФ\fIС饤\fRץ󥯡᥽åɡȤηѾ򻲾ȤƤ
+インタフェースのメンバーに対する「\fI定義\fR」リンクと、クラスのメンバーに対する「\fIオーバーライド\fR」リンク。メソッド・コメントの継承を参照してください。
 .RE
 .sp
 .RS 4
@@ -190,7 +190,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥå饹ӥСꥹȤƤ륵ޥ꡼ɽ
+パッケージ、クラス、およびメンバーをリストしているサマリー表。
 .RE
 .sp
 .RS 4
@@ -201,7 +201,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåӥ饹ηѾĥ꡼
+パッケージおよびクラスの継承ツリー。
 .RE
 .sp
 .RS 4
@@ -212,42 +212,42 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-
+索引。
 .RE
 .PP
-ޥɥ饤ǻꤷʤä饹ˤĤƤδ¸Υƥ(̤ƥ)Фƥ󥯤ɲäˤϡ\fI\-link\fR\fI\-linkoffline\fRץѤǤޤ
-ξܺ.PP
-\fIjavadoc\fRޥɤϼ¹Ԥ뤿Ӥ1ĤδʥɥȤޤμ¹Ԥη̤ѹޤľܼࡢʬӥɤԤޤ󡣤\fIjavadoc\fRޥɤϡ¾μ¹Ԥη̤˥󥯤Ǥޤ
+コマンドラインで指定しなかったクラスについての既存のテキスト(別に生成したテキスト)に対してリンクを追加するには、\fI\-link\fRおよび\fI\-linkoffline\fRオプションを利用できます。
+処理の詳細.PP
+\fIjavadoc\fRコマンドは実行するたびに1つの完全なドキュメントを生成します。前の実行の結果を変更または直接取り込む、増分ビルドを行いません。ただし、\fIjavadoc\fRコマンドは、他の実行の結果にリンクできます。
 .PP
-\fIjavadoc\fRޥɤμˤJavaѥ餬ɬפǡJavaѥ˰¸Ƥޤ\fIjavadoc\fRޥɤ\fIjavac\fRޥɤΰƤӽФ򥳥ѥ뤷ơСμ̵뤷ޤ\fIjavadoc\fRޥɤϡ饹ؤޤ९饹˭٤ɽȥ饹Ρֻѡ״طۤHTMLޤˡJ\fIjavadoc\fRޥɤϡɤΥɥơ󡦥Ȥ顢桼󶡤ɥȤޤɥơ󡦥Ȥ򻲾ȤƤ
+\fIjavadoc\fRコマンドの実装にはJavaコンパイラが必要で、Javaコンパイラに依存しています。\fIjavadoc\fRコマンドは\fIjavac\fRコマンドの一部を呼び出し、宣言をコンパイルして、メンバーの実装を無視します。\fIjavadoc\fRコマンドは、クラス階層を含むクラスの豊富な内部表現とクラスの「使用」関係を構築し、HTMLを生成します。さらに、J\fIjavadoc\fRコマンドは、ソース・コードのドキュメンテーション・コメントから、ユーザーの提供したドキュメントも取得します。ドキュメンテーション・コメントを参照してください。
 .PP
-\fIjavadoc\fRޥɤϡ᥽åΤʤʥ֡եǤ륽եФƼ¹ԤǤޤäơAPIμ߷פᤤʳǡɥơ󡦥Ȥ򵭽Ҥ\fIjavadoc\fRȤ¹ԤǤޤ
+\fIjavadoc\fRコマンドは、メソッド本体を持たない純粋なスタブ・ファイルであるソース・ファイルに対して実行できます。したがって、APIの実装前の設計の早い段階で、ドキュメンテーション・コメントを記述して\fIjavadoc\fRコメントを実行できます。
 .PP
-ѥ˰¸뤳ȤˤäơHTMLϤϡºݤμΤбޤºݤμϡŪʥɤˤǤϤʤۤΥɤ˰¸礬ޤȤС\fIjavadoc\fRޥɤϡѥѥ饹եˤ¸ߤ뤬ɤˤ¸ߤʤǥեȡ󥹥ȥ饯ɥȲޤ
+コンパイラに依存することによって、HTML出力は、実際の実装に正確に対応します。実際の実装は、明示的なソース・コードにではなく、暗黙のソース・コードに依存する場合があります。たとえば、\fIjavadoc\fRコマンドは、コンパイル済クラス・ファイルには存在するがソース・コードには存在しないデフォルト・コンストラクタをドキュメント化します。
 .PP
-¿ξ硢\fIjavadoc\fRޥɤǤϡեΥɤԴޤϥ顼ޤǤǤɥȤǤޤ٤ƤΥǥХåȥ֥륷塼ƥ󥰤λ˥ɥȤǤޤ\fIjavadoc\fRޥɤϥɥơ󡦥ȤδŪʥåԤޤ
+多くの場合、\fIjavadoc\fRコマンドでは、ソース・ファイルのコードが不完全またはエラーを含んでいる場合でもドキュメントを生成できます。すべてのデバッグやトラブルシューティングを完了する前にドキュメントを生成できます。\fIjavadoc\fRコマンドはドキュメンテーション・コメントの基本的なチェックを行います。
 .PP
-\fIjavadoc\fRޥɤϡɥȤ¤ۤݡȥ饹򤹤٤ƥɤޤΤᡢ
-\fIjavadoc\fRޥɤϡ֡ȥȥåס饹ĥǽޤϥ桼饹ˤ餺٤Ƥλȥ饹򸡺Ǥɬפޤ饹θˡ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)򻲾ȤƤ
+\fIjavadoc\fRコマンドは、ドキュメントの内部構造を構築する際、参照クラスをすべてロードします。このため、
+\fIjavadoc\fRコマンドは、ブートストラップ・クラス、拡張機能、またはユーザー・クラスにかかわらず、すべての参照クラスを検索できる必要があります。クラスの検出方法
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)を参照してください
 .PP
-̾륯饹ϡĥ饹Ȥơޤ\fIjavadoc\fRޥɤΥ饹ѥǥɤɬפޤ
-.SS "JavadocΥɥåå"
+通常、作成するクラスは、拡張クラスとして、または\fIjavadoc\fRコマンドのクラス・パスでロードされる必要があります。
+.SS "Javadocのドックレット"
 .PP
-\fIjavadoc\fRޥɤνϤƤȷϡɥååȤѤƥޥǤޤ\fIjavadoc\fRޥɤˤϡɸɥååȤȸƤФǥեȤȹߥɥååȤޤɸɥååȤϡHTMLAPIɥȤޤɸɥååȤޤϥ֥饹뤳Ȥ䡢HTMLXMLMIFRTFʤɤιߤνϷȼΥɥååȤ򵭽Ҥ뤳ȤǽǤ
+\fIjavadoc\fRコマンドの出力の内容と形式は、ドックレットを使用してカスタマイズできます。\fIjavadoc\fRコマンドには、標準ドックレットと呼ばれるデフォルトの組込みドックレットがあります。標準ドックレットは、HTML形式のAPIドキュメントを生成します。標準ドックレットを修正またはサブクラスを作成することや、HTML、XML、MIF、RTFなどの好みの出力形式を生成する独自のドックレットを記述することも可能です。
 .PP
-\fI\-doclet\fRץǥࡦɥååȤꤵƤʤ硢\fIjavadoc\fRޥɤϡǥեȤɸɥååȤѤޤ\fIjavadoc\fRޥɤˤϡѤƤɥååȤ˴طʤѤǤ뤤ĤΥץ󤬤ޤɸɥååȤǤϡ¾ˡĤΥޥɥ饤󡦥ץɲäޤץ򻲾ȤƤ
-.SH "ե"
+\fI\-doclet\fRオプションでカスタム・ドックレットが指定されていない場合、\fIjavadoc\fRコマンドは、デフォルトの標準ドックレットを使用します。\fIjavadoc\fRコマンドには、使用されているドックレットに関係なく使用できるいくつかのオプションがあります。標準ドックレットでは、これらの他に、いくつかのコマンドライン・オプションが追加されます。オプションを参照してください。
+.SH "ソース・ファイル"
 .PP
-\fIjavadoc\fRޥɤϡΥפΥե뤫ϤޤΥեϡ饹Java쥽ե(\fI\&.java\fR)ѥåȡե롢ץȡե롢Ӥ¾̤ΥեǤǤϡɥȲʤĥ꡼¸ߤ礬ƥȡեƥץ졼ȡեˤĤƤޤ
-.SS "饹Υե"
+\fIjavadoc\fRコマンドは、次のタイプのソース・ファイルから出力を生成します。そのファイルは、クラスのJava言語ソース・ファイル(\fI\&.java\fR)、パッケージ・コメント・ファイル、概要コメント・ファイル、およびその他の未処理のファイルです。ここでは、ドキュメント化しないがソース・ツリーに存在する場合があるテスト・ファイルやテンプレート・ファイルについても説明します。
+.SS "クラスのソース・ファイル"
 .PP
-줾Υ饹ޤϥ󥿥եӤΥСϡȼΥɥơ󡦥ȤĤȤǤ򥽡եݻޤɥơ󡦥Ȥ򻲾ȤƤ
-.SS "ѥåȡե"
+それぞれのクラスまたはインタフェース、およびそのメンバーは、独自のドキュメンテーション・コメントを持つことができ、それをソース・ファイル内に保持します。ドキュメンテーション・コメントを参照してください。
+.SS "パッケージ・コメント・ファイル"
 .PP
-줾ΥѥåϡȼΥɥơ󡦥ȤĤȤǤѤΥեݻޤƤϡ\fIjavadoc\fRޥɤˤäѥåΥޥ꡼ڡȤ߹ޤޤΥȤˤϡ̾ΥѥåΤƤϤޤɥȤ򵭽Ҥޤ
+それぞれのパッケージは、独自のドキュメンテーション・コメントを持つことができ、それを専用のソース・ファイルに保持します。その内容は、\fIjavadoc\fRコマンドによって生成されるパッケージのサマリー・ページに組み込まれます。このコメントには、通常、そのパッケージ全体に当てはまるドキュメントを記述します。
 .PP
-ѥåȡեˤϡΤ줫Υե˥ȤǼǤޤ
+パッケージ・コメント・ファイルを作成するには、次のいずれかのファイルにコメントを格納できます。
 .sp
 .RS 4
 .ie n \{\
@@ -257,7 +257,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackage\-info\&.java\fRեˤϡѥåѥåᡢѥåȡJavadocǼǤޤΥե뤬ͥ褵ޤ
+\fIpackage\-info\&.java\fRファイルには、パッケージ宣言、パッケージ注釈、パッケージ・コメント、およびJavadocタグを格納できます。このファイルが優先されます。
 .RE
 .sp
 .RS 4
@@ -268,15 +268,15 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackage\&.html\fRեˤϡѥåȤJavadocΤߤǼǤޤѥåϳǼǤޤ
+\fIpackage\&.html\fRファイルには、パッケージ・コメントとJavadocタグのみを格納できます。パッケージ注釈は格納できません。
 .RE
 .PP
-ƥѥåϡ\fIpackage\&.html\fRեޤ\fIpackage\-info\&.java\fRեΤ줫1ĻĤȤǤޤξĤȤϤǤޤ󡣤Τɤ餫Υե򥽡եȤȤˡĥ꡼ΤΥѥåǥ쥯ȥ֤Ƥ
-package\-info\&.javaե.PP
-\fIpackage\-info\&.java\fRեˤϡι¤ΥѥåȤޤ뤳ȤǤޤȤϡѥå֤ޤ
+各パッケージは、\fIpackage\&.html\fRファイルまたは\fIpackage\-info\&.java\fRファイルのいずれかを1つ持つことができますが、その両方を持つことはできません。このどちらかのファイルをソース・ファイルとともに、ソース・ツリー内のそのパッケージ・ディレクトリ内に配置してください。
+package\-info\&.javaファイル.PP
+\fIpackage\-info\&.java\fRファイルには、次の構造のパッケージ・コメントを含めることができます。コメントは、パッケージ宣言の前に配置されます。
 .PP
-\fB:\fR
-ȶڤʸǤ\fI/**\fR\fI*/\fR¸ߤɬפޤ֤ιԤƬΥꥹϾάǽǤ
+\fB注意:\fR
+コメント区切り文字である\fI/**\fRおよび\fI*/\fRが存在する必要がありますが、中間の行の先頭のアスタリスクは省略可能です。
 .sp
 .if n \{\
 .RS 4
@@ -302,10 +302,10 @@
 .if n \{\
 .RE
 .\}
-package\&.htmlե.PP
-\fIpackage\&.html\fRեˤϡι¤ΥѥåȤޤ뤳ȤǤޤȤϡ\fI<body>\fRǤ֤ޤ
+package\&.htmlファイル.PP
+\fIpackage\&.html\fRファイルには、次の構造のパッケージ・コメントを含めることができます。コメントは、\fI<body>\fR要素に配置されます。
 .PP
-ե:
+ファイル:
 \fIjava/applet/package\&.html\fR
 .sp
 .if n \{\
@@ -332,9 +332,9 @@
 .RE
 .\}
 .PP
-\fIpackage\&.html\fRե̾HTMLեǤꡢѥåޤǤޤ󡣥ѥåȡեƤHTMLǵҤޤ㳰1ĤޤΥɥơ󡦥ȤˤϡȶڤʸǤ\fI/**\fR\fI*/\fRޤϹƬΥꥹޤʤȤǤȤ񤯾ϡǽʸѥåΥޥ꡼Ȥ\fI<body>\fRȺǽʸδ֤˥ȥ䤽¾ΥƥȤޤʤ褦ˤޤѥåޤ뤳ȤǤޤ٤ƤΥ֥åϡθ֤ɬפޤ\fI@see\fRѥåȡեɲäˤϡ̾Ѥɬפޤ
-ȡեν.PP
-\fIjavadoc\fRȤ¹Ԥȡѥåȡե뤬ޤѥåȡե뤬Ĥäϡ\fIjavadoc\fRޥɤϼμ¹Ԥޤ
+\fIpackage\&.html\fRファイルは通常のHTMLファイルであり、パッケージ宣言を含んでいません。パッケージ・コメント・ファイルの内容はHTMLで記述しますが、例外が1つあります。このドキュメンテーション・コメントには、コメント区切り文字である\fI/**\fRと\fI*/\fR、または行頭のアスタリスクを含めない、という点です。コメントを書く場合は、最初の文をパッケージのサマリーとし、\fI<body>\fRタグと最初の文の間にタイトルやその他のテキストを含めないようにします。パッケージ・タグを含めることができます。すべてのブロック・タグは、主説明の後に配置する必要があります。\fI@see\fRタグをパッケージ・コメント・ファイルに追加する場合には、完全修飾名を使用する必要があります。
+コメント・ファイルの処理.PP
+\fIjavadoc\fRコメントを実行すると、パッケージ・コメント・ファイルが検索されます。パッケージ・コメント・ファイルが見つかった場合は、\fIjavadoc\fRコマンドは次の手順を実行します。
 .sp
 .RS 4
 .ie n \{\
@@ -344,8 +344,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ǥ褦˥Ȥ򥳥ԡޤpackage\&.htmlξ硢\fIjavadoc\fRޥɤϡ\fI<body>\fR\fI</body>\fR
-HTML֤Τ٤ƤƤ򥳥ԡޤ\fI<head>\fRޤᡢ\fI<title>\fR䥽եҤʤɤξ֤뤳ȤǤޤ줿ɥȤˤϤϰɽޤ
+処理できるようにコメントをコピーします。package\&.htmlの場合、\fIjavadoc\fRコマンドは、\fI<body>\fRと\fI</body>\fR
+HTMLタグ間のすべての内容をコピーします。\fI<head>\fRセクションを含め、そこに\fI<title>\fRタグやソース・ファイルの著作権記述などの情報を配置することもできますが、生成されたドキュメントにはそれらは一切表示されません。
 .RE
 .sp
 .RS 4
@@ -356,7 +356,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåޤѥå򻲾ȤƤ
+パッケージ・タグを処理します。パッケージ・タグを参照してください。
 .RE
 .sp
 .RS 4
@@ -367,8 +367,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ƥȤ줿ѥåΥޥ꡼ڡβޤJavaץåȥեࡢStandard Edition APIͤγ
-(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)򻲾ȤƤ
+処理したテキストを生成されたパッケージのサマリー・ページの下部に挿入します。Javaプラットフォーム、Standard Edition API仕様の概要
+(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)を参照してください
 .RE
 .sp
 .RS 4
@@ -379,24 +379,24 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåΥޥ꡼ڡƬˡѥåȤκǽʸ򥳥ԡޤˡ\fIjavadoc\fRޥɤϡץڡΥѥåꥹȤˡѥå̾ȥѥåȤκǽʸɲäޤJavaץåȥեࡢStandard Edition APIͤγ
-(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)򻲾ȤƤ
-.sp
-ʸνϡ饹СμκǽʸνƱ롼ˤäȽǤޤ
-.RE
-.SS "ץȡե"
+パッケージのサマリー・ページの先頭に、パッケージ・コメントの最初の文をコピーします。さらに、\fIjavadoc\fRコマンドは、概要ページのパッケージ・リストに、パッケージ名とパッケージ・コメントの最初の文を追加します。Javaプラットフォーム、Standard Edition API仕様の概要
+(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)を参照してください
+.sp
+文の終わりは、クラスやメンバーの主説明の最初の文の終わりと同じルールによって判断されます。
+.RE
+.SS "概要コメント・ファイル"
 .PP
-ɥȲƥץꥱޤϥѥååȤϡȼγץɥơ󡦥ȤĤȤǤѤΥեݻޤƤϡ\fIjavadoc\fRޥɤˤä복ץڡȤ߹ޤޤΥȤˤϡ̾ץꥱޤϥѥååΤƤϤޤɥȤ򵭽Ҥޤ
+ドキュメント化する各アプリケーションまたはパッケージ・セットは、独自の概要ドキュメンテーション・コメントを持つことができ、それは専用のソース・ファイルに保持されます。その内容は、\fIjavadoc\fRコマンドによって生成される概要ページに組み込まれます。このコメントには、通常、アプリケーションまたはパッケージ・セット全体に当てはまるドキュメントを記述します。
 .PP
-Υեˤoverview\&.htmlʤɤ̾դ뤳ȤǤɤ֤Ƥ⤫ޤޤ󡣰Ūʾϡĥ꡼κǾǤ
+このファイルにはoverview\&.htmlなどの名前を付けることができ、どこに配置してもかまいません。一般的な場所は、ソース・ツリーの最上部です。
 .PP
-ȤС\fIjava\&.applet\fRѥåΥե뤬/home/user/src/java/appletǥ쥯ȥ˳ǼƤ硢ץȡե/home/user/src/overview\&.html˺Ǥޤ
+たとえば、\fIjava\&.applet\fRパッケージのソース・ファイルが/home/user/src/java/appletディレクトリに格納されている場合、概要コメント・ファイルは/home/user/src/overview\&.htmlに作成できます。
 .PP
-ۤʤѥåΥåȤФ\fIjavadoc\fRޥɤʣ¹ԤϡƱ1ĤΥեΥåȤФʣγץȡեǤޤȤСɥѤ\fI\-private\fRꤷ\fIjavadoc\fRޥɤ1¹Ԥ塢ɥѤˤΥץꤷʤǺټ¹Ԥ뤳ȤǤޤξ硢Ƴץȡե1ʸܤǡΥɥȤѤޤѤȤƵҤǤޤ
+異なるパッケージのセットに対して\fIjavadoc\fRコマンドを複数回実行する場合は、同じ1つのソース・ファイルのセットに対して複数の概要コメント・ファイルを作成できます。たとえば、内部ドキュメント用に\fI\-private\fRを指定して\fIjavadoc\fRコマンドを1回実行した後、公開ドキュメント用にそのオプションを指定しないで再度実行することができます。この場合、各概要コメント・ファイルの1文目で、そのドキュメントを公開用または内部用として記述できます。
 .PP
-ץȡեƤϡHTMLǵҤ줿1Ĥ礭ʥɥơ󡦥ȤǤǽʸϥץꥱޤϥѥåΥåȤΥޥ꡼Ȥޤ\fI<body>\fRȺǽʸδ֤˥ȥ䤽¾ΥƥȤޤʤ褦ˤޤ{\fI@link}\fRʤɤΥ饤󡦥٤ƤΥϡθ֤ɬפޤ\fI@see\fRɲäˤϡ̾Ѥɬפޤ
+概要コメント・ファイルの内容は、HTMLで記述された1つの大きなドキュメンテーション・コメントです。最初の文はアプリケーションまたはパッケージのセットのサマリーとします。\fI<body>\fRタグと最初の文の間にタイトルやその他のテキストを含めないようにします。{\fI@link}\fRなどのインライン・タグを除くすべてのタグは、主説明の後に配置する必要があります。\fI@see\fRタグを追加する場合には、完全修飾名を使用する必要があります。
 .PP
-\fIjavadoc\fRޥɤμ¹Իˡ\fI\-overview\fRץѤƳץȡե̾ꤷޤΥեϡѥåȡեƱ褦˽ޤ\fIjavadoc\fRޥɤϼμ¹Ԥޤ
+\fIjavadoc\fRコマンドの実行時に、\fI\-overview\fRオプションを使用して概要コメント・ファイル名を指定します。このファイルは、パッケージ・コメント・ファイルと同じように処理されます。\fIjavadoc\fRコマンドは次の手順を実行します。
 .sp
 .RS 4
 .ie n \{\
@@ -406,7 +406,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI<body>\fR\fI</body>\fRδ֤ˤƤ򤹤٤ƽоݤȤƥԡޤ
+\fI<body>\fRと\fI</body>\fRタグの間にある内容をすべて処理対象としてコピーします。
 .RE
 .sp
 .RS 4
@@ -417,7 +417,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץнޤץ򻲾ȤƤ
+概要タグがあれば処理します。概要タグを参照してください。
 .RE
 .sp
 .RS 4
@@ -428,8 +428,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ƥȤ줿ץڡβޤJavaץåȥեStandard Edition APIͤγ
-(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)򻲾ȤƤ
+処理したテキストを生成された概要ページの下部に挿入します。JavaプラットフォームStandard Edition API仕様の概要
+(http://docs\&.oracle\&.com/javase/8/docs/api/overview\-summary\&.html)を参照してください
 .RE
 .sp
 .RS 4
@@ -440,17 +440,17 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץޥ꡼ڡƬˡץȤκǽʸ򥳥ԡޤ
-.RE
-.SS "̤Υե"
+概要サマリー・ページの先頭に、概要コメントの最初の文をコピーします。
+.RE
+.SS "未処理のファイル"
 .PP
-եˤϡ\fIjavadoc\fRޥɤˤäưǥ쥯ȥ˥ԡ롢ǤդΥեޤ뤳ȤǤޤΤ褦ʥեˤϡ̾եåե롢ץJavaӥ饹ե롢ŪJavaեΥɥơ󡦥Ȥαƶʤ¿ƤޤΩHTMLեʤɤޤ
+ソース・ファイルには、\fIjavadoc\fRコマンドによって宛先ディレクトリにコピーされる、任意のファイルを含めることができます。このようなファイルには、通常、グラフィック・ファイル、サンプルのJavaソースおよびクラス・ファイル、一般的なJavaソース・ファイルのドキュメンテーション・コメントの影響を受けない多くの内容を含む独立したHTMLファイルなどがあります。
 .PP
-̤Υեޤˤϡdoc\-filesȤǥ쥯ȥ˥ե֤ޤdoc\-filesǥ쥯ȥϡեޤǤդΥѥåǥ쥯ȥΥ֥ǥ쥯ȥˤʤ뤳ȤǤޤdoc\-files֥ǥ쥯ȥϡѥåȤ1ѰդǤޤ
+未処理のファイルを含めるには、doc\-filesというディレクトリにファイルを配置します。doc\-filesディレクトリは、ソース・ファイルを含む任意のパッケージ・ディレクトリのサブディレクトリになることができます。doc\-filesサブディレクトリは、パッケージごとに1つ用意できます。
 .PP
-ȤСܥΥ᡼\fIjava\&.awt\&.Button\fR饹ΥɥȤ˴ޤˤϡΥ᡼ե/home/user/src/java/awt/doc\-files/ǥ쥯ȥ֤ޤdoc\-filesǥ쥯ȥ/home/user/src/java/doc\-files֤ʤǤjavaϥѥåǤϤʤǤեޤ뤳ȤǤޤ
+たとえば、ボタンのイメージを\fIjava\&.awt\&.Button\fRクラスのドキュメントに含める場合には、そのイメージ・ファイルを/home/user/src/java/awt/doc\-files/ディレクトリに置きます。doc\-filesディレクトリを/home/user/src/java/doc\-filesに置かないでください。javaはパッケージではないからです。ソース・ファイルを含めることもできません。
 .PP
-\fIjavadoc\fRޥɤϥե򻲾ȤʤΤǡ̤ΥեؤΤ٤ƤΥ󥯤ϡɤ˴ޤޤƤɬפޤ\fIjavadoc\fRޥɤϥǥ쥯ȥȤΤ٤ƤƤ˥ԡޤǤϡButton\&.javaɥơ󡦥ȤΥ󥯤ɤΤ褦˸뤫򼨤Ƥޤ
+\fIjavadoc\fRコマンドはファイルを参照しないので、未処理のファイルへのすべてのリンクは、コードに含まれている必要があります。\fIjavadoc\fRコマンドはディレクトリとそのすべての内容を宛先にコピーします。次の例では、Button\&.javaドキュメンテーション・コメントのリンクがどのように見えるかを示しています。
 .sp
 .if n \{\
 .RS 4
@@ -464,13 +464,13 @@
 .if n \{\
 .RE
 .\}
-.SS "ƥȤӥƥץ졼ȡե"
+.SS "テストおよびテンプレート・ファイル"
 .PP
-ĥ꡼ΥƥȤӥƥץ졼ȡե򡢥ե뤬¸ߤǥ쥯ȥޤϥ֥ǥ쥯ȥƱǥ쥯ȥ˳ǼǤޤƥȤӥƥץ졼ȡե뤬Τɤˤϡ\fIjavadoc\fRޥɤ¹ԤŪ˸̤Υե̾Ϥޤ
+ソース・ツリーのテストおよびテンプレート・ファイルを、ソース・ファイルが存在するディレクトリまたはサブディレクトリと同じディレクトリに格納できます。テストおよびテンプレート・ファイルが処理されるのを防ぐには、\fIjavadoc\fRコマンドを実行し、明示的に個別のソース・ファイル名を渡します。
 .PP
-ƥȡեϡͭʡѥǽʥեǤƥץ졼ȡեϡͭʡߴΤ륽եǤϤޤ󤬡¿ξ硢\fI\&.java\fRäƤޤ
-ƥȡե.PP
-ƥȡե̾ʤѥå䡢ե뤬¸ߤѥåȤ̤Υѥå°褦ˤ硢ƥȡե򥽡եβΥ֥ǥ쥯ȥ֤Υǥ쥯ȥ̵̾դޤƥȡե򥽡Ʊǥ쥯ȥ֤ѥå̾򼨤ޥɥ饤ꤷ\fIjavadoc\fRޥɤƤӽФȡƥȡեϷٹޤϥ顼ޤե뤬̵̾ĥ֥ǥ쥯ȥ¸ߤ硢ƥȡե롦ǥ쥯ȥϥåפ졢顼ޤϷٹȯԤޤ󡣤ȤСեΥƥȡեcom\&.package1ɲäˤϡ̵ʥѥå̾Υ֥ǥ쥯ȥ֤ޤΥǥ쥯ȥ̾ˤϥϥե󤬴ޤޤƤ뤿̵Ǥ
+テスト・ファイルは、有効な、コンパイル可能なソース・ファイルです。テンプレート・ファイルは、有効な、互換性のあるソース・ファイルではありませんが、多くの場合、\fI\&.java\fR接尾辞を持っています。
+テスト・ファイル.PP
+テスト・ファイルを、名前なしパッケージや、ソース・ファイルが存在するパッケージとは別のパッケージに属するようにする場合、テスト・ファイルをソース・ファイルの下のサブディレクトリに配置し、そのディレクトリに無効な名前を付けます。テスト・ファイルをソースと同じディレクトリに配置し、パッケージ名を示すコマンドライン引数を指定して\fIjavadoc\fRコマンドを呼び出すと、テスト・ファイルは警告またはエラーを引き起こします。ファイルが無効な名前を持つサブディレクトリ内に存在する場合、テスト・ファイル・ディレクトリはスキップされ、エラーまたは警告は発行されません。たとえば、ソース・ファイルのテスト・ファイルをcom\&.package1に追加するには、無効なパッケージ名のサブディレクトリに配置します。次のディレクトリ名にはハイフンが含まれているため無効です。
 .sp
 .if n \{\
 .RS 4
@@ -482,13 +482,13 @@
 .RE
 .\}
 .PP
-ƥȡե˥ɥơ󡦥Ȥޤޤ硢\fIjavadoc\fRޥɤθ̤μ¹Ԥǡ磻ɥɤޤƥȡե̾(\fIcom/package1/test\-files/*\&.java\fRʤ)ϤơƥȡեΥɥȤ褦Ǥޤ
-ƥץ졼ȡե.PP
-ƥץ졼ȡե򥽡ǥ쥯ȥ֤뤬\fIjavadoc\fRޥɤ¹ԤȤ˥顼ʤ硢ե\fIBuffer\-Template\&.java\fRʤɤ̵̾դơʤ褦ˤޤ\fIjavadoc\fRޥɤϡ\fI\&.java\fRͭʥ饹̾ˤʤ̾ĥեΤߤޤ
-.SH "ե"
+テスト・ファイルにドキュメンテーション・コメントが含まれる場合、\fIjavadoc\fRコマンドの個別の実行で、ワイルドカードを含んだテスト・ソース・ファイル名(\fIcom/package1/test\-files/*\&.java\fRなど)を渡して、テスト・ファイルのドキュメントを生成するように設定できます。
+テンプレート・ファイル.PP
+テンプレート・ファイルをソース・ディレクトリに配置するが、\fIjavadoc\fRコマンドを実行するときにエラーを生成しない場合、ファイルに\fIBuffer\-Template\&.java\fRなどの無効な名前を付けて、処理させないようにします。\fIjavadoc\fRコマンドは、接尾辞の\fI\&.java\fRが削除されると有効なクラス名になる名前を持つソース・ファイルのみを処理します。
+.SH "生成されるファイル"
 .PP
-ǥեȤǤϡ\fIjavadoc\fRޥɤϡHTMLΥɥȤɸɥååȤѤޤɸɥååȤϡ롢ƥڡ߻ȥڡݡȡڡޤHTMLڡϸ̤Υեбޤ\fIjavadoc\fRޥɤϡ2ĤΥפΥեޤǽΥפˤϡ饹ӥ󥿥ե˱̾դޤ2ܤΥפˤϡǽΥפΥեȤζɤˡϥե󤬴ޤޤޤ(package\-summary\&.htmlʤ)
-.SS "ƥڡ"
+デフォルトでは、\fIjavadoc\fRコマンドは、HTML形式のドキュメントを生成する標準ドックレットを使用します。標準ドックレットは、ここで説明する、基本内容ページ、相互参照ページ、サポート・ページを生成します。各HTMLページは個別のファイルに対応します。\fIjavadoc\fRコマンドは、2つのタイプのファイルを生成します。最初のタイプには、クラスおよびインタフェースに応じた名前が付けられます。2番目のタイプには、最初のタイプのファイルとの競合を防ぐために、ハイフンが含まれます(package\-summary\&.htmlなど)。
+.SS "基本内容ページ"
 .sp
 .RS 4
 .ie n \{\
@@ -498,7 +498,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ܤƤ륯饹ޤϥ󥿥եȤ1ĤΥ饹ޤϥ󥿥եڡ(classname\&.html)
+記載されているクラスまたはインタフェースごとに1つのクラスまたはインタフェース・ページ(classname\&.html)。
 .RE
 .sp
 .RS 4
@@ -509,7 +509,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ܤƤѥåȤ1ĤΥѥåڡ(package\-summary\&.html)\fIjavadoc\fRޥɤϡĥ꡼Υѥåǥ쥯ȥˤpackage\&.htmlޤpackage\-info\&.javaȤ̾ΥեHTMLƥȤ򤹤٤Ȥޤ
+記載されているパッケージごとに1つのパッケージ・ページ(package\-summary\&.html)。\fIjavadoc\fRコマンドは、ソース・ツリーのパッケージ・ディレクトリ内にあるpackage\&.htmlまたはpackage\-info\&.javaという名前のファイル内のHTMLテキストをすべて組み入れます。
 .RE
 .sp
 .RS 4
@@ -520,9 +520,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåΥåΤФ1Ĥγץڡ(overview\-summary\&.html)ץڡϡɥȤƬڡˤʤޤ\fIjavadoc\fRޥɤϡ\fI\-overview\fRץǻꤵ줿եHTMLƥȤ򤹤٤ȤޤץڡΤϡ\fIjavadoc\fRޥɤʣΥѥå̾ϤΤߤǤHTMLե졼पӥץ򻲾ȤƤ
-.RE
-.SS "߻ȥڡ"
+パッケージのセット全体に対して1つの概要ページ(overview\-summary\&.html)。概要ページは、生成ドキュメントの先頭ページになります。\fIjavadoc\fRコマンドは、\fI\-overview\fRオプションで指定されたファイル内のHTMLテキストをすべて組み入れます。概要ページが作成されるのは、\fIjavadoc\fRコマンドに複数のパッケージ名を渡した場合のみです。HTMLフレームおよびオプションを参照してください。
+.RE
+.SS "相互参照ページ"
 .sp
 .RS 4
 .ie n \{\
@@ -532,7 +532,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåΥåΤФ1ĤΥ饹إڡ(overview\-tree\&.html)إڡɽˤϡʥӥ󡦥СΡֳספ򥯥åƤ顢ֳإĥ꡼פ򥯥åޤ
+パッケージのセット全体に対して1つのクラス階層ページ(overview\-tree\&.html)。階層ページを表示するには、ナビゲーション・バーの「概要」をクリックしてから、「階層ツリー」をクリックします。
 .RE
 .sp
 .RS 4
@@ -543,7 +543,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåȤ1ĤΥ饹إڡ(package\-tree\&.html)إڡɽˤϡΥѥå饹ޤϥ󥿥եΥڡ˰ưֳإĥ꡼פ򥯥åƤΥѥåγؤɽޤ
+パッケージごとに1つのクラス階層ページ(package\-tree\&.html)。階層ページを表示するには、特定のパッケージ、クラス、またはインタフェースのページに移動し、「階層ツリー」をクリックしてそのパッケージの階層を表示します。
 .RE
 .sp
 .RS 4
@@ -554,7 +554,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåȤ1Ĥλѥڡ(package\-use\&.html)ȡ饹ӥ󥿥եȤ1ĤĤλѥڡ(class\-use/classname\&.html)ѥڡǤϡꤷ饹󥿥եޤϥѥåΰѤƤѥå饹᥽åɡ󥹥ȥ饯ӥեɤˤĤƵҤޤȤС饹ޤϥ󥿥եAˤȡλѥڡˤϡAΥ֥饹AȤ줿եɡA֤᥽åɡAΥѥ᡼ĥ᥽åɤӥ󥹥ȥ饯Ȥ߹ޤޤѥڡɽˤϡѥå饹ޤϥ󥿥ե˰ưʥӥ󡦥СΡֻѡץ󥯤򥯥åޤ
+パッケージごとに1つの使用ページ(package\-use\&.html)と、クラスおよびインタフェースごとに1つずつの使用ページ(class\-use/classname\&.html)。使用ページでは、指定したクラス、インタフェース、またはパッケージの一部を使用しているパッケージ、クラス、メソッド、コンストラクタ、およびフィールドについて記述されます。たとえば、クラスまたはインタフェースAを例にすると、その使用ページには、Aのサブクラス、Aとして宣言されたフィールド、Aを返すメソッド、A型のパラメータを持つメソッドおよびコンストラクタが組み込まれます。使用ページを表示するには、パッケージ、クラス、またはインタフェースに移動し、ナビゲーション・バーの「使用」リンクをクリックします。
 .RE
 .sp
 .RS 4
@@ -565,7 +565,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-٤Ƥ侩APIȤο侩ؤꥹȤ侩APIڡ(deprecated\-list\&.html)侩APIϾμǺǽΤǻѤʤǤ
+すべての非推奨APIとその推奨する代替をリストする非推奨APIページ(deprecated\-list\&.html)。非推奨APIは将来の実装で削除される可能性があるので使用しないでください。
 .RE
 .sp
 .RS 4
@@ -576,7 +576,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-եɤѤեͥڡ(constant\-values\&.html)
+定数フィールドの値用の定数フィールド値ページ(constant\-values\&.html)。
 .RE
 .sp
 .RS 4
@@ -587,9 +587,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ľ󲽤줿ڡ(serialized\-form\&.html)եɤӥ᥽åɤޤࡢľ󲽲ǽijǽʥ饹˴ؤѤΥڡǤΥڡξϡAPIѤ볫ȯԤǤϤʤƼԤɬפʾǤľ󲽤줿ڡإˤϡľ󲽤줿饹˰ươΥ饹ȤˤִϢܡץǡľ󲽤줿פ򥯥åޤɸɥååȤľ󲽤줿ڡޤΥڡˤϡSerializable뤹٤ƤΥ饹(publicޤpublic)\fIreadObject\fR\fIwriteObject\fR᥽åɡľ󲽤줿եɡ\fI@serial\fR\fI@serialField\fR\fI@serialData\fRΥɥơ󡦥ȤȤȤ˥ꥹȤޤľ󲽲ǽpublic饹ˤϡΥ饹(ޤϤΥѥå)\fI@serial\fR
-excludeǥޡޤľ󲽲ǽpackage\-private饹ޤˤϡΥ饹(ޤϤΥѥå)\fI@serial\fR
-includeǥޡޤ꡼1\&.4Ǥϡ\fI\-private\fRץꤻ\fIjavadoc\fRޥɤ¹Ԥ뤳Ȥˤꡢpublic饹private饹δľ󲽤줿Ǥޤץ򻲾ȤƤ
+直列化された形式ページ(serialized\-form\&.html)。フィールドおよびメソッドの説明を含む、直列化可能かつ外部化可能なクラスに関する情報用のページです。このページ内の情報は、APIを使用する開発者ではなく、再実装者に必要な情報です。直列化された形式ページへアクセスするには、直列化されたクラスに移動して、そのクラス・コメントにある「関連項目」セクションで「直列化された形式」をクリックします。標準ドックレットは直列化された形式ページを生成します。このページには、Serializableを実装するすべてのクラス(publicまたは非public)が、その\fIreadObject\fRや\fIwriteObject\fRメソッド、直列化されたフィールド、および\fI@serial\fR、\fI@serialField\fR、\fI@serialData\fRタグからのドキュメンテーション・コメントとともにリストされます。直列化可能なpublicクラスを除外するには、そのクラス(またはそのパッケージ)を\fI@serial\fR
+excludeでマークします。直列化可能なpackage\-privateクラスを含めるには、そのクラス(またはそのパッケージ)を\fI@serial\fR
+includeでマークします。リリース1\&.4では、\fI\-private\fRオプションを指定せずに\fIjavadoc\fRコマンドを実行することにより、publicクラスおよびprivateクラスの完全に直列化された形式を生成できます。オプションを参照してください。
 .RE
 .sp
 .RS 4
@@ -600,9 +600,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ڡ(\fIindex\-*\&.html\fR)٤ƤΥ饹̾󥿥ե̾󥹥ȥ饯̾ե̾ӥ᥽å̾ե٥åȽ¤ǤޤڡϡUnicode򰷤褦˹ݲƤޤ1ĤΥեȤ뤳Ȥ⡢Ƭʸ(ѸξA\(enZ)Ȥ̡ΥեȤ뤳ȤǤޤ
-.RE
-.SS "ݡȡڡ"
+索引ページ(\fIindex\-*\&.html\fR)。すべてのクラス名、インタフェース名、コンストラクタ名、フィールド名、およびメソッド名がアルファベット順に並んでいます。索引ページは、Unicodeを扱えるように国際化されています。1つのファイルとして生成することも、先頭文字(英語の場合A\(enZ)ごとに別々のファイルとして生成することもできます。
+.RE
+.SS "サポート・ページ"
 .sp
 .RS 4
 .ie n \{\
@@ -612,7 +612,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-إסڡ(help\-doc\&.html)ʥӥ󡦥СҤγƥڡ˴ؤܤƤޤǥեȤΥإסեȼΥࡦإסեǥС饤ɤˤϡ\fI\-helpfile\fRѤޤ
+ヘルプ・ページ(help\-doc\&.html)。ナビゲーション・バーや前述の各ページに関する説明が記載されています。デフォルトのヘルプ・ファイルを独自のカスタム・ヘルプ・ファイルでオーバーライドするには、\fI\-helpfile\fRを使用します。
 .RE
 .sp
 .RS 4
@@ -623,7 +623,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɽѤHTMLե졼1Ĥindex\&.htmlե롣ե졼դƬڡɽˤϤΥեɤޤindex\&.htmlեˤϡƥȡƥĤϴޤޤƤޤ
+表示用のHTMLフレームを作成する1つのindex\&.htmlファイル。フレーム付きの先頭ページを表示するにはこのファイルをロードします。index\&.htmlファイルには、テキスト・コンテンツは含まれていません。
 .RE
 .sp
 .RS 4
@@ -634,7 +634,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ʣΥե졼ࡦե(\fI*\-frame\&.html\fR)ѥå饹ӥ󥿥եΥꥹȤޤޤƤޤե졼ࡦեHTMLե졼ɽޤ
+複数のフレーム・ファイル(\fI*\-frame\&.html\fR)。パッケージ、クラス、およびインタフェースのリストが含まれています。フレーム・ファイルはHTMLフレームを表示します。
 .RE
 .sp
 .RS 4
@@ -645,7 +645,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ѥåꥹȡե(package\-list)\fI\-link\fR\fI\-linkoffline\fRץǻѤޤѥåꥹȡեϥƥȡեǤꡢɤΥ󥯤⥢Ǥޤ
+パッケージ・リスト・ファイル(package\-list)。\fI\-link\fRおよび\fI\-linkoffline\fRオプションで使用されます。パッケージ・リスト・ファイルはテキスト・ファイルであり、どのリンクからもアクセスできません。
 .RE
 .sp
 .RS 4
@@ -656,7 +656,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-륷ȡե(stylesheet\&.css)ڡΰǤˤĤƿեȡեߥꡢեȡեȡ롢֤椷ޤ
+スタイルシート・ファイル(stylesheet\&.css)。生成されるページの一部の要素について色、フォント・ファミリ、フォント・サイズ、フォント・スタイル、および配置を制御します。
 .RE
 .sp
 .RS 4
@@ -667,22 +667,22 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-doc\-filesǥ쥯ȥꡣǥ쥯ȥ˥ԡ륤᡼ץ롦ɡɤʤɤΥե뤬ǼޤΥեϡ\fIjavadoc\fRޥɤˤäƽޤ󡣤Υǥ쥯ȥϡĥ꡼¸ߤˤΤ߽ޤ
+doc\-filesディレクトリ。宛先ディレクトリにコピーするイメージ、サンプル・コード、ソース・コードなどのファイルが格納されます。これらのファイルは、\fIjavadoc\fRコマンドによって処理されません。このディレクトリは、ソース・ツリーの中に存在する場合にのみ処理されます。
 .RE
 .PP
-ץ򻲾ȤƤ
-.SS "HTMLե졼"
+オプションを参照してください。
+.SS "HTMLフレーム"
 .PP
-\fIjavadoc\fRޥɤϡޥɤϤ줿ͤ˴ŤǾɬפʿ(2ޤ3)Υե졼ޤ\fIjavadoc\fRޥɤ˰Ȥ1ĤΥѥå̾ޤ1ĤΥѥå˴ޤޤ륽եϤϡѥåΥꥹȤάޤΤˡ\fIjavadoc\fRޥɤϺ¦1ĤΥե졼饹ΥꥹȤɽޤʣΥѥå̾Ϥϡ\fIjavadoc\fRޥɤϡ٤ƤΥѥåꥹȤ3Υե졼ȳץڡ(overview\-summary\&.html)ޤե졼άˤϡ֥ե졼ʤץ󥯤򥯥å뤫overview\-summary\&.htmlڡڡåȤɽޤ
-.SS "եι¤"
+\fIjavadoc\fRコマンドは、コマンドに渡された値に基づき、最小限必要な数(2または3)のフレームを生成します。\fIjavadoc\fRコマンドに引数として1つのパッケージ名または1つのパッケージに含まれるソース・ファイルを渡す場合は、パッケージのリストが省略されます。そのかわりに、\fIjavadoc\fRコマンドは左側の列に1つのフレームを作成し、クラスのリストを表示します。複数のパッケージ名を渡した場合は、\fIjavadoc\fRコマンドは、すべてのパッケージをリストする第3のフレームと概要ページ(overview\-summary\&.html)を作成します。フレームを省略するには、「フレームなし」リンクをクリックするか、overview\-summary\&.htmlページからページ・セットを表示します。
+.SS "生成されるファイルの構造"
 .PP
-륯饹ե뤪ӥ󥿥եեϡJavaե뤪ӥ饹եƱǥ쥯ȥ곬ؤޤ1ĤΥ֥ѥåˤĤ1ĤΥǥ쥯ȥꡢȤ¤ˤʤޤ
+生成されるクラス・ファイルおよびインタフェース・ファイルは、Javaソース・ファイルおよびクラス・ファイルと同じディレクトリ階層に編成されます。1つのサブパッケージにつき1つのディレクトリ、という構造になります。
 .PP
-ȤС\fIjava\&.applet\&.Applet\fR饹ѤɥȤϡjava/applet/Applet\&.html˳Ǽޤ
+たとえば、\fIjava\&.applet\&.Applet\fRクラス用に生成されるドキュメントは、java/applet/Applet\&.htmlに格納されます。
 .PP
-ǥ쥯ȥ̾\fIapidocs\fRȤȡ\fIjava\&.applet\fRѥåΥեι¤ϡΤȤǤҤΤ褦ˡ\fIframe\fRȤ̾˴ޤեϡ٤ƺޤϺΥե졼ɽޤʳHTMLեϡ٤Ʊ¦Υե졼ɽޤ
+生成先ディレクトリの名前が\fIapidocs\fRだとすると、\fIjava\&.applet\fRパッケージのファイルの構造は、次のとおりです。前述のように、\fIframe\fRという語を名前に含むファイルは、すべて左上または左下のフレームに表示されます。それ以外のHTMLファイルは、すべて右側のフレームに表示されます。
 .PP
-ǥ쥯ȥǤꥹ(*)ϡ\fIjavadoc\fRޥɤؤΰѥå̾ǤϤʤե̾Ǥ˾άե뤪ӥǥ쥯ȥ򼨤Ƥޤե̾ξ硢ΥѥåꥹȤޤdoc\-filesǥ쥯ȥϡĥ꡼¸ߤˤΤߡ˺ޤե򻲾ȤƤ
+ディレクトリは太字です。アスタリスク(*)は、\fIjavadoc\fRコマンドへの引数がパッケージ名ではなくソース・ファイル名である場合に省略されるファイルおよびディレクトリを示しています。引数がソース・ファイル名の場合、空のパッケージ・リストが作成されます。doc\-filesディレクトリは、ソース・ツリー内に存在する場合にのみ、生成先に作成されます。生成されるファイルを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -692,7 +692,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBapidocs\fR: Ǿ̥٥롦ǥ쥯ȥ
+\fBapidocs\fR: 最上位レベル・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -702,7 +702,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-index\&.html: HTMLե졼ꤹڡ
+index\&.html: HTMLフレームを設定する初期ページ
 .RE
 .sp
 .RS 4
@@ -713,7 +713,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-*overview\-summary\&.html: ѥåꥹȤȥޥ꡼
+*overview\-summary\&.html: パッケージ・リストとサマリー
 .RE
 .sp
 .RS 4
@@ -724,7 +724,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-overview\-tree\&.html: ٤ƤΥѥåΥ饹
+overview\-tree\&.html: すべてのパッケージのクラス階層
 .RE
 .sp
 .RS 4
@@ -735,7 +735,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-deprecated\-list\&.html: ٤ƤΥѥå侩API
+deprecated\-list\&.html: すべてのパッケージの非推奨API
 .RE
 .sp
 .RS 4
@@ -746,7 +746,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-constant\-values\&.html: ٤ƤΥѥåŪե
+constant\-values\&.html: すべてのパッケージの静的フィールド値
 .RE
 .sp
 .RS 4
@@ -757,7 +757,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-serialized\-form\&.html: ٤ƤΥѥåľ󲽤줿ե
+serialized\-form\&.html: すべてのパッケージの直列化されたフォーム
 .RE
 .sp
 .RS 4
@@ -768,7 +768,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-*overview\-frame\&.html: Υե졼ɽ뤹٤ƤΥѥå
+*overview\-frame\&.html: 左上のフレームに表示するすべてのパッケージ
 .RE
 .sp
 .RS 4
@@ -779,7 +779,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-allclasses\-frame\&.html: Υե졼ɽ뤹٤ƤΥ饹
+allclasses\-frame\&.html: 左下のフレームに表示するすべてのクラス
 .RE
 .sp
 .RS 4
@@ -790,7 +790,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-help\-doc\&.html: Javadocڡ˴ؤإ
+help\-doc\&.html: Javadocページの編成に関するヘルプ
 .RE
 .sp
 .RS 4
@@ -802,7 +802,7 @@
 .IP \(bu 2.3
 .\}
 index\-all\&.html:
-\fI\-splitindex\fRץʤǺ줿ǥեȤκ
+\fI\-splitindex\fRオプションなしで作成されたデフォルトの索引
 .RE
 .sp
 .RS 4
@@ -814,7 +814,7 @@
 .IP \(bu 2.3
 .\}
 \fBindex\-files\fR:
-\fI\-splitindex\fRץꤷƺ줿ǥ쥯ȥ
+\fI\-splitindex\fRオプションを指定して作成されたディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -825,7 +825,7 @@
 .IP \(bu 2.3
 .\}
 index\-<number>\&.html:
-\fI\-splitindex\fRץꤷƺ줿ե
+\fI\-splitindex\fRオプションを指定して作成された索引ファイル
 .RE
 .RE
 .sp
@@ -837,7 +837,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-list: Ȥ褹뤿Υѥå̾
+package\-list: 外部参照を解決するためのパッケージ名
 .RE
 .sp
 .RS 4
@@ -848,7 +848,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-stylesheet\&.css: եȡ֤ʤɤޤ
+stylesheet\&.css: フォント、色、位置などを定義します
 .RE
 .RE
 .sp
@@ -860,7 +860,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBjava\fR: ѥåǥ쥯ȥ
+\fBjava\fR: パッケージ・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -870,7 +870,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBapplet\fR: ֥ѥåǥ쥯ȥ
+\fBapplet\fR: サブパッケージ・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -881,7 +881,7 @@
 .IP \(bu 2.3
 .\}
 Applet\&.html:
-\fIApplet\fR饹ڡ
+\fIApplet\fRクラス・ページ
 .RE
 .sp
 .RS 4
@@ -893,7 +893,7 @@
 .IP \(bu 2.3
 .\}
 AppletContext\&.html:
-\fIAppletContext\fR󥿥ե
+\fIAppletContext\fRインタフェース
 .RE
 .sp
 .RS 4
@@ -905,7 +905,7 @@
 .IP \(bu 2.3
 .\}
 AppletStub\&.html:
-\fIAppletStub\fR󥿥ե
+\fIAppletStub\fRインタフェース
 .RE
 .sp
 .RS 4
@@ -917,7 +917,7 @@
 .IP \(bu 2.3
 .\}
 AudioClip\&.html:
-\fIAudioClip\fR󥿥ե
+\fIAudioClip\fRインタフェース
 .RE
 .sp
 .RS 4
@@ -928,7 +928,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-summary\&.html: 饹ȥޥ꡼
+package\-summary\&.html: クラスとサマリー
 .RE
 .sp
 .RS 4
@@ -939,7 +939,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-frame\&.html: Υե졼ɽѥå饹
+package\-frame\&.html: 左下のフレームに表示するパッケージ・クラス
 .RE
 .sp
 .RS 4
@@ -950,7 +950,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-tree\&.html: ΥѥåΥ饹
+package\-tree\&.html: このパッケージのクラス階層
 .RE
 .sp
 .RS 4
@@ -961,7 +961,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-package\-use\&.html: ΥѥåѤ
+package\-use\&.html: このパッケージが使用される場所
 .RE
 .sp
 .RS 4
@@ -972,7 +972,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBdoc\-files\fR: ᡼ӥץ롦եΥǥ쥯ȥ
+\fBdoc\-files\fR: イメージおよびサンプル・ファイルのディレクトリ
 .RE
 .sp
 .RS 4
@@ -983,18 +983,18 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBclass\-use\fR: ᡼ӥץ롦եξ
-.sp
-\- Applet\&.html: Applet饹λ
+\fBclass\-use\fR: イメージおよびサンプル・ファイルの場所
+.sp
+\- Applet\&.html: Appletクラスの使用
 .sp
 \- AppletContext\&.html:
-\fIAppletContext\fR󥿥եλ
+\fIAppletContext\fRインタフェースの使用
 .sp
 \- AppletStub\&.html:
-\fIAppletStub\fR󥿥եλ
+\fIAppletStub\fRインタフェースの使用
 .sp
 \- AudioClip\&.html:
-\fIAudioClip\fR󥿥եλ
+\fIAudioClip\fRインタフェースの使用
 .RE
 .RE
 .RE
@@ -1007,7 +1007,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBsrc\-html\fR: ɡǥ쥯ȥ
+\fBsrc\-html\fR: ソース・コード・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -1017,7 +1017,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBjava\fR: ѥåǥ쥯ȥ
+\fBjava\fR: パッケージ・ディレクトリ
 .sp
 .RS 4
 .ie n \{\
@@ -1027,24 +1027,24 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fBapplet\fR: ֥ѥåǥ쥯ȥ
-.sp
-\- Applet\&.html: Applet
+\fBapplet\fR: サブパッケージ・ディレクトリ
+.sp
+\- Applet\&.html: Appletソース・コード
 .sp
 \- AppletContext\&.html:
-\fIAppletContext\fR
+\fIAppletContext\fRソース・コード
 .sp
 \- AppletStub\&.html:
-\fIAppletStub\fR
+\fIAppletStub\fRソース・コード
 .sp
 \- AudioClip\&.html:
-\fIAudioClip\fR
-.RE
-.RE
-.RE
-.SS "API"
+\fIAudioClip\fRソース・コード
+.RE
+.RE
+.RE
+.SS "生成されるAPI宣言"
 .PP
-\fIjavadoc\fRޥɤϡ줾Υ饹󥿥եեɡ󥹥ȥ饯ӥ᥽åɤεҤκǽˡAPIѤޤȤС\fIBoolean\fR饹ϡΤ褦ˤʤޤ
+\fIjavadoc\fRコマンドは、それぞれのクラス、インタフェース、フィールド、コンストラクタ、およびメソッドの記述の最初に、そのAPI用の宣言を生成します。たとえば、\fIBoolean\fRクラスの宣言は、次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -1058,7 +1058,7 @@
 .RE
 .\}
 .PP
-\fIBoolean\&.valueOf\fR᥽åɤϼΤȤǤ
+\fIBoolean\&.valueOf\fRメソッドの宣言は次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -1070,15 +1070,15 @@
 .RE
 .\}
 .PP
-\fIjavadoc\fRޥɤϡ\fIpublic\fR\fIprotected\fR\fIprivate\fR\fIabstract\fR\fIfinal\fR\fIstatic\fR\fItransient\fR\fIvolatile\fRޤ뤳ȤǤޤ\fIsynchronized\fR\fInative\fRϤǤޤ\fIsynchronized\fR\fInative\fRҤϡξܺ٤ȤߤʤƤ뤿ᡢAPIͤˤϴޤޤޤ
+\fIjavadoc\fRコマンドは、修飾子\fIpublic\fR、\fIprotected\fR、\fIprivate\fR、\fIabstract\fR、\fIfinal\fR、\fIstatic\fR、\fItransient\fR、および\fIvolatile\fRを含めることができますが、\fIsynchronized\fRおよび\fInative\fRはできません。\fIsynchronized\fRおよび\fInative\fR修飾子は、実装の詳細とみなされているため、API仕様には含まれません。
 .PP
-APIǤϡ¹ޥƥˤĤơ\fIsynchronized\fR˰¸ΤǤϤʤȤμȤƥɥȲɬפޤȤС1ĤenumerationʣΥåɤ¹ԤƻѤ뤳ȤϤǤʤפΤ褦˵ҤޤɥȤˤϡΥޥƥ¸ˡ򵭽ҤʤǤȤС\fIHashtable\fRץϥåɥդǤɬפޤ֥ݡȤ뤹٤ƤΥ᥽åɤƱƤ¸פΤ褦˻ꤹ뺬Ϥޤ󡣤٤¹ΤˡХåȡ٥ŪƱ븢¤ͭƤȤᤷޤ
-.SH "ɥơ󡦥"
+APIでは、並行性セマンティクスについて、キーワード\fIsynchronized\fRに依存するのではなく、コメントの主説明としてドキュメント化する必要があります。たとえば、「1つのenumerationを複数のスレッドから並行して使用することはできない」のように記述します。ドキュメントには、これらのセマンティクスを実現する方法を記述しないでください。たとえば、\fIHashtable\fRオプションはスレッドセーフである必要がありますが、「エクスポートされるすべてのメソッドを同期化してそれを実現する」のように指定する根拠はありません。より高度な並行性のために、バケット・レベルで内部的に同期化する権限を保有しておくことをお薦めします。
+.SH "ドキュメンテーション・コメント"
 .PP
-ΥǤϡɤΥȤȥȤηѾˤĤޤ
-.SS "ɡ"
+このセクションでは、ソース・コードのコメントとコメントの継承について説明します。
+.SS "ソース・コード・コメント"
 .PP
-ɤǤդΥ饹󥿥ե᥽åɡ󥹥ȥ饯ޤϥեɤˡɥơ󡦥Ȥ򵭽Ҥ뤳ȤǤޤƥѥåˤɥơ󡦥ȤǤޤʸϼ㴳ۤʤޤפˤɥơ󡦥ȤǤޤɥơ󡦥Ȥϡ\fI/**\fRȡɽ\fI*/\fRδ֤ˤʸ鹽ޤƬΥꥹϳƹԤǻѤǤιǾܤޤȤΥƥȤϡʣԤˤ錄äƵҤǤޤ
+ソース・コードの任意のクラス、インタフェース、メソッド、コンストラクタ、またはフィールドの宣言の前に、ドキュメンテーション・コメントを記述することができます。各パッケージにもドキュメンテーション・コメントを作成できます。構文は若干異なりますが、概要にもドキュメンテーション・コメントを作成できます。ドキュメンテーション・コメントは、\fI/**\fRと、終わりを表す\fI*/\fRの間にある文字から構成されます。先頭のアスタリスクは各行で使用でき、次の項で詳しく説明します。コメントのテキストは、複数行にわたって記述できます。
 .sp
 .if n \{\
 .RS 4
@@ -1093,7 +1093,7 @@
 .RE
 .\}
 .PP
-ڡ󤹤ˤϡȤ1Ԥޤ
+スペースを節約するには、コメントを1行に入れます。
 .sp
 .if n \{\
 .RS 4
@@ -1104,10 +1104,10 @@
 .if n \{\
 .RE
 .\}
-Ȥ.PP
-ɥơ󡦥Ȥϡ饹󥿥ե󥹥ȥ饯᥽åɡޤϥեľ֤ˤΤǧޤ᥽åɤΤ֤Ƥɥơ󡦥Ȥ̵뤵ޤ\fIjavadoc\fRޥɤϡʸȤ1ĤΥɥơ󡦥Ȥǧޤ󡣥ѤǤ򻲾ȤƤ
+コメントの配置.PP
+ドキュメンテーション・コメントは、クラス、インタフェース、コンストラクタ、メソッド、またはフィールド宣言の直前に配置される場合にのみ認識されます。メソッドの本体に置かれているドキュメンテーション・コメントは無視されます。\fIjavadoc\fRコマンドは、宣言文ごとに1つのドキュメンテーション・コメントしか認識しません。タグを使用できる場所を参照してください。
 .PP
-褯ְ㤤ϡ饹Ȥȥ饹δ֤\fIimport\fRʸ֤ƤޤȤǤ\fIjavadoc\fRޥɤϥ饹Ȥ̵뤹Τǡ\fIimport\fRʸ򤳤ξ֤ʤǤ
+よくある間違いは、クラス・コメントとクラス宣言の間に\fIimport\fR文を置いてしまうことです。\fIjavadoc\fRコマンドはクラス・コメントを無視するので、\fIimport\fR文をこの場所に配置しないでください。
 .sp
 .if n \{\
 .RS 4
@@ -1124,8 +1124,8 @@
 .if n \{\
 .RE
 .\}
-ȤΥѡ.PP
-ɥơ󡦥ȤˤϡȤθ³󤬴ޤޤޤϡ϶ڤʸ\fI/**\fRǻϤޤꡢޤ³ޤϡƬʸ\fI@\fRιԤǽΥ֥åϤޤޤ(ƬΥꥹʸƬζڤʸ\fI/**\fRϽ)򵭽ҤΤߤΥȤ򵭽Ҥ뤳ȤǤޤϡʹߤ³뤳ȤϤǤޤ󡣥ΰϡʣԤˤ錄äƵҤǤޤο¤Ϥޤ󡣲⵭ҤǤ륿ȡ1󤷤ҤǤʤޤȤС\fI@see\fR饿ϻϤޤޤ
+コメントのパーツ.PP
+ドキュメンテーション・コメントには、主説明とその後に続くタグ・セクションが含まれます。主説明は、開始区切り文字\fI/**\fRで始まり、タグ・セクションまで続きます。タグ・セクションは、先頭文字が\fI@\fRの行で定義される最初のブロック・タグから始まります(先頭のアスタリスク、空白文字、先頭の区切り文字\fI/**\fRは除く)。主説明を記述せず、タグ・セクションのみのコメントを記述することもできます。主説明は、タグ・セクション以降に続けることはできません。タグの引数は、複数行にわたって記述できます。タグの数に制限はありません。何回も記述できるタグと、1回しか記述できないタグがあります。たとえば、次の\fI@see\fRタグからタグ・セクションは始まります。
 .sp
 .if n \{\
 .RS 4
@@ -1139,8 +1139,8 @@
 .if n \{\
 .RE
 .\}
-֥åӥ饤󡦥.PP
-ϡ\fIjavadoc\fRޥɤɥơ󡦥üʥɤǤˤ2ĤΥפޤ1Ĥ\fI@tag\fRΤ褦ɽ֥å(ɥ󡦥ȤƤФ)⤦1Ĥ\fI{@tag}\fRΤ褦楫åǰϤɽ륤饤󡦥Ǥ֥åᤵˤϡƬΥꥹʸڤʸ(\fI/**\fR)ơԤƬ֤ɬפޤϡ\fI@\fRʸƥ̤ξǻѤƤ⡢γϤȤƲᤵʤȤ̣Ƥޤ\fI@\fRʸѤƹԤ򳫻ϤƤ⡢줬ᤵʤ褦ˤˤϡHTMLƥƥ\fI&#064;\fRѤޤ줾Υ֥åˤϡϢդ줿ƥȤޤΥƥȤϡθ夫顢Υޤϥɥơ󡦥ȤκǸޤǤδ֤˵Ҥ줿ƥȤǤ(ޤϥȶڤʸ)δϢƥȤϡʣԤˤ錄äƵҤǤޤ饤󡦥ϡƥȤ򵭽ҤǤǤФɤˤǤ֤ȤǤᤵޤˤϥ֥å\fI@deprecated\fRȥ饤󡦥\fI{@link}\fRޤޤƤޤjavadoc򻲾ȤƤ
+ブロックおよびインライン・タグ.PP
+タグは、\fIjavadoc\fRコマンドが処理するドキュメンテーション・コメント内の特殊なキーワードです。タグには2つのタイプがあります。1つは\fI@tag\fRタグのように表記されるブロック・タグ(スタンドアロン・タグとも呼ばれる)、もう1つは\fI{@tag}\fRタグのように中カッコで囲んで表記されるインライン・タグです。ブロック・タグが解釈されるには、行頭のアスタリスク、空白文字、区切り文字(\fI/**\fR)を除いて、行の先頭に置く必要があります。これは、\fI@\fR文字をテキスト内の別の場所で使用しても、タグの開始として解釈されないことを意味しています。\fI@\fR文字を使用して行を開始しても、それが解釈されないようにするには、HTMLエンティティ\fI&#064;\fRを使用します。それぞれのブロック・タグには、関連付けられたテキストがあります。このテキストは、タグの後から、次のタグの前、またはドキュメンテーション・コメントの最後までの間に記述されたテキストです(タグまたはコメント区切り文字を除く)。この関連テキストは、複数行にわたって記述できます。インライン・タグは、テキストを記述できる場所であればどこにでも置くことができ、解釈されます。次の例にはブロック・タグ\fI@deprecated\fRとインライン・タグ\fI{@link}\fRが含まれています。javadocタグを参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -1153,10 +1153,10 @@
 .if n \{\
 .RE
 .\}
-HTMLǤΥȤε.PP
-ƥȤHTMLƥƥHTMLѤHTMLǵҤɬפޤѤ֥饦ݡȤǤդHTMLΥСѤǤޤɸɥååȤϡǥ󥰡롦Ȥӥե졼ޤᡢɥơ󡦥ȰʳʬHTML 3\&.2˽򤷤ɤޤե졼ࡦåȤΤᡢ줿եˤHTML 4\&.0侩ޤ
+HTMLでのコメントの記述.PP
+テキストはHTMLエンティティとHTMLタグを使用してHTMLで記述される必要があります。使用するブラウザがサポートする任意のHTMLのバージョンを使用できます。標準ドックレットは、カスケーディング・スタイル・シートおよびフレームを含め、ドキュメンテーション・コメント以外の部分でHTML 3\&.2に準拠したコードを生成します。フレーム・セットのため、生成されたファイルにはHTML 4\&.0が推奨されます。
 .PP
-ȤС꾮(<)Ӥ礭(>)Υƥƥϡ\fI&lt;\fR\fI&gt;\fRȵҤɬפޤƱͤˡѥ(&)\fI&amp;\fRȵҤɬפޤǤϡHTML\fI<b>\fRѤƤޤ
+たとえば、より小さい記号(<)およびより大きい記号(>)のエンティティは、\fI&lt;\fRおよび\fI&gt;\fRと記述する必要があります。同様に、アンパサンド(&)は\fI&amp;\fRと記述する必要があります。次の例では、太字のHTMLタグ\fI<b>\fRを使用しています。
 .sp
 .if n \{\
 .RS 4
@@ -1170,12 +1170,12 @@
 .if n \{\
 .RE
 .\}
-ƬΥꥹ.PP
-\fIjavadoc\fRޥɤˤɥơ󡦥ȤβϻˡƹԤƬˤ륢ꥹ(*)ʸ˴ޤǽΥꥹ(*)ʸˤ䥿֤˴ޤƬΥꥹά硢ǥȤݻޤޤǥץ롦ɤ\fI<PRE>\fRΥɥơ󡦥ȤľŽդ褦ˡƬζʸϺʤʤޤ֥饦ϡʸ򥿥֤Χ˲ᤷޤǥȤε(ڤʸ\fI/**\fRޤ\fI<PRE>\fRǤϤʤ)ޡˤʤޤ
-ǽʸ.PP
-ƥɥơ󡦥ȤκǽʸϡƤ륨ƥƥ˴ؤʷ餫Ĵʥޥ꡼ʸǤɬפޤʸϡ򡢥֡ޤϹԽλʸ³ǽΥԥꥪɡޤϺǽΥ֥å֤ǽޤǽʸϡ\fIjavadoc\fRޥɤˤäHTMLڡƬˤСΥޥ꡼ʬ˥ԡޤ
-ʣեɤ.PP
-JavaץåȥեǤϡ1ĤʸʣΥեɤǤޤʸˤϡ1ĤΥɥơ󡦥ȤҤǤޤ󡣤ΥȤ٤ƤΥեɤФƥԡޤեɤȤ˥ɥơ󡦥Ȥ򵭽Ҥɬפϡƥեɤ̡ʸɬפޤȤСΥɥơ󡦥Ȥϡ1ĤȤƵҤŬڤǤξϡ2Ĥʬ뤳Ȥᤷޤ
+先頭のアスタリスク.PP
+\fIjavadoc\fRコマンドによるドキュメンテーション・コメントの解析時に、各行の先頭にあるアスタリスク(*)文字は破棄されます。最初のアスタリスク(*)文字より前にある空白やタブも破棄されます。行頭のアスタリスクを省略した場合、インデントを保持したままでサンプル・コードを\fI<PRE>\fRタグ内のドキュメンテーション・コメントに直接貼り付けられるように、先頭の空白文字は削除されなくなります。ブラウザは、空白文字をタブよりも一律に解釈します。インデントの起点は(区切り文字\fI/**\fRまたは\fI<PRE>\fRタグではなく)左マージンになります。
+最初の文.PP
+各ドキュメンテーション・コメントの最初の文は、宣言されているエンティティに関する簡潔かつ完全なサマリー文である必要があります。この文は、空白、タブ、または行終了文字が続く最初のピリオド、または最初のブロック・タグがある位置で終わります。最初の文は、\fIjavadoc\fRコマンドによってHTMLページの先頭にあるメンバーのサマリーの部分にコピーされます。
+複数フィールドの宣言.PP
+Javaプラットフォームでは、1つの文で複数のフィールドを宣言できます。ただし、この文には、1つのドキュメンテーション・コメントしか記述できません。そのコメントが、すべてのフィールドに対してコピーされます。フィールドごとにドキュメンテーション・コメントを記述する必要がある場合は、各フィールドを別々の文で宣言する必要があります。たとえば、次のドキュメンテーション・コメントは、1つの宣言として記述すると不適切です。この場合は、宣言を2つに分けることをお薦めします。
 .sp
 .if n \{\
 .RS 4
@@ -1191,7 +1191,7 @@
 .RE
 .\}
 .PP
-\fIjavadoc\fRޥɤϡΥɤ鼡Τ褦ʥɥȤޤ
+\fIjavadoc\fRコマンドは、上のコードから次のようなドキュメントを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1216,27 +1216,27 @@
 .\}
 .PP
 The horizontal and vertical distances of point (x, y)\&.
-إåλ.PP
-СФƥɥơ󡦥Ȥ򵭽ҤȤˤϡ\fI<H1>\fR\fI<H2>\fRʤɤHTMLФѤʤȤᤷޤ\fIjavadoc\fRޥɤϡʹ¤ɥȤΤǡΤ褦ʹ¤ѤƤȡɥȤηƶ뤳Ȥޤ饹ѥåΥȤǤϡθФѤȼι¤ꤷƤޤޤ
-.SS "᥽åɡȤηѾ"
+ヘッダー・タグの使用.PP
+メンバーに対してドキュメンテーション・コメントを記述するときには、\fI<H1>\fRや\fI<H2>\fRなどのHTML見出しタグを使用しないことをお薦めします。\fIjavadoc\fRコマンドは、完全な構造化ドキュメントを作成するので、このような構造化タグが使用されていると、生成ドキュメントの形式が悪影響を受けることがあります。ただし、クラスやパッケージのコメントでは、これらの見出しを使用して独自の構造を指定してかまいません。
+.SS "メソッド・コメントの継承"
 .PP
-\fIjavadoc\fRޥɤǤϡ饹ӥ󥿥եǥ᥽åɡȤѾơƥȤϤꡢŪ˥᥽åɡȤѾ뤳ȤǤޤ󥹥ȥ饯եɡӥͥȤ줿饹ϡɥơ󡦥ȤѾޤ
+\fIjavadoc\fRコマンドでは、クラスおよびインタフェースでメソッド・コメントを継承して、欠落したテキストを入力したり、明示的にメソッド・コメントを継承することができます。コンストラクタ、フィールド、およびネストされたクラスは、ドキュメンテーション・コメントを継承しません。
 .PP
-\fB:\fR
-ɥơ󡦥Ȥ򥳥ԡѤˤϡѾ᥽åɤΥե뤬\fI\-sourcepath\fRץǻꤷѥΤߤ֤Ƥɬפޤޥɥ饤ǡ饹ѥåϤɬפϤޤ󡣤ϥ꡼1\&.3\&.\fIn\fRȤоŪǤޤǤϡ饹ɥȲ륯饹Ǥ뤳ȤɬפǤ
-ƥȤ.PP
-ޤ\fI@return\fR\fI@param\fR\fI@throws\fR᥽åɡȤƤ硢\fIjavadoc\fRޥɤϡбޤϥȤ򡢤줬С饤ɤޤϼƤ᥽å()饳ԡޤ᥽åɡȤηѾ򻲾ȤƤ
+\fB注意:\fR
+ドキュメンテーション・コメントをコピーに利用するには、継承したメソッドのソース・ファイルが\fI\-sourcepath\fRオプションで指定したパスのみに置かれている必要があります。コマンドラインで、クラスもパッケージも渡す必要はありません。この点はリリース1\&.3\&.\fIn\fR以前とは対照的です。これまでは、クラスがドキュメント化されるクラスであることが必要でした。
+欠落テキストの入力.PP
+主説明、または\fI@return\fR、\fI@param\fR、\fI@throws\fRタグがメソッド・コメントから欠落している場合、\fIjavadoc\fRコマンドは、対応する主説明またはタグ・コメントを、それがオーバーライドまたは実装しているメソッド(ある場合)からコピーします。メソッド・コメントの継承を参照してください。
 .PP
-Υѥ᡼\fI@param\fRĤʤ硢Υѥ᡼ΥȤ̤ηѾؤΥ᥽åɤ饳ԡޤ㳰\fI@throws\fRĤʤ硢㳰Ƥˤꡢ\fI@throws\fRԡޤ
+特定のパラメータの\fI@param\fRタグが見つからない場合、そのパラメータのコメントが、上位の継承階層のメソッドからコピーされます。特定の例外の\fI@throws\fRタグが見つからない場合、その例外が宣言されている場合にかぎり、\fI@throws\fRタグがコピーされます。
 .PP
-ưϥ꡼1\&.3ưȤоŪǤޤǤΥСǤϡޤϥ¸ߤСȤϰڷѾޤǤ
+この動作はリリース1\&.3以前の動作とは対照的です。これまでのバージョンでは、主説明またはタグが存在すれば、コメントは一切継承されませんでした。
 .PP
-javadocӥץ򻲾ȤƤ
-ŪʷѾ.PP
-\fI{@inheritDoc}\fR饤󡦥᥽åɤμޤ\fI@return\fR\fI@param\fR\fI@throws\fRȤޤбѾ줿ޤϥȤϡξ˥ԡޤ
-.SS "饹ӥ󥿥եηѾ"
+javadocタグおよびオプションを参照してください。
+明示的な継承.PP
+\fI{@inheritDoc}\fRインライン・タグをメソッドの主説明または\fI@return\fR、\fI@param\fR、\fI@throws\fRタグ・コメントに挿入します。対応する継承された主説明またはタグ・コメントは、その場所にコピーされます。
+.SS "クラスおよびインタフェースの継承"
 .PP
-ȤηѾϡ饹ӥ󥿥եηѾΡͤ뤹٤Ƥξȯޤ
+コメントの継承は、クラスおよびインタフェースからの継承の、考えられるすべての場合に発生します。
 .sp
 .RS 4
 .ie n \{\
@@ -1246,7 +1246,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饹Υ᥽åɤѡ饹Υ᥽åɤ򥪡С饤ɤƤ
+クラスのメソッドがスーパークラスのメソッドをオーバーライドしている場合
 .RE
 .sp
 .RS 4
@@ -1257,7 +1257,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-󥿥եΥ᥽åɤѡ󥿥եΥ᥽åɤ򥪡С饤ɤƤ
+インタフェースのメソッドがスーパーインタフェースのメソッドをオーバーライドしている場合
 .RE
 .sp
 .RS 4
@@ -1268,15 +1268,15 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饹Υ᥽åɤ󥿥եΥ᥽åɤƤ
+クラスのメソッドがインタフェースのメソッドを実装している場合
 .RE
 .PP
-ǽ2ĤΥǤϡ\fIjavadoc\fRޥɤϡС饤ɤƤ᥽åɤΥɥ\fI֥С饤ɡ\fRȤФޤȤѾƤ뤫ɤˤ餺С饤ɤƤ᥽åɤؤΥ󥯤ޤޤޤ
+最初の2つのケースでは、\fIjavadoc\fRコマンドは、オーバーライドしているメソッドのドキュメント内に\fI「オーバーライド」\fRという小見出しを生成します。コメントが継承されているかどうかにかかわらず、オーバーライドされているメソッドへのリンクが含まれます。
 .PP
-3ܤΥ(Υ饹Υ᥽åɤ󥿥եΥ᥽åɤƤ)Ǥϡ\fIjavadoc\fRޥɤϡС饤ɤƤ᥽åɤΥɥ\fI\fRȤФޤȤѾƤ뤫ɤˤ餺Ƥ᥽åɤؤΥ󥯤ޤޤޤ
-.SS "᥽åɡȤΥ르ꥺ"
+3つ目のケース(特定のクラスのメソッドがインタフェースのメソッドを実装している場合)では、\fIjavadoc\fRコマンドは、オーバーライドしているメソッドのドキュメント内に\fI「定義」\fRという小見出しを生成します。コメントが継承されているかどうかにかかわらず、実装されているメソッドへのリンクが含まれます。
+.SS "メソッド・コメントのアルゴリズム"
 .PP
-᥽åɤ˥ɥơ󡦥Ȥʤޤ\fI{@inheritDoc}\fR硢\fIjavadoc\fRޥɤϼΥ르ꥺѤŬѤǤ륳Ȥ򸡺ޤ르ꥺϡǤꤵŬѲǽʥɥơ󡦥Ȥõѡ饹⥤󥿥եͥ褹褦߷פƤޤ
+メソッドにドキュメンテーション・コメントがない、または\fI{@inheritDoc}\fRタグがある場合、\fIjavadoc\fRコマンドは次のアルゴリズムを使用して適用できるコメントを検索します。アルゴリズムは、最も特定される適用可能なドキュメンテーション・コメントを探し、スーパークラスよりもインタフェースを優先するように設計されています。
 .sp
 .RS 4
 .ie n \{\
@@ -1286,7 +1286,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ľܤ˼Ƥ(ޤϡĥƤ)󥿥ե򡢥᥽åɤ\fIimplements\fR(ޤ\fIextends\fR)Ȥθ˽иǡ1ĤĴ٤ޤΥ᥽åɤˤĤƺǽ˸Ĥäɥơ󡦥ȤѤޤ
+直接に実装されている(または、拡張されている)インタフェースを、メソッドの宣言で\fIimplements\fR(または\fIextends\fR)という語の後に出現する順序で、1つずつ調べます。このメソッドについて最初に見つかったドキュメンテーション・コメントを採用します。
 .RE
 .sp
 .RS 4
@@ -1297,7 +1297,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-1ǥɥơ󡦥ȤĤʤäϡľܼƤ(ޤϡĥƤ)󥿥եΤ줾ФơΥ르ꥺΤƵŪŬѤޤ(κݤνϡ1ǥ󥿥եĴ٤ȤνƱ)
+手順1でドキュメンテーション・コメントが見つからなかった場合は、直接実装されている(または、拡張されている)インタフェースのそれぞれに対して、このアルゴリズム全体を再帰的に適用します(その際の順序は、手順1でインタフェースを調べたときの順序と同じ)。
 .RE
 .sp
 .RS 4
@@ -1308,7 +1308,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-2ǥɥơ󡦥ȤĤʤäǡΥ饹\fIObject\fRʳΥ饹Ǥ뤬󥿥եǤϤʤϡΤ褦˽ޤ
+手順2でドキュメンテーション・コメントが見つからなかった場合で、このクラスが\fIObject\fR以外のクラスであるが、インタフェースではない場合は、次のように処理します。
 .sp
 .RS 4
 .ie n \{\
@@ -1318,7 +1318,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ѡ饹ˤΥ᥽åɤˤĤƤΥɥơ󡦥ȤҤƤϡΥȤѤޤ
+スーパークラスにこのメソッドについてのドキュメンテーション・コメントが記述されている場合は、そのコメントを採用します。
 .RE
 .sp
 .RS 4
@@ -1329,14 +1329,14 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-3aǥɥơ󡦥ȤĤʤäϡѡ饹ФơΥ르ꥺΤƵŪŬѤޤ
-.RE
-.RE
-.SH "JAVADOC"
+手順3aでドキュメンテーション・コメントが見つからなかった場合は、スーパークラスに対して、このアルゴリズム全体を再帰的に適用します。
+.RE
+.RE
+.SH "JAVADOCタグ"
 .PP
-\fIjavadoc\fRޥɤϡJavaΥɥơ󡦥ޤ줿̤ʥϤޤ\fIjavadoc\fRѤȡAPI򥽡ɤ鼫ưŪǤޤϥåȥޡ(\fI@\fR)ǻϤޤꡢʸȾʸ̤ޤΥϡɽƤȤʸȾʸѤϤɬפޤϡԤƬ(ƬζʸȾάǽʥꥹθ)֤ɬפޤʤȡƥȤȤưޤȤơƱ̾Υ1սˤޤȤޤȤС\fI@see\fRʣϡ٤ƱˤޤȤ֤ޤܺ٤ϡѤǤ򻲾ȤƤ
+\fIjavadoc\fRコマンドは、Javaのドキュメンテーション・コメント内に埋め込まれた特別なタグを解析します。\fIjavadoc\fRタグを使用すると、完全な整形式のAPIをソース・コードから自動的に生成できます。タグはアットマーク記号(\fI@\fR)で始まり、大文字と小文字が区別されます。これらのタグは、表示されているとおりに大文字と小文字を使用して入力する必要があります。タグは、行の先頭(先頭の空白文字と省略可能なアスタリスクの後)に置く必要があります。そうしないと、テキストとして扱われます。慣例として、同じ名前のタグは1箇所にまとめます。たとえば、\fI@see\fRタグが複数ある場合は、すべて同じ場所にまとめて配置します。詳細は、タグを使用できる場所を参照してください。
 .PP
-ˤϡΥפޤ
+タグには、次のタイプがあります。
 .sp
 .RS 4
 .ie n \{\
@@ -1346,7 +1346,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-֥å: ֥åϼ³ˤΤ֤ޤ֥åϡ\fI@tag\fRηȤޤ
+ブロック・タグ: ブロック・タグは主説明に続くタグ・セクション内にのみ配置します。ブロック・タグは、\fI@tag\fRの形式をとります。
 .RE
 .sp
 .RS 4
@@ -1357,52 +1357,52 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饤󡦥: 饤󡦥ϼޤϥ֥åΥǤդξ֤ޤ饤󡦥\fI{@tag}\fRΤ褦楫åǰϤߤޤ
+インライン・タグ: インライン・タグは主説明内またはブロック・タグのコメント内の任意の場所に配置します。インライン・タグは\fI{@tag}\fRのように中カッコで囲みます。
 .RE
 .PP
-ࡦˤĤƤϡ\-tag tagname:Xaoptcmf:"taghead"򻲾ȤƤѤǤ⻲ȤƤ
-.SS ""
+カスタム・タグについては、\-tag tagname:Xaoptcmf:"taghead"を参照してください。タグを使用できる場所も参照してください。
+.SS "タグの説明"
 .PP
 @author \fIname\-text\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fI\-author\fRץ󤬻ѤƤ硢ꤷ̾ΥƥȤκԥȥɥȤɲäޤ1ĤΥɥơ󡦥Ȥʣ\fI@author\fRޤ뤳ȤǤޤ1Ĥ\fI@author\fR1Ĥ̾ꤹ뤳Ȥ⡢ʣ̾ꤹ뤳ȤǤޤԤξϡ\fIjavadoc\fRޥɤˤä̾̾δ֤˥(,)ȶʸޤԤξϡƥΤϤ뤳ȤʤɥȤ˥ԡޤäơޤǤϤʤƸб̾ڤʸѤɬפȤˡ1Ԥʣ̾ǤޤJavadocġǤDocȤεˡ@author˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@author)򻲾ȤƤ
+JDK 1\&.0で導入
+.sp
+\fI\-author\fRオプションが使用されている場合、指定した名前のテキストの作成者エントリを生成されるドキュメントに追加します。1つのドキュメンテーション・コメントに複数の\fI@author\fRタグを含めることができます。1つの\fI@author\fRタグに1つの名前を指定することも、複数の名前を指定することもできます。前者の場合は、\fIjavadoc\fRコマンドによって名前と名前の間にカンマ(,)と空白文字が挿入されます。後者の場合は、テキスト全体が解析されることなく、生成ドキュメントにコピーされます。したがって、カンマではなく、各言語に対応した名前区切り文字を使用する必要があるときに、1行に複数の名前を指定できます。JavadocツールでのDocコメントの記述方法の@authorに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@author)を参照してください。
 .RE
 .PP
 {@code \fItext\fR}
 .RS 4
-JDK 1\&.5Ƴ
-.sp
-\fI<code>{@literal}</code>\fRƱǤ
-.sp
-ƥȤHTMLޡåפޤϥͥȤ줿JavadocȤƲ᤻ˡtext򥳡ɡեȤɽޤˤꡢɥơ󡦥ȤǤϡѥ᡼η(\fI<Object>\fR)(\fI3 < 4\fR)(\fI<\-\fR)ʤɤǡ̾λå(<>)HTMLƥƥ(\fI&lt;\fR\fI&gt;\fR)Τ˻ѤǤޤȤСɥơ󡦥\fI{@code A<B>C}\fR\fIA<B>C\fRȤѹ줺줿HTMLڡɽޤĤޤꡢ\fI<B>\fRȤƲᤵ줺ΥեȤϥɡեȤˤʤޤɡեȤʤƱǽ¸ˤϡ\fI{@literal}\fRѤޤ
+JDK 1\&.5で導入
+.sp
+\fI<code>{@literal}</code>\fRと同等です。
+.sp
+テキストをHTMLマークアップまたはネストされたJavadocタグとして解釈せずに、textをコード・フォントで表示します。これにより、ドキュメンテーション・コメントでは、パラメータの型(\fI<Object>\fR)、不等号(\fI3 < 4\fR)、矢印(\fI<\-\fR)などで、通常の山カッコ(<および>)をHTMLエンティティ(\fI&lt;\fRおよび\fI&gt;\fR)のかわりに使用できます。たとえば、ドキュメンテーション・コメント\fI{@code A<B>C}\fRは\fIA<B>C\fRとして変更されずに生成されたHTMLページに表示されます。つまり、\fI<B>\fRが太字として解釈されず、そのフォントはコード・フォントになります。コード・フォントなしで同じ機能を実現するには、\fI{@literal}\fRタグを使用します。
 .RE
 .PP
 @deprecated \fIdeprecated\-text\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-APIư³ޤAPIѤʤȤ륳Ȥɲäޤ\fIjavadoc\fRޥɤϡ\fIdeprecated\-text\fR˰ưƥåˤηٹֿ侩Ƥޤ󡣡פɲäޤΥϡ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡӥեɤͭǤ
-.sp
-侩ƥȤκǽʸǤϡAPI侩ʤʤäȡؤȤƻѤAPI桼󼨤ɬפޤ\fIjavadoc\fRޥɤϡκǽʸ򡢥ޥ꡼Ⱥ˥ԡޤθʸ侩ˤʤäͳ뤳ȤǤޤAPIؤ\fI{@link}\fR(Javadoc 1\&.2ʹߤξ)ޤɬפޤ
-.sp
-\fI@deprecated annotation\fRѤƥץǤ侩ˤޤAPI侩ˤˡȻ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/deprecation/deprecation\&.html)򻲾ȤƤ
-.sp
-JavadocġǤDocȤεˡ@deprecated˴ؤ
+JDK 1\&.0で導入
+.sp
+このAPIは動作し続けますが、このAPIを使用しないことを薦めるコメントを追加します。\fIjavadoc\fRコマンドは、\fIdeprecated\-text\fRを主説明の前に移動してイタリックにし、その前に太字の警告「推奨されていません。」を追加します。このタグは、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、およびフィールドで有効です。
+.sp
+非推奨テキストの最初の文では、そのAPIが推奨されなくなった時期と、代替として使用するAPIをユーザーに提示する必要があります。\fIjavadoc\fRコマンドは、この最初の文を、サマリー・セクションと索引にコピーします。その後の文で非推奨になった理由を説明することもできます。代替APIを指し示す\fI{@link}\fRタグ(Javadoc 1\&.2以降の場合)を含める必要があります。
+.sp
+\fI@deprecated annotation\fRタグを使用してプログラム要素を非推奨にします。APIを非推奨にする方法と時期
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/deprecation/deprecation\&.html)を参照してください。
+.sp
+JavadocツールでのDocコメントの記述方法の@deprecatedに関する項
 
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@deprecated)⻲ȤƤ
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@deprecated)も参照してください。
 .RE
 .PP
 {@docRoot}
 .RS 4
-JDK 1\&.3Ƴ
-.sp
-ڡΡɥȤ()롼ȡǥ쥯ȥؤХѥɽޤΥϡΥڡҤΥʤɡ뤹٤ƤΥڡ黲ȤեȤ߹ȤǤ̾ϡƥڡκDzΥڡ˥󥯤ޤ
-.sp
-\fI{@docRoot}\fRϡޥɥ饤Ǥɥơ󡦥ǤѤǤޤΥϡǤդΥ(\fI@return\fR\fI@param\fR\fI@deprecated\fRʤ)Υƥʬޤࡢ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡӥեɤͭǤ
+JDK 1\&.3で導入
+.sp
+生成されるページからの、生成ドキュメントの(生成先)ルート・ディレクトリへの相対パスを表します。このタグは、著作権のページや会社のロゴなど、生成されるすべてのページから参照するファイルを組み込むときに便利です。通常は、各ページの最下部から著作権のページにリンクします。
+.sp
+この\fI{@docRoot}\fRタグは、コマンドラインでもドキュメンテーション・コメント内でも使用できます。このタグは、任意のタグ(\fI@return\fR、\fI@param\fRおよび\fI@deprecated\fRタグなど)のテキスト部分を含む、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、およびフィールドで有効です。
 .sp
 .RS 4
 .ie n \{\
@@ -1412,9 +1412,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥɥ饤ǡإåեåޤϺDzΤ褦ޤ\fIjavadoc \-bottom \*(Aq<a href="{@docRoot}/copyright\&.html">Copyright</a>\*(Aq\fR
-.sp
-\fI{@docRoot}\fRmakefileǤΤ褦Ѥ硢\fImakefile\fRץǤϡ楫å\fI{}\fRʸ̤˥פɬפޤȤСInprise MAKEС5\&.2WindowsǼ¹Ԥϡ\fI{{@docRoot}}\fRΤ褦ˡ楫åŤˤɬפޤ\fI\-bottom\fRץʤɤΥץؤΰϤΤˡ(ŤǤϤʤ)ɬפǤ(\fIhref\fRϤϾά)
+コマンドラインで、ヘッダー、フッターまたは最下部が次のように定義されます。\fIjavadoc \-bottom \*(Aq<a href="{@docRoot}/copyright\&.html">Copyright</a>\*(Aq\fR
+.sp
+\fI{@docRoot}\fRタグをmakefile内でこのように利用する場合、一部の\fImakefile\fRプログラムでは、中カッコ\fI{}\fR文字を特別にエスケープする必要があります。たとえば、Inprise MAKEバージョン5\&.2をWindows上で実行する場合は、\fI{{@docRoot}}\fRのように、中カッコを二重にする必要があります。\fI\-bottom\fRオプションなどのオプションへの引数を囲むのに、二重(一重ではなく)引用符も必要です(\fIhref\fR引数を囲む引用符は省略)。
 .RE
 .sp
 .RS 4
@@ -1425,7 +1425,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɥơ󡦥ȤǤ
+ドキュメンテーション・コメントでは
 .sp
 .if n \{\
 .RS 4
@@ -1438,24 +1438,24 @@
 .if n \{\
 .RE
 .\}
-ΥɬפͳϡɥȤ֥ѥåƱijع¤Υǥ쥯ȥ˳Ǽ뤫Ǥ\fI<a href="{@docRoot}/copyright\&.html">\fRϡ\fIjava/lang/Object\&.java\fRФƤ\fI<a href="\&.\&./\&.\&./copyright\&.html">\fR˲褵졢\fIjava/lang/ref/Reference\&.java\fRФƤ\fI<a href="\&.\&./\&.\&./\&.\&./copyright\&.html">\fR˲褵ޤ
+このタグが必要な理由は、生成ドキュメントが、サブパッケージと同じ深さを持つ階層構造のディレクトリに格納されるからです。式\fI<a href="{@docRoot}/copyright\&.html">\fRは、\fIjava/lang/Object\&.java\fRに対しては\fI<a href="\&.\&./\&.\&./copyright\&.html">\fRに解決され、\fIjava/lang/ref/Reference\&.java\fRに対しては\fI<a href="\&.\&./\&.\&./\&.\&./copyright\&.html">\fRに解決されます。
 .RE
 .RE
 .PP
 @exception \fIclass\-name description\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fI@throws\fRƱǤ@throws class\-name description򻲾ȤƤ
+JDK 1\&.0で導入
+.sp
+\fI@throws\fRタグと同じです。@throws class\-name descriptionを参照してください。
 .RE
 .PP
 {@inheritDoc}
 .RS 4
-JDK 1\&.4Ƴ
-.sp
-ǤᤤѾǽʥ饹ޤϼǽʥ󥿥ե顢Υΰ֤ˤ븽ߤΥɥơ󡦥ȤˡɥȤѾ(ԡ)ޤˤꡢŪʥȤѾĥ꡼ξ̤˵ҤԡƥȤѤƵҤ뤳ȤǤޤ
-.sp
-Υϡɥơ󡦥Ȥμΰ֤ǤΤͭǤ
+JDK 1\&.4で導入
+.sp
+最も近い継承可能なクラスまたは実装可能なインタフェースから、このタグの位置にある現在のドキュメンテーション・コメントに、ドキュメントを継承(コピー)します。これにより、より汎用的なコメントを継承ツリーの上位に記述し、コピーしたテキストを使用して記述することができます。
+.sp
+このタグは、ドキュメンテーション・コメントの次の位置でのみ有効です。
 .sp
 .RS 4
 .ie n \{\
@@ -1465,7 +1465,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-᥽åɤμ֥å⡣ξ硢ϡ̳ؤΥ饹ޤϥ󥿥ե饳ԡޤ
+メソッドの主説明ブロック内。この場合、主説明は、上位階層のクラスまたはインタフェースからコピーされます。
 .RE
 .sp
 .RS 4
@@ -1476,24 +1476,24 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-᥽åɤ\fI@return\fR\fI@param\fR\fI@throws\fRΥƥȰ⡣ξ硢ƥȤϡ̳ؤб륿饳ԡޤ
-.RE
-.sp
-ѾؤǥȤ򸫤Ĥˡ˴ؤϡ᥽åɡȤηѾ򻲾ȤƤΥĤʤ硢Ȥϡι롼˱ơưŪ˷Ѿ뤫ɤޤޤ
+メソッドの\fI@return\fR、\fI@param\fR、\fI@throws\fRタグのテキスト引数内。この場合、タグ・テキストは、上位階層の対応するタグからコピーされます。
+.RE
+.sp
+継承階層でコメントを見つける方法に関する説明は、メソッド・コメントの継承を参照してください。このタグが見つからない場合、コメントは、この項で説明するルールに応じて、自動的に継承されるかどうかが決まります。
 .RE
 .PP
 {@link \fIpackage\&.class#member label\fR}
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-ɽƥlabelȤȤ˥饤󡦥󥯤ޤlabelϡȥ饹λꤵ줿ѥå饹ޤϥС̾ΥɥȤؤޤΥϡ\fI@return\fR\fI@param\fR\fI@deprecated\fRʤɤǤդΥΥƥʬޤࡢ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡӥեɤͭǤJavadocġǤDocȤεˡ@link˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#{@link)򻲾ȤƤ
-.sp
-Υ\fI@see\fR˻ƤޤɤΥ⡢\fIpackage\&.class#member\fR\fIlabel\fRλˡȡͭʹʸƱǤʰ㤤ϡ\fI{@link}\fRǤϡִϢܡץ˥󥯤֤뤫ˡ饤󡦥󥯤ȤǤ饤󡦥ƥȤ¾ʬȶ̤뤿ˡ\fI{@link}\fRκǽȺǸ楫å򵭽Ҥޤ٥DZ楫å(\fI}\fR)Ѥɬפ硢HTMLƥƥˡ\fI&#125;\fRѤޤ
-.sp
-1ʸǻѤǤ\fI{@link}\fRο¤Ϥޤ󡣤Υϡɥơ󡦥Ȥμʬޤ\fI@deprecated\fR\fI@return\fR\fI@param\fRʤɤǤդΥΥƥʬǻѤǤޤ
-.sp
-ȤСΥȤǤ\fIgetComponentAt(int,int)\fR᥽åɤ򻲾ȤƤޤ
+JDK 1\&.2で導入
+.sp
+表示テキストlabelとともにインライン・リンクを挿入します。labelは、参照クラスの指定されたパッケージ、クラス、またはメンバーの名前のドキュメントを指し示します。このタグは、\fI@return\fR、\fI@param\fRおよび\fI@deprecated\fRタグなどの任意のタグのテキスト部分を含む、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、およびフィールドで有効です。JavadocツールでのDocコメントの記述方法の@linkに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#{@link)を参照してください。
+.sp
+このタグは\fI@see\fRタグに似ています。どちらのタグも、\fIpackage\&.class#member\fRと\fIlabel\fRの参照方法と、有効な構文が同じです。主な違いは、\fI{@link}\fRタグでは、「関連項目」セクションにリンクが配置されるかわりに、インライン・リンクが生成されるという点です。インライン・テキストの他の部分と区別するために、\fI{@link}\fRタグの最初と最後に中カッコを記述します。ラベル内で右中カッコ(\fI}\fR)を使用する必要がある場合、HTMLエンティティ記法\fI&#125;\fRを使用します。
+.sp
+1つ文の中で使用できる\fI{@link}\fRタグの数に制限はありません。このタグは、ドキュメンテーション・コメントの主説明部分、または\fI@deprecated\fR、\fI@return\fR、\fI@param\fRタグなどの任意のタグのテキスト部分で使用できます。
+.sp
+たとえば、次のコメントでは\fIgetComponentAt(int,int)\fRメソッドを参照しています。
 .sp
 .if n \{\
 .RS 4
@@ -1504,7 +1504,7 @@
 .if n \{\
 .RE
 .\}
-ɸɥååȤǤϡΥɤ鼡HTMLޤ(ΥȤƱѥå̤Υ饹򻲾ȤƤ)
+標準ドックレットでは、このコードから次のHTMLが生成されます(このコメントが同じパッケージの別のクラスを参照している場合)。
 .sp
 .if n \{\
 .RS 4
@@ -1515,7 +1515,7 @@
 .if n \{\
 .RE
 .\}
-ιԤϡΤ褦Webڡɽޤ
+前の行は、次のようにWebページに表示されます。
 .sp
 .if n \{\
 .RS 4
@@ -1530,28 +1530,28 @@
 .PP
 {@linkplain \fIpackage\&.class#member label\fR}
 .RS 4
-JDK 1\&.4Ƴ
-.sp
-\fI{@link}\fRƱư򤷤ޤ󥯡٥뤬ɡեȤǤϤʤץ졼󡦥ƥȤɽۤʤޤ٥뤬ץ졼󡦥ƥȤǵҤƤǤȤС\fIRefer to {@linkplain add() the overridden method}\fR\&.פϡRefer to the overridden methodפɽޤ
+JDK 1\&.4で導入
+.sp
+\fI{@link}\fRタグと同じ動作をしますが、リンク・ラベルがコード・フォントではなくプレーン・テキストで表示される点が異なります。ラベルがプレーン・テキストで記述されていると便利です。たとえば、「\fIRefer to {@linkplain add() the overridden method}\fR\&.」は「Refer to the overridden method」と表示されます。
 .RE
 .PP
 {@literal \fItext\fR}
 .RS 4
-JDK 1\&.5Ƴ
-.sp
-ƥȤHTMLޡåפޤϥͥȤ줿JavadocȤƲ᤻ˡtextɽޤˤꡢɥơ󡦥ȤǤϡѥ᡼η(\fI<Object>\fR)(\fI3 < 4\fR)(<\-)ʤɤǡå(\fI<>\fR)HTMLƥƥ(\fI&lt;\fR\fI&gt;\fR)Τ˻ѤǤޤȤСɥơ󡦥ȤΥƥ\fI{@literal A<B>C}\fR\fIA<B>C\fRȤơ֥饦줿HTMLڡѹ줺ɽޤ\fI<B>\fRȤƲᤵޤ(ɡեȤˤʤޤ)ɡեȤƱǽ¸ˤϡ\fI{@code}\fRѤޤ
+JDK 1\&.5で導入
+.sp
+テキストをHTMLマークアップまたはネストされたJavadocタグとして解釈せずに、textを表示します。これにより、ドキュメンテーション・コメントでは、パラメータの型(\fI<Object>\fR)、不等号(\fI3 < 4\fR)、矢印(<\-)などで、山カッコ(\fI<および>\fR)をHTMLエンティティ(\fI&lt;\fRおよび\fI&gt;\fR)のかわりに使用できます。たとえば、ドキュメンテーション・コメントのテキスト\fI{@literal A<B>C}\fRは\fIA<B>C\fRとして、ブラウザの生成されたHTMLページに変更されずに表示されます。\fI<B>\fRは太字として解釈されません(コード・フォントになりません)。コード・フォントで同じ機能を実現するには、\fI{@code}\fRタグを使用します。
 .RE
 .PP
 @param \fIparameter\-name description\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-֥ѥ᡼ץˡꤵ줿\fIparameter\-name\fRθ˻ꤵ줿description³ƥѥ᡼ɲäޤɥơ󡦥Ȥ򵭽ҤȤˤϡdescriptionʣԤˤ錄äƵҤ뤳ȤǤޤΥϡ᥽åɡ󥹥ȥ饯ޤϥ饹Υɥơ󡦥ǤΤͭǤJavadocġǤDocȤεˡ@param˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@param)򻲾ȤƤ
-.sp
-\fIparameter\-name\fRϡ᥽åɤޤϥ󥹥ȥ饯ǤΥѥ᡼̾饹᥽åɤޤϥ󥹥ȥ饯ηѥ᡼̾ˤʤޤåǤΥѥ᡼̾Ϥߡѥ᡼Ѥ뤳Ȥꤷޤ
-.sp
-饹ηѥ᡼:
+JDK 1\&.0で導入
+.sp
+「パラメータ」セクションに、指定された\fIparameter\-name\fRの後に指定されたdescriptionを続けてパラメータを追加します。ドキュメンテーション・コメントを記述するときには、descriptionを複数行にわたって記述することもできます。このタグは、メソッド、コンストラクタ、またはクラスのドキュメンテーション・コメント内でのみ有効です。JavadocツールでのDocコメントの記述方法の@paramに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@param)を参照してください。
+.sp
+\fIparameter\-name\fRは、メソッドまたはコンストラクタでのパラメータの名前か、クラス、メソッドまたはコンストラクタの型パラメータの名前になります。山カッコでこのパラメータ名を囲み、型パラメータを使用することを指定します。
+.sp
+クラスの型パラメータの例:
 .sp
 .if n \{\
 .RS 4
@@ -1566,7 +1566,7 @@
 .if n \{\
 .RE
 .\}
-᥽åɤηѥ᡼:
+メソッドの型パラメータの例:
 .sp
 .if n \{\
 .RS 4
@@ -1588,35 +1588,35 @@
 .PP
 @return \fIdescription\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-͡ץɲäơdescriptionΥƥȤ񤭹ߤޤΥƥȤǤϡͤηȡͤϰϤˤĤƵҤɬפޤΥϡ᥽åɤΥɥơ󡦥ȤǤΤͭǤJavadocġǤDocȤεˡ@return˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@return)򻲾ȤƤ
+JDK 1\&.0で導入
+.sp
+「戻り値」セクションを追加して、descriptionのテキストを書き込みます。このテキストでは、戻り値の型と、取り得る値の範囲について記述する必要があります。このタグは、メソッドのドキュメンテーション・コメントでのみ有効です。JavadocツールでのDocコメントの記述方法の@returnに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@return)を参照してください。
 .RE
 .PP
 @see \fIreference\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fIִϢܡ\fRФɲäơreferenceؤ󥯡ޤϥƥȡȥ񤭹ߤޤ1ĤΥɥơ󡦥ȤˤǤդο\fI@see\fRޤ뤳ȤǤޤϤ٤ƱФβ˥롼ײޤ\fI@see\fRˤϡ3ĤΥפηޤηǤŪǤΥϡ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡޤϥեɤͭǤѥå饹ޤϥСФ륤饤󡦥󥯤ʸˡϡ\fI{@link}\fR򻲾ȤƤ
-.sp
-\fB1\fR@see
-\fIstring\fRϡ\fIstring\fRΥƥȡȥɲäޤ󥯤ޤstringϡҤޤURLǤϥǤʤλǤ\fIjavadoc\fRޥɤϡǽʸȤŰ(")򸡺ơηҤηȶ̤ޤȤС\fI@see "The Java Programming Language"\fRϼΥƥȤޤ
-.sp
-\fBϢ\fR:
+JDK 1\&.0で導入
+.sp
+\fI「関連項目」\fR見出しを追加して、referenceを指すリンク、またはテキスト・エントリを書き込みます。1つのドキュメンテーション・コメントには任意の数の\fI@see\fRタグを含めることができますが、それらはすべて同じ見出しの下にグループ化されます。\fI@see\fRタグには、3つのタイプの形式があります。この形式が最も一般的です。このタグは、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、またはフィールドで有効です。パッケージ、クラス、またはメンバーに対するインライン・リンクを文中に挿入する方法は、\fI{@link}\fRを参照してください。
+.sp
+\fB形式1\fR。@see
+\fIstring\fRタグ形式は、\fIstring\fRのテキスト・エントリを追加します。リンクは生成されません。stringは、書籍またはURLではアクセスできない情報の参照先です。\fIjavadoc\fRコマンドは、最初の文字として二重引用符(")を検索して、この形式を前述の形式と区別します。たとえば、\fI@see "The Java Programming Language"\fRは次のテキストを生成します。
+.sp
+\fB関連項目\fR:
 .sp
 "The Java Programming Language"
 .sp
-\fB2\fR\fI@see <a href="URL#value">label</a>\fRϡ\fIURL#value\fRˤ줿󥯤ɲäޤ\fIURL#value\fRѥ᡼ϡURLޤURLǤ\fIjavadoc\fRޥɤϡǽʸȤơ֤꾮׵(\fI<\fR)򸡺ơη¾ηȶ̤ޤȤС\fI@see <a href="spec\&.html#section">Java Spec</a>\fRϼΥ󥯤ޤ
-.sp
-\fBϢ\fR:
+\fB形式2\fR。\fI@see <a href="URL#value">label</a>\fR形式は、\fIURL#value\fRにより定義されたリンクを追加します。\fIURL#value\fRパラメータは、相対URLまたは絶対URLです。\fIjavadoc\fRコマンドは、最初の文字として「より小さい」記号(\fI<\fR)を検索して、この形式を他の形式と区別します。たとえば、\fI@see <a href="spec\&.html#section">Java Spec</a>\fRは次のリンクを生成します。
+.sp
+\fB関連項目\fR:
 .sp
 Java Spec
 .sp
-\fB3\fR\fI@see package\&.class#member label\fRϡɽƥȡ٥ȤȤ˥󥯤ɲäޤΥ٥ϻȤƤJavaλꤵ줿̾ΥɥȤؤޤ٥ϥץǤ٥άϡɽƥȤΤˡ̾Ŭڤṳ̂ɽޤ\fI\-noqualifier\fRץѤȡɽƥȤѥå̾Ū˺ޤ٥ϡưɽƥȤȤϰۤʤɽƥȤˤ˻Ѥޤ̾ɽˡפ򻲾ȤƤ
-.sp
-Java SE 1\&.2ϡ٥ǤϤʤ̾\fI<code>\fR
-HTML˼ưŪɽޤJava SE 1\&.2\&.2ϡ٥Ѥ뤫ʤˤ餺\fI<code>\fRϾɽƥȤϤफǴޤޤޤ
+\fB形式3\fR。\fI@see package\&.class#member label\fR形式は、表示テキスト・ラベルとともにリンクを追加します。このラベルは参照されているJava言語の指定された名前のドキュメントを指し示します。ラベルはオプションです。ラベルを省略した場合は、表示テキストのかわりに、名前が適切に短縮されて表示されます。\fI\-noqualifier\fRオプションを使用すると、この表示テキストからパッケージ名が全体的に削除されます。ラベルは、自動生成される表示テキストとは異なる表示テキストにする場合に使用します。「名前が表示される方法」を参照してください。
+.sp
+Java SE 1\&.2だけは、ラベルではなく名前が\fI<code>\fR
+HTMLタグ内に自動的に表示されます。Java SE 1\&.2\&.2からは、ラベルを使用するかしないかにかかわらず、\fI<code>\fRタグは常に表示テキストを囲むかたちで含まれます。
 .sp
 .RS 4
 .ie n \{\
@@ -1626,10 +1626,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackage\&.class#member\fRˤϡȤƤǤդͭʥץǤ̾ꤷޤĤޤꡢѥå饹󥿥ե󥹥ȥ饯᥽åɡޤϥեɤ̾ǤС̾ʸϡ㡼׵(\fI#\fR)ˤɬפޤclassϡǤդΥȥåץ٥ޤϥͥȤ줿饹󥿥եɽޤmemberϡǤդΥ󥹥ȥ饯᥽åɤޤϥեɤɽޤ(ͥȤ줿饹ޤϥ󥿥եǤϤޤ)̾ɥȲ륯饹˴ޤޤƤ硢\fIjavadoc\fRޥɤϡ̾ؤΥ󥯤ޤȥ饹ؤΥ󥯤ˤϡ\fI\-link\fRץѤޤȥ饹°Ƥʤ̾ΥɥȤ򻲾Ȥˤϡ¾2Ĥ\fI@see\fRΤɤ餫Ѥޤ̾λפ򻲾ȤƤ
-.sp
-\fB:\fR
-ȥ饹ϡޥɥ饤\fIjavadoc\fRޥɤϤʤ饹Ǥɥdzȥ饹˥󥯤ƤսϡȤޤϳ󥯤ȸƤФޤȤС\fIjava\&.awt package\fRФƤΤ\fIjavadoc\fRޥɤ¹Ԥ硢\fIObject\fRʤɤ\fIjava\&.lang\fRΤ٤ƤΥ饹ȥ饹ˤʤޤ\fI\-link\fR\fI\-linkoffline\fRץѤơȥ饹إ󥯤ޤȥ饹ΥȤ\fIjavadoc\fRޥɤμ¹ԤˤϻѤǤޤ
+\fIpackage\&.class#member\fRには、参照されている任意の有効なプログラム要素の名前を指定します。つまり、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、またはフィールドの名前です。ただし、メンバー名の前の文字は、シャープ記号(\fI#\fR)にする必要があります。classは、任意のトップレベルまたはネストされたクラスか、インタフェースを表します。memberは、任意のコンストラクタ、メソッドまたはフィールドを表します(ネストされたクラスまたはインタフェースではありません)。この名前が、ドキュメント化されるクラスに含まれている場合、\fIjavadoc\fRコマンドは、その名前へのリンクを作成します。外部参照クラスへのリンクを作成するには、\fI\-link\fRオプションを使用します。参照クラスに属していない名前のドキュメントを参照するには、他の2つの\fI@see\fRタグ形式のどちらかを使用します。「名前の指定」を参照してください。
+.sp
+\fB注意:\fR
+外部参照クラスは、コマンドラインで\fIjavadoc\fRコマンドに渡されないクラスです。生成ドキュメント内で外部参照クラスにリンクしている箇所は、外部参照または外部リンクと呼ばれます。たとえば、\fIjava\&.awt package\fRに対してのみ\fIjavadoc\fRコマンドを実行した場合、\fIObject\fRなどの\fIjava\&.lang\fR内のすべてのクラスが外部参照クラスになります。\fI\-link\fRおよび\fI\-linkoffline\fRオプションを使用して、外部参照クラスへリンクします。外部参照クラスのソース・コメントは\fIjavadoc\fRコマンドの実行には使用できません。
 .RE
 .sp
 .RS 4
@@ -1640,7 +1640,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIlabel\fRϡάǽʥƥȤǡ󥯤Υ٥Ȥɽޤ٥ˤ϶ޤ뤳ȤǤޤ\fIlabel\fRάȡ\fIpackage\&.class\&.member\fRߤΥ饹ӥѥå˱Ŭڤṳ̂ɽޤ̾ɽˡפ򻲾ȤƤ
+\fIlabel\fRは、省略可能なテキストで、リンクのラベルとして表示されます。ラベルには空白を含めることができます。\fIlabel\fRを省略すると、\fIpackage\&.class\&.member\fRが、現在のクラスおよびパッケージに応じて適切に短縮されて表示されます。「名前が表示される方法」を参照してください。
 .RE
 .sp
 .RS 4
@@ -1651,10 +1651,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ʸ\fIpackage\&.class#member\fR\fIlabel\fRδ֤ζڤʸˤʤޤå¦ζʸϥ٥ƬȤϲᤵʤᡢ᥽åɤΥѥ᡼֤˶ʸƤ⤫ޤޤ
-.RE
-.sp
-Ǥϡ\fI@see\fR(\fICharacter\fR饹)\fIString\fR饹equals᥽åɤ򻲾ȤƤޤˤϡ̾\fIString#equals(Object)\fRȥ٥\fIequals\fRξΰޤޤƤޤ
+空白文字が、\fIpackage\&.class#member\fRと\fIlabel\fRの間の区切り文字になります。カッコの内側の空白文字はラベルの先頭とは解釈されないため、メソッドのパラメータ間に空白文字を入れてもかまいません。
+.RE
+.sp
+この例では、\fI@see\fRタグ(\fICharacter\fRクラス内)が、\fIString\fRクラスのequalsメソッドを参照しています。タグには、名前\fIString#equals(Object)\fRとラベル\fIequals\fRの両方の引数が含まれています。
 .sp
 .if n \{\
 .RS 4
@@ -1667,7 +1667,7 @@
 .if n \{\
 .RE
 .\}
-ɸɥååȤϡΤ褦HTMLޤ
+標準ドックレットは、次のようなHTMLを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1681,14 +1681,14 @@
 .if n \{\
 .RE
 .\}
-ҤΥɤϡ֥饦˼Τ褦ɽ졢٥ɽ󥯡ƥȤˤʤäƤޤ
-.sp
-\fBϢ\fR:
+前述のコードは、ブラウザに次のように表示され、ラベルは表示リンク・テキストになっています。
+.sp
+\fB関連項目\fR:
 .sp
 equals
 .RE
-̾λ.PP
-\fIpackage\&.class#member\fRȤ̾ϡ\fIjava\&.lang\&.String#toUpperCase()\fRΤ褦ʴ̾ˤ뤳Ȥ⡢\fIString#toUpperCase()\fR\fI#toUpperCase()\fRΤ褦̾ˤ뤳ȤǤޤ̾ûϡ\fIjavadoc\fRޥɤϡɸJavaѥθѤõޤ@seeθפ򻲾ȤƤ̾ϡ᥽åɰδ֤ʤɡåΥڡޤ뤳ȤǤޤʬŪ˽û̾ꤹ뤳ȤϡϤʸ뤳Ȥ䡢ɤɤߤ䤹ʤ뤳ȤǤΥꥹȤ͡ʷ̾򼨤ޤǡ\fIClass\fRˤϥ饹ޤϥ󥿥եTypeˤϥ饹󥿥ե󡢤ޤϥץߥƥ֤methodˤϥ᥽åɤޤϥ󥹥ȥ饯򡢤줾Ǥޤ
+名前の指定.PP
+この\fIpackage\&.class#member\fRという名前は、\fIjava\&.lang\&.String#toUpperCase()\fRのような完全修飾名にすることも、\fIString#toUpperCase()\fRや\fI#toUpperCase()\fRのような非完全修飾名にすることもできます。名前が完全修飾より短い場合は、\fIjavadoc\fRコマンドは、標準のJavaコンパイラの検索順序を使用して探します。「@seeタグの検索順序」を参照してください。名前は、メソッド引数の間など、カッコ内のスペースを含めることができます。部分的に修飾した短い名前を指定することの利点は、入力する文字数が減ることや、ソース・コードが読みやすくなることです。次のリストに様々な形式の名前を示します。ここで、\fIClass\fRにはクラスまたはインタフェースを、Typeにはクラス、インタフェース、配列、またはプリミティブを、methodにはメソッドまたはコンストラクタを、それぞれ指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -1725,7 +1725,7 @@
 .RE
 .\}
 .PP
-ΥꥹȤ˴ؤ:
+前のリストに関するメモ:
 .sp
 .RS 4
 .ie n \{\
@@ -1735,7 +1735,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǽΥפη(ѥåȥ饹ά)ξ硢\fIjavadoc\fRޥɤϡߤΥ饹γؤΤߤ򸡺ޤĤޤꡢߤΥ饹󥿥եΥѡ饹ѡ󥿥եޤϤγ¦ϤǤ륯饹󥿥եС򸡺ޤ(1\(en3)ߤΥѥå¾ʬ䡢¾Υѥåϸޤ(4\(en5)@seeθפ򻲾ȤƤ
+最初のタイプの形式(パッケージとクラスを省略)の場合、\fIjavadoc\fRコマンドは、現在のクラスの階層のみを検索します。つまり、現在のクラスかインタフェース、そのスーパークラスかスーパーインタフェース、またはその外側を囲んでいるクラスかインタフェースからメンバーを検索します(検索項目1\(en3)。現在のパッケージの他の部分や、他のパッケージは検索しません(検索項目4\(en5)。「@seeタグの検索順序」を参照してください。
 .RE
 .sp
 .RS 4
@@ -1746,7 +1746,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-᥽åɤޤϥ󥹥ȥ饯ϻˡ\fIgetValue\fRΤ褦˥åʤ̾Ѥ硢Ʊ̾Υեɤ¸ߤƤʤС\fIjavadoc\fRޥɤϤΥ᥽åɤؤΥ󥯤ޤΥ᥽åɤСɤƤ硢\fIjavadoc\fRޥɤϡǺǽ˸Ĥä᥽åɤ˥󥯤ޤ̤äǤޤ
+メソッドまたはコンストラクタの入力時に、\fIgetValue\fRのようにカッコなしの名前を使用した場合、同じ名前のフィールドが存在していなければ、\fIjavadoc\fRコマンドはそのメソッドへのリンクを作成します。このメソッドがオーバーロードされている場合、\fIjavadoc\fRコマンドは、検索で最初に見つかったメソッドにリンクします。結果は前もって特定できません。
 .RE
 .sp
 .RS 4
@@ -1757,7 +1757,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ͥȤ줿饹ϡ٤ƤηˤĤơ\fIouter\&.inner\fRȤƻꤹɬפޤñ\fIinner\fRȤϤʤǤ
+ネストされたクラスは、すべての形式について、\fIouter\&.inner\fRとして指定する必要があります。単純に\fIinner\fRとはしないでください。
 .RE
 .sp
 .RS 4
@@ -1768,12 +1768,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ǥ˽Ҥ٤褦ˡ饹ȥСȤδ֤ζڤʸȤƤϡɥå(\fI\&.\fR)ǤϤʤ㡼׵(\fI#\fR)ѤޤΤ褦˻ꤹȡ\fIjavadoc\fRޥɤϡޤǤޤɥåȤϡ饹ͥȤ줿饹ѥåӥ֥ѥåڤ뤿ˤѤ뤫Ǥ\fIjavadoc\fRޥɤǤϡޤʤХɥåȤϤޤٹɽޤ
-.RE
-@seeθ.PP
-\fIjavadoc\fRޥɤϡե롢ѥåե롢ץեɽ\fI@see\fRޤԤ2ĤΥեǤϡ̾\fI@see\fR˻ꤹɬפޤեǤϡ̾ޤʬ̾Ǥޤ
+すでに述べたように、クラスとメンバーとの間の区切り文字としては、ドット(\fI\&.\fR)ではなくシャープ記号(\fI#\fR)を使用します。このように指定すると、\fIjavadoc\fRコマンドは、あいまいさを解決できます。ドットは、クラス、ネストされたクラス、パッケージ、およびサブパッケージを区切るためにも使用されるからです。ただし、\fIjavadoc\fRコマンドでは、あいまいさがなければドットは正しく解析されますが、警告は表示されます。
+.RE
+@seeタグの検索順序.PP
+\fIjavadoc\fRコマンドは、ソース・ファイル、パッケージ・ファイル、概要ファイルに表示される\fI@see\fRタグを処理します。後者の2つのファイルでは、完全修飾の名前を\fI@see\fRタグに指定する必要があります。ソース・ファイルでは、完全修飾の名前、または部分修飾の名前を指定できます。
 .PP
-ˡ\fI@see\fRθ򼨤ޤ
+次に、\fI@see\fRタグの検索順序を示します。
 .sp
 .RS 4
 .ie n \{\
@@ -1783,7 +1783,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ߤΥ饹ޤϥ󥿥ե
+現在のクラスまたはインタフェース。
 .RE
 .sp
 .RS 4
@@ -1794,7 +1794,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-¦ϤǤ륯饹ȥ󥿥ե(ǤᤤΤ鸡)
+外側を囲んでいるクラスとインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1805,7 +1805,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-ѡ饹ȥѡ󥿥ե(ǤᤤΤ鸡)
+スーパークラスとスーパーインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1816,7 +1816,7 @@
 .sp -1
 .IP "  4." 4.2
 .\}
-ߤΥѥå
+現在のパッケージ。
 .RE
 .sp
 .RS 4
@@ -1827,12 +1827,12 @@
 .sp -1
 .IP "  5." 4.2
 .\}
-ݡȤƤѥå饹ӥ󥿥ե(\fIimport\fRʸν˽äƸ)
+インポートされているパッケージ、クラス、およびインタフェース(\fIimport\fR文の順序に従って検索)。
 .RE
 .PP
-\fIjavadoc\fRޥɤϡƥ饹ˤĤƹ1\-3ƵŪŬѤʤ顢פ̾ĤޤǸ³ޤĤޤꡢޤߤΥ饹򸡺ˤγ¦ϤǤ륯饹E򸡺塢EΥѡ饹򸡺Ƥ顢EϤǤ륯饹򸡺ޤ45Ǥϡ\fIjavadoc\fRޥɤ1ĤΥѥåΥ饹ޤϥ󥿥ե򸡺ϷޤäƤޤ(νϡġΥѥˤäưۤʤޤ)5Ǥϡ\fIjavadoc\fRޥɤϡ\fIjava\&.lang\fR򸡺ޤΥѥåϡ٤ƤΥץ˼ưŪ˥ݡȤ뤫Ǥ
+\fIjavadoc\fRコマンドは、各クラスについて項目1\-3を再帰的に適用しながら、一致する名前が見つかるまで検索を続けます。つまり、まず現在のクラスを検索し、次にその外側を囲んでいるクラスEを検索した後、Eのスーパークラスを検索してから、Eを囲んでいるクラスを検索します。項目4と5では、\fIjavadoc\fRコマンドが1つのパッケージ内のクラスまたはインタフェースを検索する順序は決まっていません(その順序は、個々のコンパイラによって異なります)。項目5では、\fIjavadoc\fRコマンドは、\fIjava\&.lang\fRを検索します。このパッケージは、すべてのプログラムに自動的にインポートされるからです。
 .PP
-\fIjavadoc\fRޥɤϡǤʤե\fI@see\fR򸫤ĤȡJavaѥƱǻꤵ줿̾򸡺ޤ(\fIjavadoc\fRޥɤϡ֤̾Τޤ򸡽Фޤ󡣤ϡɤˤΥ顼¸ߤƤʤȤȤƤ뤿Ǥ)θϡJavaͤƤޤ\fIjavadoc\fRޥɤϡϢ륯饹ȥѥåӥݡȤ줿饹ȥѥåΤ٤Ƥ餽̾򸡺ޤŪˤϡνǸޤ
+\fIjavadoc\fRコマンドは、完全修飾でないソース・ファイルで\fI@see\fRタグを見つけると、Javaコンパイラと同じ順序で指定された名前を検索します(ただし、\fIjavadoc\fRコマンドは、特定の名前空間のあいまいさを検出しません。これは、ソース・コードにこれらのエラーが存在していないことを前提としているためです)。この検索順序は、Java言語仕様で正式に定義されています。\fIjavadoc\fRコマンドは、関連するクラスとパッケージ、およびインポートされたクラスとパッケージのすべてからその名前を検索します。具体的には、次の順序で検索します。
 .sp
 .RS 4
 .ie n \{\
@@ -1842,7 +1842,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-ߤΥ饹ޤϥ󥿥ե
+現在のクラスまたはインタフェース。
 .RE
 .sp
 .RS 4
@@ -1853,7 +1853,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-¦ϤǤ륯饹ȥ󥿥ե(ǤᤤΤ鸡)
+外側を囲んでいるクラスとインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1864,7 +1864,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-ѡ饹ȥѡ󥿥ե(ǤᤤΤ鸡)
+スーパークラスとスーパーインタフェース(最も近いものから検索)。
 .RE
 .sp
 .RS 4
@@ -1875,7 +1875,7 @@
 .sp -1
 .IP "  4." 4.2
 .\}
-ߤΥѥå
+現在のパッケージ。
 .RE
 .sp
 .RS 4
@@ -1886,48 +1886,48 @@
 .sp -1
 .IP "  5." 4.2
 .\}
-ݡȤƤѥå饹ӥ󥿥ե(\fIimport\fRʸν˽äƸ)
+インポートされているパッケージ、クラス、およびインタフェース(\fIimport\fR文の順序に従って検索)。
 .RE
 .PP
-\fIjavadoc\fRޥɤϡɬ⥵֥饹򸡺Ȥϸ¤ޤ󡣤ޤ¹¾ΥѥåΥɥȤǤ⡢¾Υѥå򸡺ޤ󡣤ȤС\fI@see\fR\fIjava\&.awt\&.event\&.KeyEvent\fR饹˴ޤޤƤơ\fIjava\&.awt package\fRΤ̾򻲾ȤƤƤ⡢Υ饹ݡȤʤ\fIjavadoc\fRޥɤϤΥѥå򸡺ޤ
-̾ɽˡ.PP
-\fIlabel\fRάȡ\fIpackage\&.class\&.member\fRɽޤ̤ˡϸߤΥ饹ӥѥå˱Ŭڤṳ̂ޤṳ̂Ȥϡ\fIjavadoc\fRޥɤˤɬ׺Ǿ¤̾ΤߤɽȤȤǤȤС\fIString\&.toUpperCase()\fR᥽åɤˡƱ饹ΥСؤλȤ¾Υ饹ΥСؤλȤޤޤƤ硢饹̾ɽΤϸԤΥΤߤǤ(ΥꥹȤ򻲾)ѥå̾Ū˺ˤϡ\fI\-noqualifier\fRץѤޤ
-.RS 4
-\fBȤΥ\fR: \fI@see\fRƱ饹ƱѥåΥС򻲾Ȥޤ
-.RE
-.RS 4
-\fB\fR: \fI@see String#toLowerCase()\fR
-.RE
-.RS 4
-\fBɽ\fR: \fItoLowerCase()\fR \- ѥåӥ饹̾άޤ
-.RE
-.RS 4
-.RE
-.RS 4
-\fBȤΥ\fR: \fI@see\fR̤Υ饹ƱѥåΥС򻲾Ȥޤ
-.RE
-.RS 4
-\fB\fR: \fI@see Character#toLowerCase(char)\fR
-.RE
-.RS 4
-\fBɽ\fR: \fICharacter\&.toLowerCase(char)\fR \- ѥå̾ά饹̾ޤߤޤ
-.RE
-.RS 4
-.RE
-.RS 4
-\fBȤΥ\fR: \fI@see\fRϰۤʤ륯饹ۤʤѥåΥС򻲾Ȥޤ
-.RE
-.RS 4
-\fB\fR: \fI@see java\&.io\&.File#exists()\fR
-.RE
-.RS 4
-\fBɽ\fR: \fIjava\&.io\&.File\&.exists()\fR \- ѥåӥ饹̾ޤߤޤ
-.RE
-.RS 4
-.RE
-@see.PP
-¦ΥȤϡ\fI@see\fR\fIjava\&.applet\&.Applet\fRʤɤ̤ΥѥåΥ饹ˤˡ̾ɤΤ褦ɽ뤫򼨤ƤޤJavadocġǤDocȤεˡ@see˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@see)򻲾ȤƤ
+\fIjavadoc\fRコマンドは、必ずしもサブクラスを検索するとは限りません。また、実行中に他のパッケージのドキュメントが生成される場合でも、他のパッケージを検索しません。たとえば、\fI@see\fRタグが\fIjava\&.awt\&.event\&.KeyEvent\fRクラス内に含まれていて、\fIjava\&.awt package\fR内のある名前を参照していても、そのクラスがインポートしないかぎり\fIjavadoc\fRコマンドはそのパッケージを検索しません。
+名前が表示される方法.PP
+\fIlabel\fRを省略すると、\fIpackage\&.class\&.member\fRが表示されます。一般に、これは現在のクラスおよびパッケージに応じて適切に短縮されます。短縮されるとは、\fIjavadoc\fRコマンドにより必要最小限の名前のみが表示されるということです。たとえば、\fIString\&.toUpperCase()\fRメソッドに、同じクラスのメンバーへの参照と他のクラスのメンバーへの参照が含まれている場合、クラス名が表示されるのは後者のケースのみです(次のリストを参照)。パッケージ名を全体的に削除するには、\fI\-noqualifier\fRオプションを使用します。
+.RS 4
+\fB参照のタイプ\fR: \fI@see\fRタグは同じクラス、同じパッケージのメンバーを参照します
+.RE
+.RS 4
+\fB例\fR: \fI@see String#toLowerCase()\fR
+.RE
+.RS 4
+\fB表示\fR: \fItoLowerCase()\fR \- パッケージおよびクラス名を省略します
+.RE
+.RS 4
+.RE
+.RS 4
+\fB参照のタイプ\fR: \fI@see\fRタグは別のクラス、同じパッケージのメンバーを参照します
+.RE
+.RS 4
+\fB例\fR: \fI@see Character#toLowerCase(char)\fR
+.RE
+.RS 4
+\fB表示\fR: \fICharacter\&.toLowerCase(char)\fR \- パッケージ名を省略し、クラス名を含みます
+.RE
+.RS 4
+.RE
+.RS 4
+\fB参照のタイプ\fR: \fI@see\fRタグは異なるクラス、異なるパッケージのメンバーを参照します
+.RE
+.RS 4
+\fB例\fR: \fI@see java\&.io\&.File#exists()\fR
+.RE
+.RS 4
+\fB表示\fR: \fIjava\&.io\&.File\&.exists()\fR \- パッケージおよびクラス名を含みます
+.RE
+.RS 4
+.RE
+@seeタグの例.PP
+右側のコメントは、\fI@see\fRタグが\fIjava\&.applet\&.Applet\fRなどの別のパッケージのクラス内にある場合に、名前がどのように表示されるかを示しています。JavadocツールでのDocコメントの記述方法の@seeに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@see)を参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -1948,24 +1948,24 @@
 .RE
 .\}
 .PP
-\fB:\fR
-\fI@se\fR\fIe\fRĥƥɥȲʤ饹˥󥯤ˤϡ\fI\-link\fRץѤޤ
+\fB注意:\fR
+\fI@se\fR\fIe\fRタグを拡張してドキュメント化されないクラスにリンクするには、\fI\-link\fRオプションを使用します。
 .PP
 @serial \fIfield\-description\fR | include | exclude
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-ǥեȤľ󲽲ǽեɤΥɥơ󡦥ȤǻѤޤ饹ľ󲽲ǽʥեɤӥǡʸ
-(http://docs\&.oracle\&.com/javase/8/docs/platform/serialization/spec/serial\-arch\&.html#5251)򻲾ȤƤ
-.sp
-Oracleľ󲽤줿λͤ˥饹ޤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/serialized\-criteria\-137781\&.html)⻲ȤƤ
-.sp
-\fIfield\-description\fR(άǽ)Ǥϡեɤΰ̣ͤΥꥹȤ򼨤ɬפޤɬפʾϡʣιԤϤä򵭽ҤǤޤɸɥååȤϡξľ󲽤줿ڡɲäޤ߻ȥڡ򻲾ȤƤ
-.sp
-饹ľ󲽤ľ󲽲ǽեɤ򥯥饹ɲä硢ˡɲäС̤ʸɲäɬפޤ
-.sp
-\fIinclude\fR\fIexclude\fRϡľ󲽤줿ڡ˥饹ޤϥѥåޤ뤫뤫򼨤ޤΤ褦˵ǽޤ
+JDK 1\&.2で導入
+.sp
+デフォルトの直列化可能フィールドのドキュメンテーション・コメントで使用します。クラスの直列化可能なフィールドおよびデータの文書化
+(http://docs\&.oracle\&.com/javase/8/docs/platform/serialization/spec/serial\-arch\&.html#5251)を参照してください
+.sp
+Oracleの直列化された形式の仕様にクラスを含める基準
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/serialized\-criteria\-137781\&.html)も参照してください
+.sp
+\fIfield\-description\fR(省略可能)では、フィールドの意味を説明し、取り得る値のリストを示す必要があります。必要な場合は、複数の行に渡って説明を記述できます。標準ドックレットは、この情報を、直列化された形式ページに追加します。相互参照ページを参照してください。
+.sp
+クラスを直列化した後に直列化可能フィールドをクラスに追加した場合、主説明に、追加したバージョンを識別する文を追加する必要があります。
+.sp
+\fIinclude\fRおよび\fIexclude\fR引数は、直列化された形式ページにクラスまたはパッケージを含めるか除外するかを示します。次のように機能します。
 .sp
 .RS 4
 .ie n \{\
@@ -1975,7 +1975,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISerializable\fRƤpublicޤprotected饹ϡΥ饹(ޤϤΥ饹°ѥå)\fI@serial exclude\fRǥޡƤʤꡢޤޤ
+\fISerializable\fRを実装しているpublicまたはprotectedクラスは、そのクラス(またはそのクラスが属するパッケージ)が\fI@serial exclude\fRタグでマークされていないかぎり、含められます。
 .RE
 .sp
 .RS 4
@@ -1986,59 +1986,59 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISerializable\fRƤprivateޤpackage\-private饹ϡΥ饹(ޤϤΥ饹°ѥå)\fI@serial include\fRǥޡƤʤꡢޤ
-.RE
-.sp
-ȤС\fIjavax\&.swing\fRѥåpackage\&.htmlޤpackage\-info\&.java\fI@serial\fR
-\fIexclude\fRǥޡƤޤpublic饹\fIjava\&.security\&.BasicPermission\fR\fI@serial exclude\fRǥޡƤޤpackage\-private饹\fIjava\&.util\&.PropertyPermissionCollection\fR\fI@serial include\fRǥޡƤޤ
-.sp
-饹٥\fI@serial\fRϥѥå٥\fI@serial\fR򥪡С饤ɤޤ
+\fISerializable\fRを実装しているprivateまたはpackage\-privateクラスは、そのクラス(またはそのクラスが属するパッケージ)が\fI@serial include\fRタグでマークされていないかぎり、除外されます。
+.RE
+.sp
+たとえば、\fIjavax\&.swing\fRパッケージはpackage\&.htmlまたはpackage\-info\&.java内で\fI@serial\fR
+\fIexclude\fRタグでマークされています。publicクラス\fIjava\&.security\&.BasicPermission\fRは\fI@serial exclude\fRタグでマークされています。package\-privateクラス\fIjava\&.util\&.PropertyPermissionCollection\fRは\fI@serial include\fRタグでマークされています。
+.sp
+クラス・レベルの\fI@serial\fRタグはパッケージ・レベルの\fI@serial\fRタグをオーバーライドします。
 .RE
 .PP
 @serialData \fIdata\-description\fR
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-ǡͤѤơľ󲽤줿ǤΥǡηȽɥȲޤΥǡˤϡ\fIwriteObject\fR᥽åɤˤäƽ񤭹ޤάǽʥǡ\fIExternalizable\&.writeExternal\fR᥽åɤˤäƽ񤭹ޤ뤹٤ƤΥǡ(١饹ޤ)ޤޤޤ
-.sp
-\fI@serialData\fRϡ\fIwriteObject\fR\fIreadObject\fR\fIwriteExternal\fR\fIreadExternal\fR\fIwriteReplace\fR\fIreadResolve\fR᥽åɤΥɥơ󡦥ȤǻѤǤޤ
+JDK 1\&.2で導入
+.sp
+データの説明値を使用して、直列化された形式でのデータの型と順序をドキュメント化します。このデータには、\fIwriteObject\fRメソッドによって書き込まれる省略可能なデータ、および\fIExternalizable\&.writeExternal\fRメソッドによって書き込まれるすべてのデータ(ベース・クラスを含む)が含まれます。
+.sp
+\fI@serialData\fRタグは、\fIwriteObject\fR、\fIreadObject\fR、\fIwriteExternal\fR、\fIreadExternal\fR、\fIwriteReplace\fRおよび\fIreadResolve\fRメソッドのドキュメンテーション・コメントで使用できます。
 .RE
 .PP
 @serialField \fIfield\-name\fR \fIfield\-type\fR \fIfield\-description\fR
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-\fISerializable\fR饹\fIserialPersistentFields\fRС\fIObjectStreamField\fRݡͥȤɥȲޤ\fIObjectStreamField\fRݡͥȤȤ1Ĥ\fI@serialField\fRѤޤ
+JDK 1\&.2で導入
+.sp
+\fISerializable\fRクラスの\fIserialPersistentFields\fRメンバーの\fIObjectStreamField\fRコンポーネントをドキュメント化します。\fIObjectStreamField\fRコンポーネントごとに1つの\fI@serialField\fRタグを使用します。
 .RE
 .PP
 @since \fIsince\-text\fR
 .RS 4
-JDK 1\&.1Ƴ
-.sp
-ɥȤˡꤵ줿\fIsince\-text\fRͤ\fIƳ줿С\fRФɲäޤΥƥȤˤϡ̤¤Ϥޤ󡣤Υϡ٤ƤΥɥơ󡦥ȡĤޤ공סѥå饹󥿥ե󥹥ȥ饯᥽åɡޤϥեɤͭǤΥϡѹޤϵǽ\fIsince\-text\fRͤˤäƻꤵ줿եȥ꡼ʹߡ¸ߤƤ뤳Ȥ̣ޤȤС\fI@since 1\&.5\fRǤ
-.sp
-JavaץåȥեΥɤξ硢\fI@since\fRϡJavaץåȥեAPIͤΥС򼨤ޤɤե󥹼ɲä줿򼨤Ȥϸ¤ޤʣ\fI@since\fRѤǤʣ\fI@author\fRΤ褦˰ޤץǤʣAPIǻѤ硢ʣΥѤǤޤ
+JDK 1\&.1で導入
+.sp
+生成ドキュメントに、指定された\fIsince\-text\fRの値の\fI「導入されたバージョン」\fR見出しを追加します。このテキストには、特別な内部構造はありません。このタグは、すべてのドキュメンテーション・コメント、つまり概要、パッケージ、クラス、インタフェース、コンストラクタ、メソッド、またはフィールドで有効です。このタグは、特定の変更または機能が、\fIsince\-text\fRの値によって指定されたソフトウェア・リリース以降、存在していることを意味します。たとえば、\fI@since 1\&.5\fRです。
+.sp
+Javaプラットフォームのソース・コードの場合、\fI@since\fRタグは、JavaプラットフォームAPI仕様のバージョンを示します。ソース・コードがリファレンス実装に追加された時期を示すとは限りません。複数の\fI@since\fRタグを使用でき、複数の\fI@author\fRタグのように扱われます。プログラム要素が複数のAPIで使用される場合、複数のタグを使用できます。
 .RE
 .PP
 @throws \fIclass\-name\fR \fIdescription\fR
 .RS 4
-JDK 1\&.2Ƴ
-.sp
-\fI@exception\fRƱư򤷤ޤJavadocġǤDocȤεˡ@throws˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@exception)򻲾ȤƤ
-.sp
-\fI@throws\fRϡɥȤ\fIThrows\fRФɲäơ\fIclass\-name\fR\fIdescription\fRƥȤ񤭹ߤޤ\fIclass\-name\fRϡΥ᥽åɤ饹ǽΤ㳰̾ǤΥϡ᥽åɡ󥹥ȥ饯Υɥơ󡦥ǤΤͭǤΥ饹̾ǵҤƤʤ硢\fIjavadoc\fRޥɤϡ˽äƥ饹õޤʣ\fI@throws\fRƱ㳰ޤϰ㤦㳰λꤷɥơ󡦥ȤǻѤǤޤ@seeθפ򻲾ȤƤ
-.sp
-٤ƤΥå㳰ɥȲ褦ˤ뤿ˡ\fI@throws\fRthrows㳰Ѥ¸ߤʤϡ\fI@throws\fRǥɥȲ줿Τ褦ˡ\fIjavadoc\fRޥɤˤä㳰HTMLϤʤɲäޤ
-.sp
-С饤ɤ᥽å㳰ŪƤΤߡ\fI@throws\fRΥɥȤΥ᥽åɤ饵֥饹˥ԡޤ󥿥ե᥽åɤ᥽åɤ˥ԡƱͤǤ\fI{@inheritDoc}\fRѤơ\fI@throws\fRɥơѾ褦˶Ǥޤ
+JDK 1\&.2で導入
+.sp
+\fI@exception\fRタグと同じ動作をします。JavadocツールでのDocコメントの記述方法の@throwsに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@exception)を参照してください
+.sp
+\fI@throws\fRタグは、生成ドキュメントに\fIThrows\fR小見出しを追加して、\fIclass\-name\fRおよび\fIdescription\fRテキストを書き込みます。\fIclass\-name\fRは、そのメソッドからスローされる可能性のある例外の名前です。このタグは、メソッド、コンストラクタのドキュメンテーション・コメント内でのみ有効です。このクラスが完全指定の名前で記述されていない場合、\fIjavadoc\fRコマンドは、検索順序に従ってクラスを探します。複数の\fI@throws\fRタグを、同じ例外または違う例外の指定したドキュメンテーション・コメントで使用できます。「@seeタグの検索順序」を参照してください。
+.sp
+すべてのチェック済例外がドキュメント化されるようにするために、\fI@throws\fRタグがthrows節内の例外用に存在しない場合は、\fI@throws\fRタグでドキュメント化されたかのように、\fIjavadoc\fRコマンドによって例外がHTML出力に説明なしで追加されます。
+.sp
+オーバーライドされるメソッド内で例外が明示的に宣言されている場合のみ、\fI@throws\fRのドキュメントがそのメソッドからサブクラスにコピーされます。インタフェース・メソッドから実装メソッドにコピーされる場合も同様です。\fI{@inheritDoc}\fRタグを使用して、\fI@throws\fRタグがドキュメンテーションを継承するように強制できます。
 .RE
 .PP
 {@value \fIpackage\&.class#field\fR}
 .RS 4
-JDK 1\&.4Ƴ
-.sp
-ͤɽޤ\fI{@value}\fRŪեɤΥɥơ󡦥ȤǰʤǻѤƤ硢ͤɽޤ
+JDK 1\&.4で導入
+.sp
+定数の値を表示します。\fI{@value}\fRタグが静的フィールドのドキュメンテーション・コメントで引数なしで使用されている場合、その定数の値を表示します。
 .sp
 .if n \{\
 .RS 4
@@ -2052,7 +2052,7 @@
 .if n \{\
 .RE
 .\}
-ǤդΥɥơ󡦥ǰ\fIpackage\&.class#field\fRǻѤ줿硢\fI{@value}\fRϻꤵ줿ͤɽޤ
+任意のドキュメンテーション・コメント内で引数\fIpackage\&.class#field\fRありで使用された場合、\fI{@value}\fRタグは指定された定数の値を表示します。
 .sp
 .if n \{\
 .RS 4
@@ -2066,48 +2066,48 @@
 .if n \{\
 .RE
 .\}
-\fIpackage\&.class#field\fRϡ\fI@see\fRƱηˤʤޤСŪեɤǤɬפޤ
-.sp
-ͤϡե͡
-(http://docs\&.oracle\&.com/javase/8/docs/api/constant\-values\&.html)ˤɽޤ
+引数\fIpackage\&.class#field\fRは、\fI@see\fRタグ引数と同一の形式になります。ただし、メンバーは静的フィールドである必要があります。
+.sp
+これらの定数の値は「定数フィールド値」
+(http://docs\&.oracle\&.com/javase/8/docs/api/constant\-values\&.html)にも表示されます
 .RE
 .PP
 @version \fIversion\-text\fR
 .RS 4
-JDK 1\&.0Ƴ
-.sp
-\fI\-version\fRץ󤬻ѤƤ硢ɥȤ\fI֥С\fRФɲäơꤵ줿\fIversion\-text\fRͤ񤭹ߤޤΥϤΥɤޤޤ륽եȥθߤΥ꡼ֹݻ뤿ΤΤǤΤФ\fI@since\fRϡΥɤƳ줿꡼ֹݻޤ\fIversion\-text\fRͤˤϡ̤¤ϤޤJavadocġǤDocȤεˡ@version˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@version)򻲾ȤƤ
-.sp
-1ĤΥɥơ󡦥Ȥʣ\fI@version\fRޤ뤳ȤǤޤɬפ˱ơ1Ĥ\fI@version\fR1ĤΥ꡼ֹꤹ뤳Ȥ⡢ʣΥ꡼ֹꤹ뤳ȤǤޤԤξϡ\fIjavadoc\fRޥɤˤä̾̾δ֤˥(,)ȶʸޤԤξϡƥΤϤ뤳ȤʤɥȤ˥ԡޤäơޤǤϤʤƸб̾ڤʸѤɬפȤˡ1Ԥʣ̾Ǥޤ
-.RE
-.SH "ѤǤ"
+JDK 1\&.0で導入
+.sp
+\fI\-version\fRオプションが使用されている場合、生成ドキュメントに\fI「バージョン」\fR小見出しを追加して、指定された\fIversion\-text\fRの値を書き込みます。このタグはこのコードが含まれるソフトウェアの現在のリリース番号を保持するためのものであるのに対し、\fI@since\fRタグは、このコードが導入されたリリース番号を保持します。\fIversion\-text\fRの値には、特別な内部構造はありません。JavadocツールでのDocコメントの記述方法の@versionに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#@version)を参照してください
+.sp
+1つのドキュメンテーション・コメントに複数の\fI@version\fRタグを含めることができます。必要に応じて、1つの\fI@version\fRタグに1つのリリース番号を指定することも、複数のリリース番号を指定することもできます。前者の場合は、\fIjavadoc\fRコマンドによって名前と名前の間にカンマ(,)と空白文字が挿入されます。後者の場合は、テキスト全体が解析されることなく、生成ドキュメントにコピーされます。したがって、カンマではなく、各言語に対応した名前区切り文字を使用する必要があるときに、1行に複数の名前を指定できます。
+.RE
+.SH "タグを使用できる場所"
 .PP
-ǤϡѤǤˤĤޤΥ٤ƤΥɥơ󡦥ȤǻѤǤޤ\fI@see\fR\fI@since\fR\fI@deprecated\fR\fI{@link}\fR\fI{@linkplain}\fR\fI{@docroot}\fR
-.SS "ץ"
+ここでは、タグを使用できる場所について説明します。次のタグがすべてのドキュメンテーション・コメントで使用できます。\fI@see\fR、\fI@since\fR、\fI@deprecated\fR、\fI{@link}\fR、\fI{@linkplain}\fRおよび\fI{@docroot}\fR。
+.SS "概要タグ"
 .PP
-ץϡץڡΥɥơ󡦥ȤǻѤǤ륿Ǥ(Υɥơ󡦥Ȥϡ̾overview\&.htmlȤ̾Υեˤޤ)¾Υɥơ󡦥ȤξƱͤˡΥϡθǻѤɬפޤ
+概要タグは、概要ページのドキュメンテーション・コメントで使用できるタグです(このドキュメンテーション・コメントは、通常overview\&.htmlという名前のソース・ファイル内にあります)。他のドキュメンテーション・コメントの場合と同様に、これらのタグは、主説明の後で使用する必要があります。
 .PP
-\fB:\fR
-Java SE 1\&.2Ǥϡץɥ\fI{@link}\fRԶ礬ޤƥȤɽޤ󥯤ꤵޤ󡣸ߤΤȤ\fI{@docRoot}\fRϡץɥǤϵǽޤ
+\fB注意:\fR
+Java SE 1\&.2では、概要ドキュメント内の\fI{@link}\fRタグに不具合があります。テキストは正しく表示されますが、リンクが設定されません。現在のところ、\fI{@docRoot}\fRタグは、概要ドキュメント内では機能しません。
 .PP
-ץϡΤȤǤ
+概要タグは、次のとおりです。
 .PP
 @see reference || @since since\-text || @serialField field\-name field\-type field\-description || @author name\-text || @version version\-text || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} ||
-.SS "ѥå"
+.SS "パッケージ・タグ"
 .PP
-ѥåϡѥåΥɥơ󡦥ȤǻѤǤ륿ǡɥơ󡦥Ȥpackage\&.htmlޤpackage\-info\&.javaȤ̾ΥեˤޤǻѤǤ\fI@serial\fRϡ\fIinclude\fRޤ\fIexclude\fRꤷΤΤߤǤ
+パッケージ・タグは、パッケージのドキュメンテーション・コメントで使用できるタグで、ドキュメンテーション・コメントはpackage\&.htmlまたはpackage\-info\&.javaという名前のソース・ファイル内にあります。ここで使用できる\fI@serial\fRタグは、\fIinclude\fRまたは\fIexclude\fR引数を指定したもののみです。
 .PP
-ѥåϡΤȤǤ
+パッケージ・タグは、次のとおりです。
 .PP
 @see reference || @since since\-text || @serial field\-description | include | exclude || @author name\-text || @version version\-text || {@linkplain package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} ||
-.SS "饹ӥ󥿥ե"
+.SS "クラスおよびインタフェース・タグ"
 .PP
-ˡ饹ޤϥ󥿥եΥɥơ󡦥ȤǻѤǤ륿򼨤ޤ\fI@serial\fRϡ\fIinclude\fRޤ\fIexclude\fRꤷơ饹ޤϥ󥿥եΥɥơǤΤ߻ѤǤޤ
+次に、クラスまたはインタフェースのドキュメンテーション・コメントで使用できるタグを示します。\fI@serial\fRタグは、\fIinclude\fRまたは\fIexclude\fR引数を指定して、クラスまたはインタフェースのドキュメンテーション内でのみ使用できます。
 .PP
 @see reference || @since since\-text || @deprecated deprecated\-text || @serial field\-description | include | exclude || @author name\-text || @version version\-text || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} ||
 .PP
-饹Ȥ:
+クラス・コメントの例:
 .sp
 .if n \{\
 .RS 4
@@ -2133,13 +2133,13 @@
 .if n \{\
 .RE
 .\}
-.SS "եɡ"
+.SS "フィールド・タグ"
 .PP
-ΥϡեɤɽǤޤ
+これらのタグは、フィールドに表示できます。
 .PP
 @see reference || @since since\-text || @deprecated deprecated\-text || @serial field\-description | include | exclude || @serialField field\-name field\-type field\-description || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@docRoot} || {@value package\&.class#field}
 .PP
-եɡȤ:
+フィールド・コメントの例:
 .sp
 .if n \{\
 .RS 4
@@ -2155,17 +2155,17 @@
 .if n \{\
 .RE
 .\}
-.SS "󥹥ȥ饯ȥ᥽åɡ"
+.SS "コンストラクタとメソッド・タグ"
 .PP
-ˡ󥹥ȥ饯ޤϥ᥽åɤΥɥơ󡦥ȤǻѤǤ륿򼨤ޤ\fI@return\fRϥ󥹥ȥ饯ǤϻѤǤ
-\fI{@inheritDoc}\fRˤ¤ޤ
+次に、コンストラクタまたはメソッドのドキュメンテーション・コメントで使用できるタグを示します。ただし、\fI@return\fRはコンストラクタでは使用できず、
+\fI{@inheritDoc}\fRには制限があります。
 .PP
 @see reference || @since since\-text || @deprecated deprecated\-text || @param parameter\-name description || @return description || @throws class\-name description || @exception class\-name description || @serialData data\-description || {@link package\&.class#member label} || {@linkplain package\&.class#member label} || {@inheritDoc} || {@docRoot}
 .PP
-\fB:\fR
-\fI@serialData\fRϡ\fIwriteObject\fR\fIreadObject\fR\fIwriteExternal\fR\fIreadExternal\fR\fIwriteReplace\fR\fIreadResolve\fR᥽åɤΥɥơ󡦥ȤǤΤ߻ѤǤޤ
+\fB注意:\fR
+\fI@serialData\fRタグは、\fIwriteObject\fR、\fIreadObject\fR、\fIwriteExternal\fR、\fIreadExternal\fR、\fIwriteReplace\fRおよび\fIreadResolve\fRメソッドのドキュメンテーション・コメントでのみ使用できます。
 .PP
-᥽åɡȤ:
+メソッド・コメントの例:
 .sp
 .if n \{\
 .RS 4
@@ -2189,9 +2189,9 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
-\fIjavadoc\fRޥɤϡɥååȤѤƽϤꤷޤ\fIjavadoc\fRޥɤϡ\fI\-doclet\fRץǥࡦɥååȤꤵƤʳϡǥեȤɸɥååȤѤޤ\fIjavadoc\fRޥɤˤϡǤդΥɥååȤȤȤ˻ѤǤ륳ޥɥ饤󡦥ץ󤬤ޤΥץˤĤƤϡJavadocץޤɸɥååȤǤϡ¾ˡĤɲäΥޥɥ饤󡦥ץ󶡤ޤΥץˤĤƤϡɸɥååȤΥץޤɤΥץ̾⡢ʸȾʸ̤ޤ󡣤ץΰǤϡʸȾʸ̤ޤ
+\fIjavadoc\fRコマンドは、ドックレットを使用して出力を決定します。\fIjavadoc\fRコマンドは、\fI\-doclet\fRオプションでカスタム・ドックレットが指定されている場合以外は、デフォルトの標準ドックレットを使用します。\fIjavadoc\fRコマンドには、任意のドックレットとともに使用できるコマンドライン・オプションがあります。これらのオプションについては、Javadocオプションで説明します。標準ドックレットでは、この他に、いくつかの追加のコマンドライン・オプションが提供されます。これらのオプションについては、標準ドックレットのオプションで説明します。どのオプション名も、大文字と小文字が区別されません。ただし、オプションの引数では、大文字と小文字が区別されます。
 .sp
 .RS 4
 .ie n \{\
@@ -2201,7 +2201,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Javadocץ⻲ȤƤ
+Javadocオプションも参照してください
 .RE
 .sp
 .RS 4
@@ -2212,45 +2212,45 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸɥååȤΥץ⻲ȤƤ
+標準ドックレットのオプションも参照してください
 .RE
 .PP
-ץϼΤȤǤ
+オプションは次のとおりです。
 .PP
 \-1\&.1 || \-author || \-bootclasspath classpathlist || \-bottom text || \-breakiterator || \-charset name || \-classpath classpathlist || \-d directory || \-docencoding name || \-docfilesubdirs || \-doclet class || \-docletpath classpathlist || \-doctitle title || \-encoding || \-exclude packagename1:packagename2:\&.\&.\&. || \-excludedocfilessubdir name1:name2 || \-extdirs dirist || \-footer footer || \-group groupheading packagepattern:packagepattern || \-header header || \-help || \-helpfile path\efilename || \-Jflag || \-keywords || \-link extdocURL || \-linkoffline extdocURL packagelistLoc || \-linksource || \-locale language_country_variant || \-nocomment || \-nodeprecated || \-nodeprecatedlist || \-nohelp || \-noindex || \-nonavbar || \-noqualifier all | packagename1:packagename2\&.\&.\&. || \-nosince || \-notimestamp || \-notree ||
 \fI\-overview path/filename || \fR\-package || \-private || \-protected || \-public || \-quiet || \-serialwarn || \-source release || \-sourcepath sourcepathlist || \-sourcetab tablength || \-splitindex ||
 \fI\-stylesheet path/filename || \fR\-subpackages package1:package2:\&.\&.\&. || \-tag tagname:Xaoptcmf:"taghead" || \-taglet class || \-tagletpath tagletpathlist || \-title title || \-top || \-use || \-verbose || \-version || \-windowtitle title
 .PP
-Υץϡ٤ƤΥɥååȤ˻ѲǽʥJavadocץǤɸɥååȤǤϡɥååȤ¾ʬ󶡤ޤ\fI\-bootclasspath\fR\fI\-breakiterator\fR\fI\-classpath\fR\fI\-doclet\fR\fI\-docletpath\fR\fI\-encoding\fR\-\fIexclude\fR\fI\-extdirs\fR\fI\-help\fR\fI\-locale\fR\fI\-\fR\fIoverview\fR\fI\-package\fR\fI\-private\fR\fI\-protected\fR\fI\-public\fR\fI\-quiet\fR\fI\-source\fR\fI\-sourcepath\fR\fI\-subpackages\fR\fI\-verbose\fR
-.SS "Javadocץ"
+次のオプションは、すべてのドックレットに使用可能なコアのJavadocオプションです。標準ドックレットでは、ドックレットの他の部分を提供します。\fI\-bootclasspath\fR、\fI\-breakiterator\fR、\fI\-classpath\fR、\fI\-doclet\fR、\fI\-docletpath\fR、\fI\-encoding\fR、\-\fIexclude\fR、\fI\-extdirs\fR、\fI\-help\fR、\fI\-locale\fR、\fI\-\fR\fIoverview\fR、\fI\-package\fR、\fI\-private\fR、\fI\-protected\fR、\fI\-public\fR、\fI\-quiet\fR、\fI\-source\fR、\fI\-sourcepath\fR、\fI\-subpackages\fRおよび\fI\-verbose\fR。
+.SS "Javadocオプション"
 .PP
 \-overview \fIpath/filename \fR
 .RS 4
 
-\fIjavadoc\fRޥɤФơ\fIpath/filename \fRǻꤵ줿ե뤫鳵ץɥѤΥƥȤΥƥȤץڡ(overview\-summary\&.html)֤褦˻ꤷޤ\fIpath/filename\fRϡߤΥǥ쥯ȥ꤫ХѥǤ
-.sp
-\fIfilename\fRͤǤդ̾ѤpathǤդǤޤ̾overview\&.htmlȤ̾դĥ꡼κǾ̥ѥåǥ쥯ȥޤǥ쥯ȥ֤ޤξ֤ȡѥåɥȲȤpathꤹɬפʤʤޤϡ\fI\-sourcepath\fRץˤäƤΥե뤬ؤ뤫Ǥ
-.sp
-ȤС\fIjava\&.lang\fRѥåΥĥ꡼/src/classes/java/lang/ξ硢ץե/src/classes/overview\&.html֤Ǥޤ
-.sp
-ºݤ򻲾ȤƤ
-.sp
-\fIpath/filename\fRǻꤹեˤĤƤϡץȡե򻲾ȤƤ
-.sp
-ץڡΤϡ\fIjavadoc\fRޥɤʣΥѥå̾ϤΤߤǤܺ٤ϡHTMLե졼򻲾ȤƤץڡΥȥϡ\fI\-doctitle\fRˤäꤵޤ
+\fIjavadoc\fRコマンドに対して、\fIpath/filename \fRで指定されたソース・ファイルから概要ドキュメント用のテキストを取得し、そのテキストを概要ページ(overview\-summary\&.html)に配置するように指定します。\fIpath/filename\fRは、現在のディレクトリからの相対パスです。
+.sp
+\fIfilename\fRの値で任意の名前を使用し、pathで任意の配置先を指定できますが、通常はoverview\&.htmlという名前を付け、ソース・ツリー内の最上位パッケージ・ディレクトリを含むディレクトリに配置します。この場所に配置すると、パッケージをドキュメント化するときにpathを指定する必要がなくなります。これは、\fI\-sourcepath\fRオプションによってこのファイルが指し示されるからです。
+.sp
+たとえば、\fIjava\&.lang\fRパッケージのソース・ツリーが/src/classes/java/lang/の場合、概要ファイルを/src/classes/overview\&.htmlに配置できます
+.sp
+実際の例を参照してください。
+.sp
+\fIpath/filename\fRで指定するファイルについては、概要コメント・ファイルを参照してください。
+.sp
+概要ページが作成されるのは、\fIjavadoc\fRコマンドに複数のパッケージ名を渡した場合のみです。詳細は、HTMLフレームを参照してください。概要ページのタイトルは、\fI\-doctitle\fRによって設定されます。
 .RE
 .PP
 \-Xdoclint:(all|none|[\-]\fI<group>\fR)
 .RS 4
-ʻȡӥƥηJavadocȤ­ηٹݡȤ̵Javadocʸ­ƤHTMLΥ顼ݡȤޤ
-.sp
-Υץˤꡢ\fIjavadoc\fRޥɤ줿Ϥ˴ޤޤ뤹٤ƤΥɥȡȤåޤ̾ɤꡢɸ४ץ\fI\-public\fR\fI\-protected\fR\fI\-package\fR\fI\-private\fR줿Ϥ˴ޤܤǤޤ
-.sp
-\fI\-Xdoclint\fRͭˤʤäƤϡ\fIjavac\fRޥɤƱͤ˥å꤬ݡȤޤ\fIjavadoc\fRޥɤϡåեΥԡӥ顼Ф줿Τʰ֤ؤåȤϤޤåϡ١줿ɥȤХǡѤƼ¹Ԥ줿˥顼ȯǽ˱ơٹޤϥ顼ˤʤޤȤСʻȤޤJavadocȤηϡ\fIjavadoc\fRޥɤ̵HTML븶ˤʤʤᡢϷٹȤƥݡȤޤʸ顼ޤHTMLληϡ\fIjavadoc\fRޥɤ̵HTML븶ˤʤ뤿ᡢϥ顼ȤƥݡȤޤ
-.sp
-ǥեȤǤϡ\fI\-Xdoclint\fRץͭˤʤäƤޤץ\fI\-Xdoclint:none\fR̵ˤޤ
-.sp
-\fI\-Xdoclint\fRץǥݡȤƤϼΥץѹޤ
+不正な参照、アクセシビリティの欠落およびJavadocコメントの不足の警告をレポートし、無効なJavadoc構文および不足しているHTMLタグのエラーをレポートします。
+.sp
+このオプションにより、\fIjavadoc\fRコマンドは生成された出力に含まれるすべてのドキュメント・コメントをチェックします。通常どおり、標準オプション\fI\-public\fR、\fI\-protected\fR、\fI\-package\fRおよび\fI\-private\fRで生成された出力に含む項目を選択できます。
+.sp
+\fI\-Xdoclint\fRが有効になっている場合は、\fIjavac\fRコマンドと同様にメッセージで問題がレポートされます。\fIjavadoc\fRコマンドは、メッセージ、ソース・ファイルのコピーおよびエラーが検出された正確な位置を指すキャレットを出力します。メッセージは、重大度、および生成されたドキュメントがバリデータを使用して実行された場合にエラーが発生する可能性に応じて、警告またはエラーになります。たとえば、不正な参照またはJavadocコメントの欠落は、\fIjavadoc\fRコマンドが無効なHTMLを生成する原因にならないため、これらの問題は警告としてレポートされます。構文エラーまたはHTML終了タグの欠落は、\fIjavadoc\fRコマンドが無効なHTMLを生成する原因になるため、これらの問題はエラーとしてレポートされます。
+.sp
+デフォルトでは、\fI\-Xdoclint\fRオプションは有効になっています。オプション\fI\-Xdoclint:none\fRで無効にします。
+.sp
+\fI\-Xdoclint\fRオプションでレポートされる内容は次のオプションで変更します。
 .sp
 .RS 4
 .ie n \{\
@@ -2261,7 +2261,7 @@
 .IP \(bu 2.3
 .\}
 \fI\-Xdoclint\fR\fI\fR\fI none\fR:
-\fI\-Xdoclint\fRץ̵ˤޤ
+\fI\-Xdoclint\fRオプションを無効にします。
 .RE
 .sp
 .RS 4
@@ -2273,7 +2273,7 @@
 .IP \(bu 2.3
 .\}
 \fI\-Xdoclint\fR\fI\fR\fI \fR\fIgroup\fR:
-\fIgroup\fRåͭˤޤ
+\fIgroup\fRチェックを有効にします。
 .RE
 .sp
 .RS 4
@@ -2284,7 +2284,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-Xdoclint\fR\fI\fR\fI all\fR: ٤ƤΥå롼פͭˤޤ
+\fI\-Xdoclint\fR\fI\fR\fI all\fR: すべてのチェック・グループを有効にします。
 .RE
 .sp
 .RS 4
@@ -2296,10 +2296,10 @@
 .IP \(bu 2.3
 .\}
 \fI\-Xdoclint\fR\fI\fR\fI all,\fR\fI\-group\fR:
-\fIgroup\fRåʳΤ٤Ƥͭˤޤ
-.RE
-.sp
-ѿ\fIgroup\fRϼΤ줫ͤޤ
+\fIgroup\fRチェック以外のすべてを有効にします。
+.RE
+.sp
+変数\fIgroup\fRは次のいずれかの値を持ちます。
 .sp
 .RS 4
 .ie n \{\
@@ -2309,7 +2309,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIaccessibility\fR: ӥƥåǸФåޤ(ȤС\fI<table>\fRǻꤵno captionޤsummary°)
+\fIaccessibility\fR: アクセシビリティ・チェッカで検出する問題をチェックします(たとえば、\fI<table>\fRタグで指定されるno captionまたはsummary属性)。
 .RE
 .sp
 .RS 4
@@ -2320,7 +2320,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIhtml\fR: 饤ǤؤΥ֥åǤ佪λɬפȤǤλʤʤɡ̥٥HTML򸡽Фޤ롼ϡHTML 4\&.01ͤƳФޤΥפΥåϡ\fIjavadoc\fRޥɤͭˤơ֥饦ǽΤHTML򸡽Фޤ
+\fIhtml\fR: インライン要素へのブロック要素の挿入や終了タグを必要とする要素を終了しないなど、上位レベルHTMLの問題を検出します。ルールは、HTML 4\&.01仕様から導出されます。このタイプのチェックは、\fIjavadoc\fRコマンドを有効にして、ブラウザが受け入れる可能性のあるHTMLの問題を検出します。
 .RE
 .sp
 .RS 4
@@ -2331,7 +2331,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fImissing\fR: ƤJavadocȤޤϥåޤ(ȤСƤ륳Ȥ䥯饹ޤϷƤ\fI@return\fR᥽åɾƱͤΥ)
+\fImissing\fR: 欠落しているJavadocコメントまたはタグをチェックします(たとえば、欠落しているコメントやクラス、または欠落している\fI@return\fRタグやメソッド上の同様のタグ)。
 .RE
 .sp
 .RS 4
@@ -2342,7 +2342,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIreference\fR: JavadocJava APIǤλȤ˴Ϣåޤ(ȤС\fI@see\fRǸĤʤܡޤ\fI@param\fRθ̾)
+\fIreference\fR: JavadocタグのJava API要素の参照に関連する問題をチェックします(たとえば、\fI@see\fRで見つからない項目、または\fI@param\fRの後の不正な名前)。
 .RE
 .sp
 .RS 4
@@ -2353,10 +2353,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIsyntax\fR: פƤʤå(\fI<\fR\fI>\fR)䥢ѥ(\fI&\fR)̵Javadocʤɤβ̥٥ǧޤ
-.RE
-.sp
-\fI\-Xdoclint\fRץʣꤷơʣΥƥΥ顼ȷٹå륪ץͭˤǤޤޤϡΥץѤơʣΥ顼ӷٹ𥫥ƥǤޤȤСΥޥɤΤ줫Ѥơ\fIfilename\fRեHTMLʸӥӥƥåޤ
+\fIsyntax\fR: エスケープされていない山カッコ(\fI<\fRおよび\fI>\fR)やアンパサンド(\fI&\fR)、無効なJavadocタグなどの下位レベルの問題を確認します。
+.RE
+.sp
+\fI\-Xdoclint\fRオプションを複数回指定して、複数のカテゴリのエラーと警告をチェックするオプションを有効にできます。または、前のオプションを使用して、複数のエラーおよび警告カテゴリを指定できます。たとえば、次のコマンドのいずれかを使用して、\fIfilename\fRファイル内のHTML、構文およびアクセシビリティの問題をチェックします。
 .sp
 .if n \{\
 .RS 4
@@ -2368,57 +2368,57 @@
 .if n \{\
 .RE
 .\}
-\fB:\fR
-\fIjavadoc\fRޥɤǤϡΥåδݾڤޤ󡣶ŪˤϡHTMLץ饤󥹡åǤϤޤ\-\fIXdoclint\fRץŪϡ\fIjavadoc\fRޥɤͭˤưŪʥ顼ȾݡȤ뤳ȤǤ
-.sp
-\fIjavadoc\fRޥɤϡ̵ϤνԤݡȤΤ߹Ԥޤ
+\fB注意:\fR
+\fIjavadoc\fRコマンドでは、これらのチェックの完全性は保証されません。具体的には、完全なHTMLコンプライアンス・チェッカではありません。\-\fIXdoclint\fRオプションの目的は、\fIjavadoc\fRコマンドを有効にして一般的なエラーの大半をレポートすることです。
+.sp
+\fIjavadoc\fRコマンドは、無効な入力の修正を試行せず、レポートのみ行います。
 .RE
 .PP
 \-public
 .RS 4
-public饹ӥСΤɽޤ
+publicクラスおよびメンバーのみ表示します。
 .RE
 .PP
 \-protected
 .RS 4
-protectedpublicΥ饹ȥСΤߤɽޤ줬ǥեȤǤ
+protectedおよびpublicのクラスとメンバーのみを表示します。これがデフォルトです。
 .RE
 .PP
 \-package
 .RS 4
-packageprotectedpublicΥ饹ȥСΤɽޤ
+package、protected、およびpublicのクラスとメンバーのみ表示します。
 .RE
 .PP
 \-private
 .RS 4
-٤ƤΥ饹ȥСɽޤ
+すべてのクラスとメンバーを表示します。
 .RE
 .PP
 \-help
 .RS 4
-饤󡦥إפɽޤ\fIjavadoc\fR\fIɥåå\fRΥޥɥ饤󡦥ץ󤬥ꥹȤޤ
+オンライン・ヘルプを表示します。\fIjavadoc\fRと\fIドックレット\fRのコマンドライン・オプションがリストされます。
 .RE
 .PP
 \-doclet \fIclass\fR
 .RS 4
-ɥȤ˻ѤɥååȤư뤿Υ饹եꤷޤ̾ѤޤΥɥååȤˤꡢϤƤȷޤ\fI\-doclet\fRץ󤬻ѤƤʤ硢\fIjavadoc\fRޥɤϡɸɥååȤѤƥǥեȤHTMLޤΥ饹ˤ\fIstart(Root)\fR᥽åɤޤޤƤɬפޤεư饹ؤΥѥ\fI\-docletpath\fRץˤäޤɥååȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)򻲾ȤƤ
+ドキュメントの生成に使用するドックレットを起動するためのクラス・ファイルを指定します。完全修飾名を使用します。このドックレットにより、出力の内容と形式が定義されます。\fI\-doclet\fRオプションが使用されていない場合、\fIjavadoc\fRコマンドは、標準ドックレットを使用してデフォルトのHTML形式を生成します。このクラスには\fIstart(Root)\fRメソッドが含まれている必要があります。この起動クラスへのパスは\fI\-docletpath\fRオプションによって定義されます。ドックレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)を参照してください
 .RE
 .PP
 \-docletpath \fIclasspathlist\fR
 .RS 4
-\fI\-doclet\fRץǻꤵ줿ɥååȳϥ饹ե롢ӤΥ饹¸뤹٤ƤJARեؤΥѥꤷޤϥ饹ե뤬JARեˤ硢ΥץJARեؤΥѥꤷޤХѥޤϸߤΥǥ쥯ȥ꤫ХѥǤޤ\fIclasspathlist\fRʣΥѥJARե뤬ޤޤˤϡSolarisξϥ(:)ǡWindowsξϥߥ(;)Ǥ줾ڤޤŪΥɥååȳϥ饹Ǥ˸ѥˤϡΥץפǤɥååȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)򻲾ȤƤ
+\fI\-doclet\fRオプションで指定されたドックレット開始クラス・ファイル、およびそのクラスが依存するすべてのJARファイルへのパスを指定します。開始クラス・ファイルがJARファイル内にある場合、このオプションでJARファイルへのパスを指定します。絶対パスまたは現在のディレクトリからの相対パスを指定できます。\fIclasspathlist\fRに複数のパスやJARファイルが含まれる場合には、それらをSolarisの場合はコロン(:)で、Windowsの場合はセミコロン(;)でそれぞれ区切ります。目的のドックレット開始クラスがすでに検索パス内にある場合は、このオプションは不要です。ドックレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)を参照してください
 .RE
 .PP
 \-1\&.1
 .RS 4
-Javadoc 1\&.4졢ؤϤޤ󡣤ΥץϡJavadoc 1\&.1ˤäΤƱȵǽĥɥȤ뤿ΤΤǤ(ͥȤ줿饹ϥݡȤƤޤ)ΥץɬפʾϡJavadoc 1\&.2ޤ1\&.3򤫤˻ѤƤ
+Javadoc 1\&.4から削除され、代替はありません。このオプションは、Javadoc 1\&.1によって生成されるのと同じ外見と機能を持つドキュメントを作成するためのものでした(ネストされたクラスはサポートされていません)。このオプションが必要な場合は、Javadoc 1\&.2または1\&.3をかわりに使用してください。
 .RE
 .PP
 \-source \fIrelease\fR
 .RS 4
-դ륽ɤΥ꡼ꤷޤ\fIrelease\fRѥ᡼ˤϼͤǤޤ\fIjavac\fRޥɤǥɤ򥳥ѥ뤹Ȥ˻Ѥͤб\fI꡼\fRͤѤޤ
+受け付けるソース・コードのリリースを指定します。\fIrelease\fRパラメータには次の値を指定できます。\fIjavac\fRコマンドでコードをコンパイルするときに使用する値に対応する\fIリリース\fRの値を使用します。
 .sp
 .RS 4
 .ie n \{\
@@ -2428,7 +2428,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB꡼: 1\&.5\fR\fIjavadoc\fRޥɤϡJDK 1\&.5Ƴ줿Τ¾θ쵡ǽޤॳɤդޤ\fI\-source\fRץ󤬻ѤʤäΥѥΥǥեưϡ1\&.5ΤΤˤʤޤ
+\fBリリース値: 1\&.5\fR。\fIjavadoc\fRコマンドは、JDK 1\&.5で導入された総称および他の言語機能を含むコードを受け付けます。\fI\-source\fRオプションが使用されなかった場合のコンパイラのデフォルト動作は、1\&.5のものになります。
 .RE
 .sp
 .RS 4
@@ -2439,7 +2439,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB꡼: 1\&.4\fR\fIjavadoc\fRޥɤϡJDK 1\&.4Ƴ줿ޤॳɤդޤ
+\fBリリース値: 1\&.4\fR。\fIjavadoc\fRコマンドは、JDK 1\&.4で導入されたアサーションを含むコードを受け付けます。
 .RE
 .sp
 .RS 4
@@ -2450,20 +2450,20 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB꡼: 1\&.3\fR\fIjavadoc\fRޥɤϡJDK 1\&.3ʹߤƳ줿Ρޤ¾θ쵡ǽ򥵥ݡȤޤ
+\fBリリース値: 1\&.3\fR。\fIjavadoc\fRコマンドは、JDK 1\&.3以降に導入されたアサーション、総称、または他の言語機能をサポートしません。
 .RE
 .RE
 .PP
 \-sourcepath \fIsourcepathlist\fR
 .RS 4
-ѥå̾ޤ\fI\-subpackages\fRץ\fIjavadoc\fRޥɤϤȤˡե򸫤Ĥ뤿θѥꤷޤ
-\fIʣΥѥϥ(:)Ƕڤޤ\fR\fIjavadoc\fRޥɤϡꤵ줿ѥʲΤ٤ƤΥ֥ǥ쥯ȥ򸡺ޤΥץѤơɥȲ륽եΰ֤ΤߤǤʤ켫ΤϥɥȲʤɥȲ륽ե뤫Ѿ줿Ȥĥեΰ֤ǧǤޤ
-.sp
-\fI\-sourcepath\fRץѤǤΤϡ\fIjavadoc\fRޥɤ˥ѥå̾ϤΤߤǤ\fIjavadoc\fRޥɤϤ륽եϸޤ󡣥եꤹˤϡΥǥ쥯ȥ˰ư뤫1İʾΥ饹ΥɥȲפ˼褦˳ƥե˥ѥޤޤ\fI\-sourcepath\fRά줿硢\fIjavadoc\fRޥɤϡ饹ѥѤƥե򸡺ޤ(\fI\-classpath\fR򻲾)ǥեȤ\fI\-sourcepath\fRϡ饹ѥͤǤ\fI\-classpath\fRάƥѥå̾\fIjavadoc\fRޥɤϤȡ\fIjavadoc\fRޥɤϸߤΥǥ쥯ȥ(ӤΥ֥ǥ쥯ȥ)饽ե򸡺ޤ
-.sp
-\fIsourcepathlist\fRˤϡɥȲѥåΥĥ꡼Υ롼ȡǥ쥯ȥꤷޤ
-.sp
-ȤС\fIcom\&.mypackage\fRȤ̾ΥѥåɥȲˡΥե뤬/home/user/src/com/mypackage/*\&.javaˤȤޤѥcom\emypackageޤޤǥ쥯ȥ/home/user/src˻ꤷƤ顢Τ褦ˡѥå̾ꤷޤ
+パッケージ名または\fI\-subpackages\fRオプションを\fIjavadoc\fRコマンドに渡すときに、ソース・ファイルを見つけるための検索パスを指定します。
+\fI複数のパスはコロン(:)で区切ります。\fR\fIjavadoc\fRコマンドは、指定されたパス以下のすべてのサブディレクトリを検索します。このオプションを使用して、ドキュメント化されるソース・ファイルの位置のみでなく、それ自体はドキュメント化されないがドキュメント化されるソース・ファイルから継承されたコメントを持つソース・ファイルの位置も確認できます。
+.sp
+\fI\-sourcepath\fRオプションを使用できるのは、\fIjavadoc\fRコマンドにパッケージ名を渡す場合のみです。\fIjavadoc\fRコマンドに渡されるソース・ファイルは検索されません。ソース・ファイルを特定するには、そのディレクトリに移動するか、「1つ以上のクラスのドキュメント化」に示すように各ファイルの前にパスを含めます。\fI\-sourcepath\fRが省略された場合、\fIjavadoc\fRコマンドは、クラス・パスを使用してソース・ファイルを検索します(\fI\-classpath\fRを参照)。デフォルトの\fI\-sourcepath\fRは、クラス・パスの値です。\fI\-classpath\fRを省略してパッケージ名を\fIjavadoc\fRコマンドに渡すと、\fIjavadoc\fRコマンドは現在のディレクトリ(およびそのサブディレクトリ)からソース・ファイルを検索します。
+.sp
+\fIsourcepathlist\fRには、ドキュメント化するパッケージのソース・ツリーのルート・ディレクトリを設定します。
+.sp
+たとえば、\fIcom\&.mypackage\fRという名前のパッケージをドキュメント化する場合に、そのソース・ファイルが/home/user/src/com/mypackage/*\&.javaにあるとします。ソース・パスをcom\emypackageが含まれるディレクトリ/home/user/srcに指定してから、次のように、パッケージ名を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -2474,11 +2474,11 @@
 .if n \{\
 .RE
 .\}
-ѥͤȥѥå̾Ϣ뤷ơɥåȤ򥹥å(/)ѹȡΤ褦ˡѥåΥեѥˤʤޤ
+ソース・パスの値とパッケージ名を連結して、ドットをスラッシュ(/)に変更すると、次のように、パッケージのフルパスになります。
 .sp
 /home/user/src/com/mypackage
 .sp
-2ĤΥѥꤹˤϡΤ褦ˤޤ
+2つのソース・パスを設定するには、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -2493,12 +2493,12 @@
 .PP
 \-classpath \fIclasspathlist\fR
 .RS 4
-\fIjavadoc\fRޥɤȥ饹θԤȤ˻Ѥѥꤷޤȥ饹ȤϡɥȲ륯饹ȡΥ饹ˤäƻȤ뤹٤ƤΥ饹ΤȤǤ
-\fIʣΥѥϥ(:)Ƕڤޤ\fR\fIjavadoc\fRޥɤϡꤵ줿ѥʲΤ٤ƤΥ֥ǥ쥯ȥ򸡺ޤ\fIclasspathlist\fRͤꤹȤϡ饹ѥΥɥȤˤؼ˽äƤ
-.sp
-\fI\-sourcepath\fRά줿硢\fIjavadoc\fRޥɤ\fI\-classpath\fRѤơե뤪ӥ饹ե򸡺ޤ(̸ߴΤ)եȥ饹ե̡Υѥ鸡ɬפϡ\fI\-sourcepath\fR\fI\-classpath\fRξѤޤ
-.sp
-ȤС\fIcom\&.mypackage\fRɥȲˡΥե뤬ǥ쥯ȥ/home/user/src/com/mypackageˤꡢΥѥå/home/user/libthenΥ饤֥˰¸ƤȤΤ褦˻ꤷޤ
+\fIjavadoc\fRコマンドが参照クラスの検索を行うときに使用するパスを指定します。参照クラスとは、ドキュメント化されるクラスと、それらのクラスによって参照されるすべてのクラスのことです。
+\fI複数のパスはコロン(:)で区切ります。\fR\fIjavadoc\fRコマンドは、指定されたパス以下のすべてのサブディレクトリを検索します。\fIclasspathlist\fRの値を指定するときは、クラス・パスのドキュメントにある指示に従ってください。
+.sp
+\fI\-sourcepath\fRが省略された場合、\fIjavadoc\fRコマンドは\fI\-classpath\fRを使用して、ソース・ファイルおよびクラス・ファイルを検索します(下位互換性のため)。ソース・ファイルとクラス・ファイルを別々のパスから検索する必要がある場合は、\fI\-sourcepath\fRと\fI\-classpath\fRの両方を使用します。
+.sp
+たとえば、\fIcom\&.mypackage\fRをドキュメント化する場合に、そのソース・ファイルがディレクトリ/home/user/src/com/mypackageにあり、このパッケージが/home/user/libthen内のライブラリに依存しているとき、次のように指定します。
 .sp
 .if n \{\
 .RS 4
@@ -2509,21 +2509,21 @@
 .if n \{\
 .RE
 .\}
-¾ΥġƱͤˡ\fI\-classpath\fRꤵƤʤ硢\fICLASSPATH\fRĶѿꤵƤС\fIjavadoc\fRޥɤϤδĶѿѤޤɤꤵƤʤ硢\fIjavadoc\fRޥɤϸߤΥǥ쥯ȥ꤫饯饹򸡺ޤ
-.sp
-\fIjavadoc\fRޥɤ\fI\-classpath\fRѤƥ桼饹򸡺ˡˤĤƤΡĥǽ饹֡ȥȥåס饹˴Ϣܺ٤ϡ饹θˡ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)򻲾ȤƤ
-.sp
-*Υ١̾ޤ९饹ѥǤϡ\fI\&.jar\fRޤ\fI\&.JAR\fRĥҤ˻ĥǥ쥯ȥΤ٤ƤΥեΥꥹȤꤹΤƱȤߤʤޤ
-.sp
-ȤСǥ쥯ȥ\fImydir\fR\fIa\&.jar\fR\fIb\&.JA\fRRޤޤƤ硢饹ѥ\fIfoo/*\fR\fIA\&.jar:b\&.JAR\fRŸޤJARեν֤̤ȤʤޤɽΥեޤࡢꤷǥ쥯ȥΤ٤ƤJARե뤬ꥹȤ˴ޤޤޤ*ʤ륯饹ѥȥϡߤΥǥ쥯ȥΤ٤ƤJARեΥꥹȤŸޤ\fICLASSPATH\fRĶѿƱͤŸޤ饹ѥΥ磻ɥɤŸϡJavaۥޥ(JVM)γ˹ԤޤJavaץϡSystem\&.getenv(\fI"CLASSPATH"\fR)θƤӽФˤäƤʤɡĶ䤤礻ŸƤʤ磻ɥɤ򻲾Ȥޤ
+他のツールと同様に、\fI\-classpath\fRが指定されていない場合、\fICLASSPATH\fR環境変数が設定されていれば、\fIjavadoc\fRコマンドはその環境変数を使用します。どちらも設定されていない場合、\fIjavadoc\fRコマンドは現在のディレクトリからクラスを検索します。
+.sp
+\fIjavadoc\fRコマンドが\fI\-classpath\fRを使用してユーザー・クラスを検索する方法についての、拡張機能クラスやブートストラップ・クラスに関連した詳細は、クラスの検索方法
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)を参照してください。
+.sp
+*のベース名を含むクラス・パス要素は、\fI\&.jar\fRまたは\fI\&.JAR\fRを拡張子に持つディレクトリ内のすべてのファイルのリストを指定するのと同等とみなされます。
+.sp
+たとえば、ディレクトリ\fImydir\fRに\fIa\&.jar\fRと\fIb\&.JA\fRRが含まれている場合、クラス・パス要素\fIfoo/*\fRは\fIA\&.jar:b\&.JAR\fRに展開されますが、JARファイルの順番は未指定となります。非表示のファイルを含む、指定したディレクトリ内のすべてのJARファイルがリストに含まれます。*からなるクラス・パス・エントリは、現在のディレクトリ内のすべてのJARファイルのリストに展開されます。\fICLASSPATH\fR環境変数も同様に展開されます。クラス・パスのワイルドカードの展開は、Java仮想マシン(JVM)の開始前に行われます。Javaプログラムは、System\&.getenv(\fI"CLASSPATH"\fR)の呼び出しによってなど、環境を問い合せる場合を除き、展開されていないワイルドカードを参照しません。
 .RE
 .PP
 \-subpackages \fIpackage1:package2:\&.\&.\&.\fR
 .RS 4
-ե뤫ꤵ줿ѥåӤΥ֥ѥå˺ƵŪ˥ɥȤޤΥץϡɤ˿֥ѥåɲäݤǤ֥ѥåưŪȤ߹ޤ뤫ǤpackageϡǤդκǾ̥֥ѥå(\fIjava\fRʤ)ޤϴѥå(\fIjavax\&.swing\fRʤ)ˤʤޤեޤɬפϤޤ󡣰ϡ٤ƤΥڥ졼ƥ󥰡ƥǡǶڤޤ磻ɥɤϻѤǤޤ󡣥ѥåθꤹˤϡ\fI\-sourcepath\fRѤޤΥץǤϡĥ꡼¸ߤ뤬ѥå˴ޤޤʤեޤ󡣥եν򻲾ȤƤ
-.sp
-ȤСΥޥɤϡ\fIjava\fR\fIjavax\&.swing\fRȤ̾ΥѥåȤΥ֥ѥåΥɥȤޤ
+ソース・ファイルから指定されたパッケージおよびそのサブパッケージ内に再帰的にドキュメントを生成します。このオプションは、ソース・コードに新しいサブパッケージを追加する際に便利です。新しいサブパッケージが自動的に組み込まれるからです。各package引数は、任意の最上位サブパッケージ(\fIjava\fRなど)または完全修飾パッケージ(\fIjavax\&.swing\fRなど)になります。ソース・ファイルを含める必要はありません。引数は、すべてのオペレーティング・システムで、コロンで区切られます。ワイルドカードは使用できません。パッケージの検索場所を指定するには、\fI\-sourcepath\fRを使用します。このオプションでは、ソース・ツリー内に存在するがパッケージに含まれないソース・ファイルを処理しません。ソース・ファイルの処理を参照してください。
+.sp
+たとえば、次のコマンドは、\fIjava\fRおよび\fIjavax\&.swing\fRという名前のパッケージとこれらのサブパッケージ全部のドキュメントを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -2538,9 +2538,9 @@
 .PP
 \-exclude \fIpackagename1:packagename2:\&.\&.\&.\fR
 .RS 4
-ꤵ줿ѥåȤΥ֥ѥå\fI\-subpackages\fRˤäƺ줿ꥹȤ̵˽ޤޤϾ\fI\-subpackages\fRץλˤäȤ߹ޤѥåоݤȤʤޤ
-.sp
-Ǥϡ\fIjava\&.io\fR\fIjava\&.util\fR\fIjava\&.math\fRʤɤȤ߹ޤޤ\fIjava\&.net\fR\fIjava\&.lang\fR롼Ȥ˻ĥѥåϽޤ\fIjava\&.lang\fRΥ֥ѥåǤ\fIjava\&.lang\&.ref\fRդƤ
+指定されたパッケージとそのサブパッケージを\fI\-subpackages\fRによって作成されたリストから無条件に除外します。過去または将来の\fI\-subpackages\fRオプションの指定によって組み込まれるパッケージも除外の対象となります。
+.sp
+次の例では、\fIjava\&.io\fR、\fIjava\&.util\fR、\fIjava\&.math\fRなどは組み込まれますが、\fIjava\&.net\fRと\fIjava\&.lang\fRをルートに持つパッケージは除外されます。\fIjava\&.lang\fRのサブパッケージである\fIjava\&.lang\&.ref\fRが除外される点に注意してください。
 .sp
 .if n \{\
 .RS 4
@@ -2556,30 +2556,30 @@
 .PP
 \-bootclasspath \fIclasspathlist\fR
 .RS 4
-֡ȡ饹¸ߤѥꤷޤ֡ȡ饹Ȥϡ̾Javaץåȥեࡦ饹ΤȤǤ\fIbootclasspath\fRϡ\fIjavadoc\fRޥɤեȥ饹եõȤ˻Ѥ븡ѥΰǤܺ٤ϡ饹θˡ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)򻲾ȤƤ
-.sp
-\fIclasspathlist\fRѥ᡼Υǥ쥯ȥϡߥ(;)Ƕڤ(Windowsξ)(:)Ƕڤޤ(Oracle Solarisξ)
+ブート・クラスが存在するパスを指定します。ブート・クラスとは、通常、Javaプラットフォーム・クラスのことです。\fIbootclasspath\fRは、\fIjavadoc\fRコマンドがソース・ファイルとクラス・ファイルを探すときに使用する検索パスの一部です。詳細は、クラスの検出方法
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)を参照してください
+.sp
+\fIclasspathlist\fRパラメータ内のディレクトリは、セミコロン(;)で区切る(Windowsの場合)か、コロン(:)で区切ります(Oracle Solarisの場合)。
 .RE
 .PP
 \-extdirs \fIdirist\fR
 .RS 4
-ĥǽ饹¸ߤǥ쥯ȥꤷޤĥǽ饹ȤϡJavaĥǽѤ뤹٤ƤΥ饹Ǥ\fIextdirs\fRץϡ\fIjavadoc\fRޥɤեȥ饹եõȤ˻Ѥ븡ѥΰǤܺ٤ϡ\fI\-classpath\fRץ򻲾ȤƤ\fIdirlist\fRΥǥ쥯ȥϡߥ(;)Ƕڤ(Windowsξ)(:)Ƕڤޤ(Oracle Solarisξ)
+拡張機能クラスが存在するディレクトリを指定します。拡張機能クラスとは、Java拡張機能機構を使用するすべてのクラスです。\fIextdirs\fRオプションは、\fIjavadoc\fRコマンドがソース・ファイルとクラス・ファイルを探すときに使用する検索パスの一部です。詳細は、\fI\-classpath\fRオプションを参照してください。\fIdirlist\fR内のディレクトリは、セミコロン(;)で区切る(Windowsの場合)か、コロン(:)で区切ります(Oracle Solarisの場合)。
 .RE
 .PP
 \-verbose
 .RS 4
-\fIjavadoc\fRޥɤμ¹˾ܺ٤ʥåɽޤ\fIverbose\fRץꤷʤȡեΥɻɥȤ(ե뤴Ȥ1ĤΥå)ӥȻ˥åɽޤverboseץꤹȡJavaեβϤפ(ߥñ)򼨤ɲäΥåɽޤ
+\fIjavadoc\fRコマンドの実行中に詳細なメッセージを表示します。\fIverbose\fRオプションを指定しないと、ソース・ファイルのロード時、ドキュメントの生成時(ソース・ファイルごとに1つのメッセージ)、およびソート時にメッセージが表示されます。verboseオプションを指定すると、各Javaソース・ファイルの解析に要した時間(ミリ秒単位)を示す追加のメッセージが表示されます。
 .RE
 .PP
 \-quiet
 .RS 4
-åٹȥ顼Τߤɽ褦ˤơǧ䤹ޤ\fIversion\fRʸ޻ߤޤ
+メッセージを抑制し、警告とエラーのみが表示されるようにして、これらを確認しやすくします。\fIversion\fR文字列も抑止します。
 .RE
 .PP
 \-breakiterator
 .RS 4
-Ѹξ硢ѥå饹ޤϥСμκǽʸνȽǤݤˡ\fIjava\&.text\&.BreakIterator\fRιݲ줿ʸѤޤ¾Τ٤ƤΥϡѸȤͭΥ르ꥺǤϤʤǤ\fIBreakIterator\fR饹ѤƤޤǽʸϡѥå饹ޤϥСΥޥ꡼˥ԡ졢ե٥åȽκ˥ԡޤJDK 1\&.2ʹߡ\fIBreakIterator\fR饹ϡѸ٤ƤθʸνȽǤ뤿ˡǤ˻ѤƤޤäơ\fI\-breakiterator\fRץϡ1\&.2ʹߤǤϱʸʳˤϸ̤ޤ󡣱ʸˤϡΤ褦ȼΥǥեȤΥ르ꥺबޤ
+英語の場合、パッケージ、クラスまたはメンバーの主説明の最初の文の終わりを判断する際に、\fIjava\&.text\&.BreakIterator\fRの国際化された文境界を使用します。他のすべてのロケールは、英語言語というロケール固有のアルゴリズムではなく、すでに\fIBreakIterator\fRクラスを使用しています。最初の文は、パッケージ、クラス、またはメンバーのサマリーにコピーされ、アルファベット順の索引にコピーされます。JDK 1\&.2以降、\fIBreakIterator\fRクラスは、英語を除くすべての言語の文の終わりを判断するために、すでに使用されています。したがって、\fI\-breakiterator\fRオプションは、1\&.2以降では英文以外には効果がありません。英文には、次のような独自のデフォルトのアルゴリズムがあります。
 .sp
 .RS 4
 .ie n \{\
@@ -2589,7 +2589,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ʸΥǥեȤʸڤꥢ르ꥺࡣʸޤHTML֥å(\fI<P>\fRʤ)³ԥꥪɤߤޤ
+英文のデフォルトの文区切りアルゴリズム。空白文字またはHTMLブロック・タグ(\fI<P>\fRなど)が続くピリオドで停止します。
 .RE
 .sp
 .RS 4
@@ -2600,36 +2600,36 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-breakiteratorʸڤꥢ르ꥺࡣθ줬ʸǻϤޤ硢ʸ³ԥꥪɡ䡢ޤϴòߤޤΥ르ꥺǤϡThe serial no\&. is validפʤɡۤȤɤξάɽޤMr\&. SmithפϽޤ\fI\-breakiterator\fRץǤϡHTML䡢ޤϵǻϤޤʸǤߤޤHTMLޤƤǤ⡢\&.\&./filenameפκǸΥԥꥪɤߤޤ
-.RE
-.sp
-Java SE 1\&.5Ǥ\fI\-breakiterator\fRٹå졢ǥեȤʸڤꥢ르ꥺѹƤޤ󡣥ɤѹSE 1\&.4\&.xǤ\fI\-breakiterator\fRץηٹƤʤǤ⡢⤹ɬפϤޤJava SE 1\&.5\&.0ϷٹϾǤƤޤ
+breakiterator文区切りアルゴリズム。次の語が大文字で始まる場合、空白文字が続くピリオド、疑問符、または感嘆符で停止します。このアルゴリズムでは「The serial no\&. is valid」など、ほとんどの省略表記が処理されますが、「Mr\&. Smith」は処理されません。\fI\-breakiterator\fRオプションでは、HTMLタグや、数字または記号で始まる文では停止しません。HTMLタグに埋め込まれている場合でも、「\&.\&./filename」の最後のピリオドで停止します。
+.RE
+.sp
+Java SE 1\&.5では\fI\-breakiterator\fR警告メッセージが削除され、デフォルトの文区切りアルゴリズムは変更されていません。ソース・コードを変更せず、SE 1\&.4\&.xでの\fI\-breakiterator\fRオプションの警告を除去していない場合でも、何もする必要はありません。Java SE 1\&.5\&.0からは警告は消滅しています。
 .RE
 .PP
 \-locale \fIlanguage_country_variant\fR
 .RS 4
-\fIjavadoc\fRޥɤɥȤȤ˻Ѥꤷޤΰϡ\fIj\fR\fIava\&.util\&.Locale\fRɥȤƤ褦ˡ\fIen_US\fR
-(Ѹ졢ƹ)ޤ\fIen_US_WIN\fR
-(WindowsХꥢ)ʤɤΥ̾Ǥ
-.sp
-\fB:\fR
-\fI\-locale\fRץϡɸɥååȤ󶡤뤹٤ƤΥץ󡢤ޤϤ¾ǤդΥɥååȤ󶡤뤹٤ƤΥץ(¦)˻ꤹɬפޤʤȡʥӥ󡦥СѸɽޤΥޥɥ饤󡦥ץΤߡꤹ˰¸ޤɸɥååȤΥץ򻲾ȤƤ
-.sp
-ꤹȡꤷΥ꥽ե뤬\fIjavadoc\fRޥɤˤä򤵤ơå(ʥӥ󡦥СꥹȤɽθФإסեܼstylesheet\&.cssΥȤʤɤʸ)Τ˻Ѥޤޤե٥åȽ˥ȤꥹȤΥȽ硢ӺǽʸνȽǤ뤿ʸζڤʸ⡢ꤷˤäƷޤޤ\fI\-locale\fRץϡɥȲ륯饹ΥեǻꤵƤɥơ󡦥ȤΥƥȤΥꤹΤǤϤޤ
+\fIjavadoc\fRコマンドがドキュメントを生成するときに使用するロケールを指定します。この引数は、\fIj\fR\fIava\&.util\&.Locale\fRドキュメントで説明しているように、\fIen_US\fR
+(英語、米国)または\fIen_US_WIN\fR
+(Windowsバリアント)などのロケールの名前です。
+.sp
+\fB注意:\fR
+\fI\-locale\fRオプションは、標準ドックレットが提供するすべてのオプション、またはその他の任意のドックレットが提供するすべてのオプションより前(左側)に指定する必要があります。そうしないと、ナビゲーション・バーが英語で表示されます。このコマンドライン・オプションのみ、指定する順序に依存します。標準ドックレットのオプションを参照してください。
+.sp
+ロケールを指定すると、指定したロケールのリソース・ファイルが\fIjavadoc\fRコマンドによって選択されて、メッセージ(ナビゲーション・バー、リストと表の見出し、ヘルプ・ファイルの目次、stylesheet\&.cssのコメントなどの文字列)のために使用されます。また、アルファベット順にソートされるリストのソート順、および最初の文の終わりを判断するための文の区切り文字も、指定したロケールによって決まります。\fI\-locale\fRオプションは、ドキュメント化されるクラスのソース・ファイル内で指定されているドキュメンテーション・コメントのテキストのロケールを決定するものではありません。
 .RE
 .PP
 \-encoding
 .RS 4
-եΥ󥳡ǥ󥰤̾(\fIEUCJIS/SJIS\fRʤ)ꤷޤΥץ󤬻ꤵƤʤϡץåȥեΥǥեȡСѤޤӥץ⻲ȤƤ
+ソース・ファイルのエンコーディングの名前(\fIEUCJIS/SJIS\fRなど)を指定します。このオプションが指定されていない場合は、プラットフォームのデフォルト・コンバータが使用されます。およびオプションも参照してください。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjavadoc\fRޥɤ¹ԤJava Runtime Environment (JRE)ˡ\fIflag\fRľϤޤȤСɥȤ뤿˥ƥ32MBΥ꡼ݤƤɬפϡ\fI\-Xmx\fRץ򼡤Τ褦˸ƤӽФޤ\fIjavadoc \-J\-Xmx32m \-J\-Xms32m com\&.mypackage\fR\fI\-Xms\fRϾάǽǡϽ꡼ΥꤹΤߤΥץǡɬפʥ꡼κǾ̤狼äƤǤ
-.sp
-\fIJ\fR\fIflag\fRδ֤˶ʸϤޤ
-.sp
-ѤƤ\fIjavadoc\fRޥɤΥСǧˤ\fI\-version\fRץѤޤϥȥ꡼ˤɸɥååȤΥСֹ椬ޤޤޤJavadocޥɤμ¹Ԥ򻲾ȤƤ
+\fIjavadoc\fRコマンドを実行するJava Runtime Environment (JRE)に、\fIflag\fRを直接渡します。たとえば、生成ドキュメントを処理するためにシステムで32MBのメモリーを確保しておく必要がある場合は、\fI\-Xmx\fRオプションを次のように呼び出します。\fIjavadoc \-J\-Xmx32m \-J\-Xms32m com\&.mypackage\fR。\fI\-Xms\fRは省略可能で、これは初期メモリーのサイズを設定するのみのオプションで、必要なメモリーの最小量がわかっている場合に便利です。
+.sp
+\fIJ\fRと\fIflag\fRの間に空白文字はありません。
+.sp
+使用している\fIjavadoc\fRコマンドのバージョンを確認するには\fI\-version\fRオプションを使用します。出力ストリームには標準ドックレットのバージョン番号が含まれます。Javadocコマンドの実行を参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -2644,76 +2644,76 @@
 .RE
 .\}
 .RE
-.SS "ɸɥååȤΥץ"
+.SS "標準ドックレットのオプション"
 .PP
 \-d \fIdirectory\fR
 .RS 4
-\fIjavadoc\fRޥɤ줿HTMLե¸ǥ쥯ȥꤷޤ\fI\-d\fRץάȡեϸߤΥǥ쥯ȥ¸ޤ\fIdirectory\fRͤˤϡХǥ쥯ȥꡢޤϸߤκȥǥ쥯ȥ꤫Хǥ쥯ȥǤޤJava SE 1\&.4Ǥϡ\fIjavadoc\fRޥɤ¹Ԥǥ쥯ȥ꤬ưŪ˺ޤ
-.sp
-ȤСǤϡ\fIcom\&.mypackage\fRѥåΥɥȤ졢η̤\fI/user/doc/ \fRǥ쥯ȥ¸ޤ\fIjavadoc \-d \fR\fI/user/doc/ \fR\fIcom\&.mypackage\fR
+\fIjavadoc\fRコマンドが生成されたHTMLファイルを保存する生成先ディレクトリを指定します。\fI\-d\fRオプションを省略すると、ファイルは現在のディレクトリに保存されます。\fIdirectory\fRの値には、絶対ディレクトリ、または現在の作業ディレクトリからの相対ディレクトリを指定できます。Java SE 1\&.4では、\fIjavadoc\fRコマンドを実行すると生成先ディレクトリが自動的に作成されます。
+.sp
+たとえば、次の例では、\fIcom\&.mypackage\fRパッケージのドキュメントが生成され、その結果が\fI/user/doc/ \fRディレクトリに保存されます。\fIjavadoc \-d \fR\fI/user/doc/ \fR\fIcom\&.mypackage\fR
 .RE
 .PP
 \-use
 .RS 4
-ɥȲ륯饹ӥѥåȤ1ĤλѥڡȤ߹ߤޤΥڡˤϡΥ饹ޤϥѥåAPIѤƤѥå饹᥽åɡ󥹥ȥ饯ӥեɤҤޤȤС饹CˤȤȡ饹CѤƤΤȤƤϡCΥ֥饹CȤƤեɡC֤᥽åɡӷCΥѥ᡼ĥ᥽åɤȥ󥹥ȥ饯ޤȤС\fIString\fRѤλѥڡɽǤޤ\fIjava\&.awt\&.Font\fR饹\fIgetName\fR᥽åɤ\fIString\fR᤹Τǡ\fIgetName\fR᥽åɤ\fIString\fRѤ\fIgetName\fR᥽åɤ\fIString\fRѤλѥڡɽޤϼǤϤʤAPIλѤΤߤɥȲޤ᥽åɤμ\fIString\fRѤ뤬Ȥʸʤޤʸ֤ʤ硢\fIString\fRλѤȤϤߤʤޤ줿ѥڡ˥ˤϡ饹ޤϥѥå˰ưʥӥ󡦥С\fB󥯤λ\fR򥯥åޤ
+ドキュメント化されるクラスおよびパッケージごとに1つの使用ページを組み込みます。このページには、その特定のクラスまたはパッケージのAPIを使用しているパッケージ、クラス、メソッド、コンストラクタ、およびフィールドが記述されます。たとえば、クラスCを例にとると、クラスCを使用しているものとしては、Cのサブクラス、Cとして宣言されているフィールド、Cを返すメソッド、および型Cのパラメータを持つメソッドとコンストラクタがあります。たとえば、\fIString\fR型用の使用ページを表示できます。\fIjava\&.awt\&.Font\fRクラスの\fIgetName\fRメソッドは\fIString\fR型を戻すので、\fIgetName\fRメソッドは\fIString\fRを使用し、\fIgetName\fRメソッドが\fIString\fR用の使用ページに表示されます。これは実装ではなくAPIの使用のみをドキュメント化します。メソッドがその実装で\fIString\fRを使用するが、引数として文字列を取らない、または文字列を返さない場合、それは\fIString\fRの使用とはみなされません。生成された使用ページにアクセスするには、クラスまたはパッケージに移動し、ナビゲーション・バーの\fBリンクの使用\fRをクリックします。
 .RE
 .PP
 \-version
 .RS 4
-ɥȤˡ@versionΥƥȤȤ߹ߤޤΥƥȤϡǥեȤǤϾάޤѤƤ\fIjavadoc\fRޥɤΥСǧˤ\fI\-J\-version\fRץѤޤ
+生成ドキュメントに、@versionのテキストを組み込みます。このテキストは、デフォルトでは省略されます。使用している\fIjavadoc\fRコマンドのバージョンを確認するには\fI\-J\-version\fRオプションを使用します。
 .RE
 .PP
 \-author
 .RS 4
-ɥȤˡ\fI@author\fRΥƥȤȤ߹ߤޤ
+生成ドキュメントに、\fI@author\fRのテキストを組み込みます。
 .RE
 .PP
 \-splitindex
 .RS 4
-ե򥢥ե٥åȤȤʣΥեʬ䤷ʸȤ1ĤΥեȡե٥åȰʳεǻϤޤȥѤ1ĤΥեޤ
+索引ファイルをアルファベットごとに複数のファイルに分割し、文字ごとに1つのファイルと、アルファベット以外の記号で始まる索引エントリ用に1つのファイルを作成します。
 .RE
 .PP
 \-windowtitle \fItitle\fR
 .RS 4
-HTML\fI<title>\fR֤륿ȥꤷޤ\fItitle\fR˻ꤷƥȤϡɥΥȥ䡢ΥڡФƺ줿֥饦Υ֥åޡ()ɽޤΥȥˤHTMLޤʤǤȥHTMLޤޤƤȡ֥饦Ǥޤ\fItitle\fRŰϥʸѤƥޡޤ\fI\-windowtitle\fRץάȡ\fIjavadoc\fRޥɤϡ\fI\-windowtitle\fRץΤˡ\fI\-doctitle\fRץͤѤޤȤС\fIjavadoc \-windowtitle "Java SE Platform" com\&.mypackage\fRǤ
+HTMLの\fI<title>\fRタグに配置するタイトルを指定します。\fItitle\fRタグに指定したテキストは、ウィンドウのタイトルや、このページに対して作成されたブラウザのブックマーク(お気に入り)に表示されます。このタイトルにはHTMLタグを含めないでください。タイトルにHTMLタグが含まれていると、ブラウザがタグを正しく解釈できません。\fItitle\fRタグ内の内部の二重引用符はエスケープ文字を使用してマークします。\fI\-windowtitle\fRオプションを省略すると、\fIjavadoc\fRコマンドは、\fI\-windowtitle\fRオプションのかわりに、\fI\-doctitle\fRオプションの値を使用します。たとえば、\fIjavadoc \-windowtitle "Java SE Platform" com\&.mypackage\fRです。
 .RE
 .PP
 \-doctitle \fItitle\fR
 .RS 4
-ץޥ꡼եκǾζ᤯֤륿ȥꤷޤ\fItitle\fR˻ꤷƥȤ·ˤʤꡢ٥1θФȤơʥӥ󡦥СΤ֤ޤ\fItitle\fRˤHTMLӶʸޤ뤳ȤǤޤξ硢ȥǰϤɬפޤ\fItitle\fRǰѤϡפɬפޤȤС\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRǤ
+概要サマリー・ファイルの最上部の近くに配置するタイトルを指定します。\fItitle\fRタグに指定したテキストは中央揃えになり、レベル1の見出しとして、上部ナビゲーション・バーのすぐ下に置かれます。\fItitle\fRタグにはHTMLタグおよび空白文字を含めることができますが、その場合、タイトルを引用符で囲む必要があります。\fItitle\fRタグの内部で引用符を使用する場合は、エスケープする必要があります。たとえば、\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRです。
 .RE
 .PP
 \-title \fItitle\fR
 .RS 4
-Ǥ¸ߤޤJavadoc 1\&.2Υ١Ǥˤ¸ߤƤޤǤΥץϡ\fI\-doctitle\fRȤ̾ѹޤ̾ѹͳϡΥץ󤬡ɥΥȥǤϤʤɥȤΥȥ뤳ȤΤˤ뤿Ǥ
+すでに存在しません。Javadoc 1\&.2のベータ版にしか存在していませんでした。このオプションは、\fI\-doctitle\fRという名前に変更されました。名前を変更した理由は、このオプションが、ウィンドウのタイトルではなくドキュメントのタイトルを定義することを明確にするためです。
 .RE
 .PP
 \-header \fIheader\fR
 .RS 4
-ƽϥեκǾ֤إåƥȤꤷޤإåϡʥӥ󡦥Сα֤ޤ\fIheader\fRˤHTMLӶʸޤ뤳ȤǤޤξ硢\fIheader\fRǰϤɬפޤإåΰˤϥʸѤޤȤС\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRǤ
+各出力ファイルの最上部に配置するヘッダー・テキストを指定します。ヘッダーは、ナビゲーション・バーの右上に配置されます。\fIheader\fRにはHTMLタグおよび空白文字を含めることができますが、その場合、\fIheader\fRを引用符で囲む必要があります。ヘッダー内部の引用符にはエスケープ文字を使用します。たとえば、\fIjavadoc \-header "<b>Java Platform </b><br>v1\&.4" com\&.mypackage\fRです。
 .RE
 .PP
 \-footer \fIfooter\fR
 .RS 4
-ƽϥեκDz֤եåƥȤꤷޤ\fIfooter\fRͤϡʥӥ󡦥Сα֤ޤ\fIfooter\fRˤHTMLӶʸޤ뤳ȤǤޤξ硢\fIfooter\fRǰϤɬפޤեåΰˤϥʸѤޤ
+各出力ファイルの最下部に配置するフッター・テキストを指定します。\fIfooter\fRの値は、ナビゲーション・バーの右下に配置されます。\fIfooter\fRにはHTMLタグおよび空白文字を含めることができますが、その場合、\fIfooter\fRを引用符で囲む必要があります。フッター内部の引用符にはエスケープ文字を使用します。
 .RE
 .PP
 \-top
 .RS 4
-ƽϥեκǾ֤ƥȤꤷޤ
+各出力ファイルの最上部に配置するテキストを指定します。
 .RE
 .PP
 \-bottom \fItext\fR
 .RS 4
-ƽϥեκDz֤ƥȤꤷޤΥƥȤϡʥӥ󡦥С겼ΡڡκDz֤ޤƥȤˤHTMLӶʸޤ뤳ȤǤޤξ硢ƥȤǰϤɬפޤƥΰˤϥʸѤޤ
+各出力ファイルの最下部に配置するテキストを指定します。このテキストは、下部ナビゲーション・バーより下の、ページの最下部に配置されます。テキストにはHTMLタグおよび空白文字を含めることができますが、その場合、テキストを引用符で囲む必要があります。テキスト内部の引用符にはエスケープ文字を使用します。
 .RE
 .PP
 \-link \fIextdocURL\fR
 .RS 4
-¸Javadocˤ줿ȥ饹ΥɥȤؤΥ󥯤ޤ\fIextdocURL\fRϡȤƻꤹ롢Javadocˤ줿ɥȤޤǥ쥯ȥURLޤURLǤꤷ\fIjavadoc\fRޥɤμ¹Ԥǡʣ\fI\-link\fRץꤷʣΥɥȤؤΥ󥯤Ǥޤ
-.sp
-Υǥ쥯ȥpackage\-listե뤬¸ߤɬפޤ(¸ߤʤϡ\fI\-linkoffline\fRץѤޤ)\fIjavadoc\fRޥɤϡpackage\-listե뤫ѥå̾ɤ߼ä塢URLǤΥѥå˥󥯤ޤ\fIjavadoc\fRޥɤμ¹Իˡ\fIextdocURL\fRͤ줿\fI<A HREF>\fR˥ԡޤäơ\fIextdocURL\fRϥեǤϤʤǥ쥯ȥؤURLǤɬפޤ\fIextdocURL\fRХ󥯤Ѥȡ桼ΥɥȤǤդWebȾΥɥȤ˥󥯤Ǥޤа֤إ󥯤ΤߤξХ󥯤ѤǤޤХ󥯤Ѥ硢Ϥͤϰǥ쥯ȥ꤫顢󥯤Ƥѥåޤǥ쥯ȥؤǤɬפޤ(\fI\-d\fRץǻ)Х󥯤ꤹ硢̾HTTP󥯤ѤޤWebСʤե롦ƥ˥󥯤ϡե롦󥯤ѤǤޤ줿ɥơ˥Ʊե롦ƥͭˤΤߥե롦󥯤Ѥޤɤξ⡢ɤΥڥ졼ƥ󥰡ƥǤ⡢URLФޤФΤǤ⡢ޤ\fIh\fR\fIttp:\fRޤ\fIf\fR\fIile:\fRΤǤ⡢URL: Uniform Resource Locators
-(http://www\&.ietf\&.org/rfc/rfc1738\&.txt)˻ꤵƤȤꡢڤʸȤƥåѤޤ
+既存のJavadocにより生成された外部参照クラスのドキュメントへのリンクを作成します。\fIextdocURL\fR引数は、リンク先として指定する、Javadocにより生成された外部ドキュメントを含むディレクトリの絶対URLまたは相対URLです。指定した\fIjavadoc\fRコマンドの実行で、複数の\fI\-link\fRオプションを指定して複数のドキュメントへのリンクを作成できます。
+.sp
+このディレクトリ内にpackage\-listファイルが存在する必要があります(存在しない場合は、\fI\-linkoffline\fRオプションを使用します)。\fIjavadoc\fRコマンドは、package\-listファイルからパッケージ名を読み取った後、そのURLでこれらのパッケージにリンクします。\fIjavadoc\fRコマンドの実行時に、\fIextdocURL\fRの値が、作成された\fI<A HREF>\fRリンク内にコピーされます。したがって、\fIextdocURL\fRはファイルではなくディレクトリへのURLである必要があります。\fIextdocURL\fRに絶対リンクを使用すると、ユーザーのドキュメントを任意のWebサイト上のドキュメントにリンクできます。相対位置へリンクするのみの場合は相対リンクを使用できます。相対リンクを使用する場合、渡す値は宛先ディレクトリから、リンクされているパッケージを含むディレクトリへである必要があります(\fI\-d\fRオプションで指定)。絶対リンクを指定する場合、通常、HTTPリンクを使用します。ただし、Webサーバーを持たないファイル・システムにリンクする場合は、ファイル・リンクを使用できます。生成されたドキュメンテーションにアクセスする全員が同じファイル・システムを共有する場合にのみファイル・リンクを使用します。どの場合も、どのオペレーティング・システムでも、URLが絶対または相対のいずれでも、また\fIh\fR\fIttp:\fRまたは\fIf\fR\fIile:\fRのいずれでも、URLメモ: Uniform Resource Locators
+(http://www\&.ietf\&.org/rfc/rfc1738\&.txt)に指定されているとおり、区切り文字としてスラッシュを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -2727,8 +2727,8 @@
 .RE
 .\}
 .RE
-\-linkoffline\-linkץΰ㤤.PP
-ξˡ\fI\-link\fRץѤޤ
+\-linkofflineおよび\-linkオプションの違い.PP
+次の場合に、\fI\-link\fRオプションを使用します。
 .sp
 .RS 4
 .ie n \{\
@@ -2738,7 +2738,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-APIɥȤؤХѥѤ硣
+外部APIドキュメントへの相対パスを使用する場合。
 .RE
 .sp
 .RS 4
@@ -2749,14 +2749,14 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-APIɥȤؤURLѤ(URL³ɼԤȤˤäƵĤƤ)
+外部APIドキュメントへの絶対URLを使用する場合(そのURLに接続し、読取りを行うことがシェルによって許可されている場合)。
 .RE
 .PP
-APIɥȤؤURLѤ(URL³ɼԤȤˤäƵĤƤʤ)\fI\-linkoffline\fRץѤޤΤ褦ʾϡե¦եγ¦ˤɥȤ˥󥯤褦Ȥȯޤ
+外部APIドキュメントへの絶対URLを使用する場合(そのURLに接続し、読取りを行うことがシェルによって許可されていない場合)は\fI\-linkoffline\fRオプションを使用します。このような状況は、ファイアウォールの内側からファイアウォールの外側にあるドキュメントにリンクしようとする場合に発生します。
 .PP
-\fBExample 1\fR, ɥȤؤХ
-.RS 4
-http://docs\&.oracle\&.com/javase/8/docs/api/index\&.html˼褦ʡ\fIjava\&.lang\fR\fIjava\&.io\fRӤ¾Javaץåȥեࡦѥå˥󥯤硢ΥޥɤѤޤ
+\fBExample 1\fR, 外部ドキュメントへの絶対リンク
+.RS 4
+http://docs\&.oracle\&.com/javase/8/docs/api/index\&.htmlに示すような、\fIjava\&.lang\fR、\fIjava\&.io\fRおよびその他のJavaプラットフォーム・パッケージにリンクする場合、次のコマンドを使用します
 .sp
 .if n \{\
 .RS 4
@@ -2767,37 +2767,37 @@
 .if n \{\
 .RE
 .\}
-ΥޥɤϡJava SEץåȥեࡦѥåؤΥ󥯻\fIcom\&.mypackage\fRѥåΥɥȤޤɥȤˤϡȤХ饹\fItrees\fR\fIObject\fR饹ؤΥ󥯤ޤޤƤޤ\fI\-sourcepath\fR\fI\-d\fRʤɤ¾Υץɽޤ
+このコマンドは、Java SEプラットフォーム・パッケージへのリンク持つ\fIcom\&.mypackage\fRパッケージのドキュメントを生成します。生成ドキュメントには、たとえばクラス\fItrees\fR内の\fIObject\fRクラスへのリンクが含まれています。\fI\-sourcepath\fRや\fI\-d\fRなどの他のオプションは表示されません。
 .RE
 .PP
-\fBExample 2\fR, ɥȤؤХ
-.RS 4
-Ǥϡ2ĤΥѥåꡢΥɥȤ\fIjavadoc\fRޥɤʣ¹Ԥ줿ΤǤˡΥɥȤХѥʬ䤵ƤޤѥåϡAPIǤ\fIcom\&.apipackage\fRȡSPI(ӥץХ󥿥ե)Ǥc\fIom\&.spipackage\fRǤɥȤγǼϡdocs/api/com/apipackagedocs/spi/com/spipackageǤAPIѥåΥɥȤϤǤƤơdocsߤΥǥ쥯ȥǤ硢APIɥȤؤΥ󥯤SPIѥåɥȲˤϡΥޥɤ¹Ԥޤ\fIjavadoc \-d \&./spi \-link \&.\&./api com\&.spipackage\fR
-.sp
-\fI\-link\fRץϡǥ쥯ȥ(docs/spi)ХѥǤ
-.RE
-.PP
-\fI\-link\fRץѤȡɤϻȤƤƤ⡢\fIjavadoc\fRμ¹ԤǤϥɥȲʤ饹˥󥯤Ǥ褦ˤʤޤ󥯤ͭʥڡ˰ưǤ褦ˤˤϡHTMLڡĴ١ξ\fIextdocURL\fR˻ꤹɬפޤˤꡢɥѡƥΥɥơjava\&.*ɥơ(http://docs\&.oracle\&.com)إ󥯤뤳ȤǤޤ\fIjavadoc\fRޥɤǡߤμ¹ԤƤɥơAPIؤΥ󥯤Τߤˤϡ\fI\-link\fRץάޤ\fI\-link\fRץꤷʤȡ\fIjavadoc\fRޥɤϳȤΤΥɥơؤΥ󥯤ޤ󡣥ɥơ¸ߤΤɤޤϤɤ¸ߤΤ狼ʤǤ\fI\-link\fRץǤϡɥơʣξ˥󥯤Ǥޤեν򻲾ȤƤ⤦1ĤӤϡѥååȤδ֤˥󥯤뤳ȤǤΥѥååȤФ\fIjavadoc\fRޥɤ¹Ԥ塢¾ΥѥååȤФ\fIjavadoc\fRޥɤټ¹Ԥȡξåȴ֤Υ󥯤Ǥޤ
-饹λˡ.PP
-ɽ볰ȥ饹ؤΥ󥯤ξ(ӤΥƥȡ٥ǤϤʤ)饹ϼˡǻȤɬפޤ᥽åɤΤǥ饹򻲾ȤΤߤǤϽʬǤϤޤ\fIimport\fRʸΤ줫ǻȤɬפޤˡ饹\fIjava\&.io\&.File\fR򻲾Ȥˡ򼨤ޤ
+\fBExample 2\fR, 外部ドキュメントへの相対リンク
+.RS 4
+この例では、2つのパッケージがあり、そのドキュメントは\fIjavadoc\fRコマンドを複数回実行した結果生成されたものです。さらに、これらのドキュメントは相対パスで分割されています。パッケージは、APIである\fIcom\&.apipackage\fRと、SPI(サービス・プロバイダ・インタフェース)であるc\fIom\&.spipackage\fRです。ドキュメントの格納先は、docs/api/com/apipackageとdocs/spi/com/spipackageです。APIパッケージのドキュメントはすでに生成されていて、docsが現在のディレクトリである場合、APIドキュメントへのリンクを持つSPIパッケージをドキュメント化するには、次のコマンドを実行します。\fIjavadoc \-d \&./spi \-link \&.\&./api com\&.spipackage\fR
+.sp
+\fI\-link\fRオプションは、宛先ディレクトリ(docs/spi)からの相対パスです。
+.RE
+注意.PP
+\fI\-link\fRオプションを使用すると、コードからは参照されていても、今回の\fIjavadoc\fRの実行ではドキュメント化されないクラスにリンクできるようになります。リンクから有効なページに移動できるようにするには、それらのHTMLページがある場所を調べ、その場所を\fIextdocURL\fRに指定する必要があります。これにより、サードパーティのドキュメンテーションがjava\&.*ドキュメンテーション(http://docs\&.oracle\&.com)へリンクすることができます。\fIjavadoc\fRコマンドで、現在の実行で生成しているドキュメンテーション内のAPIへのリンクのみを作成する場合には、\fI\-link\fRオプションを省略します。\fI\-link\fRオプションを指定しないと、\fIjavadoc\fRコマンドは外部参照のためのドキュメンテーションへのリンクを作成しません。ドキュメンテーションが存在するのかどうか、またはどこに存在するのかがわからないからです。\fI\-link\fRオプションでは、生成ドキュメンテーション内の複数の場所にリンクを作成できます。ソース・ファイルの処理を参照してください。もう1つの用途は、パッケージ・セットの間にクロスリンクを作成することです。一方のパッケージ・セットに対して\fIjavadoc\fRコマンドを実行した後、他方のパッケージ・セットに対して\fIjavadoc\fRコマンドを再度実行すると、両セット間に双方向のリンクを作成できます。
+クラスの参照方法.PP
+表示される外部参照クラスへのリンクの場合(およびそのテキスト・ラベルだけではなく)、クラスは次の方法で参照される必要があります。メソッドの本体でクラスを参照するのみでは十分ではありません。\fIimport\fR文、宣言のいずれかで参照する必要があります。次に、クラス\fIjava\&.io\&.File\fRを参照する方法の例を示します。
 .PP
-٤ƤΥפimportʸξ硣磻ɥɤˤ륤ݡȡ̾ˤŪʥݡȡޤ\fIjava\&.lang\&.*\fRФ뼫ưݡȡ
+すべてのタイプのimport文の場合。ワイルドカードによるインポート、名前による明示的なインポート、または\fIjava\&.lang\&.*\fRに対する自動インポート。
 .PP
-Java SE 1\&.3\&.\fIn\fR1\&.2\&.\fIn\fRǤϡ̾ˤŪʥݡȤΤߵǽޤ磻ɥɤˤ\fIimport\fRʸ⡢\fIimport java\&.lang\&.*\fRμưݡȤⵡǽޤ
+Java SE 1\&.3\&.\fIn\fRおよび1\&.2\&.\fIn\fRでは、名前による明示的なインポートのみ機能します。ワイルドカードによる\fIimport\fR文も、\fIimport java\&.lang\&.*\fRの自動インポートも機能しません。
 .PP
-ξ:
+宣言の場合:
 \fIvoid mymethod(File f) {}\fR
 .PP
-Ȥϡ᥽åɡ󥹥ȥ饯եɡ饹ޤϥ󥿥ե귿ޤϥѥ᡼ס뤤ϼĥޤϥʸˤޤ
+参照は、メソッド、コンストラクタ、フィールド、クラスまたはインタフェースの戻り型またはパラメータ・タイプ、あるいは実装、拡張またはスロー文にあります。
 .PP
-פʷ̤Ȥơ\fI\-link\fRץѤƤ⡢¤Τ˸äɽʤ󥯤¿ȯǽޤƥȤϥϥѡƥȡ󥯤դ줺ɽޤ󥯤ɽٹ𤫤顢Υ󥯤ǧǤޤ饹Ȥˤäƥ󥯤ɲä뤿κǤñˡϤΥ饹򥤥ݡȤ뤳ȤǤ
-ѥåꥹ.PP
-\fI\-link\fRץˤϡ\fIjavadoc\fRޥɤˤäpackage\-listȤ̾Υե뤬\fI\-link\fRץ˻ꤷURL¸ߤƤ뤳ȤɬפǤpackage\-listեϡξˤɥȲ줿ѥå̾ΥꥹȤäñʥƥȡեǤҤǤϡ\fIjavadoc\fRޥɤϡꤷURLpackage\-listȤ̾Υե򸡺ѥå̾ɤ߼äơURLǤΥѥå˥󥯤ޤ
+重要な結果として、\fI\-link\fRオプションを使用しても、この制限のために誤って表示されないリンクが多数発生する可能性があります。テキストはハイパーテキスト・リンクが付けられずに表示されます。リンクが表示する警告から、これらのリンクを認識できます。クラスを正しく参照し、それによってリンクを追加するための最も簡単な方法はそのクラスをインポートすることです。
+パッケージ・リスト.PP
+\fI\-link\fRオプションには、\fIjavadoc\fRコマンドによって生成されるpackage\-listという名前のファイルが、\fI\-link\fRオプションに指定したURLに存在していることが必要です。package\-listファイルは、その場所にあるドキュメント化されたパッケージの名前のリストが入った単純なテキスト・ファイルです。前述の例では、\fIjavadoc\fRコマンドは、指定したURLでpackage\-listという名前のファイルを検索し、パッケージ名を読み取って、そのURLでこれらのパッケージにリンクします。
 .PP
-ȤСJava SE APIΥѥåꥹȤ
-http://docs\&.oracle\&.com/javase/8/docs/api/package\-listˤޤ
+たとえば、Java SE APIのパッケージ・リストは
+http://docs\&.oracle\&.com/javase/8/docs/api/package\-listにあります。
 .PP
-ΥѥåꥹȤϼΤ褦ƤǻϤޤäƤޤ
+このパッケージ・リストは次のような内容で始まっています。
 .sp
 .if n \{\
 .RS 4
@@ -2816,20 +2816,20 @@
 .RE
 .\}
 .PP
-\fI\-link\fRץꤻ\fIjavadoc\fR¹Ԥ硢ȥ饹°̾򸫤Ĥȡ̾󥯤ʤǽϤޤ\fI\-link\fRץꤷ硢\fIjavadoc\fRޥɤϡꤵ줿\fIextdocURL\fRξˤpackage\-listեǤΥѥå̾򸡺ޤѥå̾Ĥȡ\fIextdocURL\fR̾ղäޤ
+\fI\-link\fRオプションを指定せずに\fIjavadoc\fRを実行した場合、外部参照クラスに属する名前を見つけると、その名前をリンクなしで出力します。一方、\fI\-link\fRオプションを指定した場合、\fIjavadoc\fRコマンドは、指定された\fIextdocURL\fRの場所にあるpackage\-listファイルでそのパッケージ名を検索します。パッケージ名が見つかると、\fIextdocURL\fRが名前の前に付加されます。
 .PP
-٤ƤΥ󥯤ǽ뤿ˤϡȤΤ٤ƤΥɥȤꤷURL¸ߤɬפޤ\fIjavadoc\fRޥɤϡꤵ줿package\-list¸ߤ뤫ɤΤߤåΥڡ¸ߤ뤫ɤϥåޤ
-ʣΥ.PP
-ʣ\fI\-link\fRץꤹȡǤդογɥȤؤΥ󥯤ǤޤJavadoc 1\&.2ˤϡʣ\fI\-link\fRץǤʤȤΤԶ礬ޤJavadoc 1\&.2\&.2ǽޤ󥯤볰ɥȤȤˡΤ褦̡Υ󥯡ץꤷޤ\fIjavadoc \-link extdocURL1 \-link extdocURL2 \&.\&.\&. \-link extdocURLn com\&.mypackage\fR
-\fIextdocURL1\fR\fIextdocURL2\fR\&.\fI\&.\&. extdocURLn\fRϡ줾쳰ɥȤΥ롼Ȥؤƥ롼Ȥˤϡpackage\-listȤ̾Υե뤬äƤޤ
-.PP
-˺줿ʣΥɥȤ򥯥󥯤硢֡ȥȥåפɬפˤʤ뤳ȤޤɤΥɥȤˤĤƤpackage\-list¸ߤƤʤϡǽΥɥȤФ\fIjavadoc\fRޥɤ¹Ԥǡ2ܤΥɥȤpackage\-listϤޤ¸ߤƤޤ󡣤äơ󥯤ˤϡ2ܤΥɥȤǡǽΥɥȤʤɬפޤ
+すべてのリンクが正しく機能するためには、外部参照のすべてのドキュメントが、指定したURLに存在する必要があります。\fIjavadoc\fRコマンドは、指定されたpackage\-listが存在するかどうかのみをチェックし、これらのページが存在するかどうかはチェックしません。
+複数のリンク.PP
+複数の\fI\-link\fRオプションを指定すると、任意の数の外部生成ドキュメントへのリンクを作成できます。Javadoc 1\&.2には、複数の\fI\-link\fRオプションを指定できないという既知の不具合があります。これはJavadoc 1\&.2\&.2で修正されました。リンクする外部ドキュメントごとに、次のように別々のリンク・オプションを指定します。\fIjavadoc \-link extdocURL1 \-link extdocURL2 \&.\&.\&. \-link extdocURLn com\&.mypackage\fR
+\fIextdocURL1\fR、\fIextdocURL2\fR、\&.\fI\&.\&. extdocURLn\fRは、それぞれ外部ドキュメントのルートを指し、各ルートには、package\-listという名前のファイルが入っています。
+クロスリンク.PP
+以前に作成された複数のドキュメントをクロスリンクする場合、ブートストラップが必要になることがあります。どのドキュメントについてもpackage\-listが存在していない場合は、最初のドキュメントに対して\fIjavadoc\fRコマンドを実行する時点で、2番目のドキュメントのpackage\-listはまだ存在していません。したがって、外部リンクを作成するには、2番目のドキュメントを生成した後で、最初のドキュメントを生成しなおす必要があります。
 .PP
-ξ硢ǽΥɥŪϡpackage\-list뤳ȤǤ(ѥå̾İƤϼưǺƤ⤫ޤޤ)ˡ2ܤΥɥȤȤγ󥯤ޤɬפʳpackage\-listե뤬¸ߤʤϡ\fIjavadoc\fRޥɤٹ𤬽Ϥޤ
+この場合、最初のドキュメント生成の目的は、package\-listを作成することです(パッケージ名を把握している場合は手動で作成してもかまいません)。次に、2番目のドキュメントとその外部リンクを生成します。必要な外部のpackage\-listファイルが存在しない場合は、\fIjavadoc\fRコマンドから警告が出力されます。
 .PP
 \-linkoffline \fIextdocURL packagelistLoc\fR
 .RS 4
-Υץ\fI\-link\fRץΥХꥨǤξȤ⡢Javadocˤ줿ȥ饹ΥɥȤؤΥ󥯤ޤ\fIjavadoc\fRޥɤWeb³ѤƥɥȤ˥ǤʤȤWebΥɥȤ˥󥯤ˤϡ\fI\-link\fRo\fIffline\fRץѤޤɥȤpackage\-listե˥ǤʤȤޤϤΥե뤬\fIextdocURL\fRǻꤵ줿ˤ¸ߤ\fIpackageListLoc\fRǻǤ̤ξ(̾)¸ߤȤ\fI\-linkoffline\fRץѤޤ\fIextdocURL\fRWorld Wide WebǤǤʤϡ\fI\-linkoffline\fRץꤹ뤳ȤˤꡢɥȤ\fIjavadoc\fRޥɤWeb³ɬפȤ󤬤ʤʤޤ⤦1ĤӤϡɥȤ򹹿뤿βȤƻѤ뤳ȤǤѥåΥåΤФ\fIjavadoc\fRޥɤ¹Ԥ塢ѹΥѥåФƤΤ\fIjavadoc\fRޥɤټ¹Ԥơ줿ե򡢥ꥸʥΥåȤǤ褦ˤޤ򼨤ޤ\fI\-linkoffline\fRץϰ2ļޤ1\fI<a href>\fR󥯤Ȥ߹ޤʸꤷ2package\-listθ\fI\-linkoffline\fRޤ
+このオプションは\fI\-link\fRオプションのバリエーションです。両方とも、Javadocにより生成された外部参照クラスのドキュメントへのリンクを作成します。\fIjavadoc\fRコマンドがWeb接続を使用してドキュメントにアクセスできないとき、Web上のドキュメントにリンクするには、\fI\-link\fRo\fIffline\fRオプションを使用します。外部ドキュメントのpackage\-listファイルにアクセスできないとき、またはこのファイルが\fIextdocURL\fRで指定された場所には存在せず、\fIpackageListLoc\fRで指定できる別の場所(通常ローカル)に存在するとき、\fI\-linkoffline\fRオプションを使用します。\fIextdocURL\fRにWorld Wide Web上でしかアクセスできない場合は、\fI\-linkoffline\fRオプションを指定することにより、ドキュメントの生成時に\fIjavadoc\fRコマンドがWebに接続する必要があるという制約がなくなります。もう1つの用途は、ドキュメントを更新するための回避策として使用することです。パッケージのセット全体に対して\fIjavadoc\fRコマンドを実行した後、変更した一部のパッケージに対してのみ\fIjavadoc\fRコマンドを再度実行して、更新されたファイルを、オリジナルのセットに挿入できるようにします。次に例を示します。\fI\-linkoffline\fRオプションは引数を2つ取ります。第1引数は\fI<a href>\fRリンクに組み込まれる文字列を指定し、第2引数はpackage\-listの検索場所を\fI\-linkoffline\fRに伝えます。
 .sp
 .RS 4
 .ie n \{\
@@ -2839,7 +2839,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIextdocURL\fRͤϡȤƻꤹ롢Javadocˤ줿ɥȤޤǥ쥯ȥURLޤURLǤURLξ硢ͤϡǥ쥯ȥ(\fI\-d\fRץǻ)ȤʤѥåΥ롼ȤؤХѥˤɬפޤܺ٤ϡ\fI\-link\fRץ\fIextdocURL\fR򻲾ȤƤ
+\fIextdocURL\fRの値は、リンク先として指定する、Javadocにより生成された外部ドキュメントを含むディレクトリの絶対URLまたは相対URLです。相対URLの場合、値は、生成先ディレクトリ(\fI\-d\fRオプションで指定)からリンク先となるパッケージのルートへの相対パスにする必要があります。詳細は、\fI\-link\fRオプションの\fIextdocURL\fRを参照してください。
 .RE
 .sp
 .RS 4
@@ -2850,16 +2850,16 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackagelistLoc\fRͤϡɥȤpackage\-listեޤǥ쥯ȥؤΥѥޤURLǤϡURL (http:ޤfile:)Ǥե롦ѥǤ⤫ޤޤ󡣤ޤХѥХѥΤɤǤ⤫ޤޤХѥξϡ\fIjavadoc\fRޥɤ¹Ԥ븽ߤΥǥ쥯ȥ꤫ХѥȤƻꤷޤpackage\-listե̾ޤʤǤ
-.sp
-ꤷ\fIjavadoc\fRޥɤμ¹Ԥǡʣ\fI\-link\fRץǤޤJavadoc 1\&.2\&.2Ǥϡ\fI\-linkfile\fRץ1󤷤ǤޤǤ
-.RE
-.RE
-ɥȤؤХ.PP
-http://docs\&.oracle\&.com/javase/8/docs/api/index\&.html˼褦ʡ\fIjava\&.lang\fR
-\fIjava\&.io\fRӤ¾Java SEѥå˥󥯤ɬפ礬ޤ
+\fIpackagelistLoc\fRの値は、外部ドキュメントのpackage\-listファイルを含むディレクトリへのパスまたはURLです。これは、URL (http:またはfile:)でもファイル・パスでもかまいません。また、絶対パスと相対パスのどちらでもかまいません。相対パスの場合は、\fIjavadoc\fRコマンドが実行される現在のディレクトリからの相対パスとして指定します。package\-listファイル名を含めないでください。
+.sp
+指定した\fIjavadoc\fRコマンドの実行で、複数の\fI\-link\fRオプションを指定できます。Javadoc 1\&.2\&.2より前では、\fI\-linkfile\fRオプションは1回しか指定できませんでした。
+.RE
+.RE
+外部ドキュメントへの絶対リンク.PP
+http://docs\&.oracle\&.com/javase/8/docs/api/index\&.htmlに示すような、\fIjava\&.lang\fR、
+\fIjava\&.io\fRおよびその他のJava SEパッケージにリンクする必要がある場合があります。
 .PP
-ˤWebޤ󡣤ξ硢Ԥޤ
+ただし、シェルにはWebアクセス権がありません。この場合、次を行います。
 .sp
 .RS 4
 .ie n \{\
@@ -2869,7 +2869,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-֥饦package\-listե򳫤ޤ(http://docs\&.oracle\&.com/javase/8/docs/api/package\-list)
+ブラウザでpackage\-listファイルを開きます(http://docs\&.oracle\&.com/javase/8/docs/api/package\-list)
 .RE
 .sp
 .RS 4
@@ -2880,10 +2880,10 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-ե롦ǥ쥯ȥ¸Υ롦ԡ2\fIpackagelistLoc\fRǻꤷޤǤϡѥåꥹȡեϥȡǥ쥯ȥ(\&.)¸Ƥޤ
+ファイルをローカル・ディレクトリに保存し、このローカル・コピーを第2引数\fIpackagelistLoc\fRで指定します。この例では、パッケージ・リスト・ファイルはカレント・ディレクトリ(\&.)に保存されています。
 .RE
 .PP
-ΥޥɤϡJava SEץåȥեࡦѥåؤΥ󥯤c\fIom\&.mypackage\fRѥåΥɥȤޤɥȤˤϡȤХ饹\fItrees\fR\fIObject\fR饹ؤΥ󥯤ޤޤƤޤ\fI\-sourcepath\fRʤɡ¾ɬפʥץɽޤ
+次のコマンドは、Java SEプラットフォーム・パッケージへのリンクを持つc\fIom\&.mypackage\fRパッケージのドキュメントを生成します。生成ドキュメントには、たとえばクラス\fItrees\fR内の\fIObject\fRクラスへのリンクが含まれています。\fI\-sourcepath\fRなど、他の必要なオプションは表示されません。
 .sp
 .if n \{\
 .RS 4
@@ -2894,12 +2894,12 @@
 .if n \{\
 .RE
 .\}
-ɥȤؤХ.PP
-\fI\-linkoffline\fRХѥȤȤ˻Ѥ뤳ȤϤޤꤢޤͳñǡ̾\fI\-link\fRǴ֤˹礦Ǥ\fI\-linkoffline\fRץѤ硢̾package\-listեϥǡХ󥯤ѤϥΥեʤΤǡ̾\fI\-linkoffline\fRץ2ĤΰˡۤʤѥꤹɬפϤޤ2ĤΰƱξ硢\fI\-link\fRץѤǤޤ
-package\-listեμưǤκ.PP
-package\-listե뤬ޤ¸ߤʤƤ⡢ɥȤΥΥѥå̾狼äƤϡΥեΥԡưǺ\fIpackagelistLoc\fRǤΥѥꤹ뤳ȤǤޤ\fIcom\&.apipackage\fRǽ줿\fIcom\&.spipackage\fRΥѥåꥹȤ¸ߤʤȤФΥȤƵ󤲤ޤˡϡѥå̾Ϥ狼äƤΤΡޤƤʤɥȤ˥󥯤ɥȤɬפǤޤpackage\-listե뤬ʤJavadoc 1\&.0ޤ1\&.1줿ѥåѤpackage\-listեˤ⡢ˡѤǤޤƱͤˡ2ĤδȤ̤package\-listեͭǤ뤿ᡢ󥯤ꤷɥȤƱ˥꡼뤳Ȥǽˤʤޤ
-ʣɥȤؤΥ.PP
-ɥȤȤ1\fI\-linkoffline\fRץޤ뤳ȤǤޤ
+外部ドキュメントへの相対リンク.PP
+\fI\-linkoffline\fRを相対パスとともに使用することはあまりありません。理由は単純で、通常は\fI\-link\fRで間に合うからです。\fI\-linkoffline\fRオプションを使用する場合、通常、package\-listファイルはローカルで、相対リンクを使用する場合はリンク先のファイルもローカルなので、通常は\fI\-linkoffline\fRオプションの2つの引数に、異なるパスを指定する必要はありません。2つの引数が同一の場合、\fI\-link\fRオプションを使用できます。
+package\-listファイルの手動での作成.PP
+package\-listファイルがまだ存在しなくても、ドキュメントのリンク先のパッケージ名がわかっている場合は、このファイルのコピーを手動で作成し、\fIpackagelistLoc\fRでそのパスを指定することができます。\fIcom\&.apipackage\fRが最初に生成された時点で\fIcom\&.spipackage\fRのパッケージ・リストが存在しないという前出のケースが一例として挙げられます。この方法は、パッケージ名はわかっているものの、まだ公開されていない、新しい外部ドキュメントにリンクするドキュメントを生成する必要がある場合に便利です。また、package\-listファイルが生成されないJavadoc 1\&.0または1\&.1で生成されたパッケージ用にpackage\-listファイルを作成する場合にも、この方法が使用できます。同様に、2つの企業が未公開のpackage\-listファイルを共有できるため、クロスリンクを設定したドキュメントを同時にリリースすることも可能になります。
+複数ドキュメントへのリンク.PP
+参照先の生成ドキュメントごとに1回、\fI\-linkoffline\fRオプションを含めることができます。
 .sp
 .if n \{\
 .RS 4
@@ -2911,10 +2911,10 @@
 .if n \{\
 .RE
 .\}
-ɥȤι.PP
-ץȤ˲ޤϲɴΥѥåޤޤˤ⡢\fI\-linkoffline\fRץѤǤޤĥ꡼ΤǤǤ\fIjavadoc\fRޥɤ¹ԤȤ硢ɥơ󡦥Ȥˤ鷺ѹ®˲äĥ꡼ΰ\fIjavadoc\fRޥɤƼ¹Ԥ뤳ȤǤޤ2ܤμ¹Ԥϡɥơ󡦥ȤѹѹʤˤΤ뤳ȤդƤɤФɲáޤѹϡѥåĥ꡼ѾСΥꥹȡѥڡʤɤξǡ󥯤뤳Ȥޤ
+ドキュメントの更新.PP
+プロジェクトに何十または何百のパッケージが含まれる場合にも、\fI\-linkoffline\fRオプションを使用できます。ソース・ツリー全体ですでに\fIjavadoc\fRコマンドを実行したことがある場合、ドキュメンテーション・コメントにわずかな変更を迅速に加え、ソース・ツリーの一部で\fIjavadoc\fRコマンドを再実行することができます。2回目の実行は、ドキュメンテーション・コメントを変更し、宣言は変更しない場合にのみ正しく処理されることに注意してください。ソース・コードに対して宣言を追加、削除、または変更した場合は、索引、パッケージ・ツリー、継承されるメンバーのリスト、使用ページなどの場所で、リンクが壊れることがあります。
 .PP
-ޤοϤʼ¹ԤǻѤ롢ǥ쥯ȥ(updateʤ)ޤǤϡǥ쥯ȥ̾htmlǤǤñǤϡhtmlǥ쥯ȥοƥǥ쥯ȥ˰ưޤ\fI\-linkoffline\fRץ1˥ȡǥ쥯ȥ(\&.)ꤷ2package\-listhtmlؤХѥꤷѥåΥѥå̾ΤߤϤޤ
+まず、この新しい小規模な実行で使用する、新しい生成先ディレクトリ(updateなど)を作成します。この例では、元の生成先ディレクトリの名前はhtmlです。最も単純な例では、htmlディレクトリの親ディレクトリに移動します。\fI\-linkoffline\fRオプションの第1引数にカレント・ディレクトリ(\&.)を設定し、第2引数にpackage\-listが検索されるhtmlへの相対パスを設定し、更新するパッケージのパッケージ名のみを渡します。
 .sp
 .if n \{\
 .RS 4
@@ -2926,15 +2926,15 @@
 .RE
 .\}
 .PP
-\fIjavadoc\fRޥɤνλ塢update/com/package줿饹Υڡ򥳥ԡ(פϽ)html/com/packageθΥե˾񤭤ޤ
+\fIjavadoc\fRコマンドの終了後、update/com/package内の生成されたクラスのページをコピーし(概要や索引は除く)、html/com/package内の元のファイルに上書きします。
 .PP
 \-linksource
 .RS 4
-ƥե(ֹդ)HTMLСɸHTMLɥȤ饽եؤΥ󥯤ɲäޤ󥯤ϡեƤ륯饹󥿥ե󥹥ȥ饯᥽åɡեɤФƺޤǤʤ硢ȤХǥեȡ󥹥ȥ饯줿饹ФƤϡ󥯤Ϻޤ
-.sp
-Υץϡ\fI\-public\fR\fI\-package\fR\fI\-protected\fR\fI\-private\fRγƥץȤϴطʤΥ饹եɡΥ᥽åɤΤϤȤȤ߹ޤ줿եΤ٤Ƥξܺ٤ޤ\fI\-private\fRץ⤢碌ƻꤷʤꡢΥ饹䥤󥿥եΰˤϡ󥯤𤷤ƥǤʤȤޤ
-.sp
-ƥ󥯤ϡμ̻̾ξ˺ޤȤС\fIButton\fR饹ΥɤؤΥ󥯤ϡ\fIButton\fRȤξ˺ޤ
+各ソース・ファイル(行番号付き)のHTMLバージョンを作成し、標準HTMLドキュメントからソース・ファイルへのリンクを追加します。リンクは、ソース・ファイル内に宣言されているクラス、インタフェース、コンストラクタ、メソッド、フィールドに対して作成されます。そうでない場合、たとえばデフォルト・コンストラクタや生成されたクラスに対しては、リンクは作成されません。
+.sp
+このオプションは、\fI\-public\fR、\fI\-package\fR、\fI\-protected\fRおよび\fI\-private\fRの各オプションとは関係なく、非公開のクラス、フィールド、非公開のメソッドの本体をはじめとする組み込まれたソース・ファイル内のすべての非公開実装の詳細を公開します。\fI\-private\fRオプションもあわせて指定しないかぎり、非公開のクラスやインタフェースの一部には、リンクを介してアクセスできないことがあります。
+.sp
+各リンクは、その宣言内の識別子名の上に作成されます。たとえば、\fIButton\fRクラスのソース・コードへのリンクは、\fIButton\fRという語の上に作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -2945,7 +2945,7 @@
 .if n \{\
 .RE
 .\}
-\fIButton\fR饹\fIgetLabel\fR᥽åɤΥɤؤΥ󥯤ϡ\fIgetLabel\fRȤξ˺ޤ
+\fIButton\fRクラスの\fIgetLabel\fRメソッドのソース・コードへのリンクは、\fIgetLabel\fRという語の上に作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -2960,7 +2960,7 @@
 .PP
 \-group groupheading \fIpackagepattern:packagepattern\fR
 .RS 4
-ץڡʣΥѥå򡢻ꤷ롼פʬơ롼פȤɽޤƥ롼פϡ줾̤\fI\-group\fRץǻꤷޤ롼פϡޥɹԤǻꤵ줿ǥڡɽޤѥåϡ롼ǥե٥åȽˤʤäƤޤꤷ\fI\-group\fRץǤϡ\fIpackagepattern\fRΥꥹȤ˰פѥåФȤ\fIgroupheading\fR1Ĥɽɽޤ
+概要ページの複数のパッケージを、指定したグループに分けて、グループごとに表を作成します。各グループは、それぞれ別の\fI\-group\fRオプションで指定します。グループは、コマンド行で指定された順序でページに表示されます。パッケージは、グループ内でアルファベット順になっています。指定した\fI\-group\fRオプションでは、\fIpackagepattern\fR式のリストに一致するパッケージが、見出しとして\fIgroupheading\fRを持つ1つの表に表示されます。
 .sp
 .RS 4
 .ie n \{\
@@ -2970,7 +2970,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIgroupheading\fRˤϡǤդΥƥȤǤޤ뤳ȤǤޤꤷƥȤϡ롼פɽФˤʤޤ
+\fIgroupheading\fRには、任意のテキストを指定でき、空白を含めることができます。指定したテキストは、グループの表見出しになります。
 .RE
 .sp
 .RS 4
@@ -2981,12 +2981,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIpackagepattern\fRͤˤϡǤդΥѥå̾ƬʬȤ³1ĤΥꥹ(*)ǤդΥѥå̾ǤޤꥹϻѤǤͣΥ磻ɥɤǡǤդʸ˰פ롢Ȥ̣Ǥ1ĤΥ롼פˤϡ(:)ǶڤäʣΥѥޤ뤳ȤǤޤѥޤϥѥ󡦥ꥹȤǥꥹѤ硢ѥ󡦥ꥹȤ\fI"java\&.lang*:java\&.util"\fRΤ褦˰ǰϤɬפޤ
-.RE
-.sp
-\fI\-group\fRץꤷʤϡФ\fIPackages\fRŬڤʾФ1ĤΥ롼פ֤ޤФˤ٤ƤΥɥȲѥå(٤ƤΥ롼)ޤޤ櫓ǤϤʤ硢ĤΥѥåϡ֤¾ΥѥåפȤָФΩ롼פޤ
-.sp
-ȤС\fIjavadoc\fRޥɤǤϡ3ĤΥɥȲ줿ѥå\fI֥\fR\fIֳĥ\fR\fI֤¾Υѥå\fRʬޤ\fIjava\&.lang*\fRǤϡǸΥɥå(\&.)ꤷƤޤ\fIjava\&.lang\&.*\fRΤ褦˥ɥåȤȡ\fI java\&.lang\fRѥåϽ뤳Ȥˤʤޤ
+\fIpackagepattern\fRの値には、任意のパッケージ名の先頭部分とそれに続く1つのアスタリスク(*)で任意のパッケージ名を指定できます。アスタリスクは使用できる唯一のワイルドカードで、任意の文字に一致する、という意味です。1つのグループには、コロン(:)で区切って複数のパターンを含めることができます。パターンまたはパターン・リストでアスタリスクを使用する場合、パターン・リストは\fI"java\&.lang*:java\&.util"\fRのように引用符で囲む必要があります。
+.RE
+.sp
+\fI\-group\fRオプションを指定しない場合は、見出し\fIPackages\fRおよび適切な小見出しを持つ1つのグループに配置されます。小見出しにすべてのドキュメント化されるパッケージ(すべてのグループ)が含まれるわけではない場合、残りのパッケージは「その他のパッケージ」というサブ見出しを持つ独立したグループに入れられます。
+.sp
+たとえば、次の\fIjavadoc\fRコマンドでは、3つのドキュメント化されたパッケージが\fI「コア」\fR、\fI「拡張」\fRおよび\fI「その他のパッケージ」\fRに分けられます。\fIjava\&.lang*\fRでは、最後のドット(\&.)を指定していません。\fIjava\&.lang\&.*\fRのようにドットを入れると、\fI java\&.lang\fRパッケージは除外されることになります。
 .sp
 .if n \{\
 .RS 4
@@ -2999,7 +2999,7 @@
 .if n \{\
 .RE
 .\}
-\fBѥå\fR
+\fBコア・パッケージ\fR
 .sp
 \fIjava\&.lang\fR
 .sp
@@ -3007,7 +3007,7 @@
 .sp
 \fIjava\&.util\fR
 .sp
-\fBĥǽѥå\fR
+\fB拡張機能パッケージ\fR
 .sp
 \fIjavax\&.servlet\fR
 .sp
@@ -3018,42 +3018,42 @@
 .PP
 \-nodeprecated
 .RS 4
-侩APIɥȤʤ褦ˤޤΥץꤹȡ\fI\-nodeprecatedlist\fRץꤷƱ̤ꡢɥȤ¾ʬΤǤ⡢侩APIޤ󡣤Υץϡɤ򵭽ҤƤȤ侩ΥɤˤäƵ򻶤餵줿ʤǤ
+非推奨のAPIをドキュメントに生成しないようにします。このオプションを指定すると、\fI\-nodeprecatedlist\fRオプションを指定した場合と同じ効果があり、ドキュメントの他の部分全体でも、非推奨のAPIが生成されません。このオプションは、コードを記述しているとき、非推奨のコードによって気を散らされたくない場合に便利です。
 .RE
 .PP
 \-nodeprecatedlist
 .RS 4
-侩APIΥꥹȤޤե(deprecated\-list\&.html)ӥʥӥ󡦥СΤΥڡؤΥ󥯤ʤ褦ˤޤ\fIjavadoc\fRޥɤǤϡ³ɥȤ¾ʬǤϡ侩APIޤΥץϡ侩APIɤ˴ޤޤƤ餺ʥӥ󡦥С򤹤äȸǤ
+非推奨のAPIのリストを含むファイル(deprecated\-list\&.html)、およびナビゲーション・バーのそのページへのリンクが生成されないようにします。\fIjavadoc\fRコマンドでは、引き続き、ドキュメントの他の部分では、非推奨のAPIが生成されます。このオプションは、非推奨のAPIがソース・コードに含まれておらず、ナビゲーション・バーをすっきりと見せる場合に便利です。
 .RE
 .PP
 \-nosince
 .RS 4
-ɥȤ顢\fI@since\fR˴Ϣդ줿\fIƳ줿С\fRάޤ
+生成ドキュメントから、\fI@since\fRタグに関連付けられた\fI「導入されたバージョン」\fRセクションを省略します。
 .RE
 .PP
 \-notree
 .RS 4
-ɥȤ顢饹ӥ󥿥եγإڡάޤΥڡˤϡʥӥ󡦥СΡֳإĥ꡼ץܥ󤫤饢ǤޤǥեȤǤϡؤޤ
+生成ドキュメントから、クラスおよびインタフェースの階層ページを省略します。これらのページには、ナビゲーション・バーの「階層ツリー」ボタンからアクセスできます。デフォルトでは、階層が生成されます。
 .RE
 .PP
 \-noindex
 .RS 4
-ɥȤ顢άޤǥեȤǤϡޤ
+生成ドキュメントから、索引を省略します。デフォルトでは、索引が生成されます。
 .RE
 .PP
 \-nohelp
 .RS 4
-ϤγƥڡκǾȺDzˤʥӥ󡦥С֥إסץ󥯤άޤ
+出力の各ページの最上部と最下部にあるナビゲーション・バーから「ヘルプ」リンクを省略します。
 .RE
 .PP
 \-nonavbar
 .RS 4
-̾ڡκǾȺDzɽʥӥ󡦥Сإåӥեåʤ褦ˤޤ\fI\-nonavbar\fRץ\fI\-bottom\fRץ˱ƶͿޤ\fI\-nonavbar\fRץϡ뤿ˤΤߥեPostScriptPDFѴʤɡƤΤߤפǡʥӥɬפʤǤ
+通常、生成されるページの最上部と最下部に表示されるナビゲーション・バー、ヘッダー、およびフッターを生成しないようにします。\fI\-nonavbar\fRオプションは\fI\-bottom\fRオプションに影響を与えません。\fI\-nonavbar\fRオプションは、印刷するためにのみファイルをPostScriptやPDFに変換する場合など、内容のみが重要で、ナビゲーションの必要がない場合に便利です。
 .RE
 .PP
 \-helpfile \fIpath\efilename\fR
 .RS 4
-ǾӺDzΥʥӥ󡦥СΡ֥إסץ󥯤ΥȤʤإإסեpath\efilenameΥѥꤷޤΥץ󤬻ꤵƤʤȡ\fIjavadoc\fRޥɤϡ\fIjavadoc\fRޥǥϡɥɤƤإסեhelp\-doc\&.htmlưޤΥץѤȡǥեȤ򥪡С饤ɤǤޤե̾ˤϤɤ̾ǤǤhelp\-doc\&.html˸ꤵޤ\fIjavadoc\fRޥɤϡΤ褦ˡʥӥ󡦥СΥ󥯤ɬפ˱Ĵޤ
+最上部および最下部のナビゲーション・バーの「ヘルプ」リンクのリンク先となる代替ヘルプ・ファイルpath\efilenameのパスを指定します。このオプションが指定されていないと、\fIjavadoc\fRコマンドは、\fIjavadoc\fRコマンド内でハードコードされているヘルプ・ファイルhelp\-doc\&.htmlを自動作成します。このオプションを使用すると、デフォルトをオーバーライドできます。ファイル名にはどんな名前でも指定でき、help\-doc\&.htmlに限定されません。\fIjavadoc\fRコマンドは、次の例のように、ナビゲーション・バー内のリンクを必要に応じて調整します。
 .sp
 .if n \{\
 .RS 4
@@ -3068,7 +3068,7 @@
 .PP
 \-stylesheet \fIpath/filename \fR
 .RS 4
-HTML륷ȡեΥѥꤷޤΥץ󤬻ꤵƤʤȡ\fIjavadoc\fRޥɤϡ\fIjavadoc\fRޥǥϡɥɤƤ륹륷ȡեstylesheet\&.cssưޤΥץѤȡǥեȤ򥪡С饤ɤǤޤե̾ˤϤɤ̾ǤǤstylesheet\&.css˸ꤵޤ
+代替HTMLスタイルシート・ファイルのパスを指定します。このオプションが指定されていないと、\fIjavadoc\fRコマンドは、\fIjavadoc\fRコマンド内でハードコードされているスタイルシート・ファイルstylesheet\&.cssを自動作成します。このオプションを使用すると、デフォルトをオーバーライドできます。ファイル名にはどんな名前でも指定でき、stylesheet\&.cssに限定されません。
 .sp
 .if n \{\
 .RS 4
@@ -3083,15 +3083,15 @@
 .PP
 \-serialwarn
 .RS 4
-\fI@serial\fRʤϡѥ˷ٹޤǥեȤǤϡJavadoc 1\&.2\&.2ʹߤǤϡľ󲽤ηٹޤ󡣰Υ꡼ȤϵդưǤΥץѤȡľ󲽤ηٹɽΤǡǥեȤľ󲽲ǽեɤ\fIwriteExternal\fR᥽åɤŬڤ˥ɥȲΤΩޤ
+\fI@serial\fRタグがない場合は、コンパイル時に警告を生成します。デフォルトでは、Javadoc 1\&.2\&.2以降では、直列化の警告は生成されません。以前のリリースとは逆の動作です。このオプションを使用すると、直列化の警告が表示されるので、デフォルトの直列化可能フィールドと\fIwriteExternal\fRメソッドを適切にドキュメント化するのに役立ちます。
 .RE
 .PP
 \-charset \fIname\fR
 .RS 4
-ΥɥѤHTMLʸåȤꤷޤ̾ϡIANA RegistryCharacter Sets
-(http://www\&.iana\&.org/assignments/character\-sets)˼줿ͥMIME̾Ǥɬפޤ
-.sp
-ȤС\fIjavadoc \-charset "iso\-8859\-1" mypackage\fRϼιԤ줿ƥڡΥإåޤ
+このドキュメント用のHTML文字セットを指定します。この名前は、IANA RegistryのCharacter Sets
+(http://www\&.iana\&.org/assignments/character\-sets)に示された、優先MIME名である必要があります。
+.sp
+たとえば、\fIjavadoc \-charset "iso\-8859\-1" mypackage\fRは次の行を生成された各ページのヘッダーに挿入します。
 .sp
 .if n \{\
 .RS 4
@@ -3102,24 +3102,24 @@
 .if n \{\
 .RE
 .\}
-\fIMETA\fRϡHTMLɸ(41972654137321)HTML Document Representation
-(http://www\&.w3\&.org/TR/REC\-html40/charset\&.html#h\-5\&.2\&.2)˵ܤƤޤ
-.sp
-ӥץ⻲ȤƤ
+この\fIMETA\fRタグは、HTML標準(4197265および4137321)のHTML Document Representation
+(http://www\&.w3\&.org/TR/REC\-html40/charset\&.html#h\-5\&.2\&.2)に記載されています。
+.sp
+およびオプションも参照してください。
 .RE
 .PP
 \-docencoding \fIname\fR
 .RS 4
-HTMLեΥ󥳡ǥ󥰤ꤷޤ̾ϡIANA RegistryCharacter Sets
-(http://www\&.iana\&.org/assignments/character\-sets)˼줿ͥMIME̾Ǥɬפޤ
-.sp
-\fI\-docencoding\fRץά\fI\-encoding\fRץѤȡ줿HTMLեΰŹ沽\fI\-encoding\fRץꤵޤ:
-\fIjavadoc \-docencoding"iso\-8859\-1" mypackage\fRӥץ⻲ȤƤ
+生成されるHTMLファイルのエンコーディングを指定します。この名前は、IANA RegistryのCharacter Sets
+(http://www\&.iana\&.org/assignments/character\-sets)に示された、優先MIME名である必要があります。
+.sp
+\fI\-docencoding\fRオプションを省略し、\fI\-encoding\fRオプションを使用すると、生成されたHTMLファイルの暗号化は\fI\-encoding\fRオプションで特定されます。例:
+\fIjavadoc \-docencoding"iso\-8859\-1" mypackage\fRおよびオプションも参照してください。
 .RE
 .PP
 \-keywords
 .RS 4
-HTML<META>򡢥饹ȤեɲäޤΥϡ<META>򸡺륵󥸥󤬥ڡ򸫤ĤΩޤ󥿡ͥåΤ򸡺븡󥸥ΤۤȤɤ<META>򻲾Ȥޤ󡣥ڡѤƤǽ뤫ǤȤWebȤؤθ¤롢Ȥˤ󶡤븡󥸥ϡ<META>򻲾Ȥ뤳ȤDzä뤳ȤǤޤ<META>ˤϡ饹δ̾ȡեɤӥ᥽åɤνƤʤ̾ޤޤޤ󥹥ȥ饯ϡ饹̾ƱǤ뤿ޤޤޤ󡣤ȤС饹\fIString\fRϼΥɤdzϤޤ
+HTMLキーワード<META>タグを、クラスごとに生成されるファイルに追加します。これらのタグは、<META>タグを検索するサーチ・エンジンがページを見つける場合に役立ちます。インターネット全体を検索する検索エンジンのほとんどは<META>タグを参照しません。ページが誤用している可能性があるからです。自身のWebサイトへの検索を制限する、企業により提供される検索エンジンは、<META>タグを参照することで恩恵を受けることができます。<META>タグには、クラスの完全修飾名と、フィールドおよびメソッドの修飾されていない名前が含まれます。コンストラクタは、クラス名と同じであるため含まれません。たとえば、クラス\fIString\fRは次のキーワードで開始します。
 .sp
 .if n \{\
 .RS 4
@@ -3137,42 +3137,42 @@
 .PP
 \-tag \fItagname\fR:Xaoptcmf:"\fItaghead\fR"
 .RS 4
-\fIjavadoc\fRޥɤɥơ󡦥ΰ1ļñʥࡦ֥å\fI@tagname\fRǤ褦ˤޤˤꡢ\fIjavadoc\fRޥɤϥ̾ΥڥåԤȤǤΤǡ¸ߤ뤹٤ƤΥࡦˤĤơ\fI\-tag\fRץȤ߹ळȤפǤμ¹ԤǤϽϤʤϡ\fIX\fRդ̵ˤޤ\fI\-tag\fRץϡθФ\fItaghead\fRǽϤޤμιԤˤϡΥץ1ĤΰǻꤷƥȤ³ޤ֥åƱ͡ΰΥƥȤˤϥ饤󡦥ޤ뤳ȤǤޤΥ饤󡦥ᤵޤϤϡ1ļɸΥ(\fI@return\fR\fI@author\fRʤ)νϤȤ褯Ƥޤ\fItaghead\fRͤάȡ\fItagname\fRФȤɽޤ
-.sp
-\fB\fR:
-\fIXaoptcmf\fRˤꡢǥ֤Ǥ꤬ޤꡢ̵ˤǤ뤫ɤ(\fIX\fRѤ)ޤޤְ֤¤ʤ\fIa\fRꤷޤʳʸȹ礻ǽǤ
+\fIjavadoc\fRコマンドがドキュメンテーション・コメント内の引数を1つ取る単純なカスタム・ブロック・タグ\fI@tagname\fRを解釈できるようにします。これにより、\fIjavadoc\fRコマンドはタグ名のスペルチェックを行うことができるので、ソース・コード内に存在するすべてのカスタム・タグについて、\fI\-tag\fRオプションを組み込むことが重要です。今回の実行では出力されないタグは、\fIX\fRを付けて無効にします。\fI\-tag\fRオプションは、タグの見出し\fItaghead\fRを太字で出力します。その次の行には、このオプションの1つの引数で指定したテキストが続きます。ブロック・タグと同様、この引数のテキストにはインライン・タグを含めることができます。このインライン・タグも解釈されます。出力は、引数を1つ取る標準のタグ(\fI@return\fRや\fI@author\fRなど)の出力とよく似ています。\fItaghead\fRの値を省略すると、\fItagname\fRが見出しとして表示されます。
+.sp
+\fBタグの配置\fR:
+\fIXaoptcmf\fR引数により、ソース・コード内でタグを配置できる場所が決まり、タグを無効にできるかどうか(\fIX\fRを使用して)が決まります。タグの配置位置を制限しない場合は\fIa\fRを指定します。それ以外の文字の組合せも可能です。
 .sp
 \fIX\fR
-(̵)
+(タグの無効化)
 .sp
 \fIa\fR
-(٤)
+(すべて)
 .sp
 \fIo\fR
-()
+(概要)
 .sp
 \fIp\fR
-(ѥå)
+(パッケージ)
 .sp
 \fIt\fR
-(סĤޤꥯ饹ȥ󥿥ե)
+(タイプ、つまりクラスとインタフェース)
 .sp
 \fIc\fR
-(󥹥ȥ饯)
+(コンストラクタ)
 .sp
 \fIm\fR
-(᥽å)
+(メソッド)
 .sp
 \fIf\fR
-(ե)
-.sp
-\fB󥰥롦\fR: Ǥդΰ֤ǻѤǤ륿Υץ򼨤ޤ\fI\-tag todo:a:"To Do:"\fR
-.sp
-\fI@todo\fR򥳥󥹥ȥ饯᥽åɤӥեɤȤΤ߻Ѥ硢\fI\-tag todo:cmf:"To Do:"\fRѤޤ
-.sp
-ǸΥ(:)ϡѥ᡼ڤʸǤϤʤФƥȤΰˤʤäƤޤ\fI@todo\fRޤࡢѤΤ줫ΥץѤޤȤС\fI@todo The documentation for this method needs work\fRǤ
-.sp
-\fB̾Υ\fR: ̾ǥѤϥХååѤƥפޤΥɥơ󡦥Ȥˤϡ\fI\-tag ejb\e\e:bean:a:"EJB Bean:"\fRץѤޤ
+(フィールド)
+.sp
+\fBシングル・タグの例\fR: ソース・コード内の任意の位置で使用できるタグのタグ・オプションの例を示します。\fI\-tag todo:a:"To Do:"\fR
+.sp
+\fI@todo\fRタグをコンストラクタ、メソッドおよびフィールドとのみ使用する場合、\fI\-tag todo:cmf:"To Do:"\fRを使用します。
+.sp
+最後のコロン(:)は、パラメータ区切り文字ではなく、見出しテキストの一部になっています。\fI@todo\fRタグを含む、ソース・コード用のいずれかのタグ・オプションを使用します。たとえば、\fI@todo The documentation for this method needs work\fRです。
+.sp
+\fBタグ名内のコロン\fR: タグ名内でコロンを使用する場合はバックスラッシュを使用してエスケープします。次のドキュメンテーション・コメントには、\fI\-tag ejb\e\e:bean:a:"EJB Bean:"\fRオプションを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -3185,12 +3185,12 @@
 .if n \{\
 .RE
 .\}
-\fB̾Υڥå\fR: γȯԤɬϤʤࡦ򥽡֤뤳Ȥޤξ硢Τ٤ƤΥꥹȤϤ륿ͭˤϤʤ̵ˤɬפޤ\fIX\fRꤹȥ̵ˤʤޤꤷʤȡͭˤʤޤˤꡢ\fIjavadoc\fRޥɤϡФϥߥʤɤˤǤ뤫ɤǤޤΤ褦ʾˡ\fIjavadoc\fRޥɤٹ𤬽ϤޤǤ֤Ƥͤ\fIX\fRɲäǤޤƤС\fIX\fRΤߤǥͭˤ뤳ȤǤޤȤС\fI@todo\fRϤ硢\fI\-tag todo:Xcmf:"To Do:"\fRѤޤ˴ñˤ硢\fI\-tag todo:X\fRѤޤʸ\fI\-tag todo:X\fRϡ\fI@todo\fRåȤƤƤⵡǽޤ
-.sp
-\fBν\fR:
-\fI\-ta\fR\fIg\fR\fI\-taglet\fRץνˤäơνϽ礬ޤޤࡦɸॿȤ߹礻ƻѤ뤳ȤǤޤɸॿΥץϡꤹ뤿Υץ졼ۥǤɸॿ̾ΤߤޤɸॿξФѹǤޤ󡣤򼡤˼ޤ\fI\-tag\fRץꤷʤȡ\fI\-tagle\fR\fIt\fRץΰ֤ˤꡢޤޤξȤ¸ߤ硢ޥɥ饤κǸˤνꤷޤϡ䥿åȤޥɥ饤˻ꤵ줿֤˽뤿ǤȤС\fI\-taglet\fR\fI\-tag\fRץ̾\fItodo\fRͤľ硢ޥɥ饤˺Ǹ˻ꤵ줿Τꤷޤ
-.sp
-\fBδåȤ\fR: ǤϡϤParametersThrowsδ֤To Doޤ\fIX\fRѤơ\fI@example\fRκμ¹ԤǤϽϤʤǤ뤳Ȥꤷޤ\fI@argfile\fRѤϡΤ褦ˡե̡ιԤ˥֤Ǥޤ(Ԥη³򼨤ʸ)
+\fBタグ名のスペルチェック\fR: 一部の開発者が必ずしも出力しないカスタム・タグをソース・コード内に配置することがあります。この場合、ソース・コード内のすべてのタグをリストし、出力するタグを有効にし、出力しないタグを無効にする必要があります。\fIX\fRを指定するとタグは無効になります。指定しないと、タグは有効になります。これにより、\fIjavadoc\fRコマンドは、検出したタグが入力ミスなどによる不明タグであるかどうかを特定できます。このような場合に、\fIjavadoc\fRコマンドから警告が出力されます。すでに配置されている値に\fIX\fRを追加できます。こうしておけば、\fIX\fRを削除するのみでタグを有効にすることができます。たとえば、\fI@todo\fRタグを出力で抑制する場合、\fI\-tag todo:Xcmf:"To Do:"\fRを使用します。さらに簡単にする場合、\fI\-tag todo:X\fRを使用します。構文\fI\-tag todo:X\fRは、\fI@todo\fRタグがタグレットで定義されていても機能します。
+.sp
+\fBタグの順序\fR:
+\fI\-ta\fR\fIg\fRおよび\fI\-taglet\fRオプションの順序によって、タグの出力順が決まります。カスタム・タグと標準タグを組み合せて使用することもできます。標準タグのタグ・オプションは、順序を決定するためだけのプレースホルダです。標準タグの名前のみを取ります。標準タグの小見出しは変更できません。これを次の例に示します。\fI\-tag\fRオプションを指定しないと、\fI\-tagle\fR\fIt\fRオプションの位置により、順序が決まります。タグが両方とも存在する場合、コマンドラインの最後にある方がその順序を決定します。これは、タグやタグレットがコマンドラインに指定された順番に処理されるためです。たとえば、\fI\-taglet\fRおよび\fI\-tag\fRオプションが名前\fItodo\fR値を持つ場合、コマンドラインに最後に指定されたものが順序を決定します。
+.sp
+\fBタグの完全セットの例\fR: この例では、出力のParametersとThrowsの間にTo Doを挿入します。\fIX\fRを使用して、\fI@example\fRタグが、ソース・コード内の今回の実行では出力されないタグであることも指定します。\fI@argfile\fRタグを使用する場合は、次のように、引数ファイル内の別々の行にタグを配置できます(行の継続を示す文字は不要)。
 .sp
 .if n \{\
 .RS 4
@@ -3206,24 +3206,24 @@
 .if n \{\
 .RE
 .\}
-\fIjavadoc\fRޥɤɥơ󡦥ȤϤݤ˸줿ΤɸॿǤ⡢\fI\-tag\fR\fI\-taglet\fRץϤ줿ǤʤΤϤ٤Ȥߤʤ졢ٹ𤬥ޤ
-.sp
-ɸॿϡǽ顢ǥեȤνǥꥹŪ˳Ǽޤ\fI\-tag\fRץѤȡΥϤΥꥹȤɲäޤɸॿϡǥեȤΰ֤ưޤΤᡢɸॿ\fI\-tag\fRץάȡϥǥեȤΰ֤֤줿ޤޤˤʤޤ
-.sp
-\fBβ\fR: ֤ͭ̾ˤϡѥå˻ѤƤ\fIcom\&.mycompany\&.todo\fRȤ̾Τ褦ˡɥåȤǶڤ줿̾ѤޤOracleϡ̾˥ɥåȤޤޤʤɸॿޤ桼ϡOracleƱ̾Υư򥪡С饤ɤޤ\fI@todo\fRȤ̾ΥޤϥåȤ桼硢θOracleƱ̾ɸॿƤ⡢ΥޤϥåȤϾ˥桼ΤƱưݻޤ
-.sp
-\fBvs\&. Javadoc\fR: ̤ˡɲäɬפΤޡåפɥȤ˱ƶͿɥȤꤹ뤿ΤΤǤ硢ΥޡåפJavadocˤޤʳξˤޤJavadocġǤDocȤεˡΥࡦ˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#annotations)򻲾ȤƤ
-.sp
-\fI\-taglet\fRץѤơʣʥ֥å䥫ࡦ饤󡦥Ǥޤ
+\fIjavadoc\fRコマンドがドキュメンテーション・コメントを解析する際に検索されたタグのうち、標準タグでも、\fI\-tag\fRや\fI\-taglet\fRオプションで渡されたタグでもないものはすべて不明タグとみなされ、警告がスローされます。
+.sp
+標準タグは、最初、デフォルトの順序でリスト内に内部的に格納されます。\fI\-tag\fRオプションを使用すると、それらのタグはこのリストに追加されます。標準タグは、デフォルトの位置から移動されます。そのため、標準タグの\fI\-tag\fRオプションを省略すると、それはデフォルトの位置に配置されたままになります。
+.sp
+\fB競合の回避\fR: 固有の名前空間を作成するには、パッケージに使用されている\fIcom\&.mycompany\&.todo\fRという名前のように、ドットで区切られた名前を使用します。Oracleは、今後も名前にドットを含まない標準タグを作成します。ユーザーが作成したタグは、Oracleが定義する同じ名前のタグの動作をオーバーライドします。\fI@todo\fRという名前のタグまたはタグレットをユーザーが作成した場合、その後にOracleが同じ名前の標準タグを作成しても、そのタグまたはタグレットは常にユーザーが定義したのと同じ動作を保持します。
+.sp
+\fB注釈vs\&. Javadocタグ\fR: 一般に、追加する必要のあるマークアップが、ドキュメントに影響を与えたりドキュメントを生成したりするためのものである場合、そのマークアップはJavadocタグにします。それ以外の場合は注釈にします。JavadocツールでのDocコメントの記述方法のカスタム・タグと注釈に関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html#annotations)を参照してください。
+.sp
+\fI\-taglet\fRオプションを使用して、より複雑なブロック・タグやカスタム・インライン・タグも作成できます。
 .RE
 .PP
 \-taglet \fIclass\fR
 .RS 4
-ΥΥɥȤ˻ѤɥååȤư뤿Υ饹եꤷޤ\fIclass\fRͤδ̾ѤޤΥåȤϡࡦΥƥȰοޤåȤϡΰդϤޤåȤѤ˭٤ʥɥȤˤĤƤϡåȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/taglet/overview\&.html)򻲾ȤƤ
-.sp
-åȤϡ֥åޤϥ饤󡦥ǤåȤǤդοΰȤ뤳ȤǤޤޤƥȤˤ롢վ񤭤롢ƥȤե˽񤭽Ф¾Υץ򳫻ϤʤɤΥưǤޤåȤǻǤΤϡ־ַΤߤǤ¾Τ٤ƤηϡɥååȤˤäƹԤޤåȤѤƤ⡢ޥ饹ΥꥹȤ饯饹̾ʤɤνϼ¹ԤǤޤ󡣤ΥƥȤե˽Ϥꡢ̤ΥץȥꥬʤɤѤޤåȤؤΥѥꤹˤϡ\fI\-tagletpath\fRץѤޤˡڡParametersThrowsδ֤To DoåȤ򼨤ޤޤϡ\fI\-taglet\fRץ򤽤\fI\-tag\fRץΤ˻Ѥ뤳ȤǤޤɤ߼꤬ˤʤǽޤ
+そのタグのドキュメントの生成に使用するドックレットを起動するためのクラス・ファイルを指定します。\fIclass\fR値の完全修飾名を使用します。このタグレットは、カスタム・タグのテキスト引数の数も定義します。タグレットは、これらの引数を受け付け、処理し、出力を生成します。タグレットの例を使用した豊富なドキュメントについては、タグレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/taglet/overview\&.html)を参照してください。
+.sp
+タグレットは、ブロックタグまたはインライン・タグで便利です。タグレットは任意の数の引数をとることができます。また、テキストを太字にする、箇条書きを作成する、テキストをファイルに書き出す、その他のプロセスを開始するなどのカスタム動作を実装できます。タグレットで指定できるのは、タグの配置場所と配置形式のみです。その他のすべての決定は、ドックレットによって行われます。タグレットを使用しても、包含クラスのリストからクラス名を削除するなどの処理は実行できません。ただし、タグのテキストをファイルに出力したり、別のプロセスをトリガーするなどの副作用は得られます。タグレットへのパスを指定するには、\fI\-tagletpath\fRオプションを使用します。次に、生成されるページのParametersとThrowsの間にTo Doタグレットを挿入する例を示します。または、\fI\-taglet\fRオプションをその\fI\-tag\fRオプションのかわりに使用することができますが、読み取りが困難になる可能性があります。
 .sp
 .if n \{\
 .RS 4
@@ -3244,67 +3244,67 @@
 .PP
 \-tagletpath \fItagletpathlist\fR
 .RS 4
-taglet饹ե򸡺뤿θѥꤷޤ\fItagletpathlist\fRˤϡ(:)ǶڤäʣΥѥޤ뤳ȤǤޤ\fIjavadoc\fRޥɤϡꤵ줿ѥʲΤ٤ƤΥ֥ǥ쥯ȥ򸡺ޤ
+tagletクラス・ファイルを検索するための検索パスを指定します。\fItagletpathlist\fRには、コロン(:)で区切って複数のパスを含めることができます。\fIjavadoc\fRコマンドは、指定されたパス以下のすべてのサブディレクトリを検索します。
 .RE
 .PP
 \-docfilesubdirs
 .RS 4
-doc\-filesǥ쥯ȥΥǥסԡͭˤޤˤϡ֥ǥ쥯ȥȤΤ٤ƤƵŪ˥ԡޤȤСǥ쥯ȥoc\-files/example/imagesȤƤ٤ƥԡޤǤ⡢֥ǥ쥯ȥ꤬ǽǤ
+doc\-filesディレクトリのディープ・コピーを有効にします。宛先には、サブディレクトリとそのすべて内容が再帰的にコピーされます。たとえば、ディレクトリoc\-files/example/imagesとその内容がすべてコピーされます。ここでも、サブディレクトリを除外する指定が可能です。
 .RE
 .PP
 \-excludedocfilessubdir \fIname1:name2\fR
 .RS 4
-ꤵ줿̾doc\-files֥ǥ쥯ȥ򤹤٤ƽޤˤꡢSCCSȤ¾Υ極֥ǥ쥯ȥΥԡɤޤ
+指定された名前のdoc\-filesサブディレクトリをすべて除外します。これにより、SCCSとその他のソース・コード制御サブディレクトリのコピーを防ぎます。
 .RE
 .PP
 \-noqualifier all | \fIpackagename1\fR:\fIpackagename2\&.\&.\&.\fR
 .RS 4
-Ϥ륯饹̾齤ѥå̾άޤ\fI\-noqualifier\fRץΰϡ\fIall\fR(٤ƤΥѥåҤά)ޤϽҤȤƺѥåΥڤꥹ(磻ɥɤ)Τ줫Ȥʤޤ饹ޤϥ󥿥ե̾ɽ֤ѥå̾ޤեν򻲾ȤƤ
-.sp
-Ǥϡ٤ƤΥѥåҤάޤ\fI\-noqualifier all\fR
-.sp
-Ǥϡ\fIjava\&.lang\fR\fIjava\&.io\fRѥåҤάޤ:
-\fI\-noqualifier java\&.lang:java\&.io\fR
-.sp
-Ǥϡ\fIjava\fRǻϤޤѥåҤ\fIcom\&.sun\fR֥ѥåάޤ\fIjavax\fRϾάޤ\fI\-noqualifier java\&.*:com\&.sun\&.*\fR
-.sp
-ѥåҤҤư˽äɽ硢̾Ŭڤṳ̂ޤ̾ɽˡפ򻲾ȤƤΥ롼ϡ\fI\-noqualifier\fRץѤ뤫ɤˤ餺ͭǤ
+出力されるクラス名から修飾パッケージ名を省略します。\fI\-noqualifier\fRオプションの引数は、\fIall\fR(すべてのパッケージ修飾子を省略)、または修飾子として削除するパッケージのコロン区切りリスト(ワイルドカードも可)、のいずれかとなります。クラスまたはインタフェース名が表示される位置からパッケージ名が削除されます。ソース・ファイルの処理を参照してください。
+.sp
+次の例では、すべてのパッケージ修飾子を省略します。\fI\-noqualifier all\fR
+.sp
+次の例では、\fIjava\&.lang\fRおよび\fIjava\&.io\fRパッケージ修飾子を省略します:
+\fI\-noqualifier java\&.lang:java\&.io\fR。
+.sp
+次の例では、\fIjava\fRで始まるパッケージ修飾子および\fIcom\&.sun\fRサブパッケージを省略しますが、\fIjavax\fRは省略しません。\fI\-noqualifier java\&.*:com\&.sun\&.*\fR
+.sp
+パッケージ修飾子が前述の動作に従って表示される場合、名前は適切に短縮されます。「名前が表示される方法」を参照してください。このルールは、\fI\-noqualifier\fRオプションを使用するかどうかにかかわらず有効です。
 .RE
 .PP
 \-notimestamp
 .RS 4
-ॹפޤƥڡƬ᤯ˤ롢줿HTMLHTMLȤǥॹפޤ\fI\-notimestamp\fRץϡ\fIjavadoc\fRޥɤ2ĤΥ١Ǽ¹Ԥδ֤κʬ\fIdiff\fRΩޤॹפˤ\fIdiff\fRȯɤǤ(ǤʤȤ٤ƤΥڡ\fIdiff\fRˤʤޤ)ॹפˤ\fIjavadoc\fRޥɤΥ꡼ֹ椬ޤޤ졢ߤǤϡ\fI<!\-\- Generated by javadoc (build 1\&.5\&.0_01) on Thu Apr 02 14:04:52 IST 2009 \-\->\fRΤ褦ɽޤ
+タイムスタンプが抑制されます。各ページの先頭近くにある、生成されたHTML内のHTMLコメントでタイムスタンプが隠されます。\fI\-notimestamp\fRオプションは、\fIjavadoc\fRコマンドを2つのソース・ベースで実行し、それらの間の差分\fIdiff\fRを取得する場合に役立ちます。タイムスタンプによる\fIdiff\fRの発生を防ぐからです(そうでないとすべてのページで\fIdiff\fRになります)。タイムスタンプには\fIjavadoc\fRコマンドのリリース番号が含まれ、現在では、\fI<!\-\- Generated by javadoc (build 1\&.5\&.0_01) on Thu Apr 02 14:04:52 IST 2009 \-\->\fRのように表示されます。
 .RE
 .PP
 \-nocomment
 .RS 4
-Ӥ٤ƤΥޤॳʸΤΤߤޤΥץˤꡢϰۤʤŪΤäեѤץȤᤤʳǥȥHTMLɥȤǤ褦ˤʤޤ
+主説明およびすべてのタグを含むコメント本文全体を抑制し、宣言のみを生成します。このオプションにより、元は異なる目的のためだったソース・ファイルを再利用し、新しいプロジェクトの早い段階でスケルトンHTMLドキュメントを作成できるようになります。
 .RE
 .PP
 \-sourcetab \fItablength\fR
 .RS 4
-dzƥ֤Ѥʸοꤷޤ
-.RE
-.SH "ޥɥ饤ե"
+ソース内で各タブが使用する空白文字の数を指定します。
+.RE
+.SH "コマンドライン引数ファイル"
 .PP
-\fIjavadoc\fRޥɤûʷˤꤹ뤿ˡ\fIjavadoc\fRޥɤФ(\fI\-J\fRץ)ä1İʾΥեꤹ뤳ȤǤޤΤȤѤСɤΥڥ졼ƥ󥰡ƥǤ⡢ǤդĹ\fIjavadoc\fRޥɤǤޤ
+\fIjavadoc\fRコマンドを短くしたり簡潔にしたりするために、\fIjavadoc\fRコマンドに対する引数(\fI\-J\fRオプションを除く)が入った1つ以上のファイルを指定することができます。このことを利用すれば、どのオペレーティング・システム上でも、任意の長さの\fIjavadoc\fRコマンドを作成できます。
 .PP
-եˤϡ\fIjavac\fRΥץȥե̾ͳȤ߹礻ƵҤǤޤեγưϡڡޤϲԤǶڤޤե̾ޤ줿򤬤硢ե̾ΤŰǰϤߤޤ
+引数ファイルには、\fIjavac\fRのオプションとソース・ファイル名を自由に組み合せて記述できます。ファイル内の各引数は、スペースまたは改行で区切ります。ファイル名に埋め込まれた空白がある場合、ファイル名全体を二重引用符で囲みます。
 .PP
-եΥե̾ϡեΰ֤ǤϤʤߤΥǥ쥯ȥŪȤʤޤΥꥹȤǤϡ磻ɥ(\fI*\fR)ϻѤǤޤ󡣤ȤС*\&.javaȤϻǤޤ󡣥åȥޡ(@)ѤơեƵŪ˲᤹뤳ȤϤǤޤ󡣤ޤ\fI\-J\fRץ⥵ݡȤƤޤ󡣤ΥץϵưġϤޤưġǤϰե򥵥ݡȤƤʤǤ
+引数ファイル内のファイル名は、引数ファイルの位置ではなく、現在のディレクトリに相対的となります。これらのリストでは、ワイルドカード(\fI*\fR)は使用できません。たとえば、*\&.javaとは指定できません。アットマーク(@)を使用して、ファイルを再帰的に解釈することはできません。また、\fI\-J\fRオプションもサポートされていません。このオプションは起動ツールに渡されますが、起動ツールでは引数ファイルをサポートしていないからです。
 .PP
-\fIjavadoc\fR¹ԤȤˡưեΥѥȥե̾Ƭ@ʸդϤޤ\fIjavadoc\fRޥɤϡåȥޡ(@)ʸǻϤޤ򸫤ĤȡΥեƤŸưꥹȤޤ
+\fIjavadoc\fRを実行するときに、各引数ファイルのパスとファイル名の先頭に@文字を付けて渡します。\fIjavadoc\fRコマンドは、アットマーク(@)文字で始まる引数を見つけると、そのファイルの内容を展開して引数リストに挿入します。
 .PP
-\fBExample 1\fR, ñΰե
-.RS 4
-\fIargfile\fRȤ̾1ĤΰեѤơ٤Ƥ\fIjavadoc\fRޥɰݻǤޤ\fIjavadoc @argfile\fR˼褦ˡΰեˤξΥեƤޤޤƤޤ
+\fBExample 1\fR, 単一の引数ファイル
+.RS 4
+\fIargfile\fRという名前の1つの引数ファイルを使用して、すべての\fIjavadoc\fRコマンド引数を保持できます。\fIjavadoc @argfile\fR次の例に示すように、この引数ファイルには両方のファイルの内容が含まれています。
 .RE
 .PP
-\fBExample 2\fR, 2Ĥΰե
-.RS 4
-Τ褦ˡ2ĤΰեǤޤ\fIjavadoc\fRޥɤΥץѤ1ġѥå̾ޤϥե̾Ѥ1ĤǤΥꥹȤǤϹԷ³ʸѤƤޤ
-.sp
-ƤޤࡢoptionsȤ̾Υեޤ
+\fBExample 2\fR, 2つの引数ファイル
+.RS 4
+次のように、2つの引数ファイルを作成できます。\fIjavadoc\fRコマンドのオプション用に1つ、パッケージ名またはソース・ファイル名用に1つです。次のリストでは行継続文字を使用していません。
+.sp
+次の内容を含む、optionsという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -3324,7 +3324,7 @@
 .if n \{\
 .RE
 .\}
-ƤޤࡢpackagesȤ̾Υեޤ
+次の内容を含む、packagesという名前のファイルを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -3337,7 +3337,7 @@
 .if n \{\
 .RE
 .\}
-Τ褦ˡ\fIjavadoc\fRޥɤ¹Ԥޤ
+次のように、\fIjavadoc\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -3350,9 +3350,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, ѥѤե
-.RS 4
-եϥѥǤޤեΤ٤ƤΥե̾ϡ(\fIpath1\fR\fIpath2\fRǤϤʤ)Τ褦˸ߤκȥǥ쥯ȥŪȤʤޤ
+\fBExample 3\fR, パスを使用した引数ファイル
+.RS 4
+引数ファイルはパスを指定できますが、ファイル内のすべてのファイル名は、(\fIpath1\fRや\fIpath2\fRではなく)次のように現在の作業ディレクトリに相対的となります。
 .sp
 .if n \{\
 .RS 4
@@ -3365,9 +3365,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, ץ
-.RS 4
-ˡ\fIjavadoc\fRޥɤΥץФե˳Ǽ򼨤ޤĹǤΤǡ\fI\-bottom\fRץѤޤΤ褦ʥƥȰޤࡢbottomȤ̾ΥեǤޤ
+\fBExample 4\fR, オプション引数
+.RS 4
+次に、\fIjavadoc\fRコマンドのオプションに対する引数を引数ファイルに格納する例を示します。長い引数を指定できるので、\fI\-bottom\fRオプションを使用します。次のようなテキスト引数を含む、bottomという名前のファイルを作成できます。
 .sp
 .if n \{\
 .RS 4
@@ -3382,37 +3382,37 @@
 .if n \{\
 .RE
 .\}
-\fIjavadoc\fRޥɤ򼡤Τ褦˼¹Ԥޤ\fI javadoc \-bottom @bottom @packages\fR
-.sp
-\fI\-bottom\fRץեκǽ˴ޤơΤ褦\fIjavadoc\fRޥɤ¹Ԥ뤳ȤǤޤ\fIjavadoc @bottom @packages\fR
-.RE
-.SH "JAVADOCޥɤμ¹"
+\fIjavadoc\fRコマンドを次のように実行します。\fI javadoc \-bottom @bottom @packages\fR
+.sp
+\fI\-bottom\fRオプションを引数ファイルの最初に含めて、次のように\fIjavadoc\fRコマンドを実行することもできます。\fIjavadoc @bottom @packages\fR
+.RE
+.SH "JAVADOCコマンドの実行"
 .PP
-\fIjavadoc\fRޥɤΥ꡼ֹ\fIjavadoc \-J\-version\fRץǤޤϥȥ꡼ˤɸɥååȤΥ꡼ֹ椬ޤޤޤ\fI\-quiet\fRץ̵ˤǤޤ
+\fIjavadoc\fRコマンドのリリース番号は\fIjavadoc \-J\-version\fRオプションで特定できます。出力ストリームには標準ドックレットのリリース番号が含まれます。\fI\-quiet\fRオプションで無効にできます。
 .PP
-JavaǵҤ줿ץफ\fIjavadoc\fRޥɤưˤϸץޥƥå󥿥եѤޤΥ󥿥ե\fIcom\&.sun\&.tools\&.javadoc\&.Main\fRˤޤ(ޤ\fIjavadoc\fRޥɤϺǽǤ)ܺ٤ϡɸɥåå
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/standard\-doclet\&.html#runningprogrammatically)򻲾ȤƤ
+Java言語で記述されたプログラムから\fIjavadoc\fRコマンドを起動するには公開プログラマティック・インタフェースを使用します。このインタフェースは\fIcom\&.sun\&.tools\&.javadoc\&.Main\fRにあります(また\fIjavadoc\fRコマンドは再入可能です)。詳細は、標準ドックレット
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/standard\-doclet\&.html#runningprogrammatically)を参照してください。
 .PP
-μǤϡɸHTMLɥååȤƤӽФޤࡦɥååȤƤӽФˤϡ\fI\-doclet\fR\fI\-docletpath\fRץѤޤɥååȤγ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)򻲾ȤƤ
-.SS "ñ"
+次の手順では、標準HTMLドックレットを呼び出します。カスタム・ドックレットを呼び出すには、\fI\-doclet\fRおよび\fI\-docletpath\fRオプションを使用しますドックレットの概要
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/doclet/overview\&.html)を参照してください
+.SS "簡単な例"
 .PP
-\fIjavadoc\fRޥɤϡѥåΤФƼ¹Ԥ뤳Ȥ⡢ġΥեФƼ¹Ԥ뤳ȤǤޤƥѥå̾ϡ줾Υѥå̾бǥ쥯ȥ̾ޤ
+\fIjavadoc\fRコマンドは、パッケージ全体に対して実行することも、個々のソース・ファイルに対して実行することもできます。各パッケージ名は、それぞれのパッケージ名に対応するディレクトリ名を持ちます。
 .PP
-Ǥϡե/home/src/java/awt/*\&.javaˤޤǥ쥯ȥ/home/htmlǤ
-1İʾΥѥåΥɥȲ.PP
-ѥåɥȲˤϡΥѥåΥե򡢤ΥѥåƱ̾Υǥ쥯ȥ˳Ǽɬפޤ
+次の例では、ソース・ファイルは/home/src/java/awt/*\&.javaにあります。生成先ディレクトリは/home/htmlです。
+1つ以上のパッケージのドキュメント化.PP
+パッケージをドキュメント化するには、そのパッケージのソース・ファイルを、そのパッケージと同じ名前のディレクトリ内に格納する必要があります。
 .PP
-ѥå̾(\fIjava\&.awt\&.color\fRΤ褦˥ɥåȤǶڤ줿)ʣμ̻Ҥ鹽Ƥ硢³γƼ̻Ҥ̤Υ֥ǥ쥯ȥ(ava/awt/colorʤ)бƤɬפޤ
+パッケージ名が(\fIjava\&.awt\&.color\fRのようにドットで区切られた)複数の識別子から構成されている場合、後続の各識別子が下位のサブディレクトリ(ava/awt/colorなど)に対応している必要があります。
 .PP
-1ĤΥѥåΤʣΥե򡢰ۤʤˤ뤽Τ褦2ĤΥǥ쥯ȥꡦĥ꡼ʬƳǼ뤳ȤǤޤξ\fI\-sourcepath\fRˤäƤξξꤹɬפޤȤСsrc1/java/awt/colorsrc2/java/awt/color
+1つのパッケージのための複数のソース・ファイルを、異なる場所にあるそのような2つのディレクトリ・ツリーに分けて格納することもできます。ただし、その場合は\fI\-sourcepath\fRによってその両方の場所を指定する必要があります。たとえば、src1/java/awt/colorとsrc2/java/awt/color。
 .PP
-ǥ쥯ȥѹ(\fIcd\fRޥɤ)ޤ\fI\-sourcepath\fRץˤꡢ\fIjavadoc\fRޥɤ¹ԤǤޤξ򼨤ޤ
+ディレクトリの変更(\fIcd\fRコマンドを使用)または\fI\-sourcepath\fRオプションにより、\fIjavadoc\fRコマンドを実行できます。次の例で両方の選択肢を示します。
 .PP
-\fBExample 1\fR, 1İʾΥѥåƵŪ˼¹
-.RS 4
-Ǥ\fIjavadoc\fRޥɤǤդΥǥ쥯ȥ꤫¹ԤǤ褦ˡ\fI\-sourcepath\fRѤƵŪΤ\fI\-subpackages\fR
-(1\&.4οץ)Ѥޤϡjavaǥ쥯ȥΥ֥ѥå򤿤ɤޤ\fIjava\&.net\fR\fIjava\&.lang\fR롼Ȥ˻ĥѥåϽޤ\fIjava\&.lang\fRΥ֥ѥåǤ\fIjava\&.lang\&.ref\fRդƤޤ¾Υѥåĥ꡼ˤɤˤϡ\fIjava:javax:org\&.xml\&.sax\fRΤ褦ˡΥѥå̾\fI\-subpackages\fRΰɲäޤ
+\fBExample 1\fR, 1つ以上のパッケージから再帰的に実行
+.RS 4
+この例では\fIjavadoc\fRコマンドが任意のディレクトリから実行できるように、\fI\-sourcepath\fRを使用し、再帰的処理のために\fI\-subpackages\fR
+(1\&.4の新オプション)を使用します。これは、javaディレクトリのサブパッケージをたどりますが、\fIjava\&.net\fRと\fIjava\&.lang\fRをルートに持つパッケージは除外されます。\fIjava\&.lang\fRのサブパッケージである\fIjava\&.lang\&.ref\fRが除外される点に注意してください。また、他のパッケージ・ツリーを下方にたどるには、\fIjava:javax:org\&.xml\&.sax\fRのように、それらのパッケージの名前を\fI\-subpackages\fRの引数に追加します。
 .sp
 .if n \{\
 .RS 4
@@ -3425,9 +3425,9 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, 롼ȤؤΰưŪʥѥåμ¹
-.RS 4
-줿ѥåοƥǥ쥯ȥ˰ưޤˡɥȲ1İʾΥѥå̾ꤷ\fIjavadoc\fRޥɤ¹Ԥޤ
+\fBExample 2\fR, ルートへの移動および明示的なパッケージの実行
+.RS 4
+完全修飾されたパッケージの親ディレクトリに移動します。次に、ドキュメント化する1つ以上のパッケージの名前を指定して\fIjavadoc\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -3439,12 +3439,12 @@
 .if n \{\
 .RE
 .\}
-ޤ¾Υѥåĥ꡼ˤɤˤϡj\fIava:javax:org\&.xml\&.sax\fRΤ褦ˡΥѥå̾\fI\-subpackages\fRΰɲäޤ
+また、他のパッケージ・ツリーを下方にたどるには、j\fIava:javax:org\&.xml\&.sax\fRのように、それらのパッケージの名前を\fI\-subpackages\fRの引数に追加します。
 .RE
 .PP
-\fBExample 3\fR, 1ĤΥĥ꡼ŪʥѥåǤդΥǥ쥯ȥ꤫¹
-.RS 4
-ξ硢ߤΥǥ쥯ȥ꤬ɤǤϤޤ\fIjavadoc\fRޥɤ¹ԤǾ̥ѥåοƥǥ쥯ȥꤷ\fI\-sourcepath\fRץѤޤɥȲ1İʾΥѥå̾ꤷޤ
+\fBExample 3\fR, 1つのツリーの明示的なパッケージの任意のディレクトリから実行
+.RS 4
+この場合、現在のディレクトリがどこかは問題ではありません。\fIjavadoc\fRコマンドを実行し、最上位パッケージの親ディレクトリを指定して\fI\-sourcepath\fRオプションを使用します。ドキュメント化する1つ以上のパッケージの名前を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -3457,9 +3457,9 @@
 .\}
 .RE
 .PP
-\fBExample 4\fR, ʣΥĥ꡼ŪʥѥåǤդΥǥ쥯ȥ꤫¹
-.RS 4
-\fIjavadoc\fRޥɤ¹Ԥƥĥ꡼Υ롼ȤؤΥѥΥڤꥹȤꤷ\fI\-sourcepath\fRץѤޤɥȲ1İʾΥѥå̾ꤷޤꤷѥåΤ٤ƤΥե뤬1ĤΥ롼ȡǥ쥯ȥβ¸ߤɬפϤޤ󤬡ѥǻꤵ줿ΤɤǸĤɬפޤ
+\fBExample 4\fR, 複数のツリーの明示的なパッケージの任意のディレクトリから実行
+.RS 4
+\fIjavadoc\fRコマンドを実行し、各ツリーのルートへのパスのコロン区切りリストを指定して\fI\-sourcepath\fRオプションを使用します。ドキュメント化する1つ以上のパッケージの名前を指定します。指定したパッケージのすべてのソース・ファイルが、1つのルート・ディレクトリの下に存在する必要はありませんが、ソース・パスで指定された場所のどこかで見つかる必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -3470,16 +3470,16 @@
 .if n \{\
 .RE
 .\}
-٤ƤΥj\fIava\&.awt\fR\fIjava\&.awt\&.even\fRtѥå\fIpublic\fR\fIprotected\fR饹ȥ󥿥եˤĤơHTMLΥɥȤ졢ꤵ줿ǥ쥯ȥHTMLե뤬¸ޤ2İʾΥѥåƤΤǡɥȤϡѥåΥꥹȡ饹ΥꥹȡӥᥤΥ饹ڡȤ3ĤHTMLե졼ĤȤˤʤޤ
-.RE
-1İʾΥ饹ΥɥȲ.PP
-ޤ1İʾΥեϤơ\fIjavadoc\fRޥɤ¹Ԥ뤳ȤǤޤ\fIjavadoc\fRϡ2ĤˡΤ줫Ǽ¹ԤǤޤ1Ĥϥǥ쥯ȥѹˡ(\fIcd\fR)⤦1ĤϥեؤΥѥ˻ꤹˡǤХѥϡߤΥǥ쥯ȥȤޤեϤȤϡ\fI\-sourcepath\fRץ̵뤵ޤꥹ(*)Τ褦ʥޥɥ饤󡦥磻ɥɤѤȡ饹Υ롼פǤޤ
+すべてのケースでj\fIava\&.awt\fRおよび\fIjava\&.awt\&.even\fRtパッケージ内の\fIpublic\fRおよび\fIprotected\fRクラスとインタフェースについて、HTML形式のドキュメントが生成され、指定された生成先ディレクトリにHTMLファイルが保存されます。2つ以上のパッケージが生成されているので、ドキュメントは、パッケージのリスト、クラスのリスト、およびメインのクラス・ページという3つのHTMLフレームを持つことになります。
+.RE
+1つ以上のクラスのドキュメント化.PP
+また、1つ以上のソース・ファイルを渡して、\fIjavadoc\fRコマンドを実行することもできます。\fIjavadoc\fRは、次の2つの方法のいずれかで実行できます。1つはディレクトリを変更する方法(\fIcd\fRを使用)、もう1つはソース・ファイルへのパスを完全に指定する方法です。相対パスは、現在のディレクトリを起点とします。ソース・ファイルを渡すときは、\fI\-sourcepath\fRオプションは無視されます。アスタリスク(*)のようなコマンドライン・ワイルドカードを使用すると、クラスのグループを指定できます。
 .PP
-\fBExample 1\fR, ǥ쥯ȥѹ
-.RS 4
-ݻǥ쥯ȥѹޤˡɥȲ1İʾΥե̾ꤷ\fIjavadoc\fRޥɤ¹Ԥޤ
-.sp
-Ǥϡ\fIButton\fR饹\fICanvas\fR饹̾\fIGraphics\fRǻϤޤ륯饹ˤĤơHTMLΥɥȤޤѥå̾ǤϤʤե뤬\fIjavadoc\fRޥɤ˰ȤϤƤΤǡɥȤϡ饹ΥꥹȤȥᥤ󡦥ڡȤ2ĤΥե졼ĤȤˤʤޤ
+\fBExample 1\fR, ソース・ディレクトリに変更
+.RS 4
+ソースを保持するディレクトリに変更します。次に、ドキュメント化する1つ以上のソース・ファイルの名前を指定して\fIjavadoc\fRコマンドを実行します。
+.sp
+この例では、\fIButton\fRクラスと\fICanvas\fRクラス、および名前が\fIGraphics\fRで始まるクラスについて、HTML形式のドキュメントが生成されます。パッケージ名ではなくソース・ファイルが\fIjavadoc\fRコマンドに引数として渡されているので、ドキュメントは、クラスのリストとメイン・ページという2つのフレームを持つことになります。
 .sp
 .if n \{\
 .RS 4
@@ -3493,9 +3493,9 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ѥåΥ롼ȡǥ쥯ȥѹ
-.RS 4
-ϡƱ롼Ȥ̤Υ֥ѥåθġΥեɥȲΤΩޤѥåΥ롼ȡǥ쥯ȥ˰ܤꡢƥե򡢥롼ȤΥѥȤȤ˻ꤷޤ
+\fBExample 2\fR, パッケージのルート・ディレクトリに変更
+.RS 4
+これは、同じルートからの別のサブパッケージの個々のソース・ファイルをドキュメント化するのに役立ちます。パッケージのルート・ディレクトリに移り、各ソース・ファイルを、ルートからのパスとともに指定します。
 .sp
 .if n \{\
 .RS 4
@@ -3509,9 +3509,9 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, ǤդΥǥ쥯ȥ꤫ΥեΥɥȲ
-.RS 4
-ξ硢ߤΥǥ쥯ȥ꤬ɤǤϤޤ󡣥ɥȲ륽եؤХѥ(ޤϸߤΥǥ쥯ȥ꤫Хѥ)ꤷ\fIjavadoc\fRޥɤ¹Ԥޤ
+\fBExample 3\fR, 任意のディレクトリからのファイルのドキュメント化
+.RS 4
+この場合、現在のディレクトリがどこかは問題ではありません。ドキュメント化するソース・ファイルへの絶対パス(または現在のディレクトリからの相対パス)を指定して\fIjavadoc\fRコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -3524,8 +3524,8 @@
 .RE
 .\}
 .RE
-ѥåӥ饹ΥɥȲ.PP
-ѥåΤȸġΥ饹Ʊ˻ꤷƥɥȲ뤳ȤǤޤˡҤ2ĤȤ߹礻򼨤ޤ\fI\-sourcepath\fRץϡѥåؤΥѥФƤϻѤǤޤġΥ饹ؤΥѥФƤϻѤǤޤ
+パッケージおよびクラスのドキュメント化.PP
+パッケージ全体と個々のクラスを同時に指定してドキュメント化することもできます。次に、前述の2つの例を組み合せた例を示します。\fI\-sourcepath\fRオプションは、パッケージへのパスに対しては使用できますが、個々のクラスへのパスに対しては使用できません。
 .sp
 .if n \{\
 .RS 4
@@ -3537,14 +3537,14 @@
 .if n \{\
 .RE
 .\}
-.SS "ºݤ"
+.SS "実際の例"
 .PP
-Υޥɥ饤󤪤\fImakefile\fRС\fIjavadoc\fRޥɤJavaץåȥեAPIǼ¹ԤޤJava SE 1\&.21500Ĥpublicprotected饹ΥɥȤˤϡ180MBΥ꡼Ѥޤɤ⥪ץΰХѥѤƤ뤿ᡢǤդΥǥ쥯ȥ꤫Ʊ\fIjavadoc\fRޥɤ¹ԤǤޤ
-ޥɥ饤.PP
-ΥޥɤϡΥФĹǽޤ¤򤹤ˤϡޥɥ饤եѤޤޤϡ롦ץȤ򵭽Ҥޤ
+次のコマンドラインおよび\fImakefile\fRバージョンの\fIjavadoc\fRコマンドをJavaプラットフォームAPIで実行します。Java SE 1\&.2で約1500個のpublicおよびprotectedクラスのドキュメントを生成するには、180MBのメモリーを使用します。どちらの例もオプションの引数で絶対パスが使用されているため、任意のディレクトリから同じ\fIjavadoc\fRコマンドを実行できます。
+コマンドラインの例.PP
+次のコマンドは、一部のシェルに対して長すぎる可能性があります。この制限を回避するには、コマンドライン引数ファイルを使用します。または、シェル・スクリプトを記述します。
 .PP
-Ǥϡ\fIpackages\fRϽѥåޤ̾ǡ\fIjava\&.applet\fR
-\fIjava\&.lang\fRʤɤǤƥץΡŰǰϤޤ줿¦ˤϡʸǤޤ󡣤ȤС򥳥ԡɡڡȤϡ\fI\-bottom\fRץ󤫤ʸƤ
+この例では、\fIpackages\fRは処理するパッケージを含む名前で、\fIjava\&.applet\fR
+\fIjava\&.lang\fRなどです。各オプションの、一重引用符で囲まれた引数の内側には、改行文字を挿入できません。たとえば、この例をコピー・アンド・ペーストする場合は、\fI\-bottom\fRオプションから改行文字を削除してください。
 .sp
 .if n \{\
 .RS 4
@@ -3571,10 +3571,10 @@
 .if n \{\
 .RE
 .\}
-ץޥƥå󥿥ե.PP
-Javadoc Access APIǤϡץ¹ԤʤƤ⡢JavadocġJavaץꥱ󤫤ľܵưǤޤ
+プログラマティック・インタフェース.PP
+Javadoc Access APIでは、新しいプロセスを実行しなくても、JavadocツールをJavaアプリケーションから直接起動できます。
 .PP
-ȤСʸϥޥ\fIjavadoc \-d /home/html \-sourcepath /home/src \-subpackages java \-exclude java\&.net:java\&.lang com\&.example\fRƱǤ
+たとえば、次の文はコマンド\fIjavadoc \-d /home/html \-sourcepath /home/src \-subpackages java \-exclude java\&.net:java\&.lang com\&.example\fRと同等です。
 .sp
 .if n \{\
 .RS 4
@@ -3599,13 +3599,13 @@
 .RE
 .\}
 .PP
-\fIrun\fR᥽åɤκǽ3Ĥΰϡϡɸϡɸ२顼ȥ꡼ꤷޤ\fINull\fR\fISystem\&.in\fR\fISystem\&.out\fR\fISystem\&.err\fR줾ΥǥեͤǤ
-.SS "makefile"
+\fIrun\fRメソッドの最初の3つの引数は、入力、標準出力、および標準エラー・ストリームを指定します。\fINull\fRは\fISystem\&.in\fR、\fISystem\&.out\fRおよび\fISystem\&.err\fRそれぞれのデフォルト値です。
+.SS "makefileの例"
 .PP
-ǤϡGNU
-\fImakefile\fR򼨤ޤ\fImakefile\fRΰϡŰǰϤߤޤWindows
-\fImakefile\fRˤĤƤϡJavadoc FAQ\fImakefiles\fR˴ؤ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html#makefiles)򻲾ȤƤ
+ここでは、GNU
+\fImakefile\fRの例を示します。\fImakefile\fRの引数は、一重引用符で囲みます。Windows
+\fImakefile\fRの例については、Javadoc FAQの\fImakefiles\fRに関する項
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html#makefiles)を参照してください
 .sp
 .if n \{\
 .RS 4
@@ -3642,7 +3642,7 @@
 .if n \{\
 .RE
 .\}
-.SS ""
+.SS "注意"
 .sp
 .RS 4
 .ie n \{\
@@ -3652,7 +3652,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-windowtitle\fRץάȡ\fIjavadoc\fRޥɤˤäƥɥȡȥ뤬ɥȥ˥ԡޤ\fI\-windowtitle\fRץΥƥȤϡ\fI\-doctitle\fRץƱǤHTMLϴޤޤޤ󡣤ϡHTMLɥȥˤΤޤޤΥƥȤȤɽΤɤǤ
+\fI\-windowtitle\fRオプションを省略すると、\fIjavadoc\fRコマンドによってドキュメント・タイトルがウィンドウ・タイトルにコピーされます。\fI\-windowtitle\fRオプションのテキストは、\fI\-doctitle\fRオプションと同じですが、HTMLタグは含まれません。これは、HTMLタグが、ウィンドウ・タイトル内にそのままのテキストとして表示されるのを防ぐためです。
 .RE
 .sp
 .RS 4
@@ -3663,7 +3663,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-footer\fRץάȡ\fIjavadoc\fRޥɤˤäƥإåƥȤեå˥ԡޤ
+\fI\-footer\fRオプションを省略すると、\fIjavadoc\fRコマンドによってヘッダー・テキストがフッターにコピーされます。
 .RE
 .sp
 .RS 4
@@ -3674,9 +3674,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ǥɬפޤ󤬡\fI\-classpath\fR\fI\-link\fRפʥץǤ
-.RE
-.SH "Ūʥȥ֥륷塼ƥ"
+この例では必要ありませんが、\fI\-classpath\fRと\fI\-link\fRも重要なオプションです。
+.RE
+.SH "一般的なトラブルシューティング"
 .sp
 .RS 4
 .ie n \{\
@@ -3686,7 +3686,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjavadoc\fRޥɤͭʥ饹̾ޤեΤߤɤ߼ޤ\fIjavadoc\fRޥɤեƤɤ߼äƤʤϡ饹̾ͭǤ뤳Ȥǧޤեν򻲾ȤƤ
+\fIjavadoc\fRコマンドは有効なクラス名を含むファイルのみを読み取ります。\fIjavadoc\fRコマンドがファイルの内容を正しく読み取っていない場合は、クラス名が有効であることを確認します。ソース・ファイルの処理を参照してください。
 .RE
 .sp
 .RS 4
@@ -3697,27 +3697,27 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̤Զ礪ӥȥ֥륷塼ƥ󥰤ΥҥȤˤĤƤϡJavadoc FAQ
-(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html)򻲾ȤƤ
-.RE
-.SH "顼ȷٹ"
+共通の不具合およびトラブルシューティングのヒントについては、Javadoc FAQ
+(http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137483\&.html)を参照してください。
+.RE
+.SH "エラーと警告"
 .PP
-顼ӷٹåˤϡե̾(ɥơ󡦥ιԤǤϤʤ)ιֹ椬ޤޤޤ
+エラーおよび警告メッセージには、ファイル名と宣言行(ドキュメンテーション・コメント内の特定の行ではない)の行番号が含まれます。
 .PP
-ȤСå\fI֥顼: Class1\&.javaɤ߹ޤ\fRϡ\fIjavadoc\fRޥɤ\fIClass1\&.jav\fR\fIa\fR򸽺ߤΥǥ쥯ȥ˥ɤ褦ȤƤ뤳Ȥ̣ޤ饹̾ϤΥѥ(Фޤ)ɽޤ
-.SH "Ķ"
+たとえば、メッセージ\fI「エラー: Class1\&.javaを読み込めません」\fRは、\fIjavadoc\fRコマンドが\fIClass1\&.jav\fR\fIa\fRを現在のディレクトリにロードしようとしていることを意味します。クラス名はそのパス(絶対または相対)で表示されます。
+.SH "環境"
 .PP
 CLASSPATH
 .RS 4
-\fICLASSPATH\fRϡ\fIjavadoc\fRޥɤ桼饹եθФ˻Ѥѥ󶡤ĶѿǤδĶѿϡ\fI\-classpath\fRץˤäƥС饤ɤޤǥ쥯ȥϥߥ(Windowsξ)ޤϥ(Oracle Solarisξ)Ƕڤޤ
-.sp
-\fBWindows\fR:
+\fICLASSPATH\fRは、\fIjavadoc\fRコマンドがユーザー・クラス・ファイルの検出に使用するパスを提供する環境変数です。この環境変数は、\fI\-classpath\fRオプションによってオーバーライドされます。ディレクトリはセミコロン(Windowsの場合)またはコロン(Oracle Solarisの場合)で区切ります。
+.sp
+\fBWindowsの例\fR:
 \fI\&.;C:\eclasses;C:\ehome\ejava\eclasses\fR
 .sp
-\fBOracle Solaris\fR:
+\fBOracle Solarisの例\fR:
 \fI\&.:/home/classes:/usr/local/java/classes\fR
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -3773,7 +3773,7 @@
 .\}
 javap(1)
 .RE
-.SH "Ϣɥ"
+.SH "関連ドキュメント"
 .sp
 .RS 4
 .ie n \{\
@@ -3783,7 +3783,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JavadocƥΥ
+Javadocテクノロジ
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/javadoc/index\&.html)
 .RE
 .sp
@@ -3795,7 +3795,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饹θˡ
+クラスの検出方法
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/tools/findingclasses\&.html)
 .RE
 .sp
@@ -3807,7 +3807,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JavadocġǤDocȤεˡ
+JavadocツールでのDocコメントの記述方法
 (http://www\&.oracle\&.com/technetwork/java/javase/documentation/index\-137868\&.html)
 .RE
 .sp
@@ -3819,7 +3819,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-URL⡢Uniform Resource Locators
+URLメモ、Uniform Resource Locators
 (http://www\&.ietf\&.org/rfc/rfc1738\&.txt)
 .RE
 .sp
@@ -3831,7 +3831,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-HTMLɸࡢHTML Document Representation (41972654137321)
+HTML標準、HTML Document Representation (4197265および4137321)
 (http://www\&.w3\&.org/TR/REC\-html40/charset\&.html#h\-5\&.2\&.2)
 .RE
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javah.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javah.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javah
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javah" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "javah" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javah \- Java饹Cإåȥեޤ
-.SH ""
+javah \- JavaクラスからCヘッダーとソース・ファイルを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,102 +64,102 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIfully\-qualified\-class\-name\fR
 .RS 4
-CإåȥեѴ륯饹δ줿ꡣ
+Cヘッダーとソース・ファイルに変換されるクラスの完全修飾された場所。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjavah\fRޥɤϡͥƥ֡᥽åɤ뤿ɬפCإåȥեޤ줿إåȥեϡͥƥ֡ɤ饪֥ȤΥ󥹥ѿ򻲾Ȥ뤿CץˤäƻѤޤ\fI\&.h\fRեϡб륯饹Ȱפ֤\fIstruct\fRޤߤޤ\fIstruct\fRΥեɤϡ饹Υ󥹥ѿбޤ
+\fIjavah\fRコマンドは、ネイティブ・メソッドを実装するために必要なCヘッダーとソース・ファイルを生成します。作成されたヘッダーとソース・ファイルは、ネイティブ・ソース・コードからオブジェクトのインスタンス変数を参照するためにCプログラムによって使用されます。\fI\&.h\fRファイルは、対応するクラスと一致する配置を持つ\fIstruct\fR定義を含みます。\fIstruct\fRのフィールドは、クラスのインスタンス変数に対応します。
 .PP
-إåեȤ빽¤Τ̾ϥ饹̾ޤ\fIjavah\fRޥɤϤ륯饹ѥåˤ硢ѥå̾ϥإåե̾ȹ¤̾ξƬղäޤ(_)̾ζڤʸȤƻѤޤ
+ヘッダー・ファイルとその中で宣言される構造体の名前はクラスの名前から派生します。\fIjavah\fRコマンドに渡されるクラスがパッケージの中にある場合、パッケージ名はヘッダー・ファイル名と構造体名の両方の先頭に付加されます。下線(_)が名前の区切り文字として使用されます。
 .PP
-ǥեȤǤ\fIjavah\fRޥɤϡޥɥ饤˥ꥹȤƥ饹ΥإåեߤΥǥ쥯ȥ˥ե֤ޤեˤϡ\fI\-stubs\fRץѤƤ1ĤΥեˡꥹȤ줿٤ƤΥ饹η̤Ϣ뤹ˤϡ\fI\-o\fRץѤƤ
+デフォルトでは\fIjavah\fRコマンドは、コマンドラインにリストされる各クラスのヘッダー・ファイルを作成し、現在のディレクトリにファイルを置きます。ソース・ファイルを作成するには、\fI\-stubs\fRオプションを使用してください。1つのファイルの中に、リストされたすべてのクラスの結果を連結するには、\fI\-o\fRオプションを使用してください。
 .PP
-Java Native Interface (JNI)ϥإåޤϥ֡եɬפȤޤ\fIjavah\fRޥɤϰ³JNIΥͥƥ֡᥽åɤɬפʥͥƥ֡᥽åɴؿץȥפ˻ѤǤޤ\fIjavah\fRޥɤϥǥեȤJNIνϤη̤\fI\&.h\fRե˳Ǽޤ
-.SH "ץ"
+Java Native Interface (JNI)はヘッダー情報またはスタブ・ファイルを必要としません。\fIjavah\fRコマンドは引き続きJNI形式のネイティブ・メソッドに必要なネイティブ・メソッド関数プロトタイプの生成に使用できます。\fIjavah\fRコマンドはデフォルトでJNI形式の出力を生成し、その結果を\fI\&.h\fRファイルに格納します。
+.SH "オプション"
 .PP
 \-o \fIoutputfile\fR
 .RS 4
-ޥɥ饤˥ꥹȤ줿٤ƤΥ饹Фơ̤ΥإåޤϥեϢ뤷ƽϥե˳Ǽޤ\fI\-o\fRޤ\fI\-d\fRΤɤ餫Τ߻ѤǤޤ
+コマンドラインにリストされたすべてのクラスに対して、結果のヘッダーまたはソース・ファイルを連結して出力ファイルに格納します。\fI\-o\fRまたは\fI\-d\fRのどちらかのみ使用できます。
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-\fIjavah\fRإåեޤϥ֡ե¸롢ǥ쥯ȥꤷޤ\fI\-d\fRޤ\fI\-o\fRΤɤ餫Τ߻ѤǤޤ
+\fIjavah\fRがヘッダー・ファイルまたはスタブ・ファイルを保存する、ディレクトリを設定します。\fI\-d\fRまたは\fI\-o\fRのどちらかのみ使用できます。
 .RE
 .PP
 \-stubs
 .RS 4
-\fIjavah\fRޥɤJava֥ȡե뤫Cޤ
+\fIjavah\fRコマンドが、Javaオブジェクト・ファイルからC宣言を生成します。
 .RE
 .PP
 \-verbose
 .RS 4
-ܺٽϤꤷեξ֤˴ؤå\fIjavah\fRޥɤ\fIɸ\fR˽Ϥޤ
+詳細出力を指定し、作成ファイルの状態に関するメッセージを、\fIjavah\fRコマンドが\fI標準出力\fRに出力します。
 .RE
 .PP
 \-help
 .RS 4
-\fIjavah\fRλˡˤĤƤΥإסåϤޤ
+\fIjavah\fRの使用方法についてのヘルプ・メッセージを出力します。
 .RE
 .PP
 \-version
 .RS 4
-\fIjavah\fRޥɤΥ꡼Ϥޤ
+\fIjavah\fRコマンドのリリース情報を出力します。
 .RE
 .PP
 \-jni
 .RS 4
-JNIΥͥƥ֡᥽åɵǽץȥפޤϥե\fIjavah\fRޥɤޤɸϤǤ뤿ᡢ\fI\-jni\fRλѤϥץǤ
+JNI形式のネイティブ・メソッド機能プロトタイプを含む出力ファイルを、\fIjavah\fRコマンドが作成します。これは標準出力であるため、\fI\-jni\fRの使用はオプションです。
 .RE
 .PP
 \-classpath \fIpath\fR
 .RS 4
-饹õ\fIjavah\fRޥɤѤѥꤷޤǥեȤޤ\fICLASSPATH\fRĶѿ򥪡С饤ɤޤǥ쥯ȥOracle SolarisξϥǡWindowsξϥߥǶڤޤѥΰŪʷϼΤ褦ˤʤޤ
+クラスを探すために\fIjavah\fRコマンドが使用するパスを指定します。デフォルトまたは\fICLASSPATH\fR環境変数の設定をオーバーライドします。ディレクトリはOracle Solarisの場合はコロンで、Windowsの場合はセミコロンで区切られます。パスの一般的な形式は次のようになります。
 .sp
-\fBOracle Solaris\fRξ:
+\fBOracle Solaris\fRの場合:
 .sp
 \&.:\fIyour\-path\fR
 .sp
-:
+例:
 \fI\&.:/home/avh/classes:/usr/local/java/classes\fR
 .sp
-\fBWindows\fRξ:
+\fBWindows\fRの場合:
 .sp
 \&.;\fIyour\-path\fR
 .sp
-:
+例:
 \fI\&.;C:\eusers\edac\eclasses;C:\etools\ejava\eclasses\fR
 .sp
-ص塢*Υ١̾ޤ९饹ѥǤϡ\fI\&.jar\fRޤ\fI\&.JAR\fRĥҤ˻ĥǥ쥯ȥΤ٤ƤΥեΥꥹȤꤹΤƱȤߤʤޤ
+便宜上、*のベース名を含むクラス・パス要素は、\fI\&.jar\fRまたは\fI\&.JAR\fRを拡張子に持つディレクトリ内のすべてのファイルのリストを指定するのと同等とみなされます。
 .sp
-ȤСǥ쥯ȥ\fImydir\fR\fIa\&.jar\fR\fIb\&.JAR\fRޤޤƤ硢饹ѥ\fImydir/*\fR\fIA\fR\fI\&.jar:b\&.JAR\fRŸޤJARեν֤̤ȤʤޤΥꥹȤˤϡեޤᡢꤵ줿ǥ쥯ȥΤ٤ƤJARե뤬ޤޤޤ*ʤ륯饹ѥȥϡߤΥǥ쥯ȥΤ٤ƤJARեΥꥹȤŸޤ\fICLASSPATH\fRĶѿ⡢ˤƱͤŸޤ饹ѥΥ磻ɥɤŸϡJavaۥޥ(JVM)γ˹ԤޤJavaץϡĶ䤤礻ŸƤʤ磻ɥɤ򻲾Ȥޤ󡣤ȤС\fISystem\&.getenv("CLASSPATH")\fR򥳡뤷䤤礻Ǥ
+たとえば、ディレクトリ\fImydir\fRに\fIa\&.jar\fRと\fIb\&.JAR\fRが含まれている場合、クラス・パス要素\fImydir/*\fRは\fIA\fR\fI\&.jar:b\&.JAR\fRに展開されますが、JARファイルの順番は未指定となります。このリストには、隠しファイルも含め、指定されたディレクトリ内のすべてのJARファイルが含まれます。*からなるクラス・パス・エントリは、現在のディレクトリ内のすべてのJARファイルのリストに展開されます。\fICLASSPATH\fR環境変数も、定義時には同様に展開されます。クラス・パスのワイルドカードの展開は、Java仮想マシン(JVM)の開始前に行われます。Javaプログラムは、環境を問い合せる場合を除き、展開されていないワイルドカードを参照しません。たとえば、\fISystem\&.getenv("CLASSPATH")\fRをコールして問い合せる場合です。
 .RE
 .PP
 \-bootclasspath \fIpath\fR
 .RS 4
-֡ȥȥåס饹ɤѥꤷޤ֡ȥȥåס饹ϡǥեȤǤ\fIjre\elib\ert\&.jar\fR¾ΤĤJARեˤ롢Javaץåȥե륯饹Ǥ
+ブートストラップ・クラスをロードするパスを指定します。ブートストラップ・クラスは、デフォルトでは\fIjre\elib\ert\&.jar\fRおよび他のいくつかのJARファイルにある、コアJavaプラットフォームを実装するクラスです。
 .RE
 .PP
 \-old
 .RS 4
-ŤJDK 1\&.0Υإåե褦˻ꤷޤ
+古いJDK 1\&.0形式のヘッダー・ファイルを生成するように指定します。
 .RE
 .PP
 \-force
 .RS 4
-ϥե뤬˽񤭹ޤ褦˻ꤷޤ
+出力ファイルが常に書き込まれるように指定します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javap.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javap.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: javap
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "javap" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "javap" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-javap \- 1İʾΥ饹եե֥뤷ޤ
-.SH ""
+javap \- 1つ以上のクラス・ファイルを逆アセンブルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,51 +64,51 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclassfile\fR
 .RS 4
-νоݤȤʤ롢Ƕڤä1İʾΥ饹(DocFooter\&.classʤ)饹ѥǸФǤ륯饹򡢥ե̾ޤURL(\fIfile:///home/user/myproject/src/DocFooter\&.class\fRʤ)ǻǤޤ
+注釈の処理対象となる、空白で区切った1つ以上のクラス(DocFooter\&.classなど)。クラス・パスで検出できるクラスを、ファイル名またはURL(\fIfile:///home/user/myproject/src/DocFooter\&.class\fRなど)で指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjavap\fRޥɤϡ1ĤޤʣΥ饹եե֥뤷ޤνϤϻꤹ륪ץˤۤʤޤץꤷʤ硢\fIjavap\fRޥɤϡΥѥåϤ줿饹protectedpublicΥեɤȥ᥽åɤϤޤ\fIjavap\fRޥɤϤνϤ\fIɸ\fRɽޤ
-.SH "ץ"
+\fIjavap\fRコマンドは、1つまたは複数のクラス・ファイルを逆アセンブルします。その出力は指定するオプションにより異なります。オプションを指定しない場合、\fIjavap\fRコマンドは、そのパッケージ、渡されたクラスのprotectedおよびpublicのフィールドとメソッドを出力します。\fIjavap\fRコマンドはその出力を\fI標準出力\fRに表示します。
+.SH "オプション"
 .PP
 \-help, \-\-help, \-?
 .RS 4
-\fIjavap\fRޥɤˤĤƤΥإסåϤޤ
+\fIjavap\fRコマンドについてのヘルプ・メッセージを出力します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-l
 .RS 4
-ֹȥѿɽϤޤ
+行番号とローカル変数表を出力します。
 .RE
 .PP
 \-public
 .RS 4
-public饹ӥСΤɽޤ
+publicクラスおよびメンバーのみ表示します。
 .RE
 .PP
 \-protected
 .RS 4
-protectedpublicΥ饹ȥСΤߤɽޤ
+protectedおよびpublicのクラスとメンバーのみを表示します。
 .RE
 .PP
 \-private, \-p
 .RS 4
-٤ƤΥ饹ȥСɽޤ
+すべてのクラスとメンバーを表示します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤵ줿ץJVMϤޤ򼨤ޤ
+指定されたオプションをJVMに渡します。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -120,51 +120,51 @@
 .if n \{\
 .RE
 .\}
-JVMץξܺ٤ϡޥɤΥޥ˥奢򻲾ȤƤ
+JVMオプションの詳細は、コマンドのマニュアルを参照してください。
 .RE
 .PP
 \-s
 .RS 4
-η˥Ϥޤ
+内部の型シグニチャを出力します。
 .RE
 .PP
 \-sysinfo
 .RS 4
-Υ饹Υƥ(ѥաMD5ϥå)ɽޤ
+処理中のクラスのシステム情報(パス、サイズ、日付、MD5ハッシュ)を表示します。
 .RE
 .PP
 \-constants
 .RS 4
-\fIstatic final\fRɽޤ
+\fIstatic final\fR定数を表示します。
 .RE
 .PP
 \-c
 .RS 4
-饹γƥ᥽åɤΤ˵ե֥뤵륳ɡʤJavaХȥɤʤ̿ɽޤ
+クラスの各メソッドのために逆アセンブルされるコード、すなわちJavaバイトコードからなる命令を表示します。
 .RE
 .PP
 \-verbose
 .RS 4
-᥽åɤΥålocalsargumentsοϤޤ
+メソッドのスタック・サイズ、localsとargumentsの数を出力します。
 .RE
 .PP
 \-classpath \fIpath\fR
 .RS 4
-饹õ\fIjavap\fRޥɤѤѥꤷޤǥեȤޤ\fICLASSPATH\fRĶѿ򥪡С饤ɤޤ
+クラスを探すために\fIjavap\fRコマンドが使用するパスを指定します。デフォルトまたは\fICLASSPATH\fR環境変数の設定をオーバーライドします。
 .RE
 .PP
 \-bootclasspath \fIpath\fR
 .RS 4
-֡ȥȥåס饹ɤѥꤷޤ֡ȥȥåס饹ϡǥեȤǤ\fIjre/lib/rt\&.jar\fR¾ΤĤJARեˤ롢Javaץåȥե륯饹Ǥ
+ブートストラップ・クラスをロードするパスを指定します。ブートストラップ・クラスは、デフォルトでは\fIjre/lib/rt\&.jar\fRおよび他のいくつかのJARファイルにある、コアJavaプラットフォームを実装するクラスです。
 .RE
 .PP
 \-extdir \fIdirs\fR
 .RS 4
-󥹥ȡ뤵줿ĥǽ򸡺򥪡С饤ɤޤĥǽΥǥեȰ֤\fIjava\&.ext\&.dirs\fRǤ
+インストールされた拡張機能を検索する場所をオーバーライドします。拡張機能のデフォルト位置は\fIjava\&.ext\&.dirs\fRです。
 .RE
-.SH ""
+.SH "例"
 .PP
-\fIDocFooter\fR饹򥳥ѥ뤷ޤ
+次の\fIDocFooter\fRクラスをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -193,7 +193,7 @@
 .RE
 .\}
 .PP
-\fIjavap DocFooter\&.class\fRޥɤνϤϼޤ
+\fIjavap DocFooter\&.class\fRコマンドからの出力は次を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -212,7 +212,7 @@
 .RE
 .\}
 .PP
-\fIjavap \-c DocFooter\&.class\fRޥɤνϤϼޤ
+\fIjavap \-c DocFooter\&.class\fRコマンドからの出力は次を生成します。
 .sp
 .if n \{\
 .RS 4
@@ -283,7 +283,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jcmd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jcmd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jcmd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jcmd" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jcmd" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jcmd \- ¹Javaۥޥ(JVM)˿ǥޥɡꥯȤޤ
-.SH ""
+jcmd \- 実行中のJava仮想マシン(JVM)に診断コマンド・リクエストを送信します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -91,53 +91,53 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "説明"
 .PP
-\fIjcmd\fR桼ƥƥϡJVM˿ǥޥɡꥯȤ뤿˻ѤޤJVMƯƤΤƱޥǻѤJVMεư˻ѤΤƱͭ桼ӥ롼׼̻ҤäƤɬפޤ
+\fIjcmd\fRユーティリティは、JVMに診断コマンド・リクエストを送信するために使用されます。これはJVMが稼働しているのと同じマシンで使用し、JVMの起動に使用したものと同じ有効ユーザーおよびグループ識別子を持っている必要があります。
 .PP
-\fB:\fR
-⡼ȡޥ󤫤顢ޤ̤μ̻Ҥǿǥޥɤưˤϡ\fIcom\&.sun\&.management\&.DiagnosticCommandMBean\fR󥿥եѤǤޤ\fIDiagnosticCommandMBean\fR󥿥եξܺ٤ϡhttp://download\&.java\&.net/jdk8/docs/jre/api/management/extension/com/sun/management/DiagnosticCommandMBean\&.htmlˤAPIɥȤ򻲾ȤƤ
+\fB注意:\fR
+リモート・マシンから、または別の識別子で診断コマンドを起動するには、\fIcom\&.sun\&.management\&.DiagnosticCommandMBean\fRインタフェースを使用できます。\fIDiagnosticCommandMBean\fRインタフェースの詳細は、http://download\&.java\&.net/jdk8/docs/jre/api/management/extension/com/sun/management/DiagnosticCommandMBean\&.htmlにあるAPIドキュメントを参照してください。
 .PP
-\fIjcmd\fRʤޤ\fI\- l\fRץꤷƼ¹Ԥϡ¹Javaץ̻ҤΥꥹȤᥤ󡦥饹ӥץεư˻Ѥ줿ޥɥ饤ȤȤ˽Ϥޤ\fI\-h\fRޤ\fI\-help\fRץꤷ\fIjcmd\fR¹ԤȡġΥإסåϤޤ
+\fIjcmd\fRを引数なしまたは\fI\- l\fRオプションを指定して実行した場合は、実行中のJavaプロセス識別子のリストが、メイン・クラスおよびプロセスの起動に使用されたコマンドライン引数とともに出力されます。\fI\-h\fRまたは\fI\-help\fRオプションを指定して\fIjcmd\fRを実行すると、ツールのヘルプ・メッセージが出力されます。
 .PP
-ץ̻(\fIpid\fR)ޤϥᥤ󡦥饹(\fImain\-class\fR)ǽΰȤƻꤷ硢\fIjcmd\fRϡ̻ҤꤷJavaץˡᥤ󡦥饹̾ꤷϤ٤ƤJavaץ˿ǥޥɡꥯȤޤץ̻ҤȤ\fI0\fRꤷơ٤ƤλѲǽJavaץ˿ǥޥɡꥯȤ뤳ȤǤޤǥޥɡꥯȤȤơΤ줫Ѥޤ
+プロセス識別子(\fIpid\fR)またはメイン・クラス(\fImain\-class\fR)を最初の引数として指定した場合、\fIjcmd\fRは、識別子を指定した場合はJavaプロセスに、メイン・クラスの名前を指定した場合はすべてのJavaプロセスに診断コマンド・リクエストを送信します。プロセス識別子として\fI0\fRを指定して、すべての使用可能なJavaプロセスに診断コマンド・リクエストを送信することもできます。診断コマンド・リクエストとして、次のいずれかを使用します。
 .PP
 Perfcounter\&.print
 .RS 4
-ꤷJavaץǻѲǽʥѥեޥ󥹡󥿤Ϥޤѥեޥ󥹡󥿤ΥꥹȤJavaץˤäưۤʤ礬ޤ
+指定したJavaプロセスで使用可能なパフォーマンス・カウンタが出力されます。パフォーマンス・カウンタのリストはJavaプロセスによって異なる場合があります。
 .RE
 .PP
 \-f \fIfilename\fR
 .RS 4
-ǥޥɤɤ߼ꡢꤷJavaץե̾\fI\-f\fRץǤΤ߻Ѥޤեγƥޥɤϡ1ԤǵҤɬפޤֹ浭(\fI#\fR)ǻϤޤԤ̵뤵ޤ٤ƤιԤɤ߼뤫\fIstop\fRɤޤԤɤ߼ȡեνλޤ
+診断コマンドを読み取り、指定したJavaプロセスに送信するファイルの名前。\fI\-f\fRオプションでのみ使用します。ファイル内の各コマンドは、1行で記述する必要があります。番号記号(\fI#\fR)で始まる行は無視されます。すべての行が読み取られるか、\fIstop\fRキーワードを含む行が読み取られると、ファイルの処理が終了します。
 .RE
 .PP
 \fIcommand\fR [\fIarguments\fR]
 .RS 4
-ꤵ줿Javaץ륳ޥɡꤷץǻѤǤǥޥɤΥꥹȤϡΥץФ\fIhelp\fRޥɤɽޤƿǥޥɤȼΰåȤޤޥɤʸӻѲǽʰΥꥹȤɽˤϡ\fIhelp\fRޥɤΰȤƥޥ̾Ѥޤ
+指定されたJavaプロセスに送信するコマンド。指定したプロセスで使用できる診断コマンドのリストは、このプロセスに対して\fIhelp\fRコマンドを送信すれば表示されます。各診断コマンドに独自の引数セットがあります。コマンドの説明、構文および使用可能な引数のリストを表示するには、\fIhelp\fRコマンドの引数としてコマンド名を使用します。
 .sp
-\fB:\fR
-˥ڡޤޤƤϡŰޤŰ(\fI\*(Aq\fRޤ\fI"\fR)ǰϤɬפޤäơڥ졼ƥ󥰡ƥࡦ뤬ʤ褦ˡХåå(\fI\e\fR)ǰŰޤŰ򥨥פɬפޤޤϡΰŰǰϤǤ顢ŰǰϤळȤǤޤ(ޤŰǰϤǤ顢ŰǰϤ)
+\fB注意:\fR
+引数にスペースが含まれている場合は、一重引用符または二重引用符(\fI\*(Aq\fRまたは\fI"\fR)で囲む必要があります。加えて、オペレーティング・システム・シェルが引用符を処理しないように、バックスラッシュ(\fI\e\fR)で一重引用符または二重引用符をエスケープする必要があります。または、これらの引数を一重引用符で囲んでから、二重引用符で囲むこともできます(または二重引用符で囲んでから、一重引用符で囲む)。
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
-ƥץϸߤ¾ŪǤ
+各オプションは互いに排他的です。
 .PP
 \-f \fIfilename\fR
 .RS 4
-ꤵ줿ե뤫饳ޥɤɤ߼ޤΥץϡǽΰȤƥץ̻Ҥޤϥᥤ󡦥饹ꤹˤΤ߻ѤǤޤեγƥޥɤϡ1ԤǵҤɬפޤֹ浭(\fI#\fR)ǻϤޤԤ̵뤵ޤ٤ƤιԤɤ߼뤫\fIstop\fRɤޤԤɤ߼ȡեνλޤ
+指定されたファイルからコマンドを読み取ります。このオプションは、最初の引数としてプロセス識別子またはメイン・クラスを指定する場合にのみ使用できます。ファイル内の各コマンドは、1行で記述する必要があります。番号記号(\fI#\fR)で始まる行は無視されます。すべての行が読み取られるか、\fIstop\fRキーワードを含む行が読み取られると、ファイルの処理が終了します。
 .RE
 .PP
 \-h, \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-l
 .RS 4
-¹Javaץ̻ҤΥꥹȤᥤ󡦥饹ӥޥɥ饤ȤȤ˽Ϥޤ
+実行中のJavaプロセス識別子のリストをメイン・クラスおよびコマンドライン引数とともに出力します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jconsole
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaȥ֥륷塼ƥ󥰡ץե󥰡˥󥰤Ӵġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaトラブルシューティング、プロファイリング、モニタリングおよび管理ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jconsole" "1" "2013ǯ1121" "JDK 8" "Javaȥ֥륷塼ƥ󥰡ץե󥰡˥"
+.TH "jconsole" "1" "2013年11月21日" "JDK 8" "Javaトラブルシューティング、プロファイリング、モニタリン"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jconsole \- Javaץꥱƻ뤪Ӵ뤿Υե롦󥽡򳫻Ϥޤ
-.SH ""
+jconsole \- Javaアプリケーションを監視および管理するためのグラフィカル・コンソールを開始します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,56 +64,56 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 connection = \fIpid\fR | \fIhost\fR:\fIport\fR | \fIjmxURL\fR
 .RS 4
-\fIpid\fRͤϥJavaۥޥ(JVM)ΥץIDǤJVM\fIjconsole\fRޥɤ¹ԤƤ桼IDƱ桼IDǼ¹Ԥɬפޤ\fIhost:port\fRͤJVMưƤۥȡƥ̾ȡJVMϤȤ˥ƥࡦץѥƥ\fIcom\&.sun\&.management\&.jmxremote\&.port\fRǻꤷݡֹǤ\fIjmxUrl\fRͤϡJMXServiceURLǵҤƤ롢³JMXȤΥɥ쥹Ǥ
+\fIpid\fR値はローカルのJava仮想マシン(JVM)のプロセスIDです。JVMは\fIjconsole\fRコマンドを実行しているユーザーIDと同じユーザーIDで実行する必要があります。\fIhost:port\fR値はJVMが動作しているホスト・システムの名前と、JVMが開始したときにシステム・プロパティ\fIcom\&.sun\&.management\&.jmxremote\&.port\fRで指定したポート番号です。\fIjmxUrl\fR値は、JMXServiceURLで記述されている、接続されるJMXエージェントのアドレスです。
 .sp
-\fIconnection\fRѥ᡼ξܺ٤ϡJMXƥΥѤ˥󥰤Ӵ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/agent\&.html)򻲾ȤƤ
+\fIconnection\fRパラメータの詳細は、JMXテクノロジを使用したモニタリングおよび管理
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/agent\&.html)を参照してください
 .sp
-\fIJMXServiceURL\fR饹(
-http://docs\&.oracle\&.com/javase/8/docs/api/javax/management/remote/JMXServiceURL\&.html)⻲ȤƤ
+\fIJMXServiceURL\fRクラスの説明(
+http://docs\&.oracle\&.com/javase/8/docs/api/javax/management/remote/JMXServiceURL\&.html)も参照してください
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjconsole\fRޥɤϡ롦ޥޤϥ⡼ȡޥJavaץꥱȲۥޥδƻȴԤե롦󥽡롦ġưޤ
+\fIjconsole\fRコマンドは、ローカル・マシンまたはリモート・マシン上のJavaアプリケーションと仮想マシンの監視と管理を行うグラフィカル・コンソール・ツールを起動します。
 .PP
-WindowsǤϡ\fIjconsole\fRޥɤϥ󥽡롦ɥȴϢդƤޤ󡣤\fIjconsole\fRޥɤԤȡ顼򼨤ܥåɽޤ
-.SH "ץ"
+Windows上では、\fIjconsole\fRコマンドはコンソール・ウィンドウと関連付けられていません。ただし、\fIjconsole\fRコマンドが失敗すると、エラー情報を示すダイアログ・ボックスが表示されます。
+.SH "オプション"
 .PP
 \-interval\fI=n\fR
 .RS 4
-ֳ֤\fIn\fRäꤷޤ(ǥեȤ4)
+更新間隔を\fIn\fR秒に設定します(デフォルトは4秒)。
 .RE
 .PP
 \-notile
 .RS 4
-ǽ˥ɥ򥿥󥰤ޤ(ʣ³ξ)
+最初にウィンドウをタイリングしません(複数接続の場合)。
 .RE
 .PP
 \-pluginpath \fIplugins\fR
 .RS 4
-\fIJConsole\fRץ饰򸡺ǥ쥯ȥޤJARեΥꥹȤꤷޤ\fIplugins\fRѥˤ\fIMETA\-INF/services/com\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fRȤ̾ΥץХեޤǤɬפꡢˤϥץ饰󤴤Ȥ1ԤޤޤƤޤιԤ\fIcom\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fR饹Ƥ륯饹δ饹̾ꤷޤ
+\fIJConsole\fRプラグインを検索するディレクトリまたはJARファイルのリストを指定します。\fIplugins\fRパスには\fIMETA\-INF/services/com\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fRという名前のプロバイダ構成ファイルを含んでいる必要があり、これにはプラグインごとに1行が含まれています。その行は\fIcom\&.sun\&.tools\&.jconsole\&.JConsolePlugin\fRクラスを実装しているクラスの完全修飾クラス名を指定します。
 .RE
 .PP
 \-version
 .RS 4
-꡼ɽƽλޤ
+リリース情報を表示して終了します。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjconsole\fRޥɤ¹ԤJVM\fIflag\fRϤޤ
+\fIjconsole\fRコマンドを実行したJVMに\fIflag\fRを渡します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -123,7 +123,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JConsoleλ
+JConsoleの使用
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/jconsole\&.html)
 .RE
 .sp
@@ -135,7 +135,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JMXƥΥѤ˥󥰤Ӵ
+JMXテクノロジを使用したモニタリングおよび管理
 
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/management/agent\&.html)
 .RE
@@ -148,7 +148,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIJMXServiceURL\fR饹(
+\fIJMXServiceURL\fRクラスの説明(
 http://docs\&.oracle\&.com/javase/8/docs/api/javax/management/remote/JMXServiceURL\&.html)
 .RE
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jdb
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jdb" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jdb" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jdb \- JavaץåȥեࡦץԶ򸡽Фӽޤ
-.SH ""
+jdb \- Javaプラットフォーム・プログラムの不具合を検出および修正します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,25 +64,25 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclass\fRname
 .RS 4
-ǥХåᥤ󡦥饹̾
+デバッグするメイン・クラスの名前。
 .RE
 .PP
 \fIarguments\fR
 .RS 4
-class\fImain()\fR᥽åɤϤ
+classの\fImain()\fRメソッドに渡す引数。
 .RE
-.SH ""
+.SH "説明"
 .PP
-JavaǥХå(JDB)ϡJava饹Ѥδñʥޥɥ饤󡦥ǥХåǤ\fIjdb\fRޥɤȤΥץJDBƤӽФޤ\fIjdb\fRޥɤϡJDBA (Java Platform Debugger Architecture)Ū˼¹Ԥޤϥ⡼ȤJavaۥޥ(JVM)θȥǥХåԤȤǤޤJava Platform Debugger Architecture (JDBA)
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)򻲾ȤƤ
-.SS "JDBåγ"
+Javaデバッガ(JDB)は、Javaクラス用の簡単なコマンドライン・デバッガです。\fIjdb\fRコマンドとそのオプションはJDBを呼び出します。\fIjdb\fRコマンドは、JDBA (Java Platform Debugger Architecture)を視覚的に実行し、ローカルまたはリモートのJava仮想マシン(JVM)の検査とデバッグを行うことができます。Java Platform Debugger Architecture (JDBA)
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)を参照してください。
+.SS "JDBセッションの開始"
 .PP
-JDBå򳫻Ϥˤ͡ˡޤǤˤ˻ѤΤϡǥХå륢ץꥱΥᥤ󡦥饹ѤơJDB鿷JVMưˡǤޥɥ饤ǡ\fIjava\fRޥɤΤ\fIjdb\fRޥɤϤޤȤСץꥱΥᥤ󡦥饹\fIMyClass\fRξϡJDBĶǥǥХåȤ˼ΥޥɤѤޤ
+JDBセッションを開始するには様々な方法があります。最も頻繁に使用されるのは、デバッグするアプリケーションのメイン・クラスを使用して、JDBから新しいJVMを起動する方法です。コマンドラインで、\fIjava\fRコマンドのかわりに\fIjdb\fRコマンドを入力します。たとえば、アプリケーションのメイン・クラスが\fIMyClass\fRの場合は、JDB環境でデバッグするときに次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -94,9 +94,9 @@
 .RE
 .\}
 .PP
-ˡǵưȡ\fIjdb\fRޥɤϡꤵ줿ѥ᡼Ѥ2ܤJVMƤӽФޤˡꤵ줿饹ɤơ饹κǽ̿¹ԤJVMߤޤ
+この方法で起動すると、\fIjdb\fRコマンドは、指定されたパラメータを使用して2つ目のJVMを呼び出します。次に、指定されたクラスをロードして、クラスの最初の命令を実行する前にJVMを停止させます。
 .PP
-\fIjdb\fRޥɤΤ⤦1ĤλˡϡǤ˼¹JVMjdb³뤳ȤǤ\fIjdb\fRޥɤ³VM򡢤μ¹˵ư뤿ιʸ򼡤˼ޤϡץǥХåѥ饤֥ɤ³μꤷޤ
+\fIjdb\fRコマンドのもう1つの使用方法は、すでに実行中のJVMにjdbを接続することです。\fIjdb\fRコマンドが接続するVMを、その実行中に起動するための構文を次に示します。これは、インプロセス・デバッグ用ライブラリをロードし、接続の種類を指定します。
 .sp
 .if n \{\
 .RS 4
@@ -108,7 +108,7 @@
 .RE
 .\}
 .PP
-ΥޥɤѤơ\fIjdb\fRޥɤJVM³Ǥޤ
+次のコマンドを使用して、\fIjdb\fRコマンドをJVMに接続できます。
 .sp
 .if n \{\
 .RS 4
@@ -120,36 +120,36 @@
 .RE
 .\}
 .PP
-ξ硢\fIjdb\fRޥɤϿJVMư뤫˴¸JVM³뤿ᡢ\fIjdb\fRޥɥ饤\fIMyClass\fRϻꤷޤ
+この場合、\fIjdb\fRコマンドは新しいJVMを起動するかわりに既存のJVMに接続されるため、\fIjdb\fRコマンドラインに\fIMyClass\fR引数は指定しません。
 .PP
-ǥХåJVM³ˤ¾ˤ͡ˡꡢ٤\fIjdb\fRޥɤǥݡȤƤޤ³ץˤĤƤϡJava Platform Debugger ArchitectureΥɥȤ򻲾ȤƤ
-.SS "jdbޥ"
+デバッガをJVMに接続するには他にも様々な方法があり、すべて\fIjdb\fRコマンドでサポートされています。接続オプションについては、Java Platform Debugger Architectureのドキュメントを参照してください。
+.SS "基本jdbコマンド"
 .PP
-Ū\fIjdb\fRޥɤΰ򼨤ޤJDBݡȤ륳ޥɤϤʳˤ⤢ꡢ\fI\-help\fRץѤɽǤޤ
+基本的な\fIjdb\fRコマンドの一覧を示します。JDBがサポートするコマンドはこれ以外にもあり、それらは\fI\-help\fRオプションを使用して表示できます。
 .PP
-helpޤ?
+helpまたは?
 .RS 4
-\fIhelp\fRޤ\fI?\fRޥɤϡǧ줿ޥɤΥꥹȤ˴ʷդɽޤ
+\fIhelp\fRまたは\fI?\fRコマンドは、認識されたコマンドのリストに簡潔な説明を付けて表示します。
 .RE
 .PP
 run
 .RS 4
-JDBưƥ֥졼ݥȤꤷȤˡ\fIrun\fRޥɤѤơǥХå륢ץꥱμ¹Ԥ򳫻ϤǤޤ\fIrun\fRޥɤϡ¸VM³ƤȤϰۤʤꡢǥХå륢ץꥱ\fIjdb\fR鵯ưȤˤΤ߻ѤǤޤ
+JDBを起動してブレークポイントを設定したあとに、\fIrun\fRコマンドを使用して、デバッグするアプリケーションの実行を開始できます。\fIrun\fRコマンドは、既存のVMに接続している場合とは異なり、デバッグするアプリケーションが\fIjdb\fRから起動したときにのみ使用できます。
 .RE
 .PP
 cont
 .RS 4
-֥졼ݥȡ㳰ޤϥƥå׼¹ԤθǡǥХå륢ץꥱμ¹Ԥ³ޤ
+ブレークポイント、例外、またはステップ実行の後で、デバッグするアプリケーションの実行を継続します。
 .RE
 .PP
 print
 .RS 4
-Java֥ȤӥץߥƥͤɽޤץߥƥַѿޤϥեɤξˤϡºݤͤϤޤ֥ȤξˤϡûϤޤ֥Ȥξܺ٤ˡõˤϡdumpޥɤ򻲾ȤƤ
+Javaオブジェクトおよびプリミティブ値を表示します。プリミティブ型の変数またはフィールドの場合には、実際の値が出力されます。オブジェクトの場合には、短い説明が出力されます。オブジェクトの詳細を取得する方法を探すには、dumpコマンドを参照してください。
 .sp
-\fB:\fR
-ѿɽˤϡޤǤ륯饹\fIjavac \-g\fRץѤƥѥ뤵Ƥɬפޤ
+\fB注意:\fR
+ローカル変数を表示するには、含んでいるクラスが\fIjavac \-g\fRオプションを使用してコンパイルされている必要があります。
 .sp
-\fIprint\fRޥɤϡ˼褦ʡ᥽åɸƽФѤΤʤɡ¿δñJava򥵥ݡȤޤ
+\fIprint\fRコマンドは、次に示すような、メソッド呼出しを使用したものなど、多くの簡単なJava式をサポートします。
 .sp
 .if n \{\
 .RS 4
@@ -168,12 +168,12 @@
 .PP
 dump
 .RS 4
-ץߥƥͤξ硢\fIdump\fRޥɤ\fIprint\fRޥɤƱǤ֥Ȥξ硢\fIdump\fRޥɤǤϡ֥ƤƥեɤθߤͤϤޤstaticեɤinstanceեɤϤޤ\fIdump\fRޥɤǤϡ\fIprint\fRޥɤƱݡȤޤ
+プリミティブ値の場合、\fIdump\fRコマンドは\fIprint\fRコマンドと同一です。オブジェクトの場合、\fIdump\fRコマンドでは、オブジェクト内に定義されている各フィールドの現在の値が出力されます。staticフィールドとinstanceフィールドが出力されます。\fIdump\fRコマンドでは、\fIprint\fRコマンドと同じ式がサポートされます。
 .RE
 .PP
 threads
 .RS 4
-߼¹ΥåɤɽޤåɤȤˡ̾ȸߤξ֡¾Υޥɤ˻ѤǤ륤ǥåϤޤǤϡåɡǥå4Ǥꡢåɤ\fIjava\&.lang\&.Thread\fRΥ󥹥󥹤ǡåɤ̾\fImain\fRǤꡢ߼¹Ǥ
+現在実行中のスレッドを一覧表示します。スレッドごとに、名前と現在の状態、および他のコマンドに使用できるインデックスが出力されます。この例では、スレッド・インデックスは4であり、スレッドは\fIjava\&.lang\&.Thread\fRのインスタンスで、スレッドの名前は\fImain\fRであり、現在実行中です。
 .sp
 .if n \{\
 .RS 4
@@ -188,20 +188,20 @@
 .PP
 thread
 .RS 4
-ߤΥåɤˤ륹åɤ򤷤ޤ¿\fIjdb\fRޥɤϡߤΥåɤ˴ŤƼ¹ԤޤåɤϡthreadsޥɤåɡǥåȤȤ˻ꤷޤ
+現在のスレッドにするスレッドを選択します。多くの\fIjdb\fRコマンドは、現在のスレッドの設定に基づいて実行されます。スレッドは、threadsコマンドで説明したスレッド・インデックスとともに指定します。
 .RE
 .PP
 where
 .RS 4
-ꤷʤ\fIwhere\fRޥɤ¹ԤȡߤΥåɤΥåפޤ\fIwhere\fR
-\fIall\fRޥɤϡߤΥåɡ롼פˤ륹åɤΥå򤹤٤ƥפޤ\fIwhere\fR
-\fIthreadindex\fRޥɤϡꤵ줿åɤΥåפޤ
+引数を指定しないで\fIwhere\fRコマンドを実行すると、現在のスレッドのスタックがダンプされます。\fIwhere\fR
+\fIall\fRコマンドは、現在のスレッド・グループにあるスレッドのスタックをすべてダンプします。\fIwhere\fR
+\fIthreadindex\fRコマンドは、指定されたスレッドのスタックをダンプします。
 .sp
-ߤΥåɤ(֥졼ݥȤ\fIsuspend\fRޥɤˤä)ǤƤϡѿȥեɤ\fIprint\fRޥɤ\fIdump\fRޥɤɽǤޤ\fIup\fRޥɤ\fIdown\fRޥɤǡɤΥåե졼򸽺ߤΥåե졼ˤ뤫֤ȤǤޤ
+現在のスレッドが(ブレークポイントか\fIsuspend\fRコマンドによって)中断している場合は、ローカル変数とフィールドは\fIprint\fRコマンドと\fIdump\fRコマンドで表示できます。\fIup\fRコマンドと\fIdown\fRコマンドで、どのスタック・フレームを現在のスタック・フレームにするかを選ぶことができます。
 .RE
-.SS "֥졼ݥ"
+.SS "ブレークポイント"
 .PP
-֥졼ݥȤϡֹޤϥ᥽åɤκǽ̿JDBǤޤ򼨤ޤ
+ブレークポイントは、行番号またはメソッドの最初の命令でJDBに設定できます。次に例を示します。
 .sp
 .RS 4
 .ie n \{\
@@ -211,7 +211,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥ\fIstop at MyClass:22\fRϡ\fIMyClass\fRޤޤ륽ե22ܤκǽ̿˥֥졼ݥȤꤷޤ
+コマンド\fIstop at MyClass:22\fRは、\fIMyClass\fRが含まれるソース・ファイルの22行目の最初の命令にブレークポイントを設定します。
 .RE
 .sp
 .RS 4
@@ -222,7 +222,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥ\fIstop in java\&.lang\&.String\&.length\fRϡ᥽å\fIjava\&.lang\&.String\&.length\fRƬ˥֥졼ݥȤꤷޤ
+コマンド\fIstop in java\&.lang\&.String\&.length\fRは、メソッド\fIjava\&.lang\&.String\&.length\fRの先頭にブレークポイントを設定します。
 .RE
 .sp
 .RS 4
@@ -233,106 +233,106 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ޥ\fIstop in MyClass\&.<clinit>\fRϡ\fI<clinit>\fRѤ\fIMyClass\fRŪɤꤷޤ
+コマンド\fIstop in MyClass\&.<clinit>\fRは、\fI<clinit>\fRを使用して\fIMyClass\fRの静的初期化コードを特定します。
 .RE
 .PP
-᥽åɤСɤƤˤϡ᥽åɤΰηꤷơ֥졼ݥȤФŬڤʥ᥽åɤ򤵤褦ˤɬפޤȤС\fIMyClass\&.myMethod(int,java\&.lang\&.String)\fRޤ\fIMyClass\&.myMethod()\fRȻꤷޤ
+メソッドがオーバーロードされている場合には、メソッドの引数の型も指定して、ブレークポイントに対して適切なメソッドが選択されるようにする必要があります。たとえば、\fIMyClass\&.myMethod(int,java\&.lang\&.String)\fRまたは\fIMyClass\&.myMethod()\fRと指定します。
 .PP
-\fIclear\fRޥɤϡ\fIclear MyClass:45\fRΤ褦ʹʸѤƥ֥졼ݥȤޤ\fIclear\fRѤ뤫ꤷʤ\fIstop\fRޥɤѤȡꤵƤ뤹٤ƤΥ֥졼ݥȤɽޤ\fIcont\fRޥɤϼ¹Ԥ³ޤ
-.SS "ƥå׼¹"
+\fIclear\fRコマンドは、\fIclear MyClass:45\fRのような構文を使用してブレークポイントを削除します。\fIclear\fRを使用するか、引数を指定しないで\fIstop\fRコマンドを使用すると、現在設定されているすべてのブレークポイントが表示されます。\fIcont\fRコマンドは実行を継続します。
+.SS "ステップ実行"
 .PP
-\fIstep\fRޥɤϡߤΥåե졼ޤϸƤӽФ줿᥽åǡιԤ¹Ԥޤ\fInext\fRޥɤϡߤΥåե졼μιԤ¹Ԥޤ
-.SS "㳰"
+\fIstep\fRコマンドは、現在のスタック・フレームまたは呼び出されたメソッド内で、次の行を実行します。\fInext\fRコマンドは、現在のスタック・フレームの次の行を実行します。
+.SS "例外"
 .PP
-Ƥ륹åɤθƽФåΤɤˤ\fIcatch\fRʸʤ㳰ȯȡJVM̾㳰ȥ졼ϤƽλޤJDBĶǼ¹ԤƤϡȿΥJDB椬ޤˡ\fIjdb\fRޥɤѤ㳰θǤޤ
+スローしているスレッドの呼出しスタック上のどこにも\fIcatch\fR文がない場合に例外が発生すると、JVMは通常、例外トレースを出力して終了します。ただし、JDB環境で実行している場合は、違反のスロー時にJDBに制御が戻ります。次に、\fIjdb\fRコマンドを使用して例外の原因を診断します。
 .PP
-ȤС\fIcatch java\&.io\&.FileNotFoundException\fRޤ\fIcatch\fR
-\fImypackage\&.BigTroubleException\fRΤ褦\fIcatch\fRޥɤѤȡǥХå줿ץꥱϡ¾㳰줿Ȥߤޤ㳰Υ饹ޤϥ֥饹Υ󥹥󥹤ξϡץꥱ㳰줿ߤޤ
+たとえば、\fIcatch java\&.io\&.FileNotFoundException\fRまたは\fIcatch\fR
+\fImypackage\&.BigTroubleException\fRのように\fIcatch\fRコマンドを使用すると、デバッグされたアプリケーションは、他の例外がスローされたときに停止します。例外が特定のクラスまたはサブクラスのインスタンスの場合は、アプリケーションは例外がスローされた場所で停止します。
 .PP
-\fIignore\fRޥɤѤȡ\fIcatch\fRޥɤθ̵̤ˤʤޤ\fIignore\fRޥɤǤϡǥХåJVM㳰̵뤻ǥХåΤߤ̵뤷ޤ
-.SH "ץ"
+\fIignore\fRコマンドを使用すると、以前の\fIcatch\fRコマンドの効果が無効になります。\fIignore\fRコマンドでは、デバッグされるJVMは特定の例外を無視せず、デバッガのみを無視します。
+.SH "オプション"
 .PP
-ޥɥ饤\fIjava\fRޥɤΤ\fIjdb\fRޥɤѤ硢\fIjdb\fRޥɤϡ\fI\-D\fR\fI\-classpath\fR\fI\-X\fRʤɡ\fIjava\fRޥɤƱΥץޤ\fIjdb\fRޥɤϡ¾˼ΥꥹȤˤ륪ץޤ
+コマンドラインで\fIjava\fRコマンドのかわりに\fIjdb\fRコマンドを使用する場合、\fIjdb\fRコマンドは、\fI\-D\fR、\fI\-classpath\fR、\fI\-X\fRなど、\fIjava\fRコマンドと同じ数のオプションを受け入れます。\fIjdb\fRコマンドは、その他に次のリストにあるオプションを受け入れます。
 .PP
-ǥХåԤJVM˥ǥХå³뤿ص󶡤뤿ˡ¾Υץ󤬥ݡȤƤޤ³ؤ˴ؤܺ٤ʥɥȤϡJava Platform Debugger Architecture (JPDA)
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)򻲾ȤƤ
+デバッグを行うJVMにデバッガを接続するための代替機構を提供するために、その他のオプションがサポートされています。これらの接続の代替に関する詳細なドキュメントは、Java Platform Debugger Architecture (JPDA)
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jpda/index\&.html)を参照してください
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
 .PP
 \-sourcepath \fIdir1:dir2: \&. \&. \&.\fR
 .RS 4
-ꤵ줿ѥѤơե򸡺ޤΥץ󤬻ꤵƤʤϡǥեȡѥΥɥå(\&.)Ѥޤ
+指定されたパスを使用して、ソース・ファイルを検索します。このオプションが指定されていない場合は、デフォルト・パスのドット(\&.)が使用されます。
 .RE
 .PP
 \-attach \fIaddress\fR
 .RS 4
-ǥեȤ³Ѥơ¹JVM˥ǥХå³ޤ
+デフォルトの接続機構を使用して、実行中のJVMにデバッガを接続します。
 .RE
 .PP
 \-listen \fIaddress\fR
 .RS 4
-¹JVMɸΥͥѤƻꤵ줿ɥ쥹³ΤԵޤ
+実行中のJVMが標準のコネクタを使用して指定されたアドレスに接続するのを待機します。
 .RE
 .PP
 \-launch
 .RS 4
-ǥХå륢ץꥱJDBεư夿˵ưޤ\fI\-launch\fRץˤꡢ\fIrun\fRޥɤɬפʤʤޤǥХå륢ץꥱϡư塢ץꥱ󡦥饹ɤľߤޤλǡɬפʥ֥졼ݥȤꤷ\fIcont\fRޥɤѤƼ¹Ԥ³Ǥޤ
+デバッグするアプリケーションをJDBの起動後ただちに起動します。\fI\-launch\fRオプションにより、\fIrun\fRコマンドが必要なくなります。デバッグするアプリケーションは、起動後、初期アプリケーション・クラスがロードされる直前に停止します。その時点で、必要なブレークポイントを設定し、\fIcont\fRコマンドを使用して実行を継続できます。
 .RE
 .PP
 \-listconnectors
 .RS 4
-JVMѤǤ륳ͥɽޤ
+このJVMで利用できるコネクタを一覧表示します。
 .RE
 .PP
 \-connect connector\-name:\fIname1=value1\fR
 .RS 4
-ɽ줿ͤȻΥͥѤƥåJVM³ޤ
+一覧表示された引数の値と指定のコネクタを使用してターゲットJVMに接続します。
 .RE
 .PP
 \-dbgtrace [\fIflags\fR]
 .RS 4
-\fIjdb\fRޥɤΥǥХåξϤޤ
+\fIjdb\fRコマンドのデバッグの情報を出力します。
 .RE
 .PP
 \-tclient
 .RS 4
-Java HotSpot VM饤ǥץꥱ¹Ԥޤ
+Java HotSpot VMクライアント内でアプリケーションを実行します。
 .RE
 .PP
 \-tserver
 .RS 4
-Java HotSpot VMСǥץꥱ¹Ԥޤ
+Java HotSpot VMサーバー内でアプリケーションを実行します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JVM\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+JVMに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ǥХåоݤΥץž륪ץ"
+.SH "デバッグ対象のプロセスに転送されるオプション"
 .PP
 \-v \-verbose[:\fIclass\fR|gc|jni]
 .RS 4
-Ĺ⡼ɤˤޤ
+冗長モードにします。
 .RE
 .PP
 \-D\fIname\fR=\fIvalue\fR
 .RS 4
-ƥࡦץѥƥꤷޤ
+システム・プロパティを設定します。
 .RE
 .PP
 \-classpath \fIdir\fR
 .RS 4
-饹򸡺뤿ΡǶڤäƻꤵ줿ǥ쥯ȥΥꥹȡ
+クラスを検索するための、コロンで区切って指定されたディレクトリのリスト。
 .RE
 .PP
 \-X\fIoption\fR
 .RS 4
-ɸॿåJVMץǤ
+非標準ターゲットJVMオプションです。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jdeps.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jdeps.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jdeps
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jdeps" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jdeps" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jdeps \- Java饹¸ʥ饤
-.SH ""
+jdeps \- Javaクラス依存性アナライザ。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,99 +64,99 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclasses\fR
 .RS 4
-ʬϤ륯饹̾饹ѥǸФǤ륯饹򡢥ե̾ǥ쥯ȥޤJARեǻǤޤ
+分析するクラスの名前。クラス・パスで検出できるクラスを、ファイル名、ディレクトリまたはJARファイルで指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjdeps\fRޥɤϡJava饹եΥѥå٥ޤϥ饹٥ΰ¸򼨤ޤϥ饹ˤϡ\fI\&.class\fRեΥѥ̾ǥ쥯ȥꡢJARե롢ޤϤ٤ƤΥ饹եʬϤ뤿δ饹̾ǤޤץˤϤꤷޤǥեȤǤϡ\fIjdeps\fRϥƥϤ˰¸طϤޤDOTǰ¸طǤޤ(\fI\-dotoutput\fRץ򻲾)
-.SH "ץ"
+\fIjdeps\fRコマンドは、Javaクラス・ファイルのパッケージレベルまたはクラスレベルの依存性を示します。入力クラスには、\fI\&.class\fRファイルのパス名、ディレクトリ、JARファイル、またはすべてのクラス・ファイルを分析するための完全修飾クラス名を指定できます。オプションにより出力が決定します。デフォルトでは、\fIjdeps\fRはシステム出力に依存関係を出力します。DOT言語で依存関係を生成できます(\fI\-dotoutput\fRオプションを参照)。
+.SH "オプション"
 .PP
 \-dotoutput <\fIdir\fR>
 .RS 4
-DOTեϤΰǥ쥯ȥꡣꤷ\fIjdeps\fR<\fIarchive\-file\-name\fR>\&.dotȤ̾ʬϺѤߥ֤Ȥ˰¸طꥹȤ1Ĥdotեִ֤ΰ¸طꥹȤsummary\&.dotȤ̾Υޥ꡼եޤ
+DOTファイル出力の宛先ディレクトリ。指定した場合は\fIjdeps\fRは<\fIarchive\-file\-name\fR>\&.dotという名前の分析済みアーカイブごとに依存関係をリストする1つのdotファイルを生成し、アーカイブ間の依存関係をリストするsummary\&.dotという名前のサマリー・ファイルも生成します。
 .RE
 .PP
 \-s, \-summary
 .RS 4
-¸طΥޥ꡼ΤߤϤޤ
+依存関係のサマリーのみを出力します。
 .RE
 .PP
 \-v, \-verbose
 .RS 4
-٤ƤΥ饹٥ΰ¸طϤޤ
+すべてのクラスレベルの依存関係を出力します。
 .RE
 .PP
 \-verbose:package
 .RS 4
-Ʊΰ¸طѥå٥ΰ¸طϤޤ
+同じアーカイブ内の依存関係を除き、パッケージレベルの依存関係を出力します。
 .RE
 .PP
 \-verbose:class
 .RS 4
-Ʊΰ¸ط饹٥ΰ¸طϤޤ
+同じアーカイブ内の依存関係を除き、クラスレベルの依存関係を出力します。
 .RE
 .PP
 \-cp <\fIpath\fR>, \-classpath <\fIpath\fR>
 .RS 4
-饹եθꤷޤ
+クラス・ファイルの検索場所を指定します。
 .sp
-Setting the Class Path ⻲ȤƤ
+Setting the Class Path も参照してください。
 .RE
 .PP
 \-p <\fIpkg name\fR>, \-package <\fIpkg name\fR>
 .RS 4
-ꤷѥåΰ¸ط򸡽ФޤۤʤѥåФƤΥץʣǤޤ\fI\-p\fRץ\fI\-e\fRץƱ˻ꤹ뤳ȤϤǤޤ
+指定したパッケージの依存関係を検出します。異なるパッケージに対してこのオプションを複数回指定できます。\fI\-p\fRオプションと\fI\-e\fRオプションを同時に指定することはできません。
 .RE
 .PP
 \-e <\fIregex\fR>, \-regex <\fIregex\fR>
 .RS 4
-ꤷɽѥȰפѥåΰ¸ط򸡽Фޤ\fI\-p\fRץ\fI\-e\fRץƱ˻ꤹ뤳ȤϤǤޤ
+指定した正規表現パターンと一致するパッケージの依存関係を検出します。\fI\-p\fRオプションと\fI\-e\fRオプションを同時に指定することはできません。
 .RE
 .PP
 \-include <\fIregex\fR>
 .RS 4
-ʬϤѥ˰פ륯饹¤ޤΥץϡʬϤ륯饹ΥꥹȤե륿ޤ¸ط˥ѥŬѤ\fI\-p\fR\fI\-e\fRȤȤ˻ѤǤޤ
+分析をパターンに一致するクラスに制限します。このオプションは、分析するクラスのリストをフィルタします。依存関係にパターンを適用する\fI\-p\fRおよび\fI\-e\fRとともに使用できます。
 .RE
 .PP
 \-jdkinternals
 .RS 4
-JDKAPIΥ饹٥ΰ¸ط򸡽ФޤǥեȤǤϡ\fI\-include\fRץꤷʤꡢ\fI\-classpath\fRץ󤪤ϥե˻ꤵ줿٤ƤΥ饹ʬϤޤΥץϡ\fI\-p\fRץ\fI\-e\fRץ󤪤\fI\-s\fRץȤȤ˻ѤǤޤ
+JDKの内部APIのクラスレベルの依存関係を検出します。デフォルトでは、\fI\-include\fRオプションを指定しないかぎり、\fI\-classpath\fRオプションおよび入力ファイルに指定されたすべてのクラスを分析します。このオプションは、\fI\-p\fRオプション、\fI\-e\fRオプションおよび\fI\-s\fRオプションとともに使用できません。
 .sp
-\fBٹ\fR: JDKAPIϡΥ꡼ǥǤʤʤǽޤ
+\fB警告\fR: JDKの内部APIは、今後のリリースでアクセスできなくなる可能性があります。
 .RE
 .PP
 \-P, \-profile
 .RS 4
-ѥåޤץեޤϥեɽޤ
+パッケージを含むプロファイルまたはファイルを表示します。
 .RE
 .PP
 \-apionly
 .RS 4
-եɡס᥽åɡѥ᡼ס꥿סå줿㳰פޤѥ֥å饹\fIpublic\fR\fIprotected\fRСν̾ΰ¸طʤɡʬϤAPI¤ޤ
+フィールド・タイプ、メソッド・パラメータ・タイプ、戻りタイプ、チェックされた例外タイプを含むパブリック・クラスの\fIpublic\fRおよび\fIprotected\fRメンバーの署名からの依存関係など、分析をAPIに制限します。
 .RE
 .PP
 \-R, \-recursive
 .RS 4
-٤Ƥΰ¸طƵŪޤ
+すべての依存関係を再帰的に走査します。
 .RE
 .PP
 \-version
 .RS 4
-СϤޤ
+バージョン情報を出力します。
 .RE
 .PP
 \-h, \-?, \-help
 .RS 4
-\fIjdeps\fR˴ؤإסåϤޤ
+\fIjdeps\fRに関するヘルプ・メッセージを出力します。
 .RE
-.SH ""
+.SH "例"
 .PP
-Notepad\&.jarΰ¸طʬϡ
+Notepad\&.jarの依存関係の分析。
 .sp
 .if n \{\
 .RS 4
@@ -185,7 +185,7 @@
 .RE
 .\}
 .PP
-\-Pޤ\-profileץѤơĢ¸ץեɽޤ
+\-Pまたは\-profileオプションを使用して、メモ帳が依存するプロファイルを表示します。
 .sp
 .if n \{\
 .RS 4
@@ -213,7 +213,7 @@
 .RE
 .\}
 .PP
-tools\&.jarե\fIcom\&.sun\&.tools\&.jdeps\&.Main\fR饹ʤɡΥ饹ѥΥ饹ľܰ¸طʬϡ
+tools\&.jarファイル内の\fIcom\&.sun\&.tools\&.jdeps\&.Main\fRクラスなど、特定のクラスパス内の特定のクラスの直接依存関係の分析。
 .sp
 .if n \{\
 .RS 4
@@ -229,7 +229,7 @@
 .RE
 .\}
 .PP
-\fI\-verbose:class\fRץѤơ饹٥¸ط򸡺뤫\fI\-v\fRޤ\fI\-verbose\fRץѤƱJARե뤫ΰ¸طޤޤ
+\fI\-verbose:class\fRオプションを使用して、クラスレベル依存関係を検索するか\fI\-v\fRまたは\fI\-verbose\fRオプションを使用して同じJARファイルからの依存関係を含めます。
 .sp
 .if n \{\
 .RS 4
@@ -249,7 +249,7 @@
 .RE
 .\}
 .PP
-\fI\-R\fRޤ\fI\-recursive\fRץѤơ\fIcom\&.sun\&.tools\&.jdeps\&.Main\fR饹οŪʰ¸طʬϤޤ
+\fI\-R\fRまたは\fI\-recursive\fRオプションを使用して、\fIcom\&.sun\&.tools\&.jdeps\&.Main\fRクラスの推移的な依存関係を分析します。
 .sp
 .if n \{\
 .RS 4
@@ -305,7 +305,7 @@
 .RE
 .\}
 .PP
-Ģǥΰ¸طdotեޤ
+メモ帳デモの依存関係のdotファイルを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -317,7 +317,7 @@
 .RE
 .\}
 .PP
-\fIjdeps\fRϡ\fI\-dotoutput\fRץǻꤵ줿dotǥ쥯ȥ<\fIfilename\fR>\&.dotȤ̾dotեJARե뤴Ȥ˺JARե֤ΰ¸طꥹȤsummary\&.dotȤ̾Υޥ꡼եޤ
+\fIjdeps\fRは、\fI\-dotoutput\fRオプションで指定されたdotディレクトリに<\fIfilename\fR>\&.dotという名前のdotファイルを特定のJARファイルごとに作成し、JARファイル間の依存関係をリストするsummary\&.dotという名前のサマリー・ファイルも作成します
 .sp
 .if n \{\
 .RS 4
@@ -350,7 +350,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jhat
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jhat" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jhat" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jhat \- JavaҡפʬϤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jhat \- Javaヒープを分析します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,18 +64,18 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIheap\-dump\-file\fR
 .RS 4
-֥饦оݤȤʤJavaХʥꡦҡססե롣ʣΥҡספޤסեξ硢\fImyfile\&.hprof#3\fRΤ褦˥ե̾θ\fI#<number>\fRղä뤳ȤǡեΥפǤޤ
+ブラウズ対象となるJavaバイナリ・ヒープ・ダンプ・ファイル。複数のヒープ・ダンプを含むダンプ・ファイルの場合、\fImyfile\&.hprof#3\fRのようにファイル名の後に\fI#<number>\fRを付加することで、ファイル内の特定のダンプを指定できます。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjhat\fRޥɤJavaҡססեϤWebС򳫻Ϥޤ\fIjhat\fRޥɤѤơΥ֥饦ǥҡספ򻲾ȤǤޤ\fIjhat\fRޥɤϡΤΥ饹\fIMyClass\fRΤ٤ƤΥ󥹥󥹤ɽʤɤλ߷׺Ѥ礻Object Query Language (OQL)򥵥ݡȤޤҡספ礻OQLSQL˻ƤޤOQLΥإפˤϡ\fIjhat\fRޥɤˤäɽOQLإסڡ饢ǤޤǥեȡݡȤѤ硢OQLΥإפhttp://localhost:7000/oqlhelp/ѲǽǤ
+\fIjhat\fRコマンドはJavaヒープ・ダンプ・ファイルを解析し、Webサーバーを開始します。\fIjhat\fRコマンドを使用して、お気に入りのブラウザでヒープ・ダンプを参照できます。\fIjhat\fRコマンドは、既知のクラス\fIMyClass\fRのすべてのインスタンスを表示するなどの事前設計済の問合せやObject Query Language (OQL)をサポートします。ヒープ・ダンプの問合せを除き、OQLはSQLに似ています。OQLのヘルプには、\fIjhat\fRコマンドによって表示されるOQLヘルプ・ページからアクセスできます。デフォルト・ポートを使用する場合、OQLのヘルプはhttp://localhost:7000/oqlhelp/で利用可能です。
 .PP
-JavaΥҡספˤϡΤĤˡޤ
+Javaのヒープ・ダンプを生成するには、次のいくつかの方法があります。
 .sp
 .RS 4
 .ie n \{\
@@ -85,7 +85,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjmap \-dump\fRץѤƼ¹Ի˥ҡספޤjmap(1)򻲾ȤƤ
+\fIjmap \-dump\fRオプションを使用して実行時にヒープ・ダンプを取得します。jmap(1)を参照してください。
 .RE
 .sp
 .RS 4
@@ -96,8 +96,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjconsole\fRץѤ\fIHotSpotDiagnosticMXBean\fRͳǼ¹Ի˥ҡספޤjconsole(1)\fIHotSpotDiagnosticMXBean\fRΥ󥿥ե(
-http://docs\&.oracle\&.com/javase/8/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean\&.html)򻲾ȤƤ
+\fIjconsole\fRオプションを使用して\fIHotSpotDiagnosticMXBean\fR経由で実行時にヒープ・ダンプを取得します。jconsole(1)および\fIHotSpotDiagnosticMXBean\fRのインタフェースの説明(
+http://docs\&.oracle\&.com/javase/8/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean\&.html)を参照してください。
 .RE
 .sp
 .RS 4
@@ -108,8 +108,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ҡספϡ\fI\-XX:+HeapDumpOnOutOfMemoryError\fR
-Javaۥޥ(JVM)ץꤹ뤳Ȥǡ\fIOutOfMemoryError\fR줿Ȥޤ
+ヒープ・ダンプは、\fI\-XX:+HeapDumpOnOutOfMemoryError\fR
+Java仮想マシン(JVM)オプションを指定することで、\fIOutOfMemoryError\fRがスローされたときに生成されます。
 .RE
 .sp
 .RS 4
@@ -120,61 +120,61 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIhprof\fRޥɤѤޤHPROF: Heap/CPUץե󥰡ġ
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/hprof\&.html)򻲾ȤƤ
+\fIhprof\fRコマンドを使用します。HPROF: Heap/CPUプロファイリング・ツール
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/hprof\&.html)を参照してください
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
 \-stack false|true
 .RS 4
-֥ȳƽФåפ̵ˤޤҡסdzȾ󤬻ѤǤʤ硢Υե饰\fIfalse\fRꤹɬפޤǥեȤ\fItrue\fRǤ
+オブジェクト割当呼出しスタックの追跡を無効にします。ヒープ・ダンプ内で割当サイト情報が使用できない場合、このフラグを\fIfalse\fRに設定する必要があります。デフォルトは\fItrue\fRです。
 .RE
 .PP
 \-refs false|true
 .RS 4
-֥ȤؤλȤפ̵ˤޤǥեȤ\fItrue\fRǤǥեȤǤϡҡΤ٤ƤΥ֥ȤˤĤơХåݥ(ꤵ줿֥ȤݥȤƤ륪֥ȡȼԤޤϼȤȤƤФ)׻ޤ
+オブジェクトへの参照の追跡を無効にします。デフォルトは\fItrue\fRです。デフォルトでは、ヒープ内のすべてのオブジェクトについて、バックポインタ(指定されたオブジェクトをポイントしているオブジェクト。参照者または受信参照とも呼ばれる)が計算されます。
 .RE
 .PP
 \-port \fIport\-number\fR
 .RS 4
-\fIjhat\fRHTTPСΥݡȤꤷޤǥեȤ7000Ǥ
+\fIjhat\fRのHTTPサーバーのポートを設定します。デフォルトは7000です。
 .RE
 .PP
 \-exclude \fIexclude\-file\fR
 .RS 4
-ãǽʥ֥Ȥ礻ɬפǡСΰޤեꤷޤȤСΥե\fIjava\&.lang\&.String\&.value\fRޤޤƤ硢Υ֥\fIo\fRãǽʥ֥ȤΥꥹȤ׻ݤˡ\fIjava\&.lang\&.String\&.value\fRեɤ˴Ϣ뻲ȥѥθʤʤޤ
+到達可能なオブジェクトの問合せから除外する必要があるデータ・メンバーの一覧を含むファイルを指定します。たとえば、このファイルに\fIjava\&.lang\&.String\&.value\fRが含まれていた場合、特定のオブジェクト\fIo\fRから到達可能なオブジェクトのリストを計算する際に、\fIjava\&.lang\&.String\&.value\fRフィールドに関連する参照パスが考慮されなくなります。
 .RE
 .PP
 \-baseline \fIexclude\-file\fR
 .RS 4
-١饤ȤʤҡספꤷޤξΥҡסƱ֥IDĥ֥ȤϿǤϤʤȤƥޡޤ¾Υ֥ȤϿȤƥޡޤϡۤʤ2ĤΥҡספӤݤΩޤ
+ベースラインとなるヒープ・ダンプを指定します。両方のヒープ・ダンプ内で同じオブジェクトIDを持つオブジェクトは新規ではないとしてマークされます。他のオブジェクトは新規としてマークされます。これは、異なる2つのヒープ・ダンプを比較する際に役立ちます。
 .RE
 .PP
 \-debug \fIint\fR
 .RS 4
-ΥġΥǥХå٥ꤷޤ٥0ϥǥХåϤʤȤ̣ޤ礭ͤꤹȡĹʥ⡼ɤˤʤޤ
+このツールのデバッグ・レベルを設定します。レベル0はデバッグ出力がないことを意味します。より大きな値を設定すると、より冗長なモードになります。
 .RE
 .PP
 \-version
 .RS 4
-꡼ֹݡȤƽλޤ
+リリース番号をレポートして終了します
 .RE
 .PP
 \-h
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjhat\fRޥɤ¹ԤƤJavaۥޥ\fIflag\fRϤޤȤС512MХȤκҡסѤˤϡ\fI\-J\-Xmx512m\fRȤޤ
+\fIjhat\fRコマンドを実行しているJava仮想マシンに\fIflag\fRを渡します。たとえば、512Mバイトの最大ヒープ・サイズを使用するには、\fI\-J\-Xmx512m\fRとします。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -206,7 +206,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-HPROF: Heap/CPUץե󥰡ġ
+HPROF: Heap/CPUプロファイリング・ツール
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/samples/hprof\&.html)
 .RE
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jinfo
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jinfo" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jinfo" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jinfo \- ޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jinfo \- 構成情報を生成します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -82,83 +82,83 @@
 .RE
 .\}
 .PP
-\fIץ\fR
+\fIオプション\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIpid\fR
 .RS 4
-󤬽ϤץIDץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤ
+構成情報が出力されるプロセスID。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-󤬽Ϥ륳ե롣
+構成情報が出力されるコア・ファイル。
 .RE
 .PP
 \fIremote\-hostname\-or\-IP\fR
 .RS 4
-⡼ȡǥХåС\fIۥ̾\fRޤ\fIIP\fRɥ쥹jsadebugd(1)򻲾ȤƤ
+リモート・デバッグ・サーバーの\fIホスト名\fRまたは\fIIP\fRアドレス。jsadebugd(1)を参照してください。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥ⡼ȡۥȤǼ¹ԤƤΡץͭID
+複数のデバッグ・サーバーが同一のリモート・ホストで実行している場合の、オプション固有のID。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjinfo\fRޥɤϡꤵ줿Javaץ䥳եޤϥ⡼ȡǥХåСJavaϤޤˤϡJavaƥࡦץѥƥJavaۥޥ(JVM)Υޥɥ饤󡦥ե饰ޤޤƤޤꤵ줿ץ64ӥåJVMǼ¹ԤƤ硢\fI\-J\-d64\fRץꤹɬפ礬ޤ򼨤ޤ\fIjinfo\fR
-\fI\-J\-d64 \-sysprops pid\fR
+\fIjinfo\fRコマンドは、指定されたJavaプロセスやコア・ファイルまたはリモート・デバッグ・サーバーのJava構成情報を出力します。構成情報には、Javaシステム・プロパティとJava仮想マシン(JVM)のコマンドライン・フラグが含まれています。指定されたプロセスが64ビットJVM上で実行されている場合、\fI\-J\-d64\fRオプションを指定する必要がある場合があります。次に例を示します。\fIjinfo\fR
+\fI\-J\-d64 \-sysprops pid\fR。
 .PP
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤ\fIdbgeng\&.dll\fR¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤjvm\&.dllξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤȤС\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fRǤ
-.SH "ץ"
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。\fIdbgeng\&.dll\fRが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。\fIPATH\fR環境変数には、ターゲット・プロセスによって使用されるjvm\&.dllの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。たとえば、\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fRです。
+.SH "オプション"
 .PP
 no\-option
 .RS 4
-ޥɥ饤󡦥ե饰򡢥ƥࡦץѥƥ̾ͤΥڥȤȤ˽Ϥޤ
+コマンドライン・フラグを、システム・プロパティ名と値のペアとともに出力します。
 .RE
 .PP
 \-flag \fIname\fR
 .RS 4
-ꤵ줿ޥɥ饤󡦥ե饰̾ͤϤޤ
+指定されたコマンドライン・フラグの名前と値を出力します。
 .RE
 .PP
 \-flag \fI[+|\-]name\fR
 .RS 4
-ꤵ줿֡뷿Υޥɥ饤󡦥ե饰ͭޤ̵ˤޤ
+指定されたブール型のコマンドライン・フラグを有効または無効にします。
 .RE
 .PP
 \-flag \fIname=value\fR
 .RS 4
-ꤵ줿ޥɥ饤󡦥ե饰ꤵ줿ͤꤷޤ
+指定されたコマンドライン・フラグを指定された値に設定します。
 .RE
 .PP
 \-flags
 .RS 4
-JVMϤ륳ޥɥ饤󡦥ե饰Ϥޤ
+JVMに渡されるコマンドライン・フラグを出力します。
 .RE
 .PP
 \-sysprops
 .RS 4
-Javaƥࡦץѥƥ̾ͤΥڥȤƽϤޤ
+Javaシステム・プロパティを名前と値のペアとして出力します。
 .RE
 .PP
 \-h
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jjs.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jjs.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jjs
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ܥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 基本ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jjs" "1" "2013ǯ1121" "JDK 8" "ܥġ"
+.TH "jjs" "1" "2013年11月21日" "JDK 8" "基本ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jjs \- Nashorn󥸥ƤӽФޤ
-.SH ""
+jjs \- Nashornエンジンを呼び出します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,28 +64,28 @@
 .PP
 \fIoptions\fR
 .RS 4
-ʸǶڤ줿\fIjjs\fRޥɤ1İʾΥץ󡣾ܺ٤ϡץ򻲾ȤƤ
+空白文字で区切られた、\fIjjs\fRコマンドの1つ以上のオプション。詳細は、オプションを参照してください。
 .RE
 .PP
 \fIscript\-files\fR
 .RS 4
-ʸǶڤ줿NashornѤƲ᤹1İʾΥץȡե롣ե뤬ꤵʤϡ÷뤬ưޤ
+空白文字で区切られた、Nashornを使用して解釈する1つ以上のスクリプト・ファイル。ファイルが指定されない場合は、対話型シェルが起動されます。
 .RE
 .PP
 \fIarguments\fR
 .RS 4
-ťϥե󡦥ޡ(\fI\-\-\fR)θΤ٤ƤͤȤƥץȤޤ÷Ϥޤͤˤ\fIarguments\fRץѥƥѤƥǤޤ(Example 3򻲾ȤƤ)
+二重ハイフン・マーカー(\fI\-\-\fR)の後のすべての値が、引数としてスクリプトまたは対話型シェルに渡されます。これらの値には\fIarguments\fRプロパティを使用してアクセスできます(Example 3を参照してください)。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjjs\fRޥɥ饤󡦥ġѤNashorn󥸥ƤӽФޤѤơ1ĤޤʣΥץȡեᤷꡢ÷¹Ԥ뤳ȤǤޤ
-.SH "ץ"
+\fIjjs\fRコマンドライン・ツールを使用してNashornエンジンを呼び出します。これを使用して、1つまたは複数のスクリプト・ファイルを解釈したり、対話型シェルを実行することができます。
+.SH "オプション"
 .PP
-\fIjjs\fRޥɤΥץϥץȤNashornˤäƲᤵ椷ޤ
+\fIjjs\fRコマンドのオプションはスクリプトがNashornによって解釈される条件を制御します。
 .PP
 \-ccs=\fIsize\fR, \-\-class\-cache\-size=\fIsize\fR
 .RS 4
-饹å塦Хñ̤ꤷޤХ(KB)򼨤\fIk\fRޤ\fIK\fRʸɲäᥬХ(MB)򼨤\fIm\fRޤ\fIM\fRʸɲäХ(GB)򼨤\fIg\fRޤ\fIG\fRɲäޤǥեȤǤϡ饹å塦50ХȤꤵޤϡ1024Х(1 KB)ꤹˡ򼨤ޤ
+クラス・キャッシュ・サイズをバイト単位で設定します。キロバイト(KB)を示すために\fIk\fRまたは\fIK\fRの文字を追加し、メガバイト(MB)を示すために\fIm\fRまたは\fIM\fRの文字を追加し、ギガバイト(GB)を示すために\fIg\fRまたは\fIG\fRを追加します。デフォルトでは、クラス・キャッシュ・サイズは50バイトに設定されます。次の例は、1024バイト(1 KB)に設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -101,17 +101,17 @@
 .PP
 \-co, \-\-compile\-only
 .RS 4
-ץȤ¹Ԥ˥ѥ뤷ޤ
+スクリプトを実行せずにコンパイルします。
 .RE
 .PP
 \-cp \fIpath\fR, \-\-classpath \fIpath\fR
 .RS 4
-ݡȤ륯饹ؤΥѥꤷޤʣΥѥꤹˤϡΥץ򷫤֤ޤϳƥѥ򥳥(:)Ƕڤޤ
+サポートするクラスへのパスを指定します。複数のパスを設定するには、このオプションを繰り返すか、または各パスをコロン(:)で区切ります。
 .RE
 .PP
 \-D\fIname\fR=\fIvalue\fR
 .RS 4
-ץѥƥ̾ͤƤ뤳ȤǡץȤϤƥࡦץѥƥꤷޤǡ÷⡼ɤNashornƤӽФơ\fImyValue\fR\fImyKey\fRȤ̾Υץѥƥ˳Ƥˡ򼨤ޤ
+プロパティ名に値を割り当てることで、スクリプトに渡すシステム・プロパティを設定します。次の例で、対話型モードでNashornを呼び出して、\fImyValue\fRを\fImyKey\fRという名前のプロパティに割り当てる方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -125,67 +125,67 @@
 .if n \{\
 .RE
 .\}
-Υץ򷫤֤ѤȡʣΥץѥƥǤޤ
+このオプションを繰り返し使用すると、複数のプロパティを設定できます。
 .RE
 .PP
 \-d=\fIpath\fR, \-\-dump\-debug\-dir=\fIpath\fR
 .RS 4
-饹եפǥ쥯ȥؤΥѥꤷޤ
+クラス・ファイルをダンプするディレクトリへのパスを指定します。
 .RE
 .PP
 \-\-debug\-lines
 .RS 4
-饹եιֹɽޤǥեȤǤϡΥץͭˤʤäƤޤ̵ˤˤ\fI\-\-debug\-lines=false\fRꤷޤ
+クラス・ファイル内の行番号表を生成します。デフォルトでは、このオプションは有効になっています。無効にするには\fI\-\-debug\-lines=false\fRを指定します。
 .RE
 .PP
 \-\-debug\-locals
 .RS 4
-饹եΥѿޤ
+クラス・ファイル内のローカル変数を生成します。
 .RE
 .PP
 \-doe, \-\-dump\-on\-error
 .RS 4
-顼ȯȤˡե롦åȥ졼󶡤ޤǥեȤǤϡñʥ顼åΤߤϤޤ
+エラーが発生したときに、フル・スタック・トレースを提供します。デフォルトでは、簡単なエラー・メッセージのみが出力されます。
 .RE
 .PP
 \-\-early\-lvalue\-error
 .RS 4
-̵ʺͼ顼Ȥ(ĤޤꡢɤϤȤ)𤵤ޤǥեȤǤϡΥץͭˤʤäƤޤ̵ˤˤ\fI\-\-early\-lvalue\-error=false\fRꤷޤ̵ʾ硢̵ʺͼϥɤ¹Ԥޤ𤵤ޤ
+無効な左辺値式が早期エラーとして(つまり、コードが解析されるときに)報告されます。デフォルトでは、このオプションは有効になっています。無効にするには\fI\-\-early\-lvalue\-error=false\fRを指定します。無効な場合、無効な左辺値式はコードが実行されるまで報告されません。
 .RE
 .PP
 \-\-empty\-statements
 .RS 4
-ʸJavaݹʸĥ꡼¸ޤ
+空の文をJavaの抽象構文ツリーに保存します。
 .RE
 .PP
 \-fv, \-\-fullversion
 .RS 4
-NashornСʸϤޤ
+完全なNashornバージョン文字列を出力します。
 .RE
 .PP
 \-\-function\-statement\-error
 .RS 4
-ؿʸȤƻѤȥ顼åϤޤ
+関数の宣言が文として使用されるとエラー・メッセージが出力されます。
 .RE
 .PP
 \-\-function\-statement\-warning
 .RS 4
-ؿʸȤƻѤȷٹåϤޤ
+関数の宣言が文として使用されると警告メッセージが出力されます。
 .RE
 .PP
 \-fx
 .RS 4
-ץȤJavaFXץꥱȤƵưޤ
+スクリプトをJavaFXアプリケーションとして起動します。
 .RE
 .PP
 \-h, \-help
 .RS 4
-ץΥꥹȤȤϤޤ
+オプションのリストとその説明を出力します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤷ\fIjava\fRưץJVMϤޤǡ÷⡼ɤNashornƤӽФơJVMˤäƻѤ꡼4 GBꤹˡ򼨤ޤ
+指定した\fIjava\fR起動オプションをJVMに渡します。次の例で、対話型モードでNashornを呼び出して、JVMによって使用される最大メモリーを4 GBに設定する方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -199,22 +199,22 @@
 .if n \{\
 .RE
 .\}
-Υץ򷫤֤Ѥȡʣ\fIjava\fRޥɡץϤȤǤޤ
+このオプションを繰り返し使用すると、複数の\fIjava\fRコマンド・オプションを渡すことができます。
 .RE
 .PP
 \-\-lazy\-compilation
 .RS 4
-쥤ά(ĤޤꡢץΤ٤˥ѥ뤵ʤ)ͭˤޤΥץϻŪʤΤǤ
+レイジー・コード生成戦略(つまり、スクリプト全体が一度にコンパイルされない)を有効にします。このオプションは試験的なものです。
 .RE
 .PP
 \-\-loader\-per\-compile
 .RS 4
-ѥ뤴Ȥ˿饹ޤǥեȤǤϡΥץͭˤʤäƤޤ̵ˤˤ\fI\-\-loader\-per\-compile=false\fRꤷޤ
+コンパイルごとに新しいクラス・ローダーを作成します。デフォルトでは、このオプションは有効になっています。無効にするには\fI\-\-loader\-per\-compile=false\fRを指定します。
 .RE
 .PP
 \-\-log=\fIsubsystem\fR:\fIlevel\fR
 .RS 4
-ꤵ줿֥ƥФơΥ٥ǥ󥰤¹ԤޤޤǶڤäʣΥ֥ƥΥ󥰡٥Ǥޤ򼨤ޤ
+指定されたサブシステムに対して、特定のレベルでロギングを実行します。カンマで区切って複数のサブシステムのロギング・レベルを指定できます。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -229,116 +229,116 @@
 .PP
 \-\-package=\fIname\fR
 .RS 4
-줿饹եɲäѥåꤷޤ
+生成されたクラス・ファイルを追加するパッケージを指定します。
 .RE
 .PP
 \-\-parse\-only
 .RS 4
-ѥ뤻˥ɤϤޤ
+コンパイルせずにコードを解析します。
 .RE
 .PP
 \-\-print\-ast
 .RS 4
-ݹʸĥ꡼Ϥޤ
+抽象構文ツリーを出力します。
 .RE
 .PP
 \-\-print\-code
 .RS 4
-ХȥɤϤޤ
+バイトコードを出力します。
 .RE
 .PP
 \-\-print\-lower\-ast
 .RS 4
-겼ݹʸĥ꡼Ϥޤ
+掘り下げた抽象構文ツリーを出力します。
 .RE
 .PP
 \-\-print\-lower\-parse
 .RS 4
-겼ϥĥ꡼Ϥޤ
+掘り下げた解析ツリーを出力します。
 .RE
 .PP
 \-\-print\-no\-newline
 .RS 4
-¾\fI\-\-print*\fRץǶŪ1ԤǽϤޤ
+その他の\fI\-\-print*\fRオプションで強制的に1行で出力します。
 .RE
 .PP
 \-\-print\-parse
 .RS 4
-ϥĥ꡼Ϥޤ
+解析ツリーを出力します。
 .RE
 .PP
 \-\-print\-symbols
 .RS 4
-ɽϤޤ
+記号表を出力します。
 .RE
 .PP
 \-pcs, \-\-profile\-callsites
 .RS 4
-ƤӽФȤΥץե롦ǡפޤ
+呼び出しサイトのプロファイル・データをダンプします。
 .RE
 .PP
 \-scripting
 .RS 4
-Υץȵǽͭˤޤ
+シェルのスクリプト機能を有効にします。
 .RE
 .PP
 \-\-stderr=\fIfilename\fR|\fIstream\fR|\fItty\fR
 .RS 4
-ɸ२顼ȥ꡼ꤷե롢ȥ꡼(Ȥ\fIstdout\fR)ˡޤϥƥü˥쥯Ȥޤ
+標準エラー・ストリームを指定したファイル、ストリーム(たとえば\fIstdout\fR)に、またはテキスト端末にリダイレクトします。
 .RE
 .PP
 \-\-stdout=\fIfilename\fR|\fIstream\fR|\fItty\fR
 .RS 4
-ɸϥȥ꡼ꤷե롢ȥ꡼(Ȥ\fIstderr\fR)ˡޤϥƥü˥쥯Ȥޤ
+標準出力ストリームを指定したファイル、ストリーム(たとえば\fIstderr\fR)に、またはテキスト端末にリダイレクトします。
 .RE
 .PP
 \-strict
 .RS 4
-ɸ(ECMAScript Edition 5\&.1)ؤν򶯲strict⡼ɤͭˤˤ궦̤Υǥ󥰡顼ñ˸ФǤ褦ˤʤޤ
+標準(ECMAScript Edition 5\&.1)への準拠を強化するstrictモードを有効にし、これにより共通のコーディング・エラーを簡単に検出できるようになります。
 .RE
 .PP
 \-t=\fIzone\fR, \-timezone=\fIzone\fR
 .RS 4
-ץȤμ¹ԤФꤷॾꤷޤOSꤵ줿ॾ򥪡С饤ɤ\fIDate\fR֥ȤǻѤޤ
+スクリプトの実行に対し指定したタイムゾーンを設定します。OSで設定されたタイムゾーンをオーバーライドし、\fIDate\fRオブジェクトで使用されます。
 .RE
 .PP
 \-tcs=\fIparameter\fR, \-\-trace\-callsites=\fIparameter\fR
 .RS 4
-ƽФȤΥȥ졼Υ⡼ɤͭˤޤѲǽʥѥ᡼ϡΤȤǤ
+呼出しサイトのトレースのモードを有効にします。使用可能なパラメータは、次のとおりです。
 .PP
 miss
 .RS 4
-ƽФȤΥߥȥ졼ޤ
+呼出しサイトのミスをトレースします。
 .RE
 .PP
 enterexit
 .RS 4
-ƽФȤؤνȥ졼ޤ
+呼出しサイトへの出入りをトレースします。
 .RE
 .PP
 objects
 .RS 4
-֥ȤΥץѥƥϤޤ
+オブジェクトのプロパティを出力します。
 .RE
 .RE
 .PP
 \-\-verify\-code
 .RS 4
-Хȥɤ¹Ԥ˸ڤޤ
+バイトコードを実行する前に検証します。
 .RE
 .PP
 \-v, \-version
 .RS 4
-NashornСʸϤޤ
+Nashornバージョン文字列を出力します。
 .RE
 .PP
 \-xhelp
 .RS 4
-ޥɥ饤󡦥ץγĥإפϤޤ
+コマンドライン・オプションの拡張ヘルプを出力します。
 .RE
-.SH ""
+.SH "例"
 .PP
-\fBExample 1\fR, NashornѤץȤμ¹
+\fBExample 1\fR, Nashornを使用したスクリプトの実行
 .RS 4
 .sp
 .if n \{\
@@ -352,7 +352,7 @@
 .\}
 .RE
 .PP
-\fBExample 2\fR, ÷⡼ɤǤNashornμ¹
+\fBExample 2\fR, 対話型モードでのNashornの実行
 .RS 4
 .sp
 .if n \{\
@@ -370,7 +370,7 @@
 .\}
 .RE
 .PP
-\fBExample 3\fR, NashornؤΰϤ
+\fBExample 3\fR, Nashornへの引数の渡し
 .RS 4
 .sp
 .if n \{\
@@ -386,7 +386,7 @@
 .RE
 .\}
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .PP
 \fIjrunscript\fR
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jmap
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jmap" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jmap" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jmap \- ץ䥳եޤϥ⡼ȡǥХåСΡѥ֥ȡ꡼ޥåפޤϥҡס꡼ξܺ٤ϤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jmap \- プロセスやコア・ファイルまたはリモート・デバッグ・サーバーの、共用オブジェクト・メモリー・マップまたはヒープ・メモリーの詳細を出力します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -84,93 +84,93 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIpid\fR
 .RS 4
-Ϥ꡼ޥåפΥץIDץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤ
+出力するメモリー・マップのプロセスID。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-Ϥ꡼ޥåפΥե롣
+出力するメモリー・マップのコア・ファイル。
 .RE
 .PP
 \fIremote\-hostname\-or\-IP\fR
 .RS 4
-⡼ȡǥХåС\fIۥ̾\fRޤ\fIIP\fRɥ쥹jsadebugd(1)򻲾ȤƤ
+リモート・デバッグ・サーバーの\fIホスト名\fRまたは\fIIP\fRアドレス。jsadebugd(1)を参照してください。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥ⡼ȡۥȤǼ¹ԤƤΡץͭID
+複数のデバッグ・サーバーが同一のリモート・ホストで実行している場合の、オプション固有のID。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjmap\fRޥɤϡꤵ줿ץ䥳եޤϥ⡼ȡǥХåСΡѥ֥ȡ꡼ޥåפޤϥҡס꡼ξܺ٤Ϥޤꤵ줿ץ64ӥåJavaۥޥ(JVM)Ǽ¹ԤƤ硢\fI\-J\-d64\fRץꤹɬפ礬ޤ򼨤ޤ\fIjmap\fR
-\fI\-J\-d64 \-heap pid\fR
+\fIjmap\fRコマンドは、指定されたプロセスやコア・ファイルまたはリモート・デバッグ・サーバーの、共用オブジェクト・メモリー・マップまたはヒープ・メモリーの詳細を出力します。指定されたプロセスが64ビットJava仮想マシン(JVM)上で実行されている場合、\fI\-J\-d64\fRオプションを指定する必要がある場合があります。次に例を示します。\fIjmap\fR
+\fI\-J\-d64 \-heap pid\fR。
 .PP
-\fB:\fR
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤ\fIdbgeng\&.dll\fRե뤬¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤ\fIjvm\&.dll\fRξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤ򼨤ޤ\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fR
-.SH "ץ"
+\fB注意:\fR
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。\fIdbgeng\&.dll\fRファイルが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。\fIPATH\fR環境変数には、ターゲット・プロセスによって使用される\fIjvm\&.dll\fRの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。次に例を示します。\fIset PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fR。
+.SH "オプション"
 .PP
-<ץʤ>
+<オプションなし>
 .RS 4
-ץѤʤ硢\fIjmap\fRޥɤ϶ѥ֥ȡޥåԥ󥰤ϤޤåJVM˥ɤ줿ѥ֥ȤȤˡϥɥ쥹ޥåԥ󥰤ΥӶѥ֥ȡեΥեѥϤޤưϡOracle Solaris
-\fIpmap\fR桼ƥƥƤޤ
+オプションを使用しない場合、\fIjmap\fRコマンドは共用オブジェクト・マッピングを出力します。ターゲットJVMにロードされた共用オブジェクトごとに、開始アドレス、マッピングのサイズおよび共用オブジェクト・ファイルのフルパスが出力されます。この動作は、Oracle Solaris
+\fIpmap\fRユーティリティと類似しています。
 .RE
 .PP
 \-dump:[live,] format=b, file=\fIfilename\fR
 .RS 4
-Javaҡפ\fIhprof\fRХʥ\fIfilename\fR˥פޤ\fIlive\fR֥ץϥץǤꤷ硢ҡΥƥ֤ʥ֥ȤΤߤפޤҡספ򻲾Ȥˤϡjhat(1)ޥɤѤ줿եɤ߼ޤ
+Javaヒープを\fIhprof\fRバイナリ形式で\fIfilename\fRにダンプします。\fIlive\fRサブオプションはオプションですが、指定した場合、ヒープ内のアクティブなオブジェクトのみがダンプされます。ヒープ・ダンプを参照するには、jhat(1)コマンドを使用して生成されたファイルを読み取ります。
 .RE
 .PP
 \-finalizerinfo
 .RS 4
-եʥ饤ԤäƤ륪֥Ȥ˴ؤϤޤ
+ファイナライズを待っているオブジェクトに関する情報を出力します。
 .RE
 .PP
 \-heap
 .RS 4
-ѤƤ륬١쥯Υҡסޥ꡼إåϢΥҡ׻ѾϤޤˡintern줿ʸοȥϤޤ
+使用されているガベージ・コレクションのヒープ・サマリー、ヘッダー構成、および世代関連のヒープ使用状況を出力します。さらに、internされた文字列の数とサイズも出力されます。
 .RE
 .PP
 \-histo[:live]
 .RS 4
-ҡפΥҥȥϤޤJava饹Ȥˡ֥ȤοХñ̤ǤΥ꡼Ӵ饹̾ϤޤJVM饹̾ϥꥹ(*)ƬդƽϤޤ\fIlive\fR֥ץ󤬻ꤵ줿硢ƥ֤ʥ֥ȤΤߤȤޤ
+ヒープのヒストグラムを出力します。Javaクラスごとに、オブジェクトの数、バイト単位でのメモリー・サイズ、および完全修飾クラス名が出力されます。JVMの内部クラス名はアスタリスク(*)の接頭辞を付けて出力されます。\fIlive\fRサブオプションが指定された場合、アクティブなオブジェクトのみがカウントされます。
 .RE
 .PP
 \-clstats
 .RS 4
-JavaҡפΡ饹ϢץǡϤޤ饹Ȥˡ̾֡ɥ쥹ƥ饹ӥ饹ɤ饹οȥϤޤ
+Javaヒープの、クラス・ローダー関連の統計データを出力します。クラス・ローダーごとに、その名前、状態、アドレス、親クラス・ローダー、およびクラス・ローダーがロードしたクラスの数とサイズが出力されます。
 .RE
 .PP
 \-F
 .RS 4
-ޤPIDʤȤˡΥץ\fIjmap \-dump\fRޤ\fIjmap \-histo\fRץȤȤ˻ѤޤΥ⡼ɤǤϡ\fIlive\fR֥ץϥݡȤޤ
+強制します。PIDが応答しないときに、このオプションを\fIjmap \-dump\fRまたは\fIjmap \-histo\fRオプションとともに使用します。このモードでは、\fIlive\fRサブオプションはサポートされません。
 .RE
 .PP
 \-h
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIjmap\fRޥɤ¹ԤƤJavaۥޥ\fIflag\fRϤޤ
+\fIjmap\fRコマンドを実行しているJava仮想マシンに\fIflag\fRを渡します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jps.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jps.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jps
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ˥󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: モニタリング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jps" "1" "2013ǯ1121" "JDK 8" "˥󥰡ġ"
+.TH "jps" "1" "2013年11月21日" "JDK 8" "モニタリング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jps \- åȡƥǷ¬줿Javaۥޥ(JVM)ɽޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jps \- ターゲット・システム上で計測されたJava仮想マシン(JVM)を一覧表示します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,60 +64,60 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIhostid\fR
 .RS 4
-ץݡȤۥȤμ̻ҡ\fIhostid\fRˤϡ̿ץȥ롢ݡֹ桢˸ͭ¾Υǡꤷץ󡦥ݡͥȤޤ뤳ȤǤޤۥȼ̻Ҥ򻲾ȤƤ
+プロセス・レポートを生成するホストの識別子。\fIhostid\fRには、通信プロトコル、ポート番号、実装に固有な他のデータを指定したオプション・コンポーネントを含めることができます。ホスト識別子を参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjps\fRޥɤϡåȡƥǷ¬줿Java HotSpot VMɽޤΥޥɤɽǤݡȾϡäJVM˴ؤΤ˸ꤵޤ
+\fIjps\fRコマンドは、ターゲット・システム上で計測されたJava HotSpot VMを一覧表示します。このコマンドで表示できるレポート情報は、アクセス権を持ったJVMに関するものに限定されます。
 .PP
-\fIhostid\fRꤻ\fIjps\fRޥɤ¹Ԥ硢롦ۥȤǷ¬줿JVMޤ\fIhostid\fRꤷƵư硢ꤵ줿ץȥȥݡȤѤơꤵ줿ۥȾJVM򸡺ޤ\fIjstatd\fRץåȡۥȾǼ¹ԤƤꤵޤ
+\fIhostid\fRを指定せずに\fIjps\fRコマンドを実行した場合、ローカル・ホストで計測されたJVMが検索されます。\fIhostid\fRを指定して起動した場合、指定されたプロトコルとポートを使用して、指定されたホスト上のJVMを検索します。\fIjstatd\fRプロセスがターゲット・ホスト上で実行されていると想定されます。
 .PP
-\fIjps\fRޥɤϡåȡƥǷ¬줿JVMˤĤơVM̻ҡĤޤ\fIlvmid\fRݡȤޤ\fIlvmid\fRϡŪˤJVMץФ륪ڥ졼ƥ󥰡ƥΥץ̻ҤǤɬ⤽ǤȤϸ¤ޤ󡣥ץꤷʤ硢\fIjps\fRˤäơJavaץꥱ\fIlvmid\fRɽ졢줾˥ץꥱΥ饹̾ޤJARե̾ñʷǼޤδñʷΥ饹̾JARե̾Ǥϡ饹ΥѥåޤJARե롦ѥ󤬾άƤޤ
+\fIjps\fRコマンドは、ターゲット・システムで計測された各JVMについて、ローカルVM識別子、つまり\fIlvmid\fRをレポートします。\fIlvmid\fRは、一般的にはJVMプロセスに対するオペレーティング・システムのプロセス識別子ですが、必ずしもそうであるとは限りません。オプションを指定しない場合、\fIjps\fRによって、各Javaアプリケーションの\fIlvmid\fRが一覧表示され、それぞれにアプリケーションのクラス名またはJARファイル名が簡単な形式で示されます。この簡単な形式のクラス名とJARファイル名では、クラスのパッケージ情報またはJARファイル・パス情報が省略されています。
 .PP
-\fIjps\fRޥɤϡJavaưġѤmain᥽åɤϤ륯饹̾Ȱ򸡺ޤȼεưġѤƥåJVMưϡ\fImain\fR᥽åɤϤ륯饹̾ޤJARե̾ȰѤǤޤ󡣤ξ硢\fIjps\fRޥɤϡ\fImain\fR᥽åɤϤ륯饹̾ޤJARե̾ȰФơʸ\fIUnknown\fRϤޤ
+\fIjps\fRコマンドは、Java起動ツールを使用してmainメソッドに渡されるクラス名と引数を検索します。独自の起動ツールを使用してターゲットJVMを起動した場合は、\fImain\fRメソッドに渡されるクラス名またはJARファイル名と引数は利用できません。この場合、\fIjps\fRコマンドは、\fImain\fRメソッドに渡されるクラス名またはJARファイル名と引数に対して、文字列\fIUnknown\fRを出力します。
 .PP
-\fIjps\fRޥɤJVMΥꥹȤϡΥޥɤ¹Ԥץ󥷥ѥͿ줿˴Ť¤礬ޤΥޥɤϡڥ졼ƥ󥰡ƥȼΥ浡ˤ˴Ťơץ󥷥ѥ˥ͿƤJVMΤߤɽޤ
-.SH "ץ"
+\fIjps\fRコマンドで生成されるJVMのリストは、このコマンドを実行するプリンシパルに与えられたアクセス権に基づき、制限される場合があります。このコマンドは、オペレーティング・システム独自のアクセス制御機構による決定に基づいて、プリンシパルにアクセス権が与えられているJVMのみを一覧表示します。
+.SH "オプション"
 .PP
-\fIjps\fRޥɤǤϡޥɤνϤѹ륪ץ¿ݡȤƤޤ衢Υץϡѹޤѻߤǽޤ
+\fIjps\fRコマンドでは、コマンドの出力を変更するオプションが多数サポートされています。将来、これらのオプションは、変更または廃止される可能性があります。
 .PP
 \-q
 .RS 4
-饹̾JARե̾\fImain\fR᥽åɤϤ줿νϤVM̻ҤΰΤߤޤ
+クラス名、JARファイル名、および\fImain\fRメソッドに渡された引数の出力を抑制し、ローカルVM識別子の一覧のみを生成します。
 .RE
 .PP
 \-m
 .RS 4
-\fImain\fR᥽åɤϤϤޤνϤϡȤ߹ޤƤJVMФ\fInull\fRˤʤ뤳Ȥ⤢ޤ
+\fImain\fRメソッドに渡される引数を出力します。この出力は、組み込まれているJVMに対して\fInull\fRになることもあります。
 .RE
 .PP
 \-l
 .RS 4
-ץꥱ\fImain\fR饹Υե롦ѥå̾ޤϥץꥱJARեؤΥեѥ̾Ϥޤ
+アプリケーションの\fImain\fRクラスのフル・パッケージ名、またはアプリケーションのJARファイルへのフルパス名を出力します。
 .RE
 .PP
 \-v
 .RS 4
-JVMϤɽޤ
+JVMに渡される引数を表示します。
 .RE
 .PP
 \-V
 .RS 4
-饹̾JARե̾mai᥽åɤϤ줿νϤVM̻ҤΰΤߤޤ
+クラス名、JARファイル名、およびmaiメソッドに渡された引数の出力を抑制し、ローカルVM識別子の一覧のみを生成します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JVM\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ\fIץ\fR1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+JVMに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されている\fIオプション\fRを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ۥȼ̻"
+.SH "ホスト識別子"
 .PP
-ۥȼ̻ҡĤޤ\fIhostid\fRϡåȡƥ򼨤ʸǤ\fIhostid\fRʸιʸϡURIιʸбƤޤ
+ホスト識別子、つまり\fIhostid\fRは、ターゲット・システムを示す文字列です。\fIhostid\fR文字列の構文は、URIの構文に対応しています。
 .sp
 .if n \{\
 .RS 4
@@ -131,27 +131,27 @@
 .PP
 \fIprotocol\fR
 .RS 4
-̿ץȥǤ\fIprotocol\fRά졢\fIhostname\fRꤵƤʤ硢ǥեȤΥץȥ뤬ץåȥեͭκŬ줿롦ץȥˤʤޤץȥ뤬ά졢ۥ̾ꤵƤϡǥեȡץȥ\fIrmi\fRˤʤޤ
+通信プロトコルです。\fIprotocol\fRが省略され、\fIhostname\fRが指定されていない場合、デフォルトのプロトコルが、プラットフォーム固有の最適化されたローカル・プロトコルになります。プロトコルが省略され、ホスト名が指定されている場合は、デフォルト・プロトコルは\fIrmi\fRになります。
 .RE
 .PP
 hostname
 .RS 4
-åȡۥȤ򼨤ۥ̾ޤIPɥ쥹Ǥ\fIhostname\fRѥ᡼άƤϡåȡۥȤϥ롦ۥȤˤʤޤ
+ターゲット・ホストを示すホスト名またはIPアドレスです。\fIhostname\fRパラメータが省略されている場合は、ターゲット・ホストはローカル・ホストになります。
 .RE
 .PP
 port
 .RS 4
-⡼ȡС̿뤿ΥǥեȡݡȤǤ\fIhostname\fRѥ᡼άƤ뤫\fIprotocol\fRѥ᡼Ŭ줿롦ץȥꤷƤ硢\fIport\fRѥ᡼̵뤵ޤʳξ硢\fIport\fRѥ᡼ΰϡˤäưۤʤޤǥեȤ
-\fIrmi\fRץȥξ硢\fIport\fRѥ᡼ϡ⡼ȡۥȾrmiregistryΥݡֹ򼨤ޤ\fIport\fRѥ᡼άƤ뤫\fIprotocol\fRѥ᡼\fIrmi\fR򼨤Ƥ硢ǥեȤrmiregistryݡ(1099)Ѥޤ
+リモート・サーバーと通信するためのデフォルト・ポートです。\fIhostname\fRパラメータが省略されているか、\fIprotocol\fRパラメータが、最適化されたローカル・プロトコルを指定している場合、\fIport\fRパラメータは無視されます。それ以外の場合、\fIport\fRパラメータの扱いは、実装によって異なります。デフォルトの
+\fIrmi\fRプロトコルの場合、\fIport\fRパラメータは、リモート・ホスト上のrmiregistryのポート番号を示します。\fIport\fRパラメータが省略されているか、\fIprotocol\fRパラメータが\fIrmi\fRを示している場合、デフォルトのrmiregistryポート(1099)が使用されます。
 .RE
 .PP
 servername
 .RS 4
-Υѥ᡼ΰϡˤäưۤʤޤŬ줿롦ץȥξ硢Υեɤ̵뤵ޤ\fIrmi\fRץȥξ硢Υѥ᡼ϡ⡼ȡۥȾRMI⡼ȡ֥Ȥ̾򼨤ʸˤʤޤܺ٤ϡ\fIjstatd\fRޥɤ\fI\-n\fRץ򻲾ȤƤ
+このパラメータの扱いは、実装によって異なります。最適化されたローカル・プロトコルの場合、このフィールドは無視されます。\fIrmi\fRプロトコルの場合、このパラメータは、リモート・ホスト上のRMIリモート・オブジェクトの名前を示す文字列になります。詳細は、\fIjstatd\fRコマンドの\fI\-n\fRオプションを参照してください。
 .RE
-.SH "ϥեޥå"
+.SH "出力フォーマット"
 .PP
-\fIjps\fRޥɤνϤϡΥѥ˽ޤ
+\fIjps\fRコマンドの出力は、次のパターンに従います。
 .sp
 .if n \{\
 .RS 4
@@ -163,15 +163,15 @@
 .RE
 .\}
 .PP
-٤Ƥνϥȡ϶ʸǶڤޤ\fIarg\fRͤǶѤȡºݤ֥ѥ᡼˰ޥåԥ󥰤褦ȤȤˡޤˤʤޤ
+すべての出力トークンは空白文字で区切られます。\fIarg\fR値の中で空白を使用すると、実際の定位置パラメータに引数をマッピングしようとするときに、あいまいになります。
 .PP
-\fB:\fR
-Υ꡼Ǥηѹǽ뤿ᡢ\fIjps\fRνϤϤ륹ץȤϺʤȤᤷޤ\fIjps\fRϤϤ륹ץȤȡΥġξΥ꡼ǡץȤѹɬפˤʤǽޤ
-.SH ""
+\fB注意:\fR
+将来のリリースでこの形式は変更される可能性があるため、\fIjps\fRの出力を解析するスクリプトは作成しないことをお薦めします。\fIjps\fR出力を解析するスクリプトを作成すると、このツールの将来のリリースで、作成したスクリプトの変更が必要になる可能性があります。
+.SH "例"
 .PP
-ιǤϡ\fIjps\fRޥɤ򼨤ޤ
+この項では、\fIjps\fRコマンドの例を示します。
 .PP
-롦ۥȾǷ¬줿JVMɽ:
+ローカル・ホスト上で計測されたJVMを一覧表示する場合:
 .sp
 .if n \{\
 .RS 4
@@ -186,7 +186,7 @@
 .RE
 .\}
 .PP
-Ǥϡ⡼ȡۥȾǷ¬줿JVMɽޤǤϡ\fIjstat\fRСȡRMI쥸ȥޤ̤γrmiregistryץΤ줫⡼ȡۥȤΥǥեȡݡ(ݡ1099)Ǽ¹ԤƤꤷƤޤޤ롦ۥȤ⡼ȡۥȤؤͭʥäƤ뤳ȤꤷƤޤˤϡ\fI\-l\fRץޤޤ졢饹̾ޤJARե̾ܺ٤ʷǽϤޤ
+次の例では、リモート・ホスト上で計測されたJVMを一覧表示します。この例では、\fIjstat\fRサーバーと、その内部RMIレジストリまたは別の外部rmiregistryプロセスのいずれかが、リモート・ホストのデフォルト・ポート(ポート1099)で実行されていると想定しています。また、ローカル・ホストが、リモート・ホストへの有効なアクセス権を持っていることも想定しています。この例には、\fI\-l\fRオプションも含まれ、クラス名またはJARファイル名を詳細な形式で出力します。
 .sp
 .if n \{\
 .RS 4
@@ -200,7 +200,7 @@
 .RE
 .\}
 .PP
-ǤϡRMI쥸ȥ˥ǥեȤǤϤʤݡȤѤơ⡼ȡۥȾǷ¬줿JVMɽޤǤϡRMI쥸ȥ꤬ݡ2002˥Хɤ줿\fIjstatd\fRС⡼ȡۥȾǼ¹ԤƤꤷƤޤޤ\fI\-m\fRץѤơɽ줿줾Javaץꥱ\fImain\fR᥽åɤϤȤ߹Ǥޤ
+次の例では、RMIレジストリにデフォルトではないポートを使用して、リモート・ホスト上で計測されたJVMを一覧表示します。この例では、内部RMIレジストリがポート2002にバインドされた\fIjstatd\fRサーバーが、リモート・ホスト上で実行されていると想定しています。また、\fI\-m\fRオプションを使用して、一覧表示されたそれぞれのJavaアプリケーションの\fImain\fRメソッドに渡される引数を組み込んでいます。
 .sp
 .if n \{\
 .RS 4
@@ -213,7 +213,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jrunscript
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ץƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: スクリプティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jrunscript" "1" "2013ǯ1121" "JDK 8" "ץƥ󥰡ġ"
+.TH "jrunscript" "1" "2013年11月21日" "JDK 8" "スクリプティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jrunscript \- ÷⡼ɤȥХå⡼ɤ򥵥ݡȤ륳ޥɥ饤󡦥ץȡ¹ԤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jrunscript \- 対話型モードとバッチ・モードをサポートするコマンドライン・スクリプト・シェルを実行します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,83 +64,83 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIarguments\fR
 .RS 4
-Ѥ硢ץޤϥޥ̾ľ˵ҤƤ򻲾ȤƤ
+引数を使用する場合、オプションまたはコマンド名の直後に記述してください。引数を参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjrunscript\fRޥɤϡ˰¸ʤޥɥ饤󡦥ץȡǤ\fIjrunscript\fRϡ÷(read\-eval\-print)⡼ɤȥХå(\fI\-f\fRץ)⡼ɤξΥץȼ¹Ԥ򥵥ݡȤޤǥեȤλѸJavaScriptǤ\fI\-l\fRץѤ¾θǤޤ\fIjrunscript\fRޥɤϡJavaȥץȸȤ̿ѤõŪʥץߥ󥰡򥵥ݡȤޤ
-.SH "ץ"
+\fIjrunscript\fRコマンドは、言語に依存しないコマンドライン・スクリプト・シェルです。\fIjrunscript\fRは、対話型(read\-eval\-print)モードとバッチ(\fI\-f\fRオプション)・モードの両方のスクリプト実行をサポートします。デフォルトの使用言語はJavaScriptですが、\fI\-l\fRオプションを使用すれば他の言語も指定できます。\fIjrunscript\fRコマンドは、Javaとスクリプト言語との通信を使用して探求的なプログラミング・スタイルをサポートします。
+.SH "オプション"
 .PP
 \-classpath \fIpath\fR
 .RS 4
-ץȤɬפΤ륯饹եξ򼨤ޤ
+スクリプトがアクセスする必要のあるクラス・ファイルの場所を示します。
 .RE
 .PP
 \-cp \fIpath\fR
 .RS 4
 \fI\-classpath\fR
-\fIpath\fRƱǤ
+\fIpath\fRと同じです。
 .RE
 .PP
 \-D\fIname\fR=\fIvalue\fR
 .RS 4
-JavaΥƥࡦץѥƥꤷޤ
+Javaのシステム・プロパティを設定します。
 .RE
 .PP
 \-J\fIflag\fR
 .RS 4
-\fIflag\fR\fIjrunscript\fRޥɤ¹ԤƤJavaۥޥľϤޤ
+\fIflag\fRを、\fIjrunscript\fRコマンドが実行されているJava仮想マシンに直接渡します。
 .RE
 .PP
 \-I \fIlanguage\fR
 .RS 4
-ꤵ줿ץȸѤޤǥեȤǤJavaScriptѤޤ¾ΥץȸѤˤϡ\fI\-cp\fRޤ\fI\-classpath\fRץѤơб륹ץȡ󥸥JARեꤹɬפޤ
+指定されたスクリプト言語を使用します。デフォルトではJavaScriptが使用されます。他のスクリプト言語を使用するには、\fI\-cp\fRまたは\fI\-classpath\fRオプションを使用して、対応するスクリプト・エンジンのJARファイルを指定する必要があります。
 .RE
 .PP
 \-e \fIscript\fR
 .RS 4
-ꤵ줿ץȤɾޤΥץѤСޥɥ饤ˤ٤Ƥꤵ줿1ԥץȤ¹ԤǤޤ
+指定されたスクリプトを評価します。このオプションを使用すれば、コマンドラインにすべてが指定された1行スクリプトを実行できます。
 .RE
 .PP
 \-encoding \fIencoding\fR
 .RS 4
-ץȡեɼ˻Ѥʸ󥳡ǥ󥰤ꤷޤ
+スクリプト・ファイルの読取り時に使用する文字エンコーディングを指定します。
 .RE
 .PP
 \-f \fIscript\-file\fR
 .RS 4
-ꤵ줿ץȡե(Хå⡼)ɾޤ
+指定されたスクリプト・ファイル(バッチ・モード)を評価します。
 .RE
 .PP
 \-f \-
 .RS 4
-ɸϤ饹ץȤɤ߼ꡢɾޤ(÷⡼)
+標準入力からスクリプトを読み取り、それを評価します(対話型モード)。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-?
 .RS 4
-إסåɽƽλޤ
+ヘルプ・メッセージを表示して終了します。
 .RE
 .PP
 \-q
 .RS 4
-Ѳǽʤ٤ƤΥץȡ󥸥ɽȡλޤ
+利用可能なすべてのスクリプト・エンジンを一覧表示したあと、終了します。
 .RE
-.SH ""
+.SH "引数"
 .PP
-arguments¸ߤƤơ\fI\-e\fR\fI\-f\fRΤΥץѤʤä硢ǽΰץȡեȤʤꡢ¾ΰ¸ߤϥץȤϤޤargumentsȡ\fI\-e\fRޤ\fI\-f\fRץ󤬻ѤƤ硢٤ƤargumentsץȤϤޤarguments\fI\-e\fR\fI\-f\fRɤ¸ߤʤäϡ÷⡼ɤѤޤץȤ饹ץȰѤˤϡ\fIarguments\fRȤ̾\fIString\fR󷿤Υ󥸥ѿѤޤ
-.SH ""
-.SS "饤󡦥ץȤμ¹"
+argumentsが存在していて、かつ\fI\-e\fR、\fI\-f\fRのいずれのオプションも使用されなかった場合、最初の引数がスクリプト・ファイルとなり、他の引数が存在する場合はスクリプトに渡されます。argumentsと、\fI\-e\fRまたは\fI\-f\fRオプションが使用されている場合、すべてのargumentsがスクリプトに渡されます。arguments、\fI\-e\fR、\fI\-f\fRがどれも存在しなかった場合は、対話型モードが使用されます。スクリプトからスクリプト引数を使用するには、\fIarguments\fRという名前の\fIString\fR配列型のエンジン変数を使用します。
+.SH "例"
+.SS "インライン・スクリプトの実行"
 .sp
 .if n \{\
 .RS 4
@@ -152,7 +152,7 @@
 .if n \{\
 .RE
 .\}
-.SS "ꤵ줿λѤӥץȡեɾ"
+.SS "指定された言語の使用およびスクリプト・ファイルの評価"
 .sp
 .if n \{\
 .RS 4
@@ -163,7 +163,7 @@
 .if n \{\
 .RE
 .\}
-.SS "÷⡼"
+.SS "対話型モード"
 .sp
 .if n \{\
 .RS 4
@@ -184,9 +184,9 @@
 .if n \{\
 .RE
 .\}
-.SS "ץȰꤷץȡեμ¹"
+.SS "スクリプト引数を指定したスクリプト・ファイルの実行"
 .PP
-test\&.jsեϥץȡեǤ\fIarg1\fR\fIarg2\fR\fIarg3\fRγưץȤϤޤץȤargumentsѤƤΰ˥Ǥޤ
+test\&.jsファイルはスクリプト・ファイルです。\fIarg1\fR、\fIarg2\fRおよび\fIarg3\fRの各引数がスクリプトに渡されます。スクリプトはarguments配列を使用してこれらの引数にアクセスできます。
 .sp
 .if n \{\
 .RS 4
@@ -197,10 +197,10 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .PP
-JavaScriptѤ硢桼ץȤɾˡ\fIjrunscript\fRޥɤϤĤȹߴؿȹߥ֥ȤޤJavaScriptȹߤˤĤƤϡhttp://code\&.google\&.com/p/jsdoc\-toolkit/ˤ
-JsDoc\-Toolkit򻲾ȤƤ
+JavaScriptが使用される場合、ユーザー定義スクリプトを評価する前に、\fIjrunscript\fRコマンドはいくつかの組込み関数や組込みオブジェクトを初期化します。これらのJavaScriptの組込みについては、http://code\&.google\&.com/p/jsdoc\-toolkit/にある
+JsDoc\-Toolkitを参照してください。
 .br
 'pl 8.5i
 'bp
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jsadebugd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jsadebugd" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jsadebugd" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jsadebugd \- Javaץޤϥե³ǥХåСȤƵǽޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jsadebugd \- Javaプロセスまたはコア・ファイルに接続し、デバッグ・サーバーとして機能します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -74,26 +74,26 @@
 .PP
 \fIpid\fR
 .RS 4
-ǥХåС³ץΥץIDǤץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤñΥץ³ǤǥХåСΥ󥹥󥹤ϡ1Ĥ¤ޤ
+デバッグ・サーバーが接続するプロセスのプロセスIDです。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。単一のプロセスに接続できるデバッグ・サーバーのインスタンスは、1つに制限されます。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-ǥХåС³륳եǤ
+デバッグ・サーバーを接続するコア・ファイルです。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥޥǼ¹ԤƤɬפˤʤ롢ץΰդIDǤIDϡ⡼ȡ饤Ȥ³ΥǥХåСꤹ뤿˻ѤɬפޤIDϡñΥޥǰդˤɬפޤ
+複数のデバッグ・サーバーが同一のマシン上で実行されている場合に必要になる、オプションの一意のIDです。このIDは、リモート・クライアントが、接続先のデバッグ・サーバーを特定するために使用する必要があります。このIDは、単一のマシン内で一意にする必要があります。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjsadebugd\fRޥɤϡJavaץޤϥե³ǥХåСȤƵǽޤ\fIjstack\fR\fIjmap\fR\fIjinfo\fRʤɤΥ⡼ȡ饤ȤϡJava Remote Method Invocation (RMI)ѤƤ륵С³Ǥޤ\fIjsadebugd\fRޥɤưˡ\fIrmiregistry\fRޥɤRMI쥸ȥ򼡤Τ褦˵ưޤ\fI$JAVA_HOME\fRJDKΥ󥹥ȡ롦ǥ쥯ȥǤ
+\fIjsadebugd\fRコマンドは、Javaプロセスまたはコア・ファイルに接続し、デバッグ・サーバーとして機能します。\fIjstack\fR、\fIjmap\fRおよび\fIjinfo\fRなどのリモート・クライアントは、Java Remote Method Invocation (RMI)を使用しているサーバーに接続できます。\fIjsadebugd\fRコマンドを起動する前に、\fIrmiregistry\fRコマンドでRMIレジストリを次のように起動します。\fI$JAVA_HOME\fRはJDKのインストール・ディレクトリです。
 .sp
 .if n \{\
 .RS 4
@@ -105,12 +105,12 @@
 .RE
 .\}
 .PP
-RMI쥸ȥ꤬ưƤʤ硢\fIjsadebugd\fRޥɤRMI쥸ȥɸ(1099)ݡȤǵưޤǥХåСϡ\fISIGINT\fR뤳ȤˤߤǤޤSIGINTˤϡ\fB[Ctrl] + [C]\fR򲡤ޤ
+RMIレジストリが起動していない場合、\fIjsadebugd\fRコマンドはRMIレジストリを標準(1099)ポートで内部で起動します。デバッグ・サーバーは、\fISIGINT\fRを送信することにより停止できます。SIGINTを送信するには、\fB[Ctrl] + [C]\fRを押します。
 .PP
-\fB:\fR
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤ\fIdbgeng\&.dll\fR¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤjvm\&.dllξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤ:
+\fB注意:\fR
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。\fIdbgeng\&.dll\fRが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。\fIPATH\fR環境変数には、ターゲット・プロセスによって使用されるjvm\&.dllの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。例:
 \fIs\fR\fIet PATH=%JDK_HOME%\ejre\ebin\eclient;%PATH%\fR
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jstack
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ȥ֥륷塼ƥ󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: トラブルシューティング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jstack" "1" "2013ǯ1121" "JDK 8" "ȥ֥륷塼ƥ󥰡ġ"
+.TH "jstack" "1" "2013年11月21日" "JDK 8" "トラブルシューティング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jstack \- Javaץեޤϥ⡼ȡǥХåСФJavaåɤΥåȥ졼ϤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jstack \- Javaプロセス、コア・ファイルまたはリモート・デバッグ・サーバーに対するJavaスレッドのスタック・トレースを出力します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -84,40 +84,40 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIpid\fR
 .RS 4
-Ϥ륹åȥ졼ΥץIDǤץJavaץǤɬפޤޥǼ¹ԤƤJavaץΰˤϡjps(1)ޥɤѤޤ
+出力するスタック・トレースのプロセスIDです。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)コマンドを使用します。
 .RE
 .PP
-\fI¹Բǽե\fR
+\fI実行可能ファイル\fR
 .RS 4
-פκJava¹Բǽե롣
+コア・ダンプの作成元のJava実行可能ファイル。
 .RE
 .PP
-\fI\fR
+\fIコア\fR
 .RS 4
-Ϥ륹åȥ졼ΥեǤ
+出力するスタック・トレースのコア・ファイルです。
 .RE
 .PP
 \fIremote\-hostname\-or\-IP\fR
 .RS 4
-⡼ȡǥХåС\fIۥ̾\fRޤ\fIIP\fRɥ쥹jsadebugd(1)򻲾ȤƤ
+リモート・デバッグ・サーバーの\fIホスト名\fRまたは\fIIP\fRアドレス。jsadebugd(1)を参照してください。
 .RE
 .PP
 \fIserver\-id\fR
 .RS 4
-ʣΥǥХåСƱΥ⡼ȡۥȤǼ¹ԤƤΡץͭID
+複数のデバッグ・サーバーが同一のリモート・ホストで実行している場合の、オプション固有のID。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjstack\fRޥɤϡꤵ줿Javaץեޤϥ⡼ȡǥХåСФJavaåɤJavaåȥ졼ϤޤJavaե졼ऴȤˡե륯饹̾᥽å̾Хȥɡǥå(bci)ӹֹ(Ѳǽʾ)Ϥޤ\fI\-m\fRץѤȡ\fIjstack\fRޥɤϡ٤ƤΥåɤJavaե졼ȥͥƥ֡ե졼ξ򡢥ץࡦ(PC)ȤȤ˽Ϥޤͥƥ֡ե졼ऴȤˡPC˺Ǥᤤͥƥ֡ܥ(Ѳǽʾ)ϤޤC++ʬ̾ʬޤC++̾ʬˤϡΥޥɤνϤ\fIc++filt\fR˥ѥפޤꤵ줿ץ64ӥåJavaۥޥǼ¹ԤƤϡ\fI\-J\-d64\fRץꤹɬפޤ(:
-\fIjstack \-J\-d64 \-m pid\fR)
+\fIjstack\fRコマンドは、指定されたJavaプロセス、コア・ファイルまたはリモート・デバッグ・サーバーに対するJavaスレッドのJavaスタック・トレースを出力します。Javaフレームごとに、フルクラス名、メソッド名、バイトコード・インデックス(bci)、および行番号(利用可能な場合)が出力されます。\fI\-m\fRオプションを使用すると、\fIjstack\fRコマンドは、すべてのスレッドのJavaフレームとネイティブ・フレームの両方を、プログラム・カウンタ(PC)とともに出力します。ネイティブ・フレームごとに、PCに最も近いネイティブ・シンボル(利用可能な場合)が出力されます。C++分解名は分解解除されません。C++名を分解解除するには、このコマンドの出力を\fIc++filt\fRにパイプします。指定されたプロセスが64ビットJava仮想マシン上で実行されている場合は、\fI\-J\-d64\fRオプションを指定する必要があります(例:
+\fIjstack \-J\-d64 \-m pid\fR)。
 .PP
-\fB\fR
-Υ桼ƥƥϥݡоݳǤꡢJDKΥ꡼ǤѤǤʤʤǽޤdbgeng\&.dllե뤬¸ߤƤʤWindowsƥǤϡDebugging Tools For Windows򥤥󥹥ȡ뤷ʤȤΥġ뤬ưޤ󡣤ޤ\fIPATH\fRĶѿˤϡåȡץˤäƻѤjvm\&.dllξꡢޤϥå塦סե뤬줿꤬ޤޤ褦ˤƤ򼨤ޤ
+\fB注意\fR
+このユーティリティはサポート対象外であり、将来のJDKのリリースでは利用できなくなる可能性があります。dbgeng\&.dllファイルが存在していないWindowsシステムでは、Debugging Tools For Windowsをインストールしないとこれらのツールが正常に動作しません。また、\fIPATH\fR環境変数には、ターゲット・プロセスによって使用されるjvm\&.dllの場所、またはクラッシュ・ダンプ・ファイルが生成された場所が含まれるようにしてください。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -128,39 +128,39 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-F
 .RS 4
 \fIjstack\fR
 [\fI\-l\fR]
-\fIpid\fRʤ˥åפޤ
+\fIpid\fRが応答しない場合にスタック・ダンプを強制します。
 .RE
 .PP
 \-l
 .RS 4
-ĹΥꥹȡͭ\fIjava\&.util\&.concurrent\fRνͭǤ륷󥯥ʥΰʤɡåˤĤƤɲþޤhttp://docs\&.oracle\&.com/javase/8/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer\&.htmlˤ
-\fIAbstractOwnableSynchronizer\fR饹Ҥ򻲾ȤƤ
+長形式のリスト。所有\fIjava\&.util\&.concurrent\fRの所有できるシンクロナイザの一覧など、ロックについての追加情報を印刷します。http://docs\&.oracle\&.com/javase/8/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer\&.htmlにある
+\fIAbstractOwnableSynchronizer\fRクラス記述を参照してください
 .RE
 .PP
 \-m
 .RS 4
-JavaӥͥƥC/C++ե졼ξĺ⡼ɤΥåȥ졼Ϥޤ
+JavaおよびネイティブC/C++フレームの両方を持つ混合モードのスタック・トレースを出力します。
 .RE
 .PP
 \-h
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
 .PP
 \-help
 .RS 4
-إסåϤޤ
+ヘルプ・メッセージが出力されます。
 .RE
-.SH "ΤԶ"
+.SH "既知の不具合"
 .PP
-⡼ɤΥåȥ졼Ǥϡ\fI\-m\fRץϥ⡼ȡǥХåСǤϵǽޤ
-.SH "Ϣ"
+混合モードのスタック・トレースでは、\fI\-m\fRオプションはリモート・デバッグ・サーバーでは機能しません。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jstat
 .\" Language: English
-.\" Date: 2011ǯ510
-.\" SectDesc: ˥󥰡ġ
+.\" Date: 2011年5月10日
+.\" SectDesc: モニタリング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jstat" "1" "2011ǯ510" "JDK 8" "˥󥰡ġ"
+.TH "jstat" "1" "2011年5月10日" "JDK 8" "モニタリング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jstat \- Javaۥޥ(JVM)פƻ뤷ޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jstat \- Java仮想マシン(JVM)の統計を監視します。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,17 +64,17 @@
 .PP
 \fIgeneralOption\fR
 .RS 4
-ñȤǻѤŪʥޥɥ饤󡦥ץǤ(\fI\-help\fRޤ\fI\-options\fR)Ūʥץ򻲾ȤƤ
+単独で使用する一般的なコマンドライン・オプションです(\fI\-help\fRまたは\fI\-options\fR)。一般的なオプションを参照してください。
 .RE
 .PP
 \fIoutputOptions\fR
 .RS 4
-ñ\fIstatOption\fR\fI\-t\fR\fI\-h\fR\fI\-J\fRΤ줫Υץǹ1İʾνϥץ󡣽ϥץ򻲾ȤƤ
+単一の\fIstatOption\fRと\fI\-t\fR、\fI\-h\fRおよび\fI\-J\fRのいずれかのオプションで構成される1つ以上の出力オプション。出力オプションを参照してください。
 .RE
 .PP
 \fIvmid\fR
 .RS 4
-åJVM򼨤ʸǤ벾ۥޥ̻ҤǤŪʹʸϼΤȤǤ
+ターゲットJVMを示す文字列である仮想マシン識別子です。一般的な構文は次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -85,24 +85,24 @@
 .if n \{\
 .RE
 .\}
-\fIvmid\fRʸιʸϡURIιʸбƤޤ\fIvmid\fRʸϡJVMɽñ顢̿ץȥ롢ݡֹ桢¾μͭͤ򼨤ʣʹ¤ޤǡ͡˰ۤʤޤۥޥ̻Ҥ򻲾ȤƤ
+\fIvmid\fR文字列の構文は、URIの構文に対応しています。\fIvmid\fR文字列は、ローカルJVMを表す単純な整数から、通信プロトコル、ポート番号、および他の実装固有の値を示す複雑な構造まで、様々に異なります。仮想マシン識別子を参照してください。
 .RE
 .PP
 \fIinterval\fR [s|ms]
 .RS 4
-(s)ޤϥߥ(ms)Τꤷñ̤ǤΥץ󥰴ֳ֤ǤǥեȤñ̤ϥߥäǤˤɬפޤꤷ硢\fIjstat\fRޥɤϳƴֳ֤ǽϤޤ
+秒(s)またはミリ秒(ms)のうち指定した単位でのサンプリング間隔です。デフォルトの単位はミリ秒です。正の整数にする必要があります。指定した場合、\fIjstat\fRコマンドは各間隔で出力を生成します。
 .RE
 .PP
 \fIcount\fR
 .RS 4
-ɽ륵ץǤǥե̵ͤ¤ǡåJVMλޤǡޤ\fIjstat\fRޥɤλޤǡ\fIjstat\fRޥɤץǡɽޤͤϡǤɬפޤ
+表示するサンプル数です。デフォルト値は無限で、ターゲットJVMが終了するまで、または\fIjstat\fRコマンドが終了するまで、\fIjstat\fRコマンドは統計データを表示します。この値は、正の整数である必要があります。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjstat\fRޥɤϡ֤ƤJava HotSpot VMΥѥեޥץǡɽޤåJVMϡۥޥ̻Ҥޤ\fIvmid\fRץˤäƼ̤ޤ
-.SH "ۥޥ̻"
+\fIjstat\fRコマンドは、設置されているJava HotSpot VMのパフォーマンス統計データを表示します。ターゲットJVMは、仮想マシン識別子または\fIvmid\fRオプションによって識別されます。
+.SH "仮想マシン識別子"
 .PP
-\fIvmid\fRʸιʸϡURIιʸбƤޤ
+\fIvmid\fR文字列の構文は、URIの構文に対応しています。
 .sp
 .if n \{\
 .RS 4
@@ -116,380 +116,380 @@
 .PP
 \fIprotocol\fR
 .RS 4
-̿ץȥǤ\fIprotocol\fRͤά졢ۥ̾ꤵƤʤ硢ǥեȤΥץȥ뤬ץåȥեͭκŬ줿롦ץȥˤʤޤ\fIprotocol\fRͤά졢ۥ̾ꤵƤϡǥեȡץȥ\fIrmi\fRˤʤޤ
+通信プロトコルです。\fIprotocol\fR値が省略され、ホスト名が指定されていない場合、デフォルトのプロトコルが、プラットフォーム固有の最適化されたローカル・プロトコルになります。\fIprotocol\fR値が省略され、ホスト名が指定されている場合は、デフォルト・プロトコルは\fIrmi\fRになります。
 .RE
 .PP
 \fIlvmid\fR
 .RS 4
-åJVMΥ벾ۥޥ̻ҤǤ\fIlvmid\fRϡƥJVMդ˼̤ץåȥեͭͤǤ\fIlvmid\fRϡۥޥ̻ҤͣɬǤǤ\fIlvmid\fRϡŪˤϥåJVMץФ륪ڥ졼ƥ󥰡ƥΥץ̻ҤǤɬ⤽ǤȤϸ¤ޤ\fIjps\fRޥɤѤơ\fIlvmid\fRǤޤޤUNIXץåȥեǤ\fIps\fRޥɤѤơWindowsǤWindowsޥ͡Ѥơ\fIlvmid\fRǤޤ
+ターゲットJVMのローカル仮想マシン識別子です。\fIlvmid\fRは、システム上のJVMを一意に識別するプラットフォーム固有の値です。\fIlvmid\fRは、仮想マシン識別子の唯一の必須要素です。\fIlvmid\fRは、一般的にはターゲットJVMプロセスに対するオペレーティング・システムのプロセス識別子ですが、必ずしもそうであるとは限りません。\fIjps\fRコマンドを使用して、\fIlvmid\fRを特定できます。また、UNIXプラットフォームでは\fIps\fRコマンドを使用して、WindowsではWindowsタスク・マネージャを使用して、\fIlvmid\fRを特定できます。
 .RE
 .PP
 \fIhostname\fR
 .RS 4
-åȡۥȤ򼨤ۥ̾ޤIPɥ쥹Ǥ\fIhostname\fRͤάƤϡåȡۥȤϥ롦ۥȤˤʤޤ
+ターゲット・ホストを示すホスト名またはIPアドレスです。\fIhostname\fR値が省略されている場合は、ターゲット・ホストはローカル・ホストになります。
 .RE
 .PP
 \fIport\fR
 .RS 4
-⡼ȡС̿뤿ΥǥեȡݡȤǤ\fIhostname\fRͤάƤ뤫Ŭ줿롦ץȥ뤬\fIprotocol\fRͤ˻ꤵƤ硢\fIport\fR̵ͤ뤵ޤʳξ硢\fIport\fRѥ᡼ΰϡˤäưۤʤޤǥեȤ\fIrmi\fRץȥξ硢ݡͤϡ⡼ȡۥȾrmiregistryΥݡֹ򼨤ޤ\fIport\fRͤά졢\fIprotocol\fRͤ\fIrmi\fRꤵƤ硢ǥեȤrmiregistryݡ(1099)Ѥޤ
+リモート・サーバーと通信するためのデフォルト・ポートです。\fIhostname\fR値が省略されているか、最適化されたローカル・プロトコルが\fIprotocol\fR値に指定されている場合、\fIport\fR値は無視されます。それ以外の場合、\fIport\fRパラメータの扱いは、実装によって異なります。デフォルトの\fIrmi\fRプロトコルの場合、ポート値は、リモート・ホスト上のrmiregistryのポート番号を示します。\fIport\fR値が省略され、\fIprotocol\fR値で\fIrmi\fRが指定されている場合、デフォルトのrmiregistryポート(1099)が使用されます。
 .RE
 .PP
 \fIservername\fR
 .RS 4
-\fIservername\fRѥ᡼ΰϡˤäưۤʤޤŬ줿롦ץȥξ硢Υեɤ̵뤵ޤ\fIrmi\fRץȥξ硢ϡ⡼ȡۥȾRMI꥽֥Ȥ̾ɽޤ
+\fIservername\fRパラメータの扱いは、実装によって異なります。最適化されたローカル・プロトコルの場合、このフィールドは無視されます。\fIrmi\fRプロトコルの場合、これは、リモート・ホスト上のRMIリソース・オブジェクトの名前を表します。
 .RE
-.SH "ץ"
+.SH "オプション"
 .PP
-\fIjstat\fRޥɤϡŪʥץȽϥץ2ĤΥפΥץ򥵥ݡȤƤޤŪʥץѤ硢\fIjstat\fRޥɤϴñʻΨӥСɽޤϥץˤäơץǡϤƤȷޤޤ
+\fIjstat\fRコマンドは、一般的なオプションと出力オプションの2つのタイプのオプションをサポートしています。一般的なオプションを使用した場合、\fIjstat\fRコマンドは簡単な使用率およびバージョン情報を表示します。出力オプションによって、統計データ出力の内容と形式が決まります。
 .PP
-٤ƤΥץȤεǽϡΥ꡼ѹޤѻߤǽޤ
-.SS "Ūʥץ"
+すべてのオプションとその機能は、将来のリリースで変更または廃止される可能性があります。
+.SS "一般的なオプション"
 .PP
-줫ΰŪʥץꤷ硢¾Υץޤϥѥ᡼ϰڻǤޤ
+いずれかの一般的なオプションを指定した場合、他のオプションまたはパラメータは一切指定できません。
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
 .PP
 \-options
 .RS 4
-StaticץΥꥹȤɽޤϥץ򻲾ȤƤ
+Staticオプションのリストを表示します。出力オプションを参照してください。
 .RE
-.SS "ϥץ"
+.SS "出力オプション"
 .PP
-ŪʥץꤷʤˡϥץǤޤϥץϡ\fIjstat\fRޥɤνϤƤȷꤷñ\fIstatOption\fRȤ줫νϥץ(\fI\-h\fR\fI\-t\fR\fI\-J\fR)ǹޤ\fIstatOption\fRϺǽ˵Ҥɬפޤ
+一般的なオプションを指定しない場合に、出力オプションを指定できます。出力オプションは、\fIjstat\fRコマンドの出力の内容と形式を決定し、単一の\fIstatOption\fRといずれかの出力オプション(\fI\-h\fR、\fI\-t\fRおよび\fI\-J\fR)で構成されます。\fIstatOption\fRは最初に記述する必要があります。
 .PP
-Ϥϡ󤬶Ƕڤ줿ɽηˤʤޤȥޤإåԤˤäơΰ̣狼ޤإåɽ٤ꤹˤϡ\fI\-h\fRץѤޤΥإå̾ϡ͡ʥץ֤ǰݤƤޤ̤ˡ2ĤΥץƱ̾󤬻ѤƤС2ĤΥǡƱǤ
+出力は、各列が空白で区切られた表の形式になります。タイトルを含むヘッダー行によって、各列の意味がわかります。ヘッダーの表示頻度を設定するには、\fI\-h\fRオプションを使用します。列のヘッダー名は、様々なオプション間で一貫性が保たれています。一般に、2つのオプションで同じ名前の列が使用されていれば、2つの列のデータ・ソースは同じです。
 .PP
-\fI\-t\fRץѤȡTimestampȤ٥դॹפ󤬡ϤκǽȤɽޤTimestampˤϡåJVMεưηв֤ñ̤ɽޤॹפ٤ϡ͡װˤäưۤʤꡢ̤٤ΤäƥǤΥåɡ塼ٱˤưޤ
+\fI\-t\fRオプションを使用すると、Timestampというラベルの付いたタイムスタンプの列が、出力の最初の列として表示されます。Timestamp列には、ターゲットJVMの起動からの経過時間が、秒単位で表示されます。タイムスタンプの精度は、様々な要因によって異なり、大量の負荷のかかったシステムでのスレッド・スケジュールの遅延により変動します。
 .PP
-intervalcountѥ᡼Ѥơ\fIjstat\fRޥɤνϤɽ٤Ȳ򤽤줾ꤷޤ
+intervalおよびcountパラメータを使用して、\fIjstat\fRコマンドがその出力を表示する頻度と回数をそれぞれ指定します。
 .PP
-\fB:\fR
-Υ꡼Ǥηѹǽ뤿ᡢ\fIjstat\fRޥɤνϤϤ륹ץȤϺʤǤ\fIjstat\fRޥɤνϤϤ륹ץȤϡΥġξΥ꡼ǡΥץȤѹɬפ뤳ȤαդƤ
+\fB注意:\fR
+将来のリリースでこの形式は変更される可能性があるため、\fIjstat\fRコマンドの出力を解析するスクリプトは作成しなでください。\fIjstat\fRコマンドの出力を解析するスクリプトを作成する場合は、このツールの将来のリリースで、そのスクリプトを変更する必要があることに留意してください。
 .PP
 \-\fIstatOption\fR
 .RS 4
-\fIjstat\fRޥɤɽץǡꤷޤˡѲǽʥץΰ򼨤ޤΥץåȥեࡦ󥹥ȡΥץɽˤϡŪʥץ\fI\-options\fRѤޤStatץ󤪤ӽϤ򻲾ȤƤ
+\fIjstat\fRコマンドが表示する統計データ情報を指定します。次に、利用可能なオプションの一覧を示します。特定のプラットフォーム・インストールのオプションを一覧表示するには、一般的なオプションの\fI\-options\fRを使用します。Statオプションおよび出力を参照してください。
 .sp
-\fIclass\fR: 饹ư˴ؤץǡɽޤ
+\fIclass\fR: クラス・ローダーの動作に関する統計データを表示します。
 .sp
-\fIcompiler\fR: Java HotSpot VM Just\-in\-Timeѥư˴ؤץǡɽޤ
+\fIcompiler\fR: Java HotSpot VM Just\-in\-Timeコンパイラの動作に関する統計データを表示します。
 .sp
-\fIgc\fR: ١쥯Ȥ줿ҡפư˴ؤץǡɽޤ
+\fIgc\fR: ガベージ・コレクトされたヒープの動作に関する統計データを表示します。
 .sp
-\fIgccapacity\fR: 头Ȥ̤бΰ˴ؤץǡɽޤ
+\fIgccapacity\fR: 世代ごとの容量と対応する領域に関する統計データを表示します。
 .sp
-\fIgccause\fR: ١쥯ץǡΥޥ꡼(\fI\-gcutil\fRƱ)ȡľӸ(ŬѲǽʾ)Υ١쥯󡦥٥Ȥθɽޤ
+\fIgccause\fR: ガベージ・コレクション統計データのサマリー(\fI\-gcutil\fRと同じ)と、直前および現在(適用可能な場合)のガベージ・コレクション・イベントの原因を表示します。
 .sp
-\fIgcnew\fR: Newư˴ؤץǡɽޤ
+\fIgcnew\fR: New世代の動作に関する統計データを表示します。
 .sp
-\fIgcnewcapacity\fR: NewΥбΰ˴ؤץǡɽޤ
+\fIgcnewcapacity\fR: New世代のサイズと対応する領域に関する統計データを表示します。
 .sp
-\fIgcold\fR: Oldưȥ᥿ڡ˴ؤץǡɽޤ
+\fIgcold\fR: Old世代の動作とメタスペースに関する統計データを表示します。
 .sp
-\fIgcoldcapacity\fR: OldΥ˴ؤץǡɽޤ
+\fIgcoldcapacity\fR: Old世代のサイズに関する統計データを表示します。
 .sp
-\fIgcmetacapacity\fR: ᥿ڡΥ˴ؤץǡɽޤ
+\fIgcmetacapacity\fR: メタスペースのサイズに関する統計データを表示します。
 .sp
-\fIgcutil\fR: ١쥯Υޥ꡼˴ؤץǡɽޤ
+\fIgcutil\fR: ガベージ・コレクションのサマリーに関する統計データを表示します。
 .sp
-\fIprintcompilation\fR: Java HotSpot VMѥ롦᥽åɤץǡɽޤ
+\fIprintcompilation\fR: Java HotSpot VMコンパイル・メソッドの統計データを表示します。
 .RE
 .PP
 \-h \fIn\fR
 .RS 4
-\fIn\fRץ(Ϲ)Ȥإåɽޤǡ\fIn\fRͤǤǥեͤ0Ǥξ硢ǡκǽιԤξإåɽޤ
+\fIn\fRサンプル(出力行)ごとに列ヘッダーを表示します。ここで、\fIn\fRは正の整数値です。デフォルト値は0です。この場合、データの最初の行の上に列ヘッダーが表示されます。
 .RE
 .PP
 \-t
 .RS 4
-ॹϤκǽȤɽޤॹפϡåJVMεưηв֤Ǥ
+タイムスタンプ列を出力の最初の列として表示します。タイムスタンプは、ターゲットJVMの起動時からの経過時間です。
 .RE
 .PP
 \-J\fIjavaOption\fR
 .RS 4
-\fIjavaOption\fRJavaץꥱưġϤޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤץδʥꥹȤˤĤƤϡjava(1)򻲾ȤƤ
+\fIjavaOption\fRをJavaアプリケーション起動ツールに渡します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。オプションの完全なリストについては、java(1)を参照してください。
 .RE
-.SS "Statץ󤪤ӽ"
+.SS "Statオプションおよび出力"
 .PP
-ξϡ\fIjstat\fRޥɤ\fIstatOption\fRˤĤƽϤޤȤ᤿ΤǤ
+次の情報は、\fIjstat\fRコマンドが各\fIstatOption\fRについて出力する列をまとめたものです。
 .PP
 \-class \fIoption\fR
 .RS 4
-饹ץǡ
+クラス・ローダーの統計データ。
 .sp
-\fILoaded\fR: ɤ줿饹ο
+\fILoaded\fR: ロードされたクラスの数。
 .sp
-\fIBytes\fR: ɤ줿KBο
+\fIBytes\fR: ロードされたKBの数。
 .sp
-\fIUnloaded\fR: ɤ줿饹ο
+\fIUnloaded\fR: アンロードされたクラスの数。
 .sp
-\fIBytes\fR: ɤ줿KBο
+\fIBytes\fR: アンロードされたKBの数。
 .sp
-\fITime\fR: 饹Υɤ䥢ɽפ֡
+\fITime\fR: クラスのロードやアンロード処理に要した時間。
 .RE
 .PP
 \-compiler \fIoption\fR
 .RS 4
-Java HotSpot VM Just\-in\-Timeѥץǡ
+Java HotSpot VM Just\-in\-Timeコンパイラの統計データ。
 .sp
-\fICompiled\fR: ¹Ԥ줿ѥ롦ο
+\fICompiled\fR: 実行されたコンパイル・タスクの数。
 .sp
-\fIFailed\fR: Ԥѥ롦ο
+\fIFailed\fR: 失敗したコンパイル・タスクの数。
 .sp
-\fIInvalid\fR: ̵ˤ줿ѥ롦ο
+\fIInvalid\fR: 無効にされたコンパイル・タスクの数。
 .sp
-\fITime\fR: ѥ롦μ¹Ԥפ֡
+\fITime\fR: コンパイル・タスクの実行に要した時間。
 .sp
-\fIFailedType\fR: Ǹ˼ԤѥΥѥ롦ס
+\fIFailedType\fR: 最後に失敗したコンパイルのコンパイル・タイプ。
 .sp
-\fIFailedMethod\fR: Ǹ˼ԤѥΥ饹̾ȥ᥽åɡ
+\fIFailedMethod\fR: 最後に失敗したコンパイルのクラス名とメソッド。
 .RE
 .PP
 \-gc \fIoption\fR
 .RS 4
-١쥯Ȥ줿ҡפץǡ
+ガベージ・コレクトされたヒープの統計データ。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIS0U\fR: Survivorΰ0λΨ(KB)
+\fIS0U\fR: Survivor領域0の使用率(KB)。
 .sp
-\fIS1U\fR: Survivorΰ1λΨ(KB)
+\fIS1U\fR: Survivor領域1の使用率(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIEU\fR: EdenΰλΨ(KB)
+\fIEU\fR: Eden領域の使用率(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIOU\fR: OldΰλΨ(KB)
+\fIOU\fR: Old領域の使用率(KB)。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIMU\fR: ᥿ڡλΨ(KB)
+\fIMU\fR: メタスペースの使用率(KB)。
 .sp
-\fIYGC\fR: 㤤Υ١쥯󡦥٥Ȥο
+\fIYGC\fR: 若い世代のガベージ・コレクション・イベントの数。
 .sp
-\fIYGCT\fR: 㤤Υ١쥯֡
+\fIYGCT\fR: 若い世代のガベージ・コレクション時間。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gccapacity \fIoption\fR
 .RS 4
-꡼ס太ΰ̡
+メモリー・プール世代および領域容量。
 .sp
-\fINGCMN\fR: NewκǾ(KB)
+\fINGCMN\fR: New世代の最小容量(KB)。
 .sp
-\fINGCMX\fR: Newκ(KB)
+\fINGCMX\fR: New世代の最大容量(KB)。
 .sp
-\fINGC\fR: Newθߤ(KB)
+\fINGC\fR: New世代の現在の容量(KB)。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIOGCMN\fR: OldκǾ(KB)
+\fIOGCMN\fR: Old世代の最小容量(KB)。
 .sp
-\fIOGCMX\fR: Oldκ(KB)
+\fIOGCMX\fR: Old世代の最大容量(KB)。
 .sp
-\fIOGC\fR: Oldθߤ(KB)
+\fIOGC\fR: Old世代の現在の容量(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIMCMN\fR: ᥿ڡκǾ(KB)
+\fIMCMN\fR: メタスペースの最小容量(KB)。
 .sp
-\fIMCMX\fR: ᥿ڡκ(KB)
+\fIMCMX\fR: メタスペースの最大容量(KB)。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .RE
 .PP
 \-gccause \fIoption\fR
 .RS 4
-Υץϡ\fI\-gcutil\fRץƱ١쥯ץǡΥޥ꡼ɽޤǸΥ١쥯󡦥٥Ȥ(ŬѲǽʾ)ߤΥ١쥯󡦥٥Ȥθޤޤޤ\fI\-gcutil\fRǰɽΤۤΥץǤϼɲäޤ
+このオプションは、\fI\-gcutil\fRオプションと同じガベージ・コレクション統計データのサマリーを表示しますが、最後のガベージ・コレクション・イベントと(適用可能な場合は)現在のガベージ・コレクション・イベントの原因が含まれます。\fI\-gcutil\fRで一覧表示される列のほか、このオプションでは次の列が追加されます。
 .sp
-١쥯󡦥٥Ȥޤ६١쥯ץǡ
+ガベージ・コレクション・イベントを含むガベージ・コレクション統計データ。
 .sp
-\fILGCC\fR: ǸΥ١쥯θ
+\fILGCC\fR: 最後のガベージ・コレクションの原因。
 .sp
-\fIGCC\fR: ߤΥ١쥯θ
+\fIGCC\fR: 現在のガベージ・コレクションの原因。
 .RE
 .PP
 \-gcnew \fIoption\fR
 .RS 4
-Newץǡ
+New世代の統計データ。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIS0U\fR: Survivorΰ0λΨ(KB)
+\fIS0U\fR: Survivor領域0の使用率(KB)。
 .sp
-\fIS1U\fR: Survivorΰ1λΨ(KB)
+\fIS1U\fR: Survivor領域1の使用率(KB)。
 .sp
-\fITT\fR: Ʋꤷ͡
+\fITT\fR: 殿堂入りしきい値。
 .sp
-\fIMTT\fR: Ʋꤷ͡
+\fIMTT\fR: 最大殿堂入りしきい値。
 .sp
-\fIDSS\fR: ŬڤSurvivor(KB)
+\fIDSS\fR: 適切なSurvivorサイズ(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIEU\fR: EdenΰλΨ(KB)
+\fIEU\fR: Eden領域の使用率(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIYGCT\fR: 㤤Υ١쥯֡
+\fIYGCT\fR: 若い世代のガベージ・コレクション時間。
 .RE
 .PP
 \-gcnewcapacity \fIoption\fR
 .RS 4
-Newΰ襵ץǡ
+New世代領域サイズの統計データ。
 .sp
-NGCMN: NewκǾ(KB)
+NGCMN: New世代の最小容量(KB)。
 .sp
-\fINGCMX\fR: Newκ(KB)
+\fINGCMX\fR: New世代の最大容量(KB)。
 .sp
-\fINGC\fR: Newθߤ(KB)
+\fINGC\fR: New世代の現在の容量(KB)。
 .sp
-\fIS0CMX\fR: Survivorΰ0κ(KB)
+\fIS0CMX\fR: Survivor領域0の最大容量(KB)。
 .sp
-\fIS0C\fR: Survivorΰ0θߤ(KB)
+\fIS0C\fR: Survivor領域0の現在の容量(KB)。
 .sp
-\fIS1CMX\fR: Survivorΰ1κ(KB)
+\fIS1CMX\fR: Survivor領域1の最大容量(KB)。
 .sp
-\fIS1C\fR: Survivorΰ1θߤ(KB)
+\fIS1C\fR: Survivor領域1の現在の容量(KB)。
 .sp
-\fIECMX\fR: Edenΰκ(KB)
+\fIECMX\fR: Eden領域の最大容量(KB)。
 .sp
-\fIEC\fR: Edenΰθߤ(KB)
+\fIEC\fR: Eden領域の現在の容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .RE
 .PP
 \-gcold \fIoption\fR
 .RS 4
-OldPermanentץǡ
+OldおよびPermanent世代の統計データ。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIMU\fR: ᥿ڡλΨ(KB)
+\fIMU\fR: メタスペースの使用率(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIOU\fR: OldΰλΨ(KB)
+\fIOU\fR: Old領域の使用率(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gcoldcapacity \fIoption\fR
 .RS 4
-Oldץǡ
+Old世代の統計データ。
 .sp
-\fIOGCMN\fR: OldκǾ(KB)
+\fIOGCMN\fR: Old世代の最小容量(KB)。
 .sp
-\fIOGCMX\fR: Oldκ(KB)
+\fIOGCMX\fR: Old世代の最大容量(KB)。
 .sp
-\fIOGC\fR: Oldθߤ(KB)
+\fIOGC\fR: Old世代の現在の容量(KB)。
 .sp
-\fIOC\fR: Oldΰθߤ(KB)
+\fIOC\fR: Old領域の現在の容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gcmetacapacity \fIoption\fR
 .RS 4
-Permanentץǡ
+Permanent世代の統計データ。
 .sp
-\fIMCMN\fR: ᥿ڡκǾ(KB)
+\fIMCMN\fR: メタスペースの最小容量(KB)。
 .sp
-\fIMCMX\fR: ᥿ڡκ(KB)
+\fIMCMX\fR: メタスペースの最大容量(KB)。
 .sp
-\fIMC\fR: ᥿ڡ(KB)
+\fIMC\fR: メタスペースの容量(KB)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-gcutil \fIoption\fR
 .RS 4
-١쥯ץǡΥޥ꡼
+ガベージ・コレクション統計データのサマリー
 .sp
-\fIS0\fR: Survivorΰ0λΨ(ߤ̤Фѡơ)
+\fIS0\fR: Survivor領域0の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIS1\fR: Survivorΰ1λΨ(ߤ̤Фѡơ)
+\fIS1\fR: Survivor領域1の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIE\fR: EdenΰλΨ(ߤ̤Фѡơ)
+\fIE\fR: Eden領域の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIO\fR: OldΰλΨ(ߤ̤Фѡơ)
+\fIO\fR: Old領域の使用率(現在の容量に対するパーセンテージ)。
 .sp
-\fIM\fR: ᥿ڡλΨ(ΰθߤ̤Фѡơ)
+\fIM\fR: メタスペースの使用率(領域の現在の容量に対するパーセンテージ)。
 .sp
-\fIYGC\fR: 㤤GC٥ȿ
+\fIYGC\fR: 若い世代のGCイベント数。
 .sp
-\fIYGCT\fR: 㤤Υ١쥯֡
+\fIYGCT\fR: 若い世代のガベージ・コレクション時間。
 .sp
-\fIFGC\fR: եGC٥ȿ
+\fIFGC\fR: フルGCイベント数。
 .sp
-\fIFGCT\fR: ե륬١쥯֡
+\fIFGCT\fR: フルガベージ・コレクション時間。
 .sp
-\fIGCT\fR: ١쥯֡
+\fIGCT\fR: ガベージ・コレクション総時間。
 .RE
 .PP
 \-printcompilation \fIoption\fR
 .RS 4
-Java HotSpot VMѥ롦᥽åɤץǡ
+Java HotSpot VMコンパイル・メソッドの統計データ。
 .sp
-\fICompiled\fR: Ƕᥳѥ뤵줿᥽åɤǼ¹Ԥ줿ѥ롦ο
+\fICompiled\fR: 最近コンパイルされたメソッドで実行されたコンパイル・タスクの数。
 .sp
-\fISize\fR: Ƕᥳѥ뤵줿᥽åɤΥХȡɤΥХȿ
+\fISize\fR: 最近コンパイルされたメソッドのバイト・コードのバイト数。
 .sp
-\fIType\fR: Ƕᥳѥ뤵줿᥽åɤΥѥ롦ס
+\fIType\fR: 最近コンパイルされたメソッドのコンパイル・タイプ。
 .sp
-\fIMethod\fR: Ƕᥳѥ뤵줿᥽åɤꤹ륯饹̾ȥ᥽å̾饹̾Ǥϡ֤̾ζڤʸȤơɥå(\&.)Τ˥å(/)Ѥޤ᥽å̾ϡꤵ줿饹Υ᥽åɤǤ2ĤΥեɤηϡHotSpot
-\fI\-XX:+PrintComplation\fRץбƤޤ
+\fIMethod\fR: 最近コンパイルされたメソッドを特定するクラス名とメソッド名。クラス名では、名前空間の区切り文字として、ドット(\&.)のかわりにスラッシュ(/)が使用されます。メソッド名は、指定されたクラス内のメソッドです。これらの2つのフィールドの形式は、HotSpot
+\fI\-XX:+PrintComplation\fRオプションと対応しています。
 .RE
-.SH ""
+.SH "例"
 .PP
-ιǤϡ21891\fIlvmid\fRĥJVM˥󥰤򼨤ޤ
-.SS "gcutilץ"
+この項では、21891の\fIlvmid\fRを持つローカルJVMをモニタリングする例を示します。
+.SS "gcutilオプション"
 .PP
-Ǥϡlvmid 21891³ơ250ߥôֳ֤7ĤΥץ\-\fIgcutil\fRץǤλ˽äƽϤɽޤ
+この例では、lvmid 21891に接続して、250ミリ秒間隔で7つのサンプルを取得し、\-\fIgcutil\fRオプションでの指定に従って出力を表示します。
 .PP
-νϤϡ㤤Υ쥯3ܤ4ܤΥץ֤ǹԤ줿Ȥ򼨤Ƥޤ쥯ˤ0\&.001ääƤꡢ֥ȤEdenΰ(E)Oldΰ(O)˾ʤᡢOldΰλΨ9\&.49%9\&.51%äƤޤSurvivorΰϡ쥯12\&.44%ѤƤޤ쥯λѤ7\&.74%ΤߤǤ
+この例の出力は、若い世代のコレクションが3番目と4番目のサンプル間で行われたことを示しています。コレクションには0\&.001秒かかっており、オブジェクトがEden領域(E)からOld領域(O)に昇格したため、Old領域の使用率は9\&.49%から9\&.51%に増加しています。Survivor領域は、コレクション前は12\&.44%が使用されていましたが、コレクション後の使用は7\&.74%のみです。
 .sp
 .if n \{\
 .RS 4
@@ -508,13 +508,13 @@
 .if n \{\
 .RE
 .\}
-.SS "إåʸη֤"
+.SS "列ヘッダー文字列の繰返し"
 .PP
-Ǥϡlvmid 21891³ơ250ߥôֳ֤ǥץ\fI\-gcutil\fRץǤλ˽äƽϤɽޤˡ\fI\-h3\fRץѤơǡ3ɽ뤴ȤإåϤޤ
+この例では、lvmid 21891に接続して、250ミリ秒間隔でサンプルを取得し、\fI\-gcutil\fRオプションでの指定に従って出力を表示します。さらに、\fI\-h3\fRオプションを使用して、データが3行表示されるごとに列ヘッダーを出力します。
 .PP
-Ǥϡإåʸη֤ɽƤۤ2ܤ3ܤΥץ֤Young GCԤ줿Ȥ狼ޤη³֤0\&.001äǤΥ쥯ǤϡSurvivorΰ0λΨ(S0U)ŬڤSurvivor(DSS)Ķ᤹뤳Ȥˤʤ륢ƥ֡ǡФޤη̡֥ȤϡOld(νϤˤɽ)ؾʤ졢Ʋꤷ(TT)312ع߳ʤޤ
+この例では、ヘッダー文字列の繰返しが表示されているほか、2番目と3番目のサンプル間でYoung GCが行われたことがわかります。この継続時間は0\&.001秒でした。このコレクションでは、Survivor領域0の使用率(S0U)が適切なSurvivorサイズ(DSS)を超過することになるアクティブ・データが検出されました。この結果、オブジェクトは、Old世代(この出力には非表示)へ昇格され、殿堂入りしきい値(TT)が、31から2へ降格されました。
 .PP
-̤Υ쥯󤬡5ܤ6ܤΥץ֤ǹԤƤޤΥ쥯ǤϡSurvivorۤȤɸ줺Ʋꤷͤ31ᤷޤ
+別のコレクションが、5番目と6番目のサンプル間で行われています。このコレクションでは、Survivorがほとんど見られず、殿堂入りしきい値を31に戻しました。
 .sp
 .if n \{\
 .RS 4
@@ -535,11 +535,11 @@
 .if n \{\
 .RE
 .\}
-.SS "ץ뤴ȤΥॹפ"
+.SS "サンプルごとのタイムスタンプの挿入"
 .PP
-Ǥϡlvmid21891³250ߥôֳ֤3ĤΥץƤޤ\fI\-t\fRץѤơǽ˥ץ뤴ȤΥॹפɽƤޤ
+この例では、lvmid21891へ接続し、250ミリ秒間隔で3つのサンプルを取得しています。\fI\-t\fRオプションを使用して、最初の列にサンプルごとのタイムスタンプを表示しています。
 .PP
-TimestampˤϡåJVMεưηв֤ñ̤ǥݡȤƤޤˡ\fI\-gcoldcapacity\fRϤǤϡꥯȤޤϾʥꥯȤ뤤Ϥξ˥ҡפĥ뤿ӤˡOld(OGC)Oldΰ(OC)ȤäƤ뤳Ȥ狼ޤ81ܤΥե롦١쥯(FGC)θ塢Old(OGC)11,696 KB13820 KBäޤ(ΰ)κ̤ϡ60,544 KB (OGCMX)ʤΤǡޤĥǤ;͵ĤƤޤ
+Timestamp列には、ターゲットJVMの起動時からの経過時間が、秒単位でレポートされています。さらに、\fI\-gcoldcapacity\fR出力では、割当リクエストまたは昇格リクエストあるいはその両方を満たすためにヒープが拡張するたびに、Old世代の容量(OGC)とOld領域の容量(OC)とが増加していることがわかります。81番目のフル・ガベージ・コレクション(FGC)の後、Old世代の容量(OGC)は11,696 KBから13820 KBに増加しました。この世代(および領域)の最大容量は、60,544 KB (OGCMX)なので、まだ拡張できる余裕が残されています。
 .sp
 .if n \{\
 .RS 4
@@ -553,11 +553,11 @@
 .if n \{\
 .RE
 .\}
-.SS "⡼JVMΥ󥹥ȥơδƻ"
+.SS "リモートJVMのインストゥルメンテーションの監視"
 .PP
-ϡ\fI\-gcutil\fRץѤơremote\&.domainȤƥlvmid 40496³ץñ̵̤¤˼Ƥޤ
+この例は、\fI\-gcutil\fRオプションを使用して、remote\&.domainというシステム上のlvmid 40496に接続し、サンプルを秒単位で無期限に取得しています。
 .PP
-lvmidϡ⡼ȡۥȤ̾ȷ礵ơ\fI40496@remote\&.domain\fR\fIvmid\fRƤޤ̤Ȥơvmidϡ\fIrmi\fRץȥѤơ⡼ȡۥȾΥǥեȤ\fIjstatd\fRС̿ޤ\fIjstatd\fRСϡrmiregistryѤơǥեȤrmiregistryݡ(ݡ1099)˥Хɤ줿\fIremote\&.domain\fR֤ޤ
+lvmidは、リモート・ホストの名前と結合されて、\fI40496@remote\&.domain\fRの\fIvmid\fRを構成しています。結果として、このvmidは、\fIrmi\fRプロトコルを使用して、リモート・ホスト上のデフォルトの\fIjstatd\fRサーバーと通信します。\fIjstatd\fRサーバーは、rmiregistryを使用して、デフォルトのrmiregistryポート(ポート1099)にバインドされた\fIremote\&.domain\fRに配置されます。
 .sp
 .if n \{\
 .RS 4
@@ -569,7 +569,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jstatd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ˥󥰡ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: モニタリング・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jstatd" "1" "2013ǯ1121" "JDK 8" "˥󥰡ġ"
+.TH "jstatd" "1" "2013年11月21日" "JDK 8" "モニタリング・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jstatd \- Javaۥޥ(JVM)˥⡼ȡ˥󥰡ġ뤬JVM³Ǥ褦ˤޤΥޥɤϻŪʤΤǡݡȤƤޤ
-.SH ""
+jstatd \- Java仮想マシン(JVM)をモニターし、リモート・モニタリング・ツールがJVMに接続できるようにします。このコマンドは試験的なもので、サポートされていません。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,47 +64,47 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIjstatd\fRޥɤϡ¬줿Java HotSpot VMκȽλ˥롦ƥǼ¹ԤƤJVMˡ⡼ȡ˥󥰡ġ뤬³Ǥ褦ˤ뤿Υ󥿥ե󶡤RMIСץꥱǤ
+\fIjstatd\fRコマンドは、計測されたJava HotSpot VMの作成と終了をモニターし、ローカル・システム上で実行されているJVMに、リモート・モニタリング・ツールが接続できるようにするためのインタフェースを提供するRMIサーバー・アプリケーションです。
 .PP
-\fIjstatd\fRСǤϡ롦ۥȤRMI쥸ȥ꤬ɬפˤʤޤ\fIjstatd\fRСϥǥեȡݡȤǡޤ\fI\-p\fR
-\fIport\fRץǻꤷݡȤǡRMI쥸ȥ³褦ȤޤRMI쥸ȥ꤬Ĥʤ硢\fI\-p\fR
-\fIport\fRץǻꤵ줿ݡȡޤ\fI\-p\fR
-\fIport\fRץ󤬾άƤϡǥեRMI쥸ȥ˥Хɤ줿\fIjstatd\fRץꥱˡ1ĤRMI쥸ȥ꤬ޤRMI쥸ȥκϡ\fI\-nr\fRץꤹ뤳ȤˤäߤǤޤ
-.SH "ץ"
+\fIjstatd\fRサーバーでは、ローカル・ホストにRMIレジストリが必要になります。\fIjstatd\fRサーバーはデフォルト・ポートで、または\fI\-p\fR
+\fIport\fRオプションで指定したポートで、RMIレジストリに接続しようとします。RMIレジストリが見つからない場合、\fI\-p\fR
+\fIport\fRオプションで指定されたポート、または\fI\-p\fR
+\fIport\fRオプションが省略されている場合は、デフォルトRMIレジストリにバインドされた\fIjstatd\fRアプリケーション内に、1つのRMIレジストリが作成されます。内部RMIレジストリの作成は、\fI\-nr\fRオプションを指定することによって中止できます。
+.SH "オプション"
 .PP
 \-nr
 .RS 4
-¸RMI쥸ȥ꤬Ĥʤ硢\fIjstatd\fRץRMI쥸ȥʤ褦ˤޤ
+既存のRMIレジストリが見つからない場合、\fIjstatd\fRプロセス内に内部RMIレジストリを作成しないようにします。
 .RE
 .PP
 \-p \fIport\fR
 .RS 4
-RMI쥸ȥ꤬ͽۤݡֹǤĤʤϡ\fI\-nr\fRץ󤬻ꤵƤʤкޤ
+RMIレジストリがあると予想されるポート番号です。見つからない場合は、\fI\-nr\fRオプションが指定されていなければ作成されます。
 .RE
 .PP
 \-n \fIrminame\fR
 .RS 4
-RMI쥸ȥˤơ⡼RMI֥ȤХɤ̾Ǥǥե̾\fIJStatRemoteHost\fRǤʣ\fIjstatd\fRСƱۥȾǵưƤ硢ƥСΥݡȤRMI֥Ȥ̾ϡΥץꤹ뤳Ȥˤäơդ̾ˤ뤳ȤǤޤΥץѤ硢˥󥰡饤Ȥ\fIhostid\fR\fIvmid\fRʸˡΰդΥС̾ޤɬפޤ
+RMIレジストリにおいて、リモートRMIオブジェクトがバインドされる名前です。デフォルト名は\fIJStatRemoteHost\fRです。複数の\fIjstatd\fRサーバーが同じホスト上で起動している場合、各サーバーのエクスポートしたRMIオブジェクトの名前は、このオプションを指定することによって、一意の名前にすることができます。ただし、このオプションを使用する場合、モニタリング・クライアントの\fIhostid\fRおよび\fIvmid\fR文字列に、その一意のサーバー名を含める必要があります。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JVM\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ\fIץ\fR1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+JVMに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されている\fIオプション\fRを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ƥ"
+.SH "セキュリティ"
 .PP
-\fIjstatd\fRСϡŬڤʥͥƥ֡JVMΤߤƻǤޤäơ\fIjstatd\fRץϡåJVMƱ桼ʤǼ¹ԤƤɬפޤUNIX١Υƥˤroot桼ʤɤΰΥ桼ʤϡƥǤդJVMˤäƥݡȤ줿󥹥ȥơؤΥäƤޤΤ褦ʻʤǼ¹ԤƤ\fIjstatd\fRץϡƥΤ٤ƤJVMƻǤޤƥ̤꤬ޤ
+\fIjstatd\fRサーバーは、適切なネイティブ・アクセス権を持つJVMのみを監視できます。したがって、\fIjstatd\fRプロセスは、ターゲットJVMと同じユーザー資格で実行されている必要があります。UNIXベースのシステムにおけるrootユーザーなどの一部のユーザー資格は、システム上の任意のJVMによってエクスポートされたインストゥルメンテーションへのアクセス権を持っています。このような資格で実行されている\fIjstatd\fRプロセスは、システム上のすべてのJVMを監視できますが、セキュリティ上の別の問題が起こります。
 .PP
-\fIjstatd\fRСˤϡ⡼ȡ饤Ȥǧڵǽޤ󡣤Τᡢ\fIjstatd\fRСץ¹Ԥȡ\fIjstatd\fRץĤ٤ƤJVMˤ륤󥹥ȥơΥݡȤ򡢥ͥåȥΤ٤ƤΥ桼˸뤳Ȥˤʤޤ̵ʾ֤ϡĶˤäƤ˾ޤʤ礬Τǡä˼²ƯĶޤϰǤʤͥåȥǤϡ\fIjstatd\fRץưˡ롦ƥݥꥷƤɬפޤ
+\fIjstatd\fRサーバーには、リモート・クライアントの認証機能がありません。そのため、\fIjstatd\fRサーバー・プロセスを実行すると、\fIjstatd\fRプロセスがアクセス権を持つすべてのJVMによるインストゥルメンテーションのエクスポートを、ネットワーク上のすべてのユーザーに公開することになります。この無防備な状態は、環境によっては望ましくない場合があるので、特に実稼働環境または安全でないネットワークでは、\fIjstatd\fRプロセスを起動する前に、ローカル・セキュリティ・ポリシーを検討する必要があります。
 .PP
-\fIjstatd\fRСϡ¾Υƥޥ͡㤬󥹥ȡ뤵Ƥʤˤϡ\fIRMISecurityPolicy\fRΥ󥹥󥹤򥤥󥹥ȡ뤷ޤΤᡢƥݥꥷեꤹɬפޤݥꥷեϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlˤ
-֥ǥեȤPolicyμȥݥꥷեιʸפ˽򤷤Ƥɬפޤ
+\fIjstatd\fRサーバーは、他のセキュリティ・マネージャがインストールされていない場合には、\fIRMISecurityPolicy\fRのインスタンスをインストールします。そのため、セキュリティ・ポリシー・ファイルを指定する必要があります。ポリシー・ファイルは、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlにある
+「デフォルトのPolicyの実装とポリシー・ファイルの構文」に準拠している必要があります
 .PP
-ΥݥꥷեǤϡƥ㳰ȯ\fIjstatd\fRС¹ԤǤޤΥݥꥷϡ٤ƤΥɡ١ؤΤ륢ǧݥꥷ⼫ͳ٤㤤Ǥ\fIjstatd\fRС¹Ԥ뤿˺ɬפʥΤߤǧݥꥷ⼫ͳ٤⤯ʤäƤޤ
+次のポリシー・ファイルでは、セキュリティ例外を発生せずに\fIjstatd\fRサーバーを実行できます。このポリシーは、すべてのコード・ベースへのあらゆるアクセス権を認めるポリシーよりも自由度が低いですが、\fIjstatd\fRサーバーを実行するために最低限必要なアクセス権のみを認めるポリシーよりも自由度が高くなっています。
 .sp
 .if n \{\
 .RS 4
@@ -118,7 +118,7 @@
 .RE
 .\}
 .PP
-ΥݥꥷѤˤϡΥƥȤ\fIjstatd\&.all\&.policy\fRȤե˥ԡΤ褦\fIjstatd\fRС¹Ԥޤ
+このポリシー設定を使用するには、このテキストを\fIjstatd\&.all\&.policy\fRというファイルにコピーし、次のように\fIjstatd\fRサーバーを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -130,16 +130,16 @@
 .RE
 .\}
 .PP
-긷ƥ»ܤ륵Ȥξ硢ࡦݥꥷեѤơοǤۥȤޤϥͥåȥ˥¤뤳ȤǤޤΤ褦ˡϡIPɥ쥹İ䤹ʤޤƥˤĤơޥݥꥷեǤнǤʤϡ\fIjstatd\fRС¹Ԥˡ\fIjstat\fR\fIjps\fRġǻѤ뤳ȤǤˡˤʤޤ
-.SH "⡼ȡ󥿥ե"
+より厳しいセキュリティを実施するサイトの場合、カスタム・ポリシー・ファイルを使用して、特定の信頼できるホストまたはネットワークにアクセスを制限することができます。ただし、このような方法は、IPアドレスの盗聴攻撃を受けやすくなります。セキュリティの問題について、カスタマイズしたポリシー・ファイルでも対処できない場合は、\fIjstatd\fRサーバーを実行せずに、\fIjstat\fRと\fIjps\fRツールをローカルで使用することが最も安全な方法になります。
+.SH "リモート・インタフェース"
 .PP
-\fIjstatd\fRץݡȤ륤󥿥եϡȼ˳ȯΤǤѹͽǤ桼ӳȯԤϡΥ󥿥եؤνߤԤʤǤ
-.SH ""
+\fIjstatd\fRプロセスがエクスポートするインタフェースは、独自に開発したものであり変更される予定です。ユーザーおよび開発者は、このインタフェースへの書込みを行わないでください。
+.SH "例"
 .PP
-ˡ\fIjstatd\fRޥɤ򼨤ޤ\fIjstatd\fRץȤˤäơСϥХå饦ɤǼưŪ˵ưޤ
-.SS "RMI쥸ȥ"
+次に、\fIjstatd\fRコマンドの例を示します。\fIjstatd\fRスクリプトによって、サーバーはバックグラウンドで自動的に起動します。
+.SS "内部RMIレジストリ"
 .PP
-ϡRMI쥸ȥѤۥȤˤ\fIjstatd\fRåεưɽƤޤǤϡǥեȤRMI쥸ȥꡦݡ(ݡ1099)ˤϡ¾ΥСϥХɤƤʤꤷƤޤ
+この例は、内部RMIレジストリを使用したホストによる\fIjstatd\fRセッションの起動を表しています。この例では、デフォルトのRMIレジストリ・ポート(ポート1099)には、他のサーバーはバインドされていないと想定しています。
 .sp
 .if n \{\
 .RS 4
@@ -150,9 +150,9 @@
 .if n \{\
 .RE
 .\}
-.SS "RMI쥸ȥ"
+.SS "外部RMIレジストリ"
 .PP
-ϡRMI쥸ȥѤ\fIjstatd\fRåεưɽƤޤ
+この例は、外部RMIレジストリを使用した\fIjstatd\fRセッションの起動を表しています。
 .sp
 .if n \{\
 .RS 4
@@ -165,7 +165,7 @@
 .RE
 .\}
 .PP
-Ǥϡݡ2020γRMI쥸ȥѤ\fIjstatd\fRåưޤ
+この例では、ポート2020の外部RMIレジストリを使用して\fIjstatd\fRセッションを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -178,7 +178,7 @@
 .RE
 .\}
 .PP
-Ǥϡݡ2020γRMI쥸ȥѤơ\fIAlternateJstatdServerName\fR˥ХɤƤ\fIjstatd\fRåưޤ
+この例では、ポート2020の外部RMIレジストリを使用して、\fIAlternateJstatdServerName\fRにバインドされている\fIjstatd\fRセッションを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -191,9 +191,9 @@
 .if n \{\
 .RE
 .\}
-.SS "ץRMI쥸ȥκ"
+.SS "インプロセスRMIレジストリの作成の停止"
 .PP
-ǤϡRMI쥸ȥ꤬ʤ˺ʤ\fIjstatd\fRåưޤǤϡRMI쥸ȥ꤬Ǥ˼¹ԤƤꤷƤޤRMI쥸ȥ꤬¹ԤƤʤ硢顼åɽޤ
+この例では、外部RMIレジストリがない場合に作成しない\fIjstatd\fRセッションを起動します。この例では、RMIレジストリがすでに実行されていると想定しています。RMIレジストリが実行されていない場合、エラー・メッセージが表示されます。
 .sp
 .if n \{\
 .RS 4
@@ -204,9 +204,9 @@
 .if n \{\
 .RE
 .\}
-.SS "RMI󥰤ͭ"
+.SS "RMIロギングの有効化"
 .PP
-ǤϡRMI󥰵ǽͭ\fIjstatd\fRåưޤˡϡȥ֥륷塼ƥ󥰤ޤϥСưΥ˥󥰤Ωޤ
+この例では、RMIロギング機能を有効化して\fIjstatd\fRセッションを起動します。この方法は、トラブルシューティングまたはサーバー活動のモニタリングに役立ちます。
 .sp
 .if n \{\
 .RS 4
@@ -218,7 +218,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: jvisualvm
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaȥ֥륷塼ƥ󥰡ץե󥰡˥󥰤Ӵġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaトラブルシューティング、プロファイリング、モニタリングおよび管理ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "jvisualvm" "1" "2013ǯ1121" "JDK 8" "Javaȥ֥륷塼ƥ󥰡ץե󥰡˥"
+.TH "jvisualvm" "1" "2013年11月21日" "JDK 8" "Javaトラブルシューティング、プロファイリング、モニタリン"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-jvisualvm \- JavaץꥱŪ˴ƻ롢ȥ֥륷塼Ȥӥץե뤷ޤ
-.SH ""
+jvisualvm \- Javaアプリケーションを視覚的に監視、トラブルシュートおよびプロファイルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,17 +64,17 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-Java VisualVMϡꤵ줿Javaۥޥ(JVM)JavaƥΥ١Υץꥱ(Javaץꥱ)¹ԤƤȤˡJavaץꥱ˴ؤܺ٤ʾ󶡤ľŪʥե롦桼󥿥եǤJava VisualVMȤ̾ϡJava VisualVMJVMեȥ˴ؤŪ󶡤Ȥ¤ͳ褷Ƥޤ
+Java VisualVMは、指定されたJava仮想マシン(JVM)でJavaテクノロジ・ベースのアプリケーション(Javaアプリケーション)が実行されているときに、そのJavaアプリケーションに関する詳細な情報を提供する直感的なグラフィカル・ユーザー・インタフェースです。Java VisualVMという名前は、Java VisualVMがJVMソフトウェアに関する情報を視覚的に提供するという事実に由来しています。
 .PP
-Java VisualVMϡĤΥ˥󥰡ȥ֥륷塼ƥ󥰤ӥץե󥰡桼ƥƥ1ĤΥġ礷ޤȤСɥ󡦥ġ\fIjmap\fR\fIjinfo\fR\fIjstat\fR\fIjstack\fR󶡤Ƥ뵡ǽΤۤȤɤJava VisualVMȤ߹ޤƤޤ\fIjconsole\fRޥɤˤä󶡤εǽʤɡ¾εǽϥץΥץ饰ȤɲäǤޤ
+Java VisualVMは、いくつかのモニタリング、トラブルシューティングおよびプロファイリング・ユーティリティを1つのツールに統合します。たとえば、スタンドアロン・ツール\fIjmap\fR、\fIjinfo\fR、\fIjstat\fRおよび\fIjstack\fRで提供されている機能のほとんどが、Java VisualVMに組み込まれています。\fIjconsole\fRコマンドによって提供される一部の機能など、他の機能はオプションのプラグインとして追加できます。
 .PP
-Java VisualVMϡJavaץꥱγȯԤץꥱΥȥ֥륷塼ƥ󥰤ԤäꡢץꥱΥѥեޥ󥹤ƻ뤪ӲꤹΤΩޤJava VisualVMѤȡȯԤϥҡספӲϡ꡼꡼ꡢ١쥯μ¹ԤӴƻ롢ӥ꡼CPUδʰץץե󥰤μ¹Ԥǽˤʤޤץ饰Java VisualVMεǽĥǤޤȤС\fIjconsole\fRޥɤΤۤȤɤεǽϡMBeanץ֤JConsole Plug\-in Wrapperץ饰𤷤ƻѤǤޤɸJava VisualVMץ饰Υ򤹤ˤϡJava VisualVM˥塼\fB֥ġ\fR\fB֥ץ饰\fR򤷤ޤ
+Java VisualVMは、Javaアプリケーションの開発者がアプリケーションのトラブルシューティングを行ったり、アプリケーションのパフォーマンスを監視および改善したりするのに役立ちます。Java VisualVMを使用すると、開発者はヒープ・ダンプの生成および解析、メモリー・リークの特定、ガベージ・コレクションの実行および監視、およびメモリーとCPUの簡易プロファイリングの実行が可能になります。プラグインでJava VisualVMの機能を拡張できます。たとえば、\fIjconsole\fRコマンドのほとんどの機能は、「MBean」タブおよびJConsole Plug\-in Wrapperプラグインを介して使用できます。標準のJava VisualVMプラグインのカタログから選択するには、Java VisualVMメニューの\fB「ツール」\fR、\fB「プラグイン」\fRを選択します。
 .PP
-Java VisualVMưˤϡΥޥɤ¹Ԥޤ
+Java VisualVMを起動するには、次のコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -85,15 +85,15 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
-ΥץϡJava VisualVMưȤ˼¹Բǽˤʤޤ
+次のオプションは、Java VisualVMを起動したときに実行可能になります。
 .PP
 \-J\fIjvm_option\fR
 .RS 4
-\fIjvm_option\fRJVMեȥϤޤ
+この\fIjvm_option\fRをJVMソフトウェアに渡します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -103,7 +103,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java VisualVMȯԤΥ
+Java VisualVM開発者のサイト
 http://visualvm\&.java\&.net/
 .RE
 .sp
@@ -115,7 +115,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java SEɥȤJava VisualVM
+Java SEドキュメントのJava VisualVM
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/visualvm/index\&.html)
 .RE
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: keytool
 .\" Language: English
-.\" Date: 2013ǯ86
-.\" SectDesc: ƥġ
+.\" Date: 2013年8月6日
+.\" SectDesc: セキュリティ・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "keytool" "1" "2013ǯ86" "JDK 8" "ƥġ"
+.TH "keytool" "1" "2013年8月6日" "JDK 8" "セキュリティ・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-keytool \- Ź沽X\&.509󤪤ӿǤޤ७ȥ(ǡ١)ޤ
-.SH ""
+keytool \- 暗号化鍵、X\&.509証明書チェーンおよび信頼できる証明書を含むキーストア(データベース)を管理します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,7 +64,7 @@
 .PP
 \fIcommands\fR
 .RS 4
-ޥɤ򻲾ȤƤΥޥɤϡΤ褦˥̤ʬवޤ
+コマンドを参照してください。これらのコマンドは、次のようにタスク別に分類されます。
 .sp
 .RS 4
 .ie n \{\
@@ -74,7 +74,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ȥؤΥǡκޤɲ
+キーストアへのデータの作成または追加
 .sp
 .RS 4
 .ie n \{\
@@ -140,7 +140,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-̤ΥȥƤΥݡ
+別のキーストアの内容のインポート
 .sp
 .RS 4
 .ie n \{\
@@ -162,7 +162,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ꥯȤ
+証明書リクエストの生成
 .sp
 .RS 4
 .ie n \{\
@@ -184,7 +184,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǡΥݡ
+データのエクスポート
 .sp
 .RS 4
 .ie n \{\
@@ -206,7 +206,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǡɽ
+データの表示
 .sp
 .RS 4
 .ie n \{\
@@ -261,7 +261,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ȥδ
+キーストアの管理
 .sp
 .RS 4
 .ie n \{\
@@ -316,7 +316,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-إפɽ
+ヘルプの表示
 .sp
 .RS 4
 .ie n \{\
@@ -330,18 +330,18 @@
 .RE
 .RE
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIkeytool\fRޥɤϡȾ뤿Υ桼ƥƥǤˤꡢ桼ϼʬθ̩ΥڥӴϢǥ̾Ѥǧ(¾Υ桼ޤϥӥФƼʬȤǧڤ뤳)䡢ǡȾ˴ؤ륵ӥѤ뤳ȤǤޤ\fIkeytool\fRޥɤǤϡ̿Ƥԥθ򥭥å夹뤳ȤǤޤ(Υե)
+\fIkeytool\fRコマンドは、鍵と証明書を管理するためのユーティリティです。これにより、ユーザーは自分の公開鍵と秘密鍵のペアおよび関連する証明書を管理し、デジタル署名を使用した自己認証(他のユーザーまたはサービスに対して自分自身を認証すること)や、データの整合性と証明書に関するサービスを利用することができます。\fIkeytool\fRコマンドでは、通信しているピアの公開鍵をキャッシュすることもできます(証明書のフォームで)。
 .PP
-Ȥϡ륨ƥƥ(ʪҤʤ)Υǥ̾դʸΤȤǤˤϡ¾Τ륨ƥƥθ(Ӥ¾ξ)̤ͤäƤ뤳Ȥ񤫤Ƥޤ(򻲾ȤƤ)ǡ˥ǥ̾դƤϡǥ̾򸡾ڤ뤳ȤǡǡӥǡʪǤ뤳ȤåǤޤǡȤϡǡѹ줿ꡢѤ줿ꤷƤʤȤ̣ޤޤǡʪǤȤϡΥǡǡƽ̾ȾΤʪϤ줿ǡǤ뤳Ȥ̣ޤ
+証明書とは、あるエンティティ(人物、会社など)からのデジタル署名付きの文書のことです。証明書には、他のあるエンティティの公開鍵(およびその他の情報)が特別な値を持っていることが書かれています。(証明書を参照してください。)データにデジタル署名が付いている場合は、デジタル署名を検証することで、データの整合性およびデータが本物であることをチェックできます。データの整合性とは、データが変更されたり、改変されたりしていないことを意味します。また、データが本物であるとは、そのデータが、データを作成して署名したと称する人物から渡されたデータであることを意味します。
 .PP
-ޤ\fIkeytool\fRޥɤѤСоΰŹ沽/沽(DES)ǻѤ̩ӥѥե졼뤳ȤǤޤ
+また、\fIkeytool\fRコマンドを使用すれば、対称暗号化/復号化(DES)で使用される秘密鍵およびパスフレーズを管理することもできます。
 .PP
-\fIkeytool\fRޥɤϡȾ򥭡ȥ˳Ǽޤȥ̾򻲾ȤƤ
-.SH "ޥɤȥץ˴ؤ"
+\fIkeytool\fRコマンドは、鍵と証明書をキーストアに格納します。キーストアの別名を参照してください。
+.SH "コマンドとオプションに関する注意"
 .PP
-͡ʥޥɤȤˤĤƤϡޥɤ򻲾ȤƤ
+様々なコマンドとその説明については、コマンドを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -351,7 +351,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɤΥޥ̾ӥץ̾ˤƬ˥ޥʥ(\-)դޤ
+どのコマンド名およびオプション名にも先頭にマイナス記号(\-)が付きます。
 .RE
 .sp
 .RS 4
@@ -362,7 +362,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ƥޥɤΥץǤդνǻǤޤ
+各コマンドのオプションは任意の順序で指定できます。
 .RE
 .sp
 .RS 4
@@ -373,7 +373,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åΤˤʤäƤʤ٤Ƥιܡޤ楫åѥåǰϤޤƤ뤹٤ƤιܤϡΤȤ˻ꤹɬפޤ
+イタリック体になっていないすべての項目、または中カッコか角カッコで囲まれているすべての項目は、そのとおりに指定する必要があります。
 .RE
 .sp
 .RS 4
@@ -384,7 +384,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץϤ楫åϡΥץ򥳥ޥɥ饤ǻꤷʤäˡǥեͤѤ뤳Ȥ̣ޤץΥǥեͤ򻲾ȤƤ楫åϡ\fI\-v\fR\fI\-rfc\fR\fI\-J\fRץϤिˤѤޤΥץϥޥɥ饤ǻꤵ줿ˤΤ̣߰ޤꤵƤʤʳǥեͤϤޤ
+オプションを囲む中カッコは、そのオプションをコマンドラインで指定しなかった場合に、デフォルト値が使用されることを意味します。オプションのデフォルト値を参照してください。中カッコは、\fI\-v\fR、\fI\-rfc\fRおよび\fI\-J\fRオプションを囲むためにも使用されますが、これらのオプションはコマンドラインで指定された場合にのみ意味を持ちます。指定されていない場合以外、デフォルト値はありません。
 .RE
 .sp
 .RS 4
@@ -395,7 +395,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץϤѥåϡΥץ򥳥ޥɥ饤ǻꤷʤäˡͤϤ뤳Ȥ̣ޤ\fI\-keypass\fRץξ硢ץ򥳥ޥɥ饤ǻꤷʤäϡ\fIkeytool\fRޥɤޤȥΥѥɤѤ/̩ߤޤλߤԤ硢\fIkeytool\fRޥɤˤꡢ/̩ΥѥɤϤޤ
+オプションを囲む角カッコは、そのオプションをコマンドラインで指定しなかった場合に、値の入力を求められることを意味します。\fI\-keypass\fRオプションの場合、オプションをコマンドラインで指定しなかった場合は、\fIkeytool\fRコマンドがまずキーストアのパスワードを使用して非公開/秘密鍵の復元を試みます。この試みが失敗した場合、\fIkeytool\fRコマンドにより、非公開/秘密鍵のパスワードの入力を求められます。
 .RE
 .sp
 .RS 4
@@ -406,11 +406,11 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-åΤιܤμºݤ(ץ)ϡꤹɬפޤȤС\fI\-printcert\fRޥɤηϼΤȤǤ
+イタリック体の項目の実際の値(オプションの値)は、指定する必要があります。たとえば、\fI\-printcert\fRコマンドの形式は次のとおりです。
 .sp
 \fIkeytool \-printcert {\-file cert_file} {\-v}\fR
 .sp
-\fI\-printcert\fRޥɤꤹϡ\fIcert_file\fRºݤΥե֤̾ޤ:
+\fI\-printcert\fRコマンドを指定する場合は、\fIcert_file\fRを実際のファイル名で置き換えます。例:
 \fIkeytool \-printcert \-file VScert\&.cer\fR
 .RE
 .sp
@@ -422,7 +422,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ץͤ˶(ڡ)ޤޤƤϡͤǰϤɬפޤ
+オプションの値に空白(スペース)が含まれている場合は、値を引用符で囲む必要があります。
 .RE
 .sp
 .RS 4
@@ -433,11 +433,11 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-help\fRץ󤬥ǥեȤǤ\fIkeytool\fRޥɤϡ\fIkeytool \-help\fRƱǤ
+\fI\-help\fRオプションがデフォルトです。\fIkeytool\fRコマンドは、\fIkeytool \-help\fRと同じです。
 .RE
-.SH "ץΥǥե"
+.SH "オプションのデフォルト値"
 .PP
-ǡ͡ʥץͤΥǥեͤ򼨤ޤ
+次の例で、様々なオプション値のデフォルト値を示します。
 .sp
 .if n \{\
 .RS 4
@@ -474,7 +474,7 @@
 .RE
 .\}
 .PP
-/̩ڥˤơ̾르ꥺ(\fI\-sigalg\fRץ)ϡˤʤ̩Υ르ꥺफޤ
+公開/秘密鍵ペアの生成において、署名アルゴリズム(\fI\-sigalg\fRオプション)は、基になる秘密鍵のアルゴリズムから派生します。
 .sp
 .RS 4
 .ie n \{\
@@ -484,7 +484,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ˤʤ̩DSAפǤϡ\fI\-sigalg\fRץΥǥեͤSHA1withDSAˤʤޤ
+基になる秘密鍵がDSAタイプである場合は、\fI\-sigalg\fRオプションのデフォルト値はSHA1withDSAになります。
 .RE
 .sp
 .RS 4
@@ -495,7 +495,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ˤʤ̩RSAפǤϡ\fI\-sigalg\fRץΥǥեͤSHA256withRSAˤʤޤ
+基になる秘密鍵がRSAタイプである場合は、\fI\-sigalg\fRオプションのデフォルト値はSHA256withRSAになります。
 .RE
 .sp
 .RS 4
@@ -506,40 +506,40 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ˤʤ̩ECפǤϡ\fI\-sigalg\fRץΥǥեͤSHA256withECDSAˤʤޤ
+基になる秘密鍵がECタイプである場合は、\fI\-sigalg\fRオプションのデフォルト値はSHA256withECDSAになります。
 .RE
 .PP
-\fI\-keyalg\fR\fI\-sigalg\fRδʥꥹȤˤĤƤϡ
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAΡJava Cryptography Architecture (JCA) Reference Guideפ򻲾ȤƤ
-.SH "̥ץ"
+\fI\-keyalg\fRおよび\fI\-sigalg\fR引数の完全なリストについては、
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppAの「Java Cryptography Architecture (JCA) Reference Guide」を参照してください。
+.SH "一般オプション"
 .PP
-\fI\-v\fRץϡ\fI\-help\fRޥɤ٤ƤΥޥɤǻѤǤޤ\fI\-v\fRץꤷ硢ޥɤϾĹ⡼ɤǼ¹Ԥ졢ܺ٤ʾ󤬽Ϥޤ
+\fI\-v\fRオプションは、\fI\-help\fRコマンドを除くすべてのコマンドで使用できます。\fI\-v\fRオプションを指定した場合、コマンドは冗長モードで実行され、詳細な情報が出力されます。
 .PP
-ǤդΥޥɤǻǤ\fI\-Jjavaoption\fR⤢ޤ\fI\-Jjavaoption\fRꤷ硢ꤵ줿\fIjavaoption\fRʸJava󥿥ץ꥿ľϤޤΥץˤϡޤ뤳ȤϤǤޤ󡣤Υץϡ¹ԴĶޤϥ꡼ѤĴǤǤ륤󥿥ץ꥿ץɽˤϡޥɥ饤\fIjava \-h\fRޤ\fIjava \-X\fRϤƤ
+任意のコマンドで指定できる\fI\-Jjavaoption\fR引数もあります。\fI\-Jjavaoption\fRを指定した場合、指定された\fIjavaoption\fR文字列がJavaインタプリタに直接渡されます。このオプションには、空白を含めることはできません。このオプションは、実行環境またはメモリー使用を調整する場合に便利です。指定できるインタプリタ・オプションを一覧表示するには、コマンドラインで\fIjava \-h\fRまたは\fIjava \-X\fRと入力してください。
 .PP
-ΥץϡȥФԤ٤ƤΥޥɤǻǤޤ
+次のオプションは、キーストアに対する操作を行うすべてのコマンドで指定できます。
 .PP
 \-storetype \fIstoretype\fR
 .RS 4
-νҤϡ󥹥󥹤륭ȥΥפꤷޤ
+この修飾子は、インスタンスを生成するキーストアのタイプを指定します。
 .RE
 .PP
 \-keystore \fIkeystore\fR
 .RS 4
-ȥξꤷޤ
+キーストアの場所を指定します。
 .sp
-\fIkeytool\fRޥɤ¹ԤݤˡJKS
-\fIstoretype\fRѤ졢ĥȥե뤬ޤ¸ߤƤʤä硢ȥե뤬ޤȤС\fIkeytool \-genkeypair\fRθƽФ\fI\-keystore\fRץ󤬻ꤵʤä硢\fI\&.keystore\fRȤ̾Υǥեȡȥե뤬桼Υۡࡦǥ쥯ȥˤޤ¸ߤƤʤС˺ޤƱͤˡ\fI\-keystore ks_file\fRȤץ󤬻ꤵƤ⤽ks_file¸ߤʤä硢Υե뤬ޤJKS
-\fIstoretype\fRξܺ٤ϡ\fI\fRKeyStoreμȥ̾˴ؤ򻲾ȤƤ
+特定の\fIkeytool\fRコマンドを実行する際に、JKS
+\fIstoretype\fRが使用され、かつキーストア・ファイルがまだ存在していなかった場合、新しいキーストア・ファイルが作成されます。たとえば、\fIkeytool \-genkeypair\fRの呼出し時に\fI\-keystore\fRオプションが指定されなかった場合、\fI\&.keystore\fRという名前のデフォルト・キーストア・ファイルがユーザーのホーム・ディレクトリ内にまだ存在していなければ、そこに作成されます。同様に、\fI\-keystore ks_file\fRというオプションが指定されてもそのks_fileが存在しなかった場合、そのファイルが作成されます。JKS
+\fIstoretype\fRの詳細は、\fIの\fRKeyStoreの実装キーストアの別名に関する項を参照してください。
 .sp
-\fI\-keystore\fRץ󤫤ϥȥ꡼ϡ\fIKeyStore\&.load\fR᥽åɤϤޤURLȤ\fINONE\fRꤵƤϡnullΥȥ꡼ब\fIKeyStore\&.load\fR᥽åɤϤޤ\fINONE\fRϡKeyStoreե١ǤϤʤ˻ꤷƤȤСϡɥȡ󡦥ǥХ¸ߤƤʤɤǤ
+\fI\-keystore\fRオプションからの入力ストリームは、\fIKeyStore\&.load\fRメソッドに渡されます。URLとして\fINONE\fRが指定されている場合は、nullのストリームが\fIKeyStore\&.load\fRメソッドに渡されます。\fINONE\fRは、KeyStoreがファイルベースではない場合に指定してください。たとえば、ハードウェア・トークン・デバイス上に存在している場合などです。
 .RE
 .PP
 \-storepass[:\fIenv\fR| :\fIfile\fR] argument
 .RS 4
-ȥݸ뤿˻Ѥѥɤꤷޤ
+キーストアの整合性を保護するために使用するパスワードを指定します。
 .sp
-\fIenv\fRޤ\fIfile\fRꤷʤ硢ѥɤͤ\fIargument\fRˤʤޤͤϡ6ʸʾˤɬפޤʳξ硢ѥɤϼΤ褦ˤƼޤ
+修飾子\fIenv\fRまたは\fIfile\fRを指定しない場合、パスワードの値は\fIargument\fRになります。この値は、6文字以上にする必要があります。それ以外の場合、パスワードは次のようにして取得されます。
 .sp
 .RS 4
 .ie n \{\
@@ -550,7 +550,7 @@
 .IP \(bu 2.3
 .\}
 \fIenv\fR:
-\fIargument\fRȤ̾δĶѿѥɤޤ
+\fIargument\fRという名前の環境変数からパスワードを取得します。
 .RE
 .sp
 .RS 4
@@ -561,119 +561,119 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIfile\fR: argumentȤ̾Υե뤫ѥɤޤ
+\fIfile\fR: argumentという名前のファイルからパスワードを取得します。
 .RE
 .sp
-\fB:\fR
-\fI\-keypass\fR\fI\-srckeypass\fR\-\fIdestkeypass\fR\fI\-srcstorepass\fR\fI\-deststorepass\fRʤɤΥѥɤɬפȤ뤽¾ΥץϤ٤ơ\fIenv\fR\fIfile\fRҤդޤѥɡץȽҤϡɬ(:)ǶڤäƤ
+\fB注意:\fR
+\fI\-keypass\fR、\fI\-srckeypass\fR、\-\fIdestkeypass\fR、\fI\-srcstorepass\fR、\fI\-deststorepass\fRなどのパスワードを必要とするその他のオプションはすべて、\fIenv\fRおよび\fIfile\fR修飾子を受け付けます。パスワード・オプションと修飾子は、必ずコロン(:)で区切ってください。
 .sp
-ѥɤϡȥƤ˥뤹٤ƤΥޥɤǻѤޤμΥޥɤ¹ԤȤˡޥɥ饤\fI\-storepass\fRץꤷʤäϡѥɤϤޤ
+パスワードは、キーストアの内容にアクセスするすべてのコマンドで使用されます。この種のコマンドを実行するときに、コマンドラインで\fI\-storepass\fRオプションを指定しなかった場合は、パスワードの入力を求められます。
 .sp
-ȥ硢ѥɤϾάǽǤѥɤꤵƤʤϡ򸡾ڤǤٹɽޤ
+キーストアから情報を取得する場合、パスワードは省略可能です。パスワードが指定されていない場合は、取得した情報の整合性を検証できず、警告が表示されます。
 .RE
 .PP
 \-providerName \fIprovider_name\fR
 .RS 4
-ƥץѥƥե˴ޤޤŹ沽ӥץХ̾ꤹ뤿˻Ѥޤ
+セキュリティ・プロパティ・ファイル内に含まれる暗号化サービス・プロバイダ名を特定するために使用されます。
 .RE
 .PP
 \-providerClass \fIprovider_class_name\fR
 .RS 4
-Ź沽ӥץХƥץѥƥե˻ꤵƤʤȤϡΥޥ饹ե̾ꤹȤ˻Ѥޤ
+暗号化サービス・プロバイダがセキュリティ・プロパティ・ファイルに指定されていないときは、そのマスター・クラス・ファイルの名前を指定するときに使用されます。
 .RE
 .PP
 \-providerArg \fIprovider_arg\fR
 .RS 4
-\fI\-providerClass\fRץȤȤ˻Ѥ졢\fIprovider_class_name\fRΥ󥹥ȥ饯Υץʸϰɽޤ
+\fI\-providerClass\fRオプションとともに使用され、\fIprovider_class_name\fRのコンストラクタのオプションの文字列入力引数を表します。
 .RE
 .PP
 \-protected
 .RS 4
-\fItrue\fRޤ\fIfalse\fRΤ줫ѥɤPIN꡼ʤɤݸ줿ǧڥѥͳǻꤹɬפϡͤ\fItrue\fR˻ꤹɬפޤ\fI\-importkeystore\fRޥɤˤ2ĤΥȥϢƤ뤿ᡢȥȰ襭ȥˤ줾켡2ĤΥץ\fI\-srcprotected\fR\-\fIdestprotected\fRѰդƤޤ
+\fItrue\fRまたは\fIfalse\fRのいずれか。パスワードを専用PINリーダーなどの保護された認証パス経由で指定する必要がある場合は、この値を\fItrue\fRに指定する必要があります。\fI\-importkeystore\fRコマンドには2つのキーストアが関連しているため、ソース・キーストアと宛先キーストアにそれぞれ次の2つのオプション、\fI\-srcprotected\fRと\-\fIdestprotected\fRが用意されています。
 .RE
 .PP
 \-ext \fI{name{:critical} {=value}}\fR
 .RS 4
-X\&.509񥨥ƥ󥷥򼨤ޤΥץ\fI\-genkeypair\fR\fI\-gencert\fRǻѤơޤ\fI\-certreq\fR˥ƥ󥷥ߡꥯȤǥꥯȤ륨ƥ󥷥򼨤ȤǤޤΥץʣǤޤ\fIname\fRˤϡݡȤƤ륨ƥ󥷥̾(̾դƥ󥷥򻲾)ޤǤդOIDֹǤޤꤵƤ硢\fIvalue\fRϥƥ󥷥ΰؤޤ\fIvalue\fRά硢ƥ󥷥Υǥեͤޤϥƥ󥷥󤬰ɬפȤʤȤ򼨤ޤ\fI:critical\fRҤꤵ줿硢ƥ󥷥\fIisCritical\fR°\fItrue\fRǡꤵʤ\fIfalse\fRǤ\fI:critical\fRΤ\fI:c\fRѤǤޤ
+X\&.509証明書エクステンションを示します。このオプションを\fI\-genkeypair\fRおよび\fI\-gencert\fRで使用して、生成される証明書または\fI\-certreq\fRにエクステンションを埋め込み、証明書リクエストでリクエストされるエクステンションを示すことができます。このオプションは複数回指定できます。\fIname\fR引数には、サポートされているエクステンション名(名前付きエクステンションを参照)または任意のOID番号を指定できます。指定されている場合、\fIvalue\fR引数はエクステンションの引数を指します。\fIvalue\fRを省略した場合、エクステンションのデフォルト値またはエクステンションが引数を必要としないことを示します。\fI:critical\fR修飾子が指定された場合、エクステンションの\fIisCritical\fR属性は\fItrue\fRで、指定されない場合は\fIfalse\fRです。\fI:critical\fRのかわりに\fI:c\fRを使用できます。
 .RE
-.SH "̾դƥ󥷥"
+.SH "名前付きエクステンション"
 .PP
-\fIkeytool\fRޥɤϡ̾Υƥ󥷥򥵥ݡȤƤޤ̾/ʸ϶̤ޤ
+\fIkeytool\fRコマンドは、次の名前のエクステンションをサポートしています。名前の大/小文字は区別されません。
 .PP
-BCޤBasicContraints
+BCまたはBasicContraints
 .RS 4
-\fB\fR: ʷϼΤȤǤ:
-\fIca:{true|false}[,pathlen:<len>]\fRޤ\fI<len>\fR(ϡ\fIca:true,pathlen:<len>\fRû̷Ǥ)<\fIlen\fR>άȡ\fIca:true\fRΰ̣ˤʤޤ
+\fB値\fR: 完全な形式は次のとおりです:
+\fIca:{true|false}[,pathlen:<len>]\fRまたは\fI<len>\fR(これは、\fIca:true,pathlen:<len>\fRの短縮形です)。<\fIlen\fR>を省略すると、\fIca:true\fRの意味になります。
 .RE
 .PP
-KUޤKeyUsage
+KUまたはKeyUsage
 .RS 4
-\fB\fR:
-\fIusage\fR(\fIusage\fR)*\fIusage\fRˤ\fIdigitalSignature\fR\fInonRepudiation\fR
-(contentCommitment)\fIkeyEncipherment\fR\fIdataEncipherment\fR\fIkeyAgreement\fR\fIkeyCertSign\fR\fIcRLSign\fR\fIencipherOnly\fR\fIdecipherOnly\fRΤ줫Ǥޤ\fIusage\fRϡΤˤʤʤꡢǽοʸ(\fIdigitalSignature\fRξ\fIdig\fR)ޤϥ륱(\fIdigitalSignature\fRξ\fIdS\fR\fIcRLSign\fRξ\fIcRLS\fR)ǾάɽǤޤ\fIusage\fRͤϡʸȾʸ̤ޤ
+\fB値\fR:
+\fIusage\fR(\fIusage\fR)*、\fIusage\fRには\fIdigitalSignature\fR、\fInonRepudiation\fR
+(contentCommitment)、\fIkeyEncipherment\fR、\fIdataEncipherment\fR、\fIkeyAgreement\fR、\fIkeyCertSign\fR、\fIcRLSign\fR、\fIencipherOnly\fR、\fIdecipherOnly\fRのいずれかを指定できます。\fIusage\fR引数は、不明確にならないかぎり、最初の数文字(\fIdigitalSignature\fRの場合は\fIdig\fR)またはキャメルケース・スタイル(\fIdigitalSignature\fRの場合は\fIdS\fR、\fIcRLSign\fRの場合は\fIcRLS\fR)で省略表記できます。\fIusage\fR値は、大文字と小文字が区別されます。
 .RE
 .PP
-EKUޤExtendedKeyUsage
+EKUまたはExtendedKeyUsage
 .RS 4
-\fB\fR:
-\fIusage\fR(\fIusage\fR)*\fIusage\fRˤ\fIanyExtendedKeyUsage\fR\fIserverAuth\fR\fIclientAuth\fR\fIcodeSigning\fR\fIemailProtection\fR\fItimeStamping\fR\fIOCSPSigning\fRޤǤդ\fIOIDʸ\fRΤ줫Ǥޤ\fIusage\fRϡΤˤʤʤꡢǽοʸޤϥ륱ǾάɽǤޤ\fIusage\fRͤϡʸȾʸ̤ޤ
+\fB値\fR:
+\fIusage\fR(\fIusage\fR)*、\fIusage\fRには\fIanyExtendedKeyUsage\fR、\fIserverAuth\fR、\fIclientAuth\fR、\fIcodeSigning\fR、\fIemailProtection\fR、\fItimeStamping\fR、\fIOCSPSigning\fRまたは任意の\fIOID文字列\fRのいずれかを指定できます。\fIusage\fR引数は、不明確にならないかぎり、最初の数文字またはキャメルケース・スタイルで省略表記できます。\fIusage\fR値は、大文字と小文字が区別されます。
 .RE
 .PP
-SANޤSubjectAlternativeName
+SANまたはSubjectAlternativeName
 .RS 4
-\fB\fR:
+\fB値\fR:
 \fItype\fR:\fIvalue\fR
-(t\fIype:value\fR)*\fItype\fRˤ\fIEMAIL\fR\fIURI\fR\fIDNS\fR\fIIP\fRޤ\fIOID\fRǤޤ\fIvalue\fRϡ\fItype\fRʸͤǤ
+(t\fIype:value\fR)*、\fItype\fRには\fIEMAIL\fR、\fIURI\fR、\fIDNS\fR、\fIIP\fRまたは\fIOID\fRを指定できます。\fIvalue\fR引数は、\fItype\fRの文字列形式の値です。
 .RE
 .PP
-IANޤIssuerAlternativeName
+IANまたはIssuerAlternativeName
 .RS 4
-\fB\fR:
-\fISubjectAlternativeName\fRƱǤ
+\fB値\fR:
+\fISubjectAlternativeName\fRと同じです。
 .RE
 .PP
-SIAޤSubjectInfoAccess
+SIAまたはSubjectInfoAccess
 .RS 4
-\fB\fR:
+\fB値\fR:
 \fImethod\fR:\fIlocation\-type\fR:\fIlocation\-value\fR
-(\fImethod:location\-type\fR:\fIlocation\-value\fR)*\fImethod\fRˤ\fItimeStamping\fR\fIcaRepository\fRޤǤդOIDǤޤ\fIlocation\-type\fR\fIlocation\-value\fRˤϡ\fISubjectAlternativeName\fRƥ󥷥ǥݡȤǤդ\fItype\fR:\fIvalue\fRǤޤ
+(\fImethod:location\-type\fR:\fIlocation\-value\fR)*、\fImethod\fRには\fItimeStamping\fR、\fIcaRepository\fRまたは任意のOIDを指定できます。\fIlocation\-type\fRおよび\fIlocation\-value\fR引数には、\fISubjectAlternativeName\fRエクステンションでサポートされる任意の\fItype\fR:\fIvalue\fRを指定できます。
 .RE
 .PP
-AIAޤAuthorityInfoAccess
+AIAまたはAuthorityInfoAccess
 .RS 4
-\fB\fR:
-\fISubjectInfoAccess\fRƱǤ\fImethod\fRˤϡ\fIocsp\fR\fIcaIssuers\fRޤǤդOIDǤޤ
+\fB値\fR:
+\fISubjectInfoAccess\fRと同じです。\fImethod\fR引数には、\fIocsp\fR、\fIcaIssuers\fRまたは任意のOIDを指定できます。
 .RE
 .PP
-\fIname\fROIDξ硢OCTET STRINGפĹΥХȤƥ󥷥ˤĤƤϡͤ\fIextnValue\fR16ʥפDER󥳡ǥ󥰤ǤHEXʸǤϡɸ16ʿ(0\-9a\-fA\-F)ʳʸ̵뤵ޤäơ01:02:03:0401020304ξȤƱͤȤƼդޤͤʤ硢ƥ󥷥ͥեɤ϶ˤʤޤ
+\fIname\fRがOIDの場合、OCTET STRINGタイプと長さのバイトを除外したエクステンションについては、値は\fIextnValue\fRの16進ダンプのDERエンコーディングです。HEX文字列では、標準の16進数(0\-9、a\-f、A\-F)以外の文字は無視されます。したがって、01:02:03:04と01020304の両方とも同一の値として受け付けられます。値がない場合、エクステンションの値フィールドは空になります。
 .PP
-\fI\-gencert\fRǤΤ߻Ѥ\fIhonored\fRȤ̤̾ϡꥯȤ˴ޤޤ륨ƥ󥷥ͥ褹ˡ򼨤ޤ̾ͤϡ\fIall\fR(ꥯȤ뤹٤ƤΥƥ󥷥ͥ褵)\fIname{:[critical|non\-critical]}\fR(̾դΥƥ󥷥ͥ褵뤬̤\fIisCritical\fR°Ѥ)\fI\-name\fR(\fIall\fRȤȤ˻Ѥ㳰򼨤)Υ޶ڤꥹȤǤǥեȤǤϡꥯȤ륨ƥ󥷥ͥ褵ޤ
+\fI\-gencert\fRでのみ使用する\fIhonored\fRという特別な名前は、証明書リクエストに含まれるエクステンションを優先する方法を示します。この名前の値は、\fIall\fR(リクエストされるすべてのエクステンションが優先される)、\fIname{:[critical|non\-critical]}\fR(名前付きのエクステンションが優先されるが、別の\fIisCritical\fR属性を使用する)、および\fI\-name\fR(\fIall\fRとともに使用し、例外を示す)のカンマ区切りリストです。デフォルトでは、リクエストされるエクステンションは優先されません。
 .PP
-\fI\-ext honored\fRץ˲ä̤̾ΡޤOID
-\fI\-ext\fRΥץꤷϡΥƥ󥷥󤬡Ǥͥ褵Ƥ륨ƥ󥷥ɲäޤ̾(ޤOID)ͥ褵ͤǤѤϡͤȽꥯȤ˴ޤޤΤ򥪡С饤ɤޤ
+\fI\-ext honored\fRオプションに加え、別の名前の、またはOID
+\fI\-ext\fRのオプションを指定した場合は、このエクステンションが、すでに優先されているエクステンションに追加されます。ただし、この名前(またはOID)を優先される値でも使用した場合は、その値と重要性がリクエストに含まれるものをオーバーライドします。
 .PP
-\fIsubjectKeyIdentifier\fRƥ󥷥Ͼ˺ޤʽ̾Ǥʤξϡ\fIauthorityKeyIdentifier\fRޤ
+\fIsubjectKeyIdentifier\fRエクステンションは常に作成されます。自己署名でない証明書の場合は、\fIauthorityKeyIdentifier\fRが作成されます。
 .PP
-\fB:\fR
-桼ϡƥ󥷥(Ӿ¾Υե)ȹ礻ˤäƤϡ󥿡ͥåȤɸ˽򤷤ʤ礬뤳ȤդƤν˴ؤٹ򻲾ȤƤ
-.SH "ޥ"
+\fB注意:\fR
+ユーザーは、エクステンション(および証明書の他のフィールド)の組合せによっては、インターネットの標準に準拠しない場合があることに注意してください。証明書の準拠に関する警告を参照してください。
+.SH "コマンド"
 .PP
 \-gencert
 .RS 4
 \fI{\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ꥯȡե(\fIkeytool\fR
-\fI\-certreq\fRޥɤǺǽ)Ф쥹ݥ󥹤ȤƾޤΥޥɤϡ\fIinfile\fR(άϡɸϤ)ꥯȤɤ߹ߡ̩̾ѤƤΥꥯȤ˽̾ơX\&.509\fIoutfile\fR(άϡɸϤ)Ϥޤ\fI\-rfc\fRꤷ硢ϷBASE64沽PEMˤʤޤʳξϡХʥDERޤ
+証明書リクエスト・ファイル(\fIkeytool\fR
+\fI\-certreq\fRコマンドで作成可能)に対するレスポンスとして証明書を生成します。このコマンドは、\fIinfile\fRから(省略した場合は、標準入力から)リクエストを読み込み、別名の秘密鍵を使用してそのリクエストに署名して、X\&.509証明書を\fIoutfile\fRに(省略した場合は、標準出力に)出力します。\fI\-rfc\fRを指定した場合、出力形式はBASE64符号化のPEMになります。それ以外の場合は、バイナリDERが作成されます。
 .sp
-\fIsigalg\fRͤˤϡ˽̾դȤ˻Ѥ륢르ꥺꤷޤ\fIstartdate\fRϡͭǤ\fIvalDays\fRϡͭ򼨤ޤ
+\fIsigalg\fR値には、証明書に署名を付けるときに使用するアルゴリズムを指定します。\fIstartdate\fR引数は、証明書の有効開始日時です。\fIvalDays\fR引数は、証明書の有効日数を示します。
 .sp
-\fIdname\fRꤹȡμΤȤƻѤޤʳξϡꥯȤ̾Ѥޤ
+\fIdname\fRを指定すると、生成される証明書の主体として使用されます。それ以外の場合は、証明書リクエストからの名前が使用されます。
 .sp
-\fIext\fRͤϡޤX\&.509ƥ󥷥򼨤ޤ\fI\-ext\fRιʸˤĤƤϡ̥ץ򻲾ȤƤ
+\fIext\fR値は、証明書に埋め込まれるX\&.509エクステンションを示します。\fI\-ext\fRの構文については、一般オプションを参照してください。
 .sp
-\fI\-gencert\fRץѤȡǤޤǤϡ\fIe1\fRȤޤξξˤϡ3Ĥξ񤬴ޤޤƤޤ
+\fI\-gencert\fRオプションを使用すると、証明書チェーンを作成できます。次の例では、\fIe1\fRという証明書を作成します。この証明書の証明書チェーンには、3つの証明書が含まれています。
 .sp
-Υޥɤϡ\fIca\fR\fIca1\fR\fIca2\fR\fIe1\fR4Ĥθڥޤ
+次のコマンドは、\fIca\fR、\fIca1\fR、\fIca2\fRおよび\fIe1\fRの4つの鍵ペアを作成します。
 .sp
 .if n \{\
 .RS 4
@@ -687,7 +687,7 @@
 .if n \{\
 .RE
 .\}
-2ĤΥޥɤϡ̾դΥޤ\fIca\fR\fIca1\fR˽̾\fIca1\fR\fIca2\fR˽̾ޤ٤ƼȯԤǤ
+次の2つのコマンドは、署名付き証明書のチェーンを作成します。\fIca\fRは\fIca1\fRに署名し、\fIca1\fRは\fIca2\fRに署名します。すべて自己発行です。
 .sp
 .if n \{\
 .RS 4
@@ -704,7 +704,7 @@
 .if n \{\
 .RE
 .\}
-Υޥɤϡ\fIe1\fRƥե\fIe1\&.cert\fR˳Ǽޤξ\fIca2\fRˤäƽ̾ޤη̡\fIe1\fRξˤ\fIca\fR\fIca1\fR\fIca2\fRޤޤ뤳Ȥˤʤޤ
+次のコマンドは、証明書\fIe1\fRを作成してファイル\fIe1\&.cert\fRに格納します。この証明書は\fIca2\fRによって署名されます。その結果、\fIe1\fRの証明書チェーンには\fIca\fR、\fIca1\fRおよび\fIca2\fRが含まれることになります。
 .sp
 .if n \{\
 .RS 4
@@ -721,23 +721,23 @@
 .RS 4
 \fI{\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-Υڥ(ӴϢ̩)ޤX\&.509 v3ʽ̾ǥåפޤϡñǤľȤƳǼޤξ̩ϡaliasꤵ뿷ȥȥ˳Ǽޤ
+鍵のペア(公開鍵および関連する秘密鍵)を生成します。公開鍵はX\&.509 v3自己署名証明書でラップされます。証明書は、単一の要素を持つ証明書チェーンとして格納されます。この証明書チェーンと秘密鍵は、aliasで特定される新しいキーストア・エントリに格納されます。
 .sp
-\fIkeyalg\fRͤϸڥ˻Ѥ륢르ꥺ\fIkeysize\fRͤƸΥ򡢤줾ꤷޤ\fIsigalg\fRͤϡʽ̾˽̾դ뤿˻Ѥ륢르ꥺꤷޤΥ르ꥺ\fIkeyalg\fRͤȸߴɬפޤ
+\fIkeyalg\fR値は鍵ペアの生成に使用するアルゴリズムを、\fIkeysize\fR値は生成する各鍵のサイズを、それぞれ指定します。\fIsigalg\fR値は、自己署名証明書に署名を付けるために使用するアルゴリズムを指定します。このアルゴリズムは\fIkeyalg\fR値と互換性がある必要があります。
 .sp
-\fIdname\fRͤˤϡ\fIalias\fRͤ˴Ϣդʽ̾issuerեɤsubjectեɤȤƻѤX\&.500̾ꤷޤޥɥ饤Ǽ̾ꤷʤäϡ̾Ϥޤ
+\fIdname\fR値には、\fIalias\fR値に関連付け、自己署名証明書のissuerフィールドとsubjectフィールドとして使用するX\&.500識別名を指定します。コマンドラインで識別名を指定しなかった場合は、識別名の入力を求められます。
 .sp
-\fIkeypass\fRͤˤϡ븰ΥڥΤ̩ݸΤ˻ѤѥɤꤷޤѥɤꤷʤäϡѥɤϤޤΤȤ\fI[Return]\fR򲡤ȡȥΥѥɤƱѥɤΥѥɤꤵޤ\fIkeypass\fRͤϡ6ʸʾˤɬפޤ
+\fIkeypass\fR値には、生成される鍵のペアのうち、秘密鍵を保護するのに使用するパスワードを指定します。パスワードを指定しなかった場合は、パスワードの入力を求められます。このとき、\fI[Return]キー\fRを押すと、キーストアのパスワードと同じパスワードが鍵のパスワードに設定されます。\fIkeypass\fR値は、6文字以上にする必要があります。
 .sp
-\fIstartdate\fRͤˤϡȯԻꤷޤϡX\&.509ΡValidityץեɤΡNot BeforeͤȤƤФޤ
+\fIstartdate\fR値には、証明書の発行時刻を指定します。これは、X\&.509証明書の「Validity」フィールドの「Not Before」値とも呼ばれます。
 .sp
-ץͤϡ2ĤηΤ줫Ǥޤ
+オプションの値は、次の2つの形式のいずれかで設定できます。
 .sp
 \fI([+\-]nnn[ymdHMS])+\fR
 .sp
 \fI[yyyy/mm/dd] [HH:MM:SS]\fR
 .sp
-ǽηǤϡȯԻϡꤵͤʬߤλ狼ܤޤꤵͤϡϢβ̤ͤϢ뤷Τˤʤޤ̤γͤǡץ饹(+)ϻ֤ʤळȤ򡢥ޥʥ(\-)ϻ֤뤳Ȥ̣Ƥޤܤ֤\fInnn\fRǡñ̤ǯ֡ʬޤäǤ(줾졢1ʸ\fIy\fR\fIm\fR\fId\fR\fIH\fR\fIM\fRޤ\fIS\fRפǼƤޤ)̤γͤ\fIjava\&.util\&.GregorianCalendar\&.add(int field, int amount)\fR᥽åɤѤ뤳ȤǡȯԻɲäͤ鱦ط׻ޤȤСꤹȡȯԻϼΤ褦ˤʤޤ
+最初の形式では、発行時刻は、指定される値の分、現在の時刻から移ります。指定される値は、一連の下位の値を連結したものになります。下位の各値で、プラス記号(「+」)は時間が進むことを、マイナス記号(「\-」)は時間が戻ることを意味しています。移る時間は\fInnn\fRで、単位は年、月、日、時間、分または秒です(それぞれ、1文字の\fIy\fR、\fIm\fR、\fId\fR、\fIH\fR、\fIM\fRまたは\fIS\fR」で示されています)。下位の各値で\fIjava\&.util\&.GregorianCalendar\&.add(int field, int amount)\fRメソッドを使用することで、発行時刻の追加の値が左から右へ計算されます。たとえば、指定すると、発行時刻は次のようになります。
 .sp
 .if n \{\
 .RS 4
@@ -752,182 +752,182 @@
 .if n \{\
 .RE
 .\}
-2ܤηǤϡ桼ϡǯ//Ȼ:ʬ:ä2ĤʬǸ̩ʳϻꤷޤ(ϸλӤ)桼ϡ1ĤʬΤߤǤޤϡ⤦1Ĥʬϸߤ(ޤϻ)ƱˤʤȤȤǤ桼ϡ˼Ƥ褦ˡ̩˻ꤹɬפޤ(û0ޤ)դȻξꤵ줿֤ǡ2Ĥʬδ֤˶ʸ1(1ĤΤ)ޤ֤Ͼ24ַǻꤷƤ
+2番目の形式では、ユーザーは、年/月/日と時間:分:秒の2つの部分で厳密な開始時刻を設定します(地元の時間帯を使用)。ユーザーは、1つの部分のみを指定できます。これは、もう1つの部分は現在の日付(または時刻)と同じになるということです。ユーザーは、形式の定義に示されているように、桁数を厳密に指定する必要があります(短い場合は0で埋めます)。日付と時刻の両方が指定された状態で、2つの部分の間に空白文字が1つ(1つのみ)あります。時間は常に24時間形式で指定してください。
 .sp
-ץꤷʤȡդϸߤλˤʤޤץϡ1Ǥޤ
+オプションを指定しないと、開始日付は現在の時刻になります。オプションは、最大で1回指定できます。
 .sp
-\fIvalDays\fRͤˤϡͭꤷޤ(\fI\-startdate\fRǻꤵ줿աޤ\fI\-startdate\fRꤵƤʤϸߤդϤޤޤ)
+\fIvalDays\fRの値には、証明書の有効日数を指定します(\fI\-startdate\fRで指定された日付、または\fI\-startdate\fRが指定されていない場合は現在の日付から始まります)。
 .sp
-ΥޥɤϡΥ꡼Ǥ\fI\-genkey\fRȤ̾ǤΥ꡼Ǥϡ³Ť̾ݡȤƤޤϡ̾\fI\-genkeypair\fRͥ褵ޤ
+このコマンドは、以前のリリースでは\fI\-genkey\fRという名前でした。このリリースでは、引き続き古い名前がサポートされています。今後は、新しい名前\fI\-genkeypair\fRが優先されます。
 .RE
 .PP
 \-genseckey
 .RS 4
 \fI\-genseckey {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-̩򿷤\fIKeyStore\&.SecretKeyEntry\fR(\fIalias\fRꤵ)˳Ǽޤ
+秘密鍵を生成し、それを新しい\fIKeyStore\&.SecretKeyEntry\fR(\fIalias\fRで特定される)内に格納します。
 .sp
-\fIkeyalg\fRͤϸڥ˻Ѥ륢르ꥺ\fIkeysize\fRͤƸΥ򡢤줾ꤷޤ\fIkeypass\fRͤϡ̩ݸѥɤǤѥɤꤷʤäϡѥɤϤޤΤȤ[Return]򲡤ȡ\fIkeystore\fRΥѥɤƱѥɤΥѥɤꤵޤ\fIkeypass\fRͤϡ6ʸʾˤɬפޤ
+\fIkeyalg\fR値は鍵ペアの生成に使用するアルゴリズムを、\fIkeysize\fR値は生成する各鍵のサイズを、それぞれ指定します。\fIkeypass\fR値は、秘密鍵を保護するパスワードです。パスワードを指定しなかった場合は、パスワードの入力を求められます。このとき、[Return]キーを押すと、\fIkeystore\fRのパスワードと同じパスワードが鍵のパスワードに設定されます。\fIkeypass\fR値は、6文字以上にする必要があります。
 .RE
 .PP
 \-importcert
 .RS 4
 \fI\-importcert {\-alias alias} {\-file cert_file} [\-keypass keypass] {\-noprompt} {\-trustcacerts} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ե\fIcert_file\fRޤϾ(ξϡPKCS#7αޤϰϢX\&.509󶡤)ɤ߹ߡ\fIalias\fRˤäꤵ\fIkeystore\fRȥ˳Ǽޤե뤬ꤵƤʤϡ\fIstdin\fRޤϾɤ߹ߤޤ
+ファイル\fIcert_file\fRから証明書または証明書チェーン(証明書チェーンの場合は、PKCS#7形式の応答または一連のX\&.509証明書で提供されるもの)を読み込み、\fIalias\fRによって特定される\fIkeystore\fRエントリに格納します。ファイルが指定されていない場合は、\fIstdin\fRから証明書または証明書チェーンを読み込みます。
 .sp
-\fIkeytool\fRޥɤǤϡX\&.509 v1v2v3ξ񡢤PKCS#7ξ񤫤鹽ƤPKCS#7ξ򥤥ݡȤǤޤݡȤǡϡХʥ沽ޤϽϲǽ沽(Base64沽ȤƤФ)Τɤ餫󶡤ɬפޤϲǽ沽ϡ󥿡ͥåRFC 1421沽ʤƤޤ沽ξ硢\fI\-\fR\fI\-\-\-\-BEGIN\fRǻϤޤʸdzϤ졢\fI\-\-\-\-\-END\fRǻϤޤʸǽλɬפޤ
+\fIkeytool\fRコマンドでは、X\&.509 v1、v2、v3の証明書、およびPKCS#7形式の証明書から構成されているPKCS#7形式の証明書チェーンをインポートできます。インポートするデータは、バイナリ符号化方式、または出力可能符号化方式(Base64符号化とも呼ばれる)のどちらかで提供する必要があります。出力可能符号化方式は、インターネットRFC 1421証明書符号化規格で定義されています。この符号化方式の場合、証明書は\fI\-\fR\fI\-\-\-\-BEGIN\fRで始まる文字列で開始され、\fI\-\-\-\-\-END\fRで始まる文字列で終了する必要があります。
 .sp
-ϡǤΥꥹȤɲä뤿ᡢǧڶ(CA)˾̾ꥯȤ̤ȤCA򥤥ݡȤ뤿(ޥɤ\fI\-certreq\fRץ򻲾)Ȥ2ĤͳǥݡȤޤ
+証明書は、信頼できる証明書のリストに追加するため、および認証局(CA)に証明書署名リクエストを送信した結果としてCAから受信した証明書応答をインポートするため(コマンドの\fI\-certreq\fRオプションを参照)という2つの理由でインポートします。
 .sp
-ɤΥפΥݡȤԤϡ\fI\-alias\fRץͤˤäƻꤷޤ̾ȥݥȤʤ硢\fIkeytool\fRޥɤϥ桼Ǥ񥨥ȥɲä褦ȤƤΤȤߤʤޤξ硢̾ȥ¸ߤƤʤȤɬפǤ̾Ǥ¸ߤƤ硢̾οǤ񤬤Ǥ¸ߤ뤳ȤˤʤΤǡ\fIkeytool\fRޥɤϥ顼ϤΥݡȤԤޤ̾ȥݥȤ硢\fIkeytool\fRޥɤϥ桼򥤥ݡȤ褦ȤƤΤȤߤʤޤ
+どちらのタイプのインポートを行うかは、\fI\-alias\fRオプションの値によって指定します。別名がキー・エントリをポイントしない場合、\fIkeytool\fRコマンドはユーザーが信頼できる証明書エントリを追加しようとしているものとみなします。この場合、別名がキーストア内に存在していないことが必要です。別名がすでに存在している場合、その別名の信頼できる証明書がすでに存在することになるので、\fIkeytool\fRコマンドはエラーを出力し、証明書のインポートを行いません。別名がキー・エントリをポイントする場合、\fIkeytool\fRコマンドはユーザーが証明書応答をインポートしようとしているものとみなします。
 .RE
 .PP
 \-importpassword
 .RS 4
 \fI{\-alias alias} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ѥե졼򥤥ݡȤ\fIalias\fRǼ̤뿷\fIKeyStore\&.SecretKeyEntry\fR˳Ǽޤѥե졼ϡɸϥȥ꡼𤷤󶡤Ǥޤޤϡ桼ˤΥץץȤɽޤ\fIkeypass\fRϡݡȤѥե졼ݸ˻ѤѥɤǤѥɤꤷʤäϡѥɤϤޤΤȤ[Return]򲡤ȡ\fIkeystore\fRΥѥɤƱѥɤΥѥɤꤵޤ\fIkeypass\fRϡ6ʸʾˤɬפޤ
+パスフレーズをインポートし、\fIalias\fRで識別される新規\fIKeyStore\&.SecretKeyEntry\fRに格納します。パスフレーズは、標準入力ストリームを介して提供できます。または、ユーザーにそのプロンプトが表示されます。\fIkeypass\fRは、インポートされるパスフレーズの保護に使用されるパスワードです。パスワードを指定しなかった場合は、パスワードの入力を求められます。このとき、[Return]キーを押すと、\fIkeystore\fRのパスワードと同じパスワードが鍵のパスワードに設定されます。\fIkeypass\fRは、6文字以上にする必要があります。
 .RE
 .PP
 \-importkeystore
 .RS 4
 \fI{\-srcstoretype srcstoretype} {\-deststoretype deststoretype} [\-srcstorepass srcstorepass] [\-deststorepass deststorepass] {\-srcprotected} {\-destprotected} {\-srcalias srcalias {\-destalias destalias} [\-srckeypass srckeypass] } [\-destkeypass destkeypass] {\-noprompt} {\-srcProviderName src_provider_name} {\-destProviderName dest_provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ȥ饿åȡȥءñΥȥޤϤ٤ƤΥȥ򥤥ݡȤޤ
+ソース・キーストアからターゲット・キーストアへ、単一のエントリまたはすべてのエントリをインポートします。
 .sp
-\fI\-srcalias\fRץ󤬻ꤵ줿硢Υޥɤϡ̾ꤵñΥȥ򥿡åȡȥ˥ݡȤޤ\fIdestalias\fRͳǥå̾ꤵʤä硢\fIsrcalias\fRå̾ȤƻѤޤΥȥ꤬ѥɤݸƤ硢\fIsrckeypass\fRѤƤΥȥ꤬ޤ\fIsrckeypass\fRꤵʤä硢\fIkeytool\fRޥɤ\fIsrcstorepass\fRѤƤΥȥ褦Ȥޤ\fIsrcstorepass\fRꤵʤäʤä硢桼ϥѥɤϤޤåȤΥȥ\fIdestkeypass\fRˤäݸޤ\fIdestkeypass\fRꤵʤä硢åȡȥϥȥΥѥɤˤäݸޤȤСۤȤɤΥɡѡƥġǤϡPKCS #12ȥ\fIstorepass\fR\fIkeypass\fRƱǤɬפޤΥġPKCS #12ȥϡ\fI\-destkeypass\fR\fI\-deststorepass\fRƱˤʤ褦˻ꤷޤ
+\fI\-srcalias\fRオプションが指定された場合、このコマンドは、その別名で特定される単一のエントリをターゲット・キーストアにインポートします。\fIdestalias\fR経由でターゲット別名が指定されなかった場合、\fIsrcalias\fRがターゲット別名として使用されます。ソースのエントリがパスワードで保護されていた場合、\fIsrckeypass\fRを使用してそのエントリが回復されます。\fIsrckeypass\fRが指定されなかった場合、\fIkeytool\fRコマンドは\fIsrcstorepass\fRを使用してそのエントリを回復しようとします。\fIsrcstorepass\fRが指定されなかったか正しくなかった場合、ユーザーはパスワードの入力を求められます。ターゲットのエントリは\fIdestkeypass\fRによって保護されます。\fIdestkeypass\fRが指定されなかった場合、ターゲット・エントリはソース・エントリのパスワードによって保護されます。たとえば、ほとんどのサード・パーティ・ツールでは、PKCS #12キーストアで\fIstorepass\fRと\fIkeypass\fRが同じである必要があります。これらのツールのPKCS #12キーストアを作成する場合は、常に\fI\-destkeypass\fRと\fI\-deststorepass\fRが同じになるように指定します。
 .sp
-\fI\-srcalias\fRץ󤬻ꤵʤä硢ȥΤ٤ƤΥȥ꤬åȡȥ˥ݡȤޤƥåȡȥб륽ȥ̾β˳ǼޤΥȥ꤬ѥɤݸƤ硢\fIsrcstorepass\fRѤƤΥȥ꤬ޤ\fIsrcstorepass\fRꤵʤäʤä硢桼ϥѥɤϤޤȥΤ륨ȥꡦפåȡȥǥݡȤƤʤ䡢륨ȥ򥿡åȡȥ˳Ǽݤ˥顼ȯ硢桼ϤΥȥ򥹥åפƽ³Ԥ뤫뤤ϽǤ뤫ޤåȡȥϥȥΥѥɤˤäݸޤ
+\fI\-srcalias\fRオプションが指定されなかった場合、ソース・キーストア内のすべてのエントリがターゲット・キーストア内にインポートされます。各ターゲット・エントリは対応するソース・エントリの別名の下に格納されます。ソースのエントリがパスワードで保護されていた場合、\fIsrcstorepass\fRを使用してそのエントリが回復されます。\fIsrcstorepass\fRが指定されなかったか正しくなかった場合、ユーザーはパスワードの入力を求められます。ソース・キーストア内のあるエントリ・タイプがターゲット・キーストアでサポートされていない場合や、あるエントリをターゲット・キーストアに格納する際にエラーが発生した場合、ユーザーはそのエントリをスキップして処理を続行するか、あるいは処理を中断するかの選択を求められます。ターゲット・エントリはソース・エントリのパスワードによって保護されます。
 .sp
-å̾åȡȥˤǤ¸ߤƤ硢桼ϡΥȥ񤭤뤫뤤ϰۤʤ̾βǿȥ뤫ޤ
+ターゲット別名がターゲット・キーストア内にすでに存在していた場合、ユーザーは、そのエントリを上書きするか、あるいは異なる別名の下で新しいエントリを作成するかの選択を求められます。
 .sp
 
-\fI\-noprompt\fRץꤷ硢桼Ͽå̾Ϥޤ󡣴¸Υȥ꤬Υå̾Ǿ񤭤ޤݡȤǤʤȥϥåפ졢ٹ𤬽Ϥޤ
+\fI\-noprompt\fRオプションを指定した場合、ユーザーは新しいターゲット別名の入力を求められません。既存のエントリがそのターゲット別名で上書きされます。インポートできないエントリはスキップされ、警告が出力されます。
 .RE
 .PP
 \-printcertreq
 .RS 4
 \fI{\-file file}\fR
 .sp
-PKCS#10ξꥯȤƤϤޤΥꥯȤϡ\fIkeytool\fR
-\fI\-certreq\fRޥɤǤޤΥޥɤϡե뤫ꥯȤɤ߼ޤե뤬¸ߤʤ硢ꥯȤɸϤɤ߼ޤ
+PKCS#10形式の証明書リクエストの内容を出力します。このリクエストは、\fIkeytool\fR
+\fI\-certreq\fRコマンドで生成できます。このコマンドは、ファイルからリクエストを読み取ります。ファイルが存在しない場合、リクエストは標準入力から読み取られます。
 .RE
 .PP
 \-certreq
 .RS 4
 \fI{\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-PKCS#10Ѥƾ̾ꥯ(CSR)ޤ
+PKCS#10形式を使用して証明書署名リクエスト(CSR)を生成します。
 .sp
-CSRϡȯԶ(CA)뤳ȤŪȤΤǤCAϡ׵Ԥ(̾ϥե饤)ǧڤޤϾ֤ޤξޤϾϡȥδ¸ξ(ǽ1Ĥμʽ̾񤫤鹽)֤ƻѤޤ
+CSRは、証明書発行局(CA)に送信することを目的としたものです。CAは、証明書要求者を(通常はオフラインで)認証し、証明書または証明書チェーンを送り返します。この証明書または証明書チェーンは、キーストア内の既存の証明書チェーン(最初は1つの自己署名証明書から構成される)に置き換えて使用します。
 .sp
-alias˴Ϣդ줿̩ϡPKCS#10ꥯȤΤ˻Ѥޤ̩˥ˤϡѥɤꤹɬפޤޥɥ饤\fIkeypass\fRꤷƤ餺̩ΥѥɤȥΥѥɤȰۤʤϡ̩ΥѥɤϤޤ\fIdname\fRꤵƤϡ줬CSRǼΤȤƻѤޤʳξϡ̾˴Ϣդ줿X\&.500̾Ѥޤ
+aliasに関連付けられた秘密鍵は、PKCS#10証明書リクエストを作成するのに使用されます。秘密鍵にアクセスするには、正しいパスワードを指定する必要があります。コマンドラインで\fIkeypass\fRを指定しておらず、秘密鍵のパスワードがキーストアのパスワードと異なる場合は、秘密鍵のパスワードの入力を求められます。\fIdname\fRが指定されている場合は、それがCSRで主体として使用されます。それ以外の場合は、別名に関連付けられたX\&.500識別名が使用されます。
 .sp
-\fIsigalg\fRͤˤϡCSR˽̾դȤ˻Ѥ륢르ꥺꤷޤ
+\fIsigalg\fR値には、CSRに署名を付けるときに使用するアルゴリズムを指定します。
 .sp
-CSRϡեcertreq_file˳Ǽޤե뤬ꤵƤʤϡ\fIstdout\fRCSRϤޤ
+CSRは、ファイルcertreq_fileに格納されます。ファイルが指定されていない場合は、\fIstdout\fRにCSRが出力されます。
 .sp
-CAΥ쥹ݥ󥹤򥤥ݡȤˤϡ\fIimportcert\fRޥɤѤޤ
+CAからのレスポンスをインポートするには、\fIimportcert\fRコマンドを使用します。
 .RE
 .PP
 \-exportcert
 .RS 4
 \fI{\-alias alias} {\-file cert_file} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-rfc} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-\fIalias\fR˴Ϣդ줿򥭡ȥɤ߹ߡեcert_file˳Ǽޤե뤬ꤵƤʤϡ\fIstdout\fR˾񤬽Ϥޤ
+\fIalias\fRに関連付けられた証明書をキーストアから読み込み、ファイルcert_fileに格納します。ファイルが指定されていない場合は、\fIstdout\fRに証明書が出力されます。
 .sp
-ǥեȤǤϡϥХʥ沽ǽϤޤ\fI\-rfc\fRץ󤬻ꤵƤ硢ϲǽ沽νϤϥ󥿡ͥåRFC 1421沽ʤޤ
+デフォルトでは、証明書はバイナリ符号化で出力されます。\fI\-rfc\fRオプションが指定されている場合、出力可能符号化方式の出力はインターネットRFC 1421証明書符号化規格で定義されます。
 .sp
-\fIalias\fRǤ򻲾ȤƤϡ񤬽Ϥޤʳξ硢\fIalias\fRϡϢդ줿ĸȥ򻲾Ȥޤξϡκǽξ֤ޤξϡ\fIalias\fRˤäɽ륨ƥƥθǧڤǤ
+\fIalias\fRが、信頼できる証明書を参照している場合は、該当する証明書が出力されます。それ以外の場合、\fIalias\fRは、関連付けられた証明書チェーンを持つ鍵エントリを参照します。この場合は、チェーン内の最初の証明書が返されます。この証明書は、\fIalias\fRによって表されるエンティティの公開鍵を認証する証明書です。
 .sp
-ΥޥɤϡΥ꡼Ǥ\fI\-export\fRȤ̾ǤΥ꡼Ǥϡ³Ť̾ݡȤƤޤϡ̾\fI\-exportcert\fRͥ褵ޤ
+このコマンドは、以前のリリースでは\fI\-export\fRという名前でした。このリリースでは、引き続き古い名前がサポートされています。今後は、新しい名前\fI\-exportcert\fRが優先されます。
 .RE
 .PP
 \-list
 .RS 4
 \fI{\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption}\fR
 .sp
-\fIalias\fRꤵ륭ȥȥƤ\fIstdout\fR˽Ϥޤ\fIalias\fRꤵƤʤϡȥΤƤɽޤ
+\fIalias\fRで特定されるキーストア・エントリの内容を\fIstdout\fRに出力します。\fIalias\fRが指定されていない場合は、キーストア全体の内容が表示されます。
 .sp
-ΥޥɤϡǥեȤǤϾSHA1ե󥬡ץȤɽޤ
-\fI\-v\fRץ󤬻ꤵƤϡͭԡȯԼԡꥢֹ桢ĥǽʤɤղŪʾȤȤˡʹ֤ɤळȤΤǤǾɽޤ\fI\-rfc\fRץ󤬻ꤵƤϡϲǽ沽ǾƤϤޤϲǽ沽ϡ󥿡ͥåRFC 1421沽ʤƤޤ
+このコマンドは、デフォルトでは証明書のSHA1フィンガープリントを表示します。
+\fI\-v\fRオプションが指定されている場合は、所有者、発行者、シリアル番号、拡張機能などの付加的な情報とともに、人間が読むことのできる形式で証明書が表示されます。\fI\-rfc\fRオプションが指定されている場合は、出力可能符号化方式で証明書の内容が出力されます。出力可能符号化方式は、インターネットRFC 1421証明書符号化規格で定義されています。
 .sp
-\fI\-v\fRץ\fI\-rfc\fRץƱ˻ꤹ뤳ȤϤǤޤ
+\fI\-v\fRオプションと\fI\-rfc\fRオプションを同時に指定することはできません。
 .RE
 .PP
 \-printcert
 .RS 4
 \fI{\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}\fR
 .sp
-եcert_filehost:portˤSSLСޤϽ̾դJARե\fIJAR_file\fR(\fI\-jarfile\fRץ)ɤ߹ߡʹ֤ɤळȤΤǤǾƤɽޤݡȤꤵƤʤϡɸHTTPSݡ443ꤵޤ\fI\-sslserver\fR\-fileץƱ˻ꤹ뤳ȤϤǤޤ󡣤ȿ硢顼𤵤ޤץ󤬻ꤵƤʤϡ\fIstdin\fRɤ߹ߤޤ
+ファイルcert_file、host:portにあるSSLサーバー、または署名付きJARファイル\fIJAR_file\fR(\fI\-jarfile\fRオプションを指定)から証明書を読み込み、人間が読むことのできる形式で証明書の内容を表示します。ポートが指定されていない場合は、標準のHTTPSポート443が想定されます。\fI\-sslserver\fRおよび\-fileオプションを同時に指定することはできません。これに反する場合、エラーが報告されます。オプションが指定されていない場合は、\fIstdin\fRから証明書を読み込みます。
 .sp
-\fI\-rfc\fRꤵƤ硢\fIkeytool\fRޥɤϡ󥿡ͥåRFC 1421沽ɸƤ褦ˡPEM⡼ɤǾϤޤ󥿡ͥåRFC 1421沽ʤ򻲾ȤƤ
+\fI\-rfc\fRが指定されている場合、\fIkeytool\fRコマンドは、インターネットRFC 1421証明書符号化標準で定義されているように、PEMモードで証明書を出力します。インターネットRFC 1421証明書符号化規格を参照してください。
 .sp
-եޤ\fIstdin\fRɤ߹硢ξϡ󥿡ͥåRFC 1421沽ɸƤ褦ˡХʥ沽ޤϽϲǽ沽ɽǤޤ
+ファイルまたは\fIstdin\fRから証明書を読み込む場合、その証明書は、インターネットRFC 1421証明書符号化標準で定義されているように、バイナリ符号化方式または出力可能符号化方式で表示できます。
 .sp
-SSLСեظˤϡ\fI\-J\-Dhttps\&.proxyHost=proxyhost\fR\fI\-J\-Dhttps\&.proxyPort=proxyport\fRץ򥳥ޥɥ饤ǻꤷơץȥͥ󥰤ѤǤޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide\&.html
-Java Secure Socket Extension (JSSE) Reference Guideפ򻲾ȤƤ
+SSLサーバーがファイアウォールの背後にある場合は、\fI\-J\-Dhttps\&.proxyHost=proxyhost\fRおよび\fI\-J\-Dhttps\&.proxyPort=proxyport\fRオプションをコマンドラインで指定して、プロキシ・トンネリングを使用できます。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide\&.htmlの
+「Java Secure Socket Extension (JSSE) Reference Guide」を参照してください
 .sp
-\fB:\fR
-ΥץϥȥȤϴطʤѤǤޤ
+\fB注意:\fR
+このオプションはキーストアとは関係なく使用できます。
 .RE
 .PP
 \-printcrl
 .RS 4
 \fI\-file crl_ {\-v}\fR
 .sp
-ե\fIcrl_\fR񼺸ꥹ(CRL)ɤ߹ߤޤCRLϡȯԤCAˤäƼ줿ǥΥꥹȤǤCAϡ\fIcrl_\fRޤ
+ファイル\fIcrl_\fRから証明書失効リスト(CRL)を読み込みます。CRLは、発行したCAによって失効されたデジタル証明書のリストです。CAは、\fIcrl_\fRを生成します。
 .sp
-\fB:\fR
-ΥץϥȥȤϴطʤѤǤޤ
+\fB注意:\fR
+このオプションはキーストアとは関係なく使用できます。
 .RE
 .PP
 \-storepasswd
 .RS 4
 \fI[\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}\fR
 .sp
-ȥƤݸ뤿˻Ѥѥɤѹޤ\fInew_storepass\fRˤϡѥɤꤷޤnew_storepassϡ6ʸʾǤɬפޤ
+キーストアの内容の整合性を保護するために使用するパスワードを変更します。\fInew_storepass\fRには、新しいパスワードを指定します。new_storepassは、6文字以上である必要があります。
 .RE
 .PP
 \-keypasswd
 .RS 4
 \fI{\-alias alias} [\-keypass old_keypass] [\-new new_keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}\fR
 .sp
-\fIalias\fRˤäꤵ/̩ݸ뤿Υѥɤ\fIold_keypass\fR\fInew_keypass\fRѹޤnew_keypassϡ6ʸʾǤɬפޤ
+\fIalias\fRによって特定される非公開/秘密鍵を保護するためのパスワードを、\fIold_keypass\fRから\fInew_keypass\fRに変更します。new_keypassは、6文字以上である必要があります。
 .sp
-ޥɥ饤\fI\-keypass\fRץꤷƤ餺ΥѥɤȥΥѥɤȰۤʤϡΥѥɤϤޤ
+コマンドラインで\fI\-keypass\fRオプションを指定しておらず、鍵のパスワードがキーストアのパスワードと異なる場合は、鍵のパスワードの入力を求められます。
 .sp
-ޥɥ饤\fI\-new\fRץꤷʤäϡѥɤϤޤ
+コマンドラインで\fI\-new\fRオプションを指定しなかった場合は、新しいパスワードの入力を求められます。
 .RE
 .PP
 \-delete
 .RS 4
 \fI[\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-\fIalias\fRˤäꤵ륨ȥ򥭡ȥޤޥɥ饤̾ꤷʤäϡ̾Ϥޤ
+\fIalias\fRによって特定されるエントリをキーストアから削除します。コマンドラインで別名を指定しなかった場合は、別名の入力を求められます。
 .RE
 .PP
 \-changealias
 .RS 4
 \fI{\-alias alias} [\-destalias destalias] [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}\fR
 .sp
-ꤵ줿\fIalias\fR鿷̾\fIdestalias\fRء¸Υȥȥưޤå̾ꤷʤä硢å̾ϤޤΥȥ꤬ȥꡦѥɤݸƤ硢\fI\-keypass\fRץǤΥѥɤǤޤѥɤꤵʤä硢\fIstorepass\fR(ꤵ줿)ޤߤޤλߤԤȡ桼ϥѥɤϤޤ
+指定された\fIalias\fRから新しい別名\fIdestalias\fRへ、既存のキーストア・エントリを移動します。ターゲット別名を指定しなかった場合、ターゲット別名の入力を求められます。元のエントリがエントリ・パスワードで保護されていた場合、\fI\-keypass\fRオプションでそのパスワードを指定できます。鍵パスワードが指定されなかった場合、\fIstorepass\fR(指定された場合)がまず試みられます。その試みが失敗すると、ユーザーはパスワードの入力を求められます。
 .RE
 .PP
 \-help
 .RS 4
-ŪʥޥɤȤΥץΰɽޤ
+基本的なコマンドとそのオプションの一覧を表示します。
 .sp
-Υޥɤξܺ٤򻲾ȤˤϡΤ褦ϤƤ:
-\fIkeytool \-command_name \-help\fR\fIcommand_name\fRϥޥɤ̾Ǥ
+特定のコマンドの詳細を参照するには、次のように入力してください:
+\fIkeytool \-command_name \-help\fR。\fIcommand_name\fRはコマンドの名前です。
 .RE
-.SH ""
+.SH "例"
 .PP
-Ǥϡ/̩ΥڥӿǤ륨ƥƥξ뤿Υȥ򼨤ޤ
-.SS "Υڥ"
+この例では、公開/秘密鍵のペアおよび信頼できるエンティティからの証明書を管理するためのキーストアを作成する手順を示します。
+.SS "鍵のペアの生成"
 .PP
-ޤȥƸΥڥޤñԤϤ롢Τ褦ʥޥɤѤǤޤ
+まず、キーストアを作成して鍵のペアを生成します。単一行に入力する、次のようなコマンドを使用できます。
 .sp
 .if n \{\
 .RS 4
@@ -942,11 +942,11 @@
 .RE
 .\}
 .PP
-ޥɤϡworkingǥ쥯ȥ\fImykeystore\fRȤ̾Υȥ(ȥϤޤ¸ߤƤʤȲ)ȥˡ\fI<new password for keystore>\fRǻꤷѥɤƤޤ̩Υڥб륨ƥƥΡּ̾פϡ̾ΤMark Jonesȿñ̤JavaȿOracle2ʸιֹ椬USǤ̩ΥϤɤ1024ӥåȤǡκˤϥǥեȤDSA르ꥺѤޤ
+コマンドは、workingディレクトリに\fImykeystore\fRという名前のキーストアを作成し(キーストアはまだ存在していないと仮定)、作成したキーストアに、\fI<new password for keystore>\fRで指定したパスワードを割り当てます。生成する公開鍵と秘密鍵のペアに対応するエンティティの「識別名」は、通称がMark Jones、組織単位がJava、組織がOracle、2文字の国番号がUSです。公開鍵と秘密鍵のサイズはどちらも1024ビットで、鍵の作成にはデフォルトのDSA鍵生成アルゴリズムを使用します。
 .PP
-ΥޥɤϡǥեȤSHA1withDSA̾르ꥺѤơȼ̾ޤ༫ʽ̾ޤ֤ͭ180Ǥϡ̾\fIbusiness\fRꤵ륭ȥȥ̩˴Ϣդޤ̩ˤϡ\fI<new password for private key>\fRǻꤷѥɤƤޤ
+このコマンドは、デフォルトのSHA1withDSA署名アルゴリズムを使用して、公開鍵と識別名情報を含む自己署名証明書を作成します。証明書の有効期間は180日です。証明書は、別名\fIbusiness\fRで特定されるキーストア・エントリ内の秘密鍵に関連付けられます。秘密鍵には、\fI<new password for private key>\fRで指定したパスワードが割り当てられます。
 .PP
-ץΥǥեͤѤ硢ޥɤûʤޤξ硢ץפǤǥեͤĥץǤϡץꤷʤХǥեͤѤޤɬͤϤޤѲǽͤϼΤȤǤ
+オプションのデフォルト値を使用する場合、コマンドは大幅に短くなります。この場合、オプションは不要です。デフォルト値を持つオプションでは、オプションを指定しなければデフォルト値が使用されます。必須値の入力を求められます。使用可能な値は次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -958,12 +958,12 @@
 .RE
 .\}
 .PP
-ξϡ\fImykey\fRȤ̾ǥȥȥ꤬졢줿Υڥ90ͭʾ񤬤Υȥ˳ǼޤΥȥϡۡࡦǥ쥯ȥ\fI\&.keystore\fRȤ̾Υȥ֤ޤȥϡޤ¸ߤƤʤ˺ޤ̾󡢥ȥΥѥɤ̩ΥѥɤϤޤ
+この場合は、\fImykey\fRという別名でキーストア・エントリが作成され、新しく生成された鍵のペア、および90日間有効な証明書がこのエントリに格納されます。このエントリは、ホーム・ディレクトリ内の\fI\&.keystore\fRという名前のキーストアに置かれます。キーストアは、まだ存在していない場合に作成されます。識別名情報、キーストアのパスワードおよび秘密鍵のパスワードの入力を求められます。
 .PP
-ʹߤǤϡץꤷʤ\fI\-genkeypair\fRޥɤ¹ԤΤȤ򼨤ޤϤ줿ϡǽ˼\fI\-genkeypair\fRޥɤͤϤΤȤޤȤм̾ˤ\fIcn=Mark Jones\fR\fIou=Java\fR\fIo=Oracle\fR\fIc=US\fRȻꤷޤ
-.SS "CAν̾դΥꥯ"
+以降では、オプションを指定しないで\fI\-genkeypair\fRコマンドを実行したものとして例を示します。情報の入力を求められた場合は、最初に示した\fI\-genkeypair\fRコマンドの値を入力したものとします。たとえば識別名には\fIcn=Mark Jones\fR、\fIou=Java\fR、\fIo=Oracle\fR、\fIc=US\fRと指定します。
+.SS "CAからの署名付き証明書のリクエスト"
 .PP
-ʽ̾븰Υڥ˾ȯԶ(CA)ν̾դƤС¾Υ桼񤬿ꤵǽ⤯ʤޤCAν̾ˤϡޤ̾ꥯ(CSR)ޤȤСΤ褦ˤޤ
+自己署名証明書を作成する鍵のペアの生成。証明書に証明書発行局(CA)の署名が付いていれば、他のユーザーから証明書が信頼される可能性も高くなります。CAの署名を取得するには、まず、証明書署名リクエスト(CSR)を生成します。たとえば、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -975,12 +975,12 @@
 .RE
 .\}
 .PP
-CSR(ǥե̾\fImykey\fRˤäꤵ륨ƥƥCSR)졢MarkJ\&.csrȤ̾Υե֤ޤΥեCA (VeriSignʤ)ФޤCA׵Ԥ(̾ϥե饤)ǧڤ׵Ԥθǧڤ̾դξ֤ޤˤäƤϡCAΥ֤Ȥ⤢ޤΥǤϡƾ񤬥Τν̾Ԥθǧڤޤ
-.SS "CAξΥݡ"
+CSR(デフォルト別名\fImykey\fRによって特定されるエンティティのCSR)が作成され、MarkJ\&.csrという名前のファイルに置かれます。このファイルをCA (VeriSignなど)に提出します。CAは要求者を(通常はオフラインで)認証し、要求者の公開鍵を認証した署名付きの証明書を送り返します。場合によっては、CAが証明書のチェーンを返すこともあります。証明書のチェーンでは、各証明書がチェーン内のその前の署名者の公開鍵を認証します。
+.SS "CAからの証明書のインポート"
 .PP
-ʽ̾ϡ֤ɬפޤǤϡƾ񤬡֥롼ȡCAȤμξν̾Ԥθǧڤޤ
+作成した自己署名証明書は、証明書チェーンで置き換える必要があります。証明書チェーンでは、各証明書が、「ルート」CAを起点とするチェーン内の次の証明書の署名者の公開鍵を認証します。
 .PP
-CAξ򥤥ݡȤˤϡȥ\fIcacerts\fRȥե1İʾοǤ񤬤ɬפޤ\fI\fR\-importcertޥɤ򻲾ȤƤ
+CAからの証明書応答をインポートするには、キーストアか、\fIcacerts\fRキーストア・ファイル内に1つ以上の信頼できる証明書がある必要があります。\fIの\fR\-importcertコマンドを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -990,7 +990,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ξϡκǾ̾ɬפǤCAθǧڤ롼CA
+証明応答が証明書チェーンの場合は、チェーンの最上位証明書が必要です。CAの公開鍵を認証するルートCA証明書。
 .RE
 .sp
 .RS 4
@@ -1001,14 +1001,14 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ñξξϡȯCA(̾)ξɬפǤξ񤬼ʽ̾Ǥʤϡν̾ԤξɬפǤꡢΤ褦ˤƼʽ̾롼Ⱦɬפˤʤޤ
+証明書応答が単一の証明書の場合は、発行CA(署名した)の証明書が必要です。その証明書が自己署名でない場合は、その署名者の証明書が必要であり、このようにして自己署名ルート証明書が必要になります。
 .RE
 .PP
-\fIcacerts\fRȥեϡĤVeriSign롼CAޤ֤ǽв٤ƤΤǡVeriSignξ򡢿ǤȤƥȥ˥ݡȤɬפʤ礬ޤ¾CAФƽ̾դꥯȤƤơCAθǧڤ񤬡\fIcacerts\fRˤޤɲäƤʤϡCAξ򡢡ֿǤפȤƥݡȤɬפޤ
+\fIcacerts\fRキーストア・ファイルは、いくつかのVeriSignルートCA証明書を含んだ状態で出荷されているので、VeriSignの証明書を、信頼できる証明書としてキーストア内にインポートする必要がない場合があります。ただし、他のCAに対して署名付き証明書をリクエストしていて、このCAの公開鍵を認証する証明書が、\fIcacerts\fRにまだ追加されていない場合は、該当するCAからの証明書を、「信頼できる証明書」としてインポートする必要があります。
 .PP
-̾CAξϡʽ̾񡢤ޤ¾CAˤäƽ̾줿Ǥ(Ԥξϡ¾CAθǧڤɬ)ABC, Inc\&.,CAǡABC鼫ʽ̾ǤA\fIBCCA\&.cer\fRȤ̾ΥեȤޤ(ξCAθǧڤޤ)ǤȤƾ򥤥ݡȤȤϡͭǤ뤳Ȥǧɬפޤޤ\fIkeytool \-printcert\fRޥɤޤ\fI\-noprompt\fRץʤ\fIkeytool \-importcert\fRޥɤǤɽɽ줿Υե󥬡ץȤԤΤȰפ뤫ɤǧޤʪϢοʪ󼨤(ޤϰʸΥݥȥˤä󼨤)ե󥬡ץȤȡΥޥɤɽ줿ե󥬡ץȤȤӤޤե󥬡ץȤפС¾βԤ(Ԥʤ)ˤΤؤԤƤʤȤǧǤޤǤμι⤬ԤƤ硢åԤ鷺˾򥤥ݡȤȡԤˤäƽ̾줿٤ƤΤΤꤹ뤳Ȥˤʤޤ
+通常、CAからの証明書は、自己署名証明書、または他のCAによって署名された証明書です(後者の場合は、該当する他のCAの公開鍵を認証する証明書が必要)。ABC, Inc\&.,がCAで、ABCから自己署名証明書であるA\fIBCCA\&.cer\fRという名前のファイルを取得したとします(この証明書はCAの公開鍵を認証します)。信頼できる証明書として証明書をインポートするときは、証明書が有効であることを確認する必要があります。まず、\fIkeytool \-printcert\fRコマンドまたは\fI\-noprompt\fRオプションなしの\fIkeytool \-importcert\fRコマンドでそれを表示し、表示された証明書のフィンガープリントが期待されるものと一致するかどうかを確認します。証明書を送信した人物に連絡し、この人物が提示した(または安全な公開鍵のリポジトリによって提示される)フィンガープリントと、上のコマンドで表示されたフィンガープリントとを比較します。フィンガープリントが一致すれば、送信途中で他の何者か(攻撃者など)による証明書のすり替えが行われていないことを確認できます。送信途中でこの種の攻撃が行われていた場合、チェックを行わずに証明書をインポートすると、攻撃者によって署名されたすべてのものを信頼することになります。
 .PP
-ͭǤȿꤹϡΥޥɤǥȥɲäǤޤ
+証明書が有効であると信頼する場合は、次のコマンドでキーストアに追加できます。
 .sp
 .if n \{\
 .RS 4
@@ -1020,12 +1020,12 @@
 .RE
 .\}
 .PP
-ABCCA\&.cerեΥǡޤ࿮ǤΥȥ꤬ȥ˺졢륨ȥ\fIabc\fRȤ̾Ƥޤ
-.SS "CAξΥݡ"
+ABCCA\&.cerファイルのデータを含む信頼できる証明書のエントリがキーストア内に作成され、該当するエントリに\fIabc\fRという別名が割り当てられます。
+.SS "CAからの証明書応答のインポート"
 .PP
-̾ꥯȤCAθǧڤ򥤥ݡȤ(ޤƱξ񤬤Ǥcacertsե¸ߤƤ)򥤥ݡȤʽ֤̾뤳ȤǤޤΥϡCAαξˡꥯȤФ쥹ݥ󥹤ȤCA֤줿ǤޤCAαñξξϡξȡݡΥȥޤ\fIcacerts\fRȥեˤǤ¸ߤ뿮ǤȤѤƹۤǤ
+証明書署名リクエストの提出先のCAの公開鍵を認証する証明書をインポートした後は(または同種の証明書がすでにcacertsファイル内に存在している場合は)、証明応答をインポートし、自己署名証明書を証明書チェーンで置き換えることができます。このチェーンは、CAの応答がチェーンの場合に、リクエストに対するレスポンスとしてCAから送り返された証明書チェーンです。また、CAの応答が単一の証明書の場合は、この証明応答と、インポート先のキーストア内または\fIcacerts\fRキーストアファイル内にすでに存在する信頼できる証明書とを使用して構築した証明書チェーンです。
 .PP
-ȤС̾ꥯȤVeriSign硢֤줿̾VSMarkJ\&.cerȤȡΤ褦ˤƱ򥤥ݡȤǤޤ
+たとえば、証明書署名リクエストをVeriSignに送信する場合、送り返された証明書の名前がVSMarkJ\&.cerだとすると、次のようにして応答をインポートできます。
 .sp
 .if n \{\
 .RS 4
@@ -1036,11 +1036,11 @@
 .if n \{\
 .RE
 .\}
-.SS "ǧڤΥݡ"
+.SS "公開鍵を認証する証明書のエクスポート"
 .PP
-\fIjarsigner\fRޥɤѤJava Archive (JAR)ե˽̾硢ΥեѤ륯饤ȤϽ̾ǧڤɬפޤ饤Ȥ̾ǧڤˡ1ĤˡޤʬθξǤ륨ȥȤƥ饤ȤΥȥ˥ݡȤˡޤ
+\fIjarsigner\fRコマンドを使用してJava Archive (JAR)ファイルに署名する場合、このファイルを使用するクライアントは署名を認証する必要があります。クライアントが署名を認証する方法の1つに、まず自分の公開鍵の証明書を信頼できるエントリとしてクライアントのキーストアにインポートする方法があります。
 .PP
-Τˤϡ򥨥ݡȤơ饤Ȥ󶡤ޤȤơΥޥɤѤơMJ\&.cerȤ̾Υե˾򥳥ԡǤޤΥޥɤǤϡȥ̾\fImykey\fRȲꤷƤޤ
+そのためには、証明書をエクスポートして、クライアントに提供します。例として、次のコマンドを使用して、MJ\&.cerという名前のファイルに証明書をコピーできます。このコマンドでは、エントリに別名\fImykey\fRがあると仮定しています。
 .sp
 .if n \{\
 .RS 4
@@ -1052,12 +1052,12 @@
 .RE
 .\}
 .PP
-Ƚ̾դJARեꤷ饤Ȥϡ\fIjarsigner\fRޥɤѤƽ̾ǧڤǤޤ
-.SS "ȥΥݡ"
+証明書と署名付きJARファイルを入手したクライアントは、\fIjarsigner\fRコマンドを使用して署名を認証できます。
+.SS "キーストアのインポート"
 .PP
-ޥ\fIimportkeystore\fRѤС륭ȥΤ̤Υȥ˥ݡȤǤޤϡȤäȥΤ٤ƤΥȥ꤬ñΥޥɤѤƥåȥȥ˥ݡȤ뤳Ȥ̣ޤΥޥɤѤСۤʤ륿פΥȥ˴ޤޤ륨ȥ򥤥ݡȤ뤳ȤǤޤݡȻˤϡåȡȥοȥϤ٤ơƱ̾(̩̩ξ)ݸѥѥɤޤȥ/̩ꥫХǤʤ硢\fIkeytool\fRޥɤϥ桼˥ѥɤϤޤΥޥɤϡ̾νʣ򸡽Фȡ桼˿̾Ϥޤ桼ϡ̾ꤹ뤳Ȥ⡢ñ˴¸̾ξ񤭤\fIkeytool\fRޥɤ˵Ĥ뤳ȤǤޤ
+コマンド\fIimportkeystore\fRを使用すれば、あるキーストアの全体を別のキーストア内にインポートできます。これは、鍵や証明書といったソースキーストア内のすべてのエントリが、単一のコマンドを使用してターゲットキーストア内にインポートされることを意味します。このコマンドを使用すれば、異なるタイプのキーストア内に含まれるエントリをインポートすることができます。インポート時には、ターゲット・キーストア内の新しいエントリはすべて、元と同じ別名および(秘密鍵や秘密鍵の場合は)保護用パスワードを持ちます。ソースキーストア内の非公開/秘密鍵をリカバリできない場合、\fIkeytool\fRコマンドはユーザーにパスワードの入力を求めます。このコマンドは、別名の重複を検出すると、ユーザーに新しい別名の入力を求めます。ユーザーは、新しい別名を指定することも、単純に既存の別名の上書きを\fIkeytool\fRコマンドに許可することもできます。
 .PP
-ȤС̾JKSפΥȥkey\&.jksΥȥPKCS#11פΥϡɥ١Υȥ˥ݡȤˤϡΥޥɤѤޤ
+たとえば、通常のJKSタイプのキーストアkey\&.jks内のエントリをPKCS#11タイプのハードウェア・ベースのキーストア内にインポートするには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1073,7 +1073,7 @@
 .RE
 .\}
 .PP
-ޤ\fIimportkeystore\fRޥɤѤС륽ȥñΥȥ򥿡åȡȥ˥ݡȤ뤳ȤǤޤξϡΥץ˲äơݡȤ̾ꤹɬפޤ\fI\-srcalias\fRץꤹˤϡå̾⥳ޥɥ饤󤫤Ǥ̩ۤ/̩ݸѥѥɤ䥿åݸѥѥɤǤޤˡ򼨤ޥɤ򼡤˼ޤ
+また、\fIimportkeystore\fRコマンドを使用すれば、あるソース・キーストア内の単一のエントリをターゲット・キーストアにインポートすることもできます。この場合は、前例のオプションに加えて、インポートする別名を指定する必要があります。\fI\-srcalias\fRオプションを指定する場合には、ターゲット別名もコマンドラインから指定できるほか、秘密/秘密鍵の保護用パスワードやターゲット保護用パスワードも指定できます。その方法を示すコマンドを次に示します。
 .sp
 .if n \{\
 .RS 4
@@ -1092,9 +1092,9 @@
 .if n \{\
 .RE
 .\}
-.SS "SSLСξ"
+.SS "SSLサーバーの証明書の生成"
 .PP
-ˡ3ĤΥƥƥĤޤ롼CA(\fIroot\fR)CA(\fIca\fR)SSLС(\fIserver\fR)ѤθڥȾ\fIkeytool\fRޥɤ򼨤ޤ٤ƤξƱȥ˳Ǽ褦ˤƤǤϡRSA侩븰Υ르ꥺǤ
+次に、3つのエンティティ、つまりルートCA(\fIroot\fR)、中間CA(\fIca\fR)およびSSLサーバー(\fIserver\fR)用の鍵ペアと証明書を生成する\fIkeytool\fRコマンドを示します。すべての証明書を同じキーストアに格納するようにしてください。これらの例では、RSAが推奨される鍵のアルゴリズムです。
 .sp
 .if n \{\
 .RS 4
@@ -1120,30 +1120,30 @@
 .if n \{\
 .RE
 .\}
-.SH "Ѹ"
+.SH "用語"
 .PP

+キーストア
 .RS 4
-ȥϡŹ沽θȾǼ뤿εǽǤ
+キーストアは、暗号化の鍵と証明書を格納するための機能です。
 .RE
 .PP
-ȥΥȥ
+キーストアのエントリ
 .RS 4
-ȥˤϰۤʤ륿פΥȥޤ뤳ȤǤޤ\fIkeytool\fRޥɤǺǤŬϰϤιȥꡦפϡ2ĤǤ
+キーストアには異なるタイプのエントリを含めることができます。\fIkeytool\fRコマンドで最も適用範囲の広いエントリ・タイプは、次の2つです。
 .sp
-\fBΥȥ\fR
-\- ƥȥϡ˽פʰŹ沽θξݻޤξϡĤƤʤɤˡݸ줿dzǼޤ̤ˡμΥȥȤƳǼ븰ϡ̩бξȼ̩Ǥ򻲾ȤƤ\fIkeytool\fRޥɤξΥפΥȥǤΤФ\fIjarsigner\fRġϸԤΥפΥȥꡢĤޤ̩Ȥ˴Ϣդ줿Τߤޤ
+\fB鍵のエントリ\fR
+\- 各エントリは、非常に重要な暗号化の鍵の情報を保持します。この情報は、許可していないアクセスを防ぐために、保護された形で格納されます。一般に、この種のエントリとして格納される鍵は、秘密鍵か、対応する公開鍵の証明書チェーンを伴う秘密鍵です。証明書チェーンを参照してください。\fIkeytool\fRコマンドがこの両方のタイプのエントリを処理できるのに対し、\fIjarsigner\fRツールは後者のタイプのエントリ、つまり秘密鍵とそれに関連付けられた証明書チェーンのみを処理します。
 .sp
-\fBǤΥȥ\fR: ƥȥϡ軰Ԥθ1ĴޤǤޤΥȥϡǤȸƤФޤϡθSubject(ͭ)ˤäꤵ륢ǥƥƥͳ褹ΤǤ뤳Ȥ򡢥ȥνͭԤꤹ뤫ǤȯԼԤϡ˽̾դ뤳ȤˤäơƤݾڤޤ
+\fB信頼できる証明書のエントリ\fR: 各エントリは、第三者からの公開鍵証明書を1つ含んでいます。このエントリは、信頼できる証明書と呼ばれます。それは、証明書内の公開鍵が、証明書のSubject(所有者)によって特定されるアイデンティティに由来するものであることを、キーストアの所有者が信頼するからです。証明書の発行者は、証明書に署名を付けることによって、その内容を保証します。
 .RE
 .PP
-ȥ̾
+キーストアの別名
 .RS 4
-ȥΤ٤ƤΥȥ(ӿǤ񥨥ȥ)ϡդ̾𤷤ƥޤ
+キーストアのすべてのエントリ(鍵および信頼できる証明書エントリ)は、一意の別名を介してアクセスされます。
 .sp
-̾ꤹΤϡ\fI\-genseckey\fRޥɤѤ̩ꡢ\fI\-genkeypair\fRޥɤѤƸڥ(̩)ꡢ\fI\-importcert\fRޥɤѤƾޤϾǤΥꥹȤɲäʤɡΥƥƥ򥭡ȥɲäǤʸ塢\fIkeytool\fRޥɤǥƥƥ򻲾ȤϡΤȤ˻ꤷ̾Ѥɬפޤ
+別名を指定するのは、\fI\-genseckey\fRコマンドを使用して秘密鍵を生成したり、\fI\-genkeypair\fRコマンドを使用して鍵ペア(公開鍵と秘密鍵)を生成したり、\fI\-importcert\fRコマンドを使用して証明書または証明書チェーンを信頼できる証明書のリストに追加するなど、特定のエンティティをキーストアに追加する場合です。これ以後、\fIkeytool\fRコマンドでエンティティを参照する場合は、このときに指定した別名を使用する必要があります。
 .sp
-ȤС\fIduke\fRȤ̾Ѥƿ̩Υڥ򼫸ʽ̾ǥåפȤޤξϡΥޥɤ¹Ԥޤ򻲾ȤƤ
+たとえば、\fIduke\fRという別名を使用して新しい公開鍵と秘密鍵のペアを生成し、公開鍵を自己署名証明書でラップするとします。この場合は、次のコマンドを実行します。証明書チェーンを参照してください。
 .sp
 .if n \{\
 .RS 4
@@ -1154,7 +1154,7 @@
 .if n \{\
 .RE
 .\}
-ǤϡѥɤȤ\fIdukekeypasswd\fRꤷƤޤʸ塢̾\fIduke\fR˴Ϣդ줿̩˥륳ޥɤ¹ԤȤϡΥѥɤɬפˤʤޤDuke̩Υѥɤ򤢤ȤѹˤϡΥޥɤ¹Ԥޤ
+この例では、初期パスワードとして\fIdukekeypasswd\fRを指定しています。以後、別名\fIduke\fRに関連付けられた秘密鍵にアクセスするコマンドを実行するときは、このパスワードが必要になります。Dukeの秘密鍵のパスワードをあとから変更するには、次のコマンドを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -1165,29 +1165,29 @@
 .if n \{\
 .RE
 .\}
-ѥɤ\fIdukekeypasswd\fR\fInewpass\fRѹޤƥȤŪȤ硢ޤϰǤ뤳Ȥ狼äƤ륷ƥǼ¹Ԥʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤɬפʥѥɤΥץ򥳥ޥɥ饤ǻꤷʤäϡѥɤϤޤ
+パスワードが、\fIdukekeypasswd\fRから\fInewpass\fRに変更されます。テストを目的とする場合、または安全であることがわかっているシステムで実行する場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。必要なパスワードのオプションをコマンドラインで指定しなかった場合は、パスワードの入力を求められます。
 .RE
 .PP
-ȥμ
+キーストアの実装
 .RS 4
-\fIjava\&.security\fRѥå󶡤Ƥ\fIKeyStore\fR饹ϡȥξؤΥӾѹԤΡΤ줿󥿥ե󶡤ޤȥθȤƤϡ줾줬ΥפΥȥоݤȤʣΰۤʤ¸߲ǽǤ
+\fIjava\&.security\fRパッケージで提供されている\fIKeyStore\fRクラスは、キーストア内の情報へのアクセスおよび情報の変更を行うための、明確に定義されたインタフェースを提供します。キーストアの固定実装としては、それぞれが特定のタイプのキーストアを対象とする複数の異なる実装が存在可能です。
 .sp
-ߡ\fIkeytool\fR\fIjarsigner\fR2ĤΥޥɥ饤󡦥ġȡPolicy ToolȤ̾GUI١Υġ뤬ȥμѤƤޤ\fIKeyStore\fR饹\fIpublic\fRǤ뤿ᡢ桼KeyStoreѤ¾ΥƥץꥱǤޤ
+現在、\fIkeytool\fRと\fIjarsigner\fRの2つのコマンドライン・ツールと、Policy Toolという名前のGUIベースのツールが、キーストアの実装を使用しています。\fIKeyStore\fRクラスは\fIpublic\fRであるため、ユーザーはKeyStoreを使用した他のセキュリティ・アプリケーションも作成できます。
 .sp
-ȥˤϡOracle󶡤ȹߤΥǥեȤμޤϡJKSȤ̾ȼΥȥ()ѤΤǡȥեȤƼƤޤμǤϡġ̩ϸ̤Υѥɤˤäݸ졢ȥΤ(̩Ȥ̤)ѥɤˤäݸޤ
+キーストアには、Oracleが提供する組込みのデフォルトの実装があります。これは、JKSという名前の独自のキーストア・タイプ(形式)を利用するもので、キーストアをファイルとして実装しています。この実装では、個々の秘密鍵は個別のパスワードによって保護され、キーストア全体の整合性も(秘密鍵とは別の)パスワードによって保護されます。
 .sp
-ȥμϡץХ١ǤŪˤϡ\fIKeyStore\fRˤä󶡤륢ץꥱ󡦥󥿥եӥץХ󥿥ե(SPI)˴ŤƼޤĤޤꡢб\fIKeystoreSpi\fRݥ饹(\fIjava\&.security\fRѥå˴ޤޤƤޤ)ꡢΥ饹ץХɬפΤService Provider InterfaceΥ᥽åɤƤޤǡ\fIץХ\fRȤϡJava Security APIˤäƥǽʥӥΥ֥åȤФθ󶡤ѥåޤϥѥåνΤȤǤȥμ󶡤ˤϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlˤ
-JavaŹ沽ƥΥץХμˡƤ褦ˡ饤ȤϥץХ\fIKeystoreSpi\fR֥饹μ󶡤ɬפޤ
+キーストアの実装は、プロバイダベースです。具体的には、\fIKeyStore\fRによって提供されるアプリケーション・インタフェースがサービス・プロバイダ・インタフェース(SPI)に基づいて実装されます。つまり、対応する\fIKeystoreSpi\fR抽象クラス(これも\fIjava\&.security\fRパッケージに含まれています)があり、このクラスが、プロバイダが実装する必要のあるService Provider Interfaceのメソッドを定義しています。ここで、\fIプロバイダ\fRとは、Java Security APIによってアクセス可能なサービスのサブセットに対し、その固定実装を提供するパッケージまたはパッケージの集合のことです。キーストアの実装を提供するには、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider\&.htmlにある
+Java暗号化アーキテクチャのプロバイダの実装方法で説明しているように、クライアントはプロバイダを実装し、\fIKeystoreSpi\fRサブクラスの実装を提供する必要があります。
 .sp
-ץꥱǤϡ\fIKeyStore\fR饹󶡤\fIgetInstance\fRեȥꡦ᥽åɤѤ뤳Ȥǡ͡ʥץХۤʤ륿פΥȥμǤޤȥΥפϡȥγǼȥǡȤȤˡȥ/̩ȥȥݸ뤿˻Ѥ륢르ꥺޤۤʤ륿פΥȥμˤϡߴϤޤ
+アプリケーションでは、\fIKeyStore\fRクラスが提供する\fIgetInstance\fRファクトリ・メソッドを使用することで、様々なプロバイダから異なるタイプのキーストアの実装を選択できます。キーストアのタイプは、キーストア情報の格納形式とデータ形式を定義するとともに、キーストア内の非公開/秘密鍵とキーストアの整合性を保護するために使用されるアルゴリズムを定義します。異なるタイプのキーストアの実装には、互換性はありません。
 .sp
-\fIkeytool\fRޥɤϡǤդΥե١Υȥưޤޥɡ饤Ϥ줿ȥξե̾Ȥưäơ\fIFileInputStream\fRѴ饭ȥɤޤ\fIjarsigner\fR\fIpolicytool\fRޥɤϡURLǻǤǤդξ꤫饭ȥɤ߼뤳ȤǤޤ
+\fIkeytool\fRコマンドは、任意のファイルベースのキーストア実装で動作します。コマンド・ラインで渡されたキーストアの場所をファイル名として扱って、\fIFileInputStream\fRに変換し、ここからキーストア情報をロードします。\fIjarsigner\fRおよび\fIpolicytool\fRコマンドは、URLで指定できる任意の場所からキーストアを読み取ることができます。
 .sp
-\fIkeytool\fR\fIjarsigner\fRξ硢\fI\-storetype\fRץѤƥޥɥ饤ǥȥΥפǤޤPolicy Toolξϡ֥ȥץ˥塼ˤäƥȥΥפǤޤ
+\fIkeytool\fRと\fIjarsigner\fRの場合、\fI\-storetype\fRオプションを使用してコマンドラインでキーストアのタイプを指定できます。Policy Toolの場合は、「キーストア」メニューによってキーストアのタイプを指定できます。
 .sp
-桼ȥΥפŪ˻ꤷʤä硢ƥץѥƥեǻꤵ줿\fIkeystore\&.type\fRץѥƥͤ˴Ťơġˤäƥȥμ򤵤ޤΥƥץѥƥե\fIjava\&.security\fRȸƤФ졢WindowsǤϥƥץѥƥǥ쥯ȥ\fIjava\&.home\elib\esecurity\fROracle SolarisǤ\fIjava\&.home/lib/security\fRˤޤ\fIjava\&.home\fRϡ¹ԻĶΥǥ쥯ȥǤ\fIjre\fRǥ쥯ȥϡSDKޤJava Runtime Environment (JRE)κǾ̤Υǥ쥯ȥˤޤ
+ユーザーがキーストアのタイプを明示的に指定しなかった場合、セキュリティ・プロパティ・ファイルで指定された\fIkeystore\&.type\fRプロパティの値に基づいて、ツールによってキーストアの実装が選択されます。このセキュリティ・プロパティ・ファイルは\fIjava\&.security\fRと呼ばれ、Windowsではセキュリティ・プロパティ・ディレクトリ\fIjava\&.home\elib\esecurity\fR、Oracle Solarisでは\fIjava\&.home/lib/security\fRにあります。\fIjava\&.home\fRは、実行時環境のディレクトリです。\fIjre\fRディレクトリは、SDKまたはJava Runtime Environment (JRE)の最上位のディレクトリにあります。
 .sp
-ƥġϡ\fIkeystore\&.type\fRͤͤǻꤵ줿פΥȥƤץХĤޤǡߥ󥹥ȡ뤵Ƥ뤹٤ƤΥץХĴ٤ޤΥץХΥȥμѤޤ\fIKeyStore\fR饹Ƥstatic᥽å\fIgetDefaultType\fRѤȡץꥱ䥢ץåȤ\fIkeystore\&.type\fRץѥƥͤǤޤΥɤϡǥեȤΥȥ(\fIkeystore\&.type\fRץѥƥǻꤵ줿)Υ󥹥󥹤ޤ
+各ツールは、\fIkeystore\&.type\fRの値を取得し、この値で指定されたタイプのキーストアを実装しているプロバイダが見つかるまで、現在インストールされているすべてのプロバイダを調べます。そのプロバイダからのキーストアの実装を使用します。\fIKeyStore\fRクラスに定義されているstaticメソッド\fIgetDefaultType\fRを使用すると、アプリケーションやアプレットから\fIkeystore\&.type\fRプロパティの値を取得できます。次のコードは、デフォルトのキーストア・タイプ(\fIkeystore\&.type\fRプロパティで指定されたタイプ)のインスタンスを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -1198,7 +1198,7 @@
 .if n \{\
 .RE
 .\}
-ǥեȤΥȥפ\fIjks\fRǡOracle󶡤ȼΥפΥȥμǤϡƥץѥƥեμιԤˤäƻꤵƤޤ
+デフォルトのキーストア・タイプは\fIjks\fRで、これはOracleが提供する独自のタイプのキーストアの実装です。これは、セキュリティ・プロパティ・ファイル内の次の行によって指定されています。
 .sp
 .if n \{\
 .RS 4
@@ -1209,7 +1209,7 @@
 .if n \{\
 .RE
 .\}
-ƥġǥǥեȰʳΥȥμѤˤϡιԤѹ̤ΥȥΥפꤷޤȤС\fIpkcs12\fRȸƤФ륭ȥΥפΥȥμ󶡤ץХѥå硢Ԥ򼡤Τ褦ѹޤ
+各ツールでデフォルト以外のキーストアの実装を使用するには、上の行を変更して別のキーストアのタイプを指定します。たとえば、\fIpkcs12\fRと呼ばれるキーストアのタイプのキーストアの実装を提供するプロバイダ・パッケージがある場合、行を次のように変更します。
 .sp
 .if n \{\
 .RS 4
@@ -1220,56 +1220,56 @@
 .if n \{\
 .RE
 .\}
-\fB:\fR
-ȥΥפλǤϡʸȾʸ϶̤ޤ󡣤ȤСJKSjksƱΤȤưޤ
+\fB注意:\fR
+キーストアのタイプの指定では、大文字と小文字は区別されません。たとえば、JKSとjksは同じものとして扱われます。
 .RE
 .PP
-
+証明書
 .RS 4
-()Ȥϡ륨ƥƥ(ȯԼ)Υǥ̾դʸΤȤǤˤϡ¾Τ륨ƥƥ(̾)θ(Ӥ¾ξ)̤ͤäƤ뤳Ȥ񤫤ƤޤѸϡ˴ϢƤޤ
+証明書(公開鍵証明書)とは、あるエンティティ(発行者)からのデジタル署名付きの文書のことです。証明書には、他のあるエンティティ(署名者)の公開鍵(およびその他の情報)が特別な値を持っていることが書かれています。次の用語は、証明書に関連しています。
 .sp
-\fB\fR: ϡΥƥƥ˴Ϣդ줿Ǥϡ륨ƥƥȤδ֤˿Ǥطɬפ뤹٤ƤοͤФƸ뤳ȤտޤΤǤϡ̾򸡾ڤΤ˻Ѥޤ
+\fB公開鍵\fR: 公開鍵は、特定のエンティティに関連付けられた数です。公開鍵は、該当するエンティティとの間に信頼できる関係を持つ必要があるすべての人に対して公開することを意図したものです。公開鍵は、署名を検証するのに使用されます。
 .sp
-\fBǥ̾\fR: ǡǥ̾ȡΥǡϡƥƥΥǥƥƥȡΥƥƥǡƤˤĤΤäƤ뤳Ȥ񤹤̾ȤȤ˳Ǽޤƥƥ̩Ѥƥǡ˽̾դȡǡε¤Բǽˤʤޤ
+\fBデジタル署名\fR: データがデジタル署名されると、そのデータは、エンティティのアイデンティティと、そのエンティティがデータの内容について知っていることを証明書する署名とともに格納されます。エンティティの秘密鍵を使用してデータに署名を付けると、データの偽造は不可能になります。
 .sp
-\fBǥƥƥ\fR: ƥƥ򥢥ɥ쥹ꤹΤˡƥˤäƤϡ򥢥ǥƥƥˤΤޤ¾ˤ⡢Oracle Solaris UIDŻҥ᡼롦ɥ쥹X\&.509̾ʤɡ͡ʤΤ򥢥ǥƥƥȤ뤳ȤǤޤ
+\fBアイデンティティ\fR: エンティティをアドレス指定する既知の方法。システムによっては、公開鍵をアイデンティティにするものがあります。公開鍵の他にも、Oracle Solaris UIDや電子メール・アドレス、X\&.509識別名など、様々なものをアイデンティティとすることができます。
 .sp
-\fB̾\fR: ̾ϡʤ餫Υǡ˥ƥƥ̩ѤƷ׻ޤ̾ԡξȯԼԤȤƤФޤ
+\fB署名\fR: 署名は、なんらかのデータを基にエンティティの秘密鍵を使用して計算されます。署名者、証明書の場合は発行者とも呼ばれます。
 .sp
-\fB̩\fR: ̩ΥƥƥΤߤΤäƤΤȤǡοΤȤ򡢤Υƥƥ̩Ȥޤ̩ϡ¾Τʤ褦̩ˤƤȤˤʤäƤޤ̩ȸϡ٤ƤθŹ沽ƥФˤʤä¸ߤƤޤDSAʤɤŵŪʸŹ沽ƥξ硢1Ĥ̩Τ1Ĥθбޤ̩ϡ̾׻Τ˻Ѥޤ
+\fB秘密鍵\fR: 秘密鍵は特定のエンティティのみが知っている数のことで、この数のことを、そのエンティティの秘密鍵といいます。秘密鍵は、他に知られないように秘密にしておくことが前提になっています。秘密鍵と公開鍵は、すべての公開鍵暗号化システムで対になって存在しています。DSAなどの典型的な公開鍵暗号化システムの場合、1つの秘密鍵は正確に1つの公開鍵に対応します。秘密鍵は、署名を計算するのに使用されます。
 .sp
-\fBƥƥ\fR: ƥƥϡ͡ȿץࡢԥ塼ȡԤʤɡٹ礤ǿоݤȤʤ͡ʤΤؤޤ
+\fBエンティティ\fR: エンティティは、人、組織、プログラム、コンピュータ、企業、銀行など、一定の度合いで信頼の対象となる様々なものを指します。
 .sp
-Ź沽Ǥϡ桼θ˥ɬפޤ絬ϤʥͥåȥĶǤϡߤ̿Ƥ륨ƥƥ֤ǰδط³ΩƤȲꤷꡢѤƤ뤹٤Ƥθ᤿Ǥݥȥ꤬¸ߤȲꤷꤹ뤳ȤԲǽǤΤ褦ʸۤ˴ؤ褹뤿˾񤬹ͰƤޤߤǤϡȯԶ(CA)Ǥ軰ԤȤƵǽޤCAϡ¾Υƥƥξ˽̾(ȯԤ)԰٤򡢿ꤷǤƤ륨ƥƥ(Ȥʤ)ǤCAˡΧη˹«ΤǡͭĿǤΤߤΤȤưޤVeriSignThawteEntrustϤᡢ¿θŪʾȯԶɤ¸ߤޤ
+公開鍵暗号化では、ユーザーの公開鍵にアクセスする必要があります。大規模なネットワーク環境では、互いに通信しているエンティティ間で以前の関係が引続き確立されていると仮定したり、使用されているすべての公開鍵を収めた信頼できるリポジトリが存在すると仮定したりすることは不可能です。このような公開鍵の配布に関する問題を解決するために証明書が考案されました。現在では、証明書発行局(CA)が信頼できる第三者として機能します。CAは、他のエンティティの証明書に署名する(発行する)行為を、信頼して任されているエンティティ(企業など)です。CAは法律上の契約に拘束されるので、有効かつ信頼できる証明書のみを作成するものとして扱われます。VeriSign、Thawte、Entrustをはじめ、多くの公的な証明書発行局が存在します。
 .sp
-MicrosoftǧڥСEntrustCAʤʤɤ°ȿѤСȼξȯԶɤ򱿱Ĥ뤳ȤǽǤ\fIkeytool\fRޥɤѤȡɽݡȤӥݡȤԤȤǤޤޤʽ̾뤳ȤǤޤ
+Microsoftの認証サーバー、EntrustのCA製品などを所属組織内で利用すれば、独自の証明書発行局を運営することも可能です。\fIkeytool\fRコマンドを使用すると、証明書の表示、インポートおよびエクスポートを行うことができます。また、自己署名証明書を生成することもできます。
 .sp
-ߡ\fIkeytool\fRޥɤX\&.509оݤˤƤޤ
+現在、\fIkeytool\fRコマンドはX\&.509証明書を対象にしています。
 .RE
 .PP
-X\&.509
+X\&.509証明書
 .RS 4
-X\&.509ʤǤϡ˴ޤƤꡢξ˽񤭹ˡ(ǡ)ˤĤƤ⵭ҤƤޤΤ٤ƤΥǡϡASN\&.1/DERȸƤФ2ĤδϢʤѤ沽ޤAbstract Syntax Notation 1ϥǡˤĤƵҤƤޤDefinite Encoding Rulesϡǡ¸žˡˤĤƵҤƤޤ
+X\&.509規格では、証明書に含める情報が定義されており、この情報を証明書に書き込む方法(データ形式)についても記述されています。証明書のすべてのデータは、ASN\&.1/DERと呼ばれる2つの関連規格を使用して符号化されます。Abstract Syntax Notation 1はデータについて記述しています。Definite Encoding Rulesは、データの保存および転送の方法について記述しています。
 .sp
-٤ƤX\&.509ϡ̾¾˼ΥǡޤǤޤ
+すべてのX\&.509証明書は、署名の他に次のデータを含んでいます。
 .sp
-\fBС\fR: ŬѤX\&.509ʤΥСꤷޤ˻ǤϡСˤäưۤʤޤΤȤ3ĤΥСƤޤ\fIkeytool\fRޥɤǤϡv1v2v3ξ򥤥ݡȤӥݡȤǤޤv3ξޤ
+\fBバージョン\fR: 証明書に適用されるX\&.509規格のバージョンを特定します。証明書に指定できる情報は、バージョンによって異なります。今のところ、3つのバージョンが定義されています。\fIkeytool\fRコマンドでは、v1、v2、v3の証明書をインポートおよびエクスポートできます。v3の証明書を生成します。
 .sp
-X\&.509 Version 1ϡ1988ǯѤƹڤƤꡢǤŪǤ
+X\&.509 Version 1は、1988年から利用されて広く普及しており、最も一般的です。
 .sp
-X\&.509 Version 2ǤϡSubjectȯԼԤ̾򤢤ȤǺѤǤ褦ˤ뤿ˡSubjectȯԼԤΰռ̻ҤγǰƳޤۤȤɤξץեʸǤϡ̾ƻѤʤȤȡǰդμ̻ҤѤʤȤ侩ƤޤVersion 2ξϡϻѤƤޤ
+X\&.509 Version 2では、Subjectや発行者の名前をあとで再利用できるようにするために、Subjectと発行者の一意識別子の概念が導入されました。ほとんどの証明書プロファイル文書では、名前を再使用しないことと、証明書で一意の識別子を使用しないことが、強く推奨されています。Version 2の証明書は、広くは使用されていません。
 .sp
-X\&.509 Version 3ϺǤ⿷(1996ǯ)ʤǡƥ󥷥γǰ򥵥ݡȤƤޤƥ󥷥ïǤ뤳ȤǤ˴ޤ뤳ȤǤޤŪʥƥ󥷥ȤƤϡKeyUsage(\fI̾\fRʤɡλѤŪ¤)AlternativeNames(DNS̾Żҥ᡼롦ɥ쥹IPɥ쥹ʤɡ¾Υǥƥƥ˴Ϣդ뤳ȤǤ)ʤɤޤƥ󥷥ˤϡcriticalȤޡդơΥƥ󥷥ΥåȻѤ̳Ť뤳ȤǤޤȤСcriticalȥޡ졢\fIkeyCertSign\fRꤵ줿KeyUsageƥ󥷥󤬾˴ޤޤƤ硢ξSSL̿󼨤ȡ񤬵ݤޤϡΥƥ󥷥ˤäơϢ̩ν̾ѤȤƻꤵƤꡢSSLǤϻѤǤʤǤ
+X\&.509 Version 3は最も新しい(1996年)規格で、エクステンションの概念をサポートしています。エクステンションは誰でも定義することができ、証明書に含めることができます。一般的なエクステンションとしては、KeyUsage(\fI署名専用\fRなど、鍵の使用を特定の目的に制限する)、AlternativeNames(DNS名、電子メール・アドレス、IPアドレスなど、他のアイデンティティを公開鍵に関連付けることができる)などがあります。エクステンションには、criticalというマークを付けて、そのエクステンションのチェックと使用を義務づけることができます。たとえば、criticalとマークされ、\fIkeyCertSign\fRが設定されたKeyUsageエクステンションが証明書に含まれている場合、この証明書をSSL通信中に提示すると、証明書が拒否されます。これは、証明書のエクステンションによって、関連する秘密鍵が証明書の署名専用として指定されており、SSLでは使用できないためです。
 .sp
-\fBꥢֹ\fR: ƥƥϡΥƥƥȯԤ¾ξȶ̤뤿ˡ˥ꥢֹƤޤξϡ͡ˡǻѤޤȤС񤬼äȡꥢֹ椬񼺸ꥹ(CRL)˳Ǽޤ
+\fBシリアル番号\fR: 証明書を作成したエンティティは、そのエンティティが発行する他の証明書と区別するために、証明書にシリアル番号を割り当てます。この情報は、様々な方法で使用されます。たとえば、証明書が取り消されると、シリアル番号が証明書失効リスト(CRL)に格納されます。
 .sp
-\fB񥢥르ꥺ༱̻\fR: ˽̾դȤCAѤ르ꥺꤷޤ
+\fB証明書アルゴリズム識別子\fR: 証明書に署名を付けるときにCAが使用したアルゴリズムを特定します。
 .sp
-\fBȯԼ̾\fR: ˽̾դƥƥX\&.500̾ǤX\&.500̾򻲾ȤƤ̾CAǤξѤ뤳Ȥϡ˽̾դƥƥꤹ뤳Ȥ̣ޤ롼ȤĤޤȥåץ٥CAξʤɡˤäƤȯԼԤȤξ˽̾դ뤳Ȥޤ
+\fB発行者名\fR: 証明書に署名を付けたエンティティのX\&.500識別名です。X\&.500識別名を参照してください。通常はCAです。この証明書を使用することは、証明書に署名を付けたエンティティを信頼することを意味します。ルートつまりトップレベルのCAの証明書など、場合によっては発行者が自身の証明書に署名を付けることがあります。
 .sp
-\fBͭ\fR: ƾϸ¤줿֤ΤͭǤδ֤ϳϤȽλˤäƻꤵ졢äû֤100ǯȤĹˤ錄뤳Ȥ⤢ޤ򤵤֤ͭϡؤν̾˻Ѥ̩ζ٤˻ʧۤʤɡ͡װǰۤʤޤ֤ͭϡϢ̩»ʤˡƥƥǤȴԤ֤Ǥ
+\fB有効期間\fR: 各証明書は限られた期間のみ有効です。この期間は開始の日時と終了の日時によって指定され、数秒の短い期間から100年という長期にわたることもあります。選択される有効期間は、証明書への署名に使用される秘密鍵の強度や証明書に支払う金額など、様々な要因で異なります。有効期間は、関連する秘密鍵が損われない場合に、エンティティが公開鍵を信頼できると期待される期間です。
 .sp
-\fB̾\fR: Ǹǧڤ륨ƥƥ̾̾X\&.500ɸѤΤǡ󥿡ͥåΤǰդʤΤꤵޤϡƥƥX\&.500̾(DN)ǤX\&.500̾򻲾ȤƤ򼨤ޤ
+\fB主体名\fR: 証明書で公開鍵を認証するエンティティの名前。この名前はX\&.500標準を使用するので、インターネット全体で一意なものと想定されます。これは、エンティティのX\&.500識別名(DN)です。X\&.500識別名を参照してください。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -1280,33 +1280,33 @@
 .if n \{\
 .RE
 .\}
-Ϥ줾Τ̾(CN)ȿñ(OU)ȿ(O)(C)ɽޤ
+これらはそれぞれ主体の通称(CN)、組織単位(OU)、組織(O)、国(C)を表します。
 .sp
-\fBΤθ\fR: ̾դ줿ƥƥθȥ르ꥺ༱̻ҤǤ르ꥺ༱̻ҤǤϡФƻѤƤŹ沽ƥपӴϢ븰ѥ᡼ꤵƤޤ
+\fB主体の公開鍵情報\fR: 名前を付けられたエンティティの公開鍵とアルゴリズム識別子です。アルゴリズム識別子では、公開鍵に対して使用されている公開鍵暗号化システムおよび関連する鍵パラメータが指定されています。
 .RE
 .PP
-
+証明書チェーン
 .RS 4
-\fIkeytool\fRޥɤǤϡ̩ӴϢޤ७ȥθȥ뤳ȤǤޤΤ褦ʥȥǤϡ̩бϡκǽξ˴ޤޤƤޤ
+\fIkeytool\fRコマンドでは、秘密鍵および関連する証明書チェーンを含むキーストアの鍵エントリを作成し、管理することができます。このようなエントリでは、秘密鍵に対応する公開鍵は、チェーンの最初の証明書に含まれています。
 .sp
-ƺȡʽ̾Ȥ1ĤǤΤߤޤ󤬳Ϥޤ\fI\fR\-genkeypairޥɤ򻲾ȤƤʽ̾ȯԼ(̾)ΤƱǤΤϡθˤäǧڤ륨ƥƥǤ\fI\-genkeypair\fRޥɤƤӽФƿ̩ΥڥȡϾ˼ʽ̾ǥåפޤ
+鍵を初めて作成すると、自己署名証明書という1つの要素のみを含むチェーンが開始されます。\fIの\fR\-genkeypairコマンドを参照してください。自己署名証明書は発行者(署名者)が主体と同じです。主体は、その公開鍵が証明書によって認証されるエンティティです。\fI\-genkeypair\fRコマンドを呼び出して新しい公開鍵と秘密鍵のペアを作成すると、公開鍵は常に自己署名証明書でラップされます。
 .sp
-θ塢̾ꥯ(CSR)\fI\-certreq\fRޥɤơCSRȯԶ(CA)ȡCAΥ쥹ݥ󥹤\fI\-importcert\fRǥݡȤ졢μʽ̾Ͼˤä֤ޤޥɤ\fI\-certreq\fR\fI\-importcert\fRץ򻲾ȤƤκǸˤΤϡSubjectθǧڤCAȯԤ()ǤΤξϡCAθǧڤǤ
+この後、証明書署名リクエスト(CSR)が\fI\-certreq\fRコマンドで生成されて、CSRが証明書発行局(CA)に送信されると、CAからのレスポンスが\fI\-importcert\fRでインポートされ、元の自己署名証明書は証明書チェーンによって置き換えられます。コマンドの\fI\-certreq\fRおよび\fI\-importcert\fRオプションを参照してください。チェーンの最後にあるのは、Subjectの公開鍵を認証したCAが発行した証明書(応答)です。チェーン内のその前の証明書は、CAの公開鍵を認証する証明書です。
 .sp
-CAθǧڤϡ¿ξ硢ʽ̾(ĤޤCAȤθǧڤ)ǤꡢϥκǽξˤʤޤˤäƤϡCAΥ֤Ȥ⤢ޤξ硢κǸξ(CAˤäƽ̾졢ȥθǧڤ)ѤϤޤ󤬡ΤξϡCSRCAȤ̤CAˤäƽ̾졢CSRCAθǧڤˤʤޤΤξϡCAθǧڤˤʤޤʲƱͤˡʽ̾줿֥롼ȡ׾ãޤǥ³ޤäơ(ǽξʸ)ƾǤϡμξν̾ԤθǧڤƤ뤳Ȥˤʤޤ
+CAの公開鍵を認証する証明書は、多くの場合、自己署名証明書(つまりCAが自身の公開鍵を認証した証明書)であり、これはチェーンの最初の証明書になります。場合によっては、CAが証明書のチェーンを返すこともあります。この場合、チェーン内の最後の証明書(CAによって署名され、鍵エントリの公開鍵を認証する証明書)に変わりはありませんが、チェーン内のその前の証明書は、CSRの送信先のCAとは別のCAによって署名され、CSRの送信先のCAの公開鍵を認証する証明書になります。チェーン内のその前の証明書は、次のCAの鍵を認証する証明書になります。以下同様に、自己署名された「ルート」証明書に達するまでチェーンが続きます。したがって、チェーン内の(最初の証明書以後の)各証明書では、チェーン内の次の証明書の署名者の公開鍵が認証されていることになります。
 .sp
-¿CAϡ򥵥ݡȤȯԺѤξΤߤ֤ޤäˡ֤CA¸ߤʤեåȤʳع¤ξϡηǤΤ褦ʾϡȥˤǤ˳ǼƤ뿮Ǥ󤫤顢Ωɬפޤ
+多くのCAは、チェーンをサポートせずに発行済の証明書のみを返します。特に、中間のCAが存在しないフラットな階層構造の場合は、その傾向が顕著です。このような場合は、キーストアにすでに格納されている信頼できる証明書情報から、証明書チェーンを確立する必要があります。
 .sp
-̤α(PKCS#7Ƥ)ǤϡȯԺѾ˲äΥݡȤޤޤƤޤ\fIkeytool\fRޥɤǤϡɤαⰷȤǤޤ
+別の応答形式(PKCS#7で定義されている形式)では、発行済証明書に加え、証明書チェーンのサポートが含まれています。\fIkeytool\fRコマンドでは、どちらの応答形式も扱うことができます。
 .sp
-ȥåץ٥(롼)CAξϡʽ̾Ǥ롼Ȥθؤοϡ롼ȾΤǤϤʤʹʤ¾ΥޤϡVeriSign롼CAʤɤμ̾ѤơïǤ⼫ʽ̾Ǥ뤿Ǥ롼CAθϹΤƤޤ롼CAθ˳ǼͳϡȤˤ뤳Ȥ¿Υġ뤫ѤǤ褦ˤʤ뤫ˤޤ󡣤Ĥޤꡢϡ롼CAθ򱿤֡ΡפȤѤΤߤǤ롼CAξ򥭡ȥɲäȤϡ\fI\-printcert\fRץѤơ˾Ƥɽɽ줿ե󥬡ץȤȡʹ롼CAWebڡʤɤꤷΤΥե󥬡ץȤȤӤɬפޤ
+トップレベル(ルート)CAの証明書は、自己署名証明書です。ただし、ルートの公開鍵への信頼は、ルート証明書自体からではなく、新聞など他のソースから取得されます。これは、VeriSignルートCAなどの識別名を使用して、誰でも自己署名型証明書を生成できるためです。ルートCAの公開鍵は広く知られています。ルートCAの公開鍵を証明書に格納する理由は、証明書という形式にすることで多くのツールから利用できるようになるからにすぎません。つまり、証明書は、ルートCAの公開鍵を運ぶ「媒体」として利用されるのみです。ルートCAの証明書をキーストアに追加するときは、\fI\-printcert\fRオプションを使用して、その前に証明書の内容を表示し、表示されたフィンガープリントと、新聞やルートCAのWebページなどから入手した既知のフィンガープリントとを比較する必要があります。
 .RE
 .PP
-cacertsե
+cacerts証明書ファイル
 .RS 4
-\fIcacerts\fRȤ̾ξեϡWindowsǤϥƥץѥƥǥ쥯ȥ\fIjava\&.home\elib\esecurity\fROracle SolarisǤ\fIjava\&.home/lib/security\fR֤Ƥޤ\fIjava\&.home\fRϡ¹ԴĶΥǥ쥯ȥ(SDK\fIjre\fRǥ쥯ȥޤJREκǾ̥ǥ쥯ȥ)Ǥ
+\fIcacerts\fRという名前の証明書ファイルは、Windowsではセキュリティ・プロパティ・ディレクトリ\fIjava\&.home\elib\esecurity\fR、Oracle Solarisでは\fIjava\&.home/lib/security\fRに置かれています。\fIjava\&.home\fRは、実行環境のディレクトリ(SDKの\fIjre\fRディレクトリまたはJREの最上位ディレクトリ)です。
 .sp
-\fIcacerts\fRեϡCAξޤࡢƥΤΥȥǤƥԤϡȥפ\fIjks\fRꤹ뤳Ȥǡ\fIkeytool\fRޥɤѤƤΥեιȴԤȤǤޤ\fIcacerts\fRȥեϡ롼CAΥǥեȡåȤޤ֤ǽв٤ƤޤǥեȤξɽˤϡΥޥɤѤޤ
+\fIcacerts\fRファイルは、CAの証明書を含む、システム全体のキーストアです。システム管理者は、キーストア・タイプに\fIjks\fRを指定することで、\fIkeytool\fRコマンドを使用してこのファイルの構成と管理を行うことができます。\fIcacerts\fRキーストア・ファイルは、ルートCA証明書のデフォルト・セットを含んだ状態で出荷されています。デフォルトの証明書を一覧表示するには、次のコマンドを使用します。
 .sp
 .if n \{\
 .RS 4
@@ -1317,23 +1317,23 @@
 .if n \{\
 .RE
 .\}
-\fIcacerts\fRȥեνѥɤϡ\fIchangeit\fRǤƥԤϡSDKΥ󥹥ȡ塢ΥեΥѥɤȥǥեȡѹɬפޤ
+\fIcacerts\fRキーストア・ファイルの初期パスワードは、\fIchangeit\fRです。システム管理者は、SDKのインストール後、このファイルのパスワードとデフォルト・アクセス権を変更する必要があります。
 .sp
-\fB:\fR
-\fIcacerts\fRեǧ뤳ȤפǤ\fIcacerts\fRեCAϡ̾¾ΥƥƥؤξȯԤΤΥƥƥȤƿꤵ뤿ᡢ\fIcacerts\fRեδϿŤ˹Ԥɬפޤ\fIcacerts\fRեˤϡꤹCAξΤߤޤޤƤɬפޤ桼ϡȤǤˤơ\fIcacerts\fRե˥Хɥ뤵Ƥ뿮Ǥ롼CA򸡾ڤ˴ؤȼηԤޤ
+\fB注意:\fR
+\fIcacerts\fRファイルを確認することが重要です。\fIcacerts\fRファイル内のCAは、署名および他のエンティティへの証明書発行のためのエンティティとして信頼されるため、\fIcacerts\fRファイルの管理は慎重に行う必要があります。\fIcacerts\fRファイルには、信頼するCAの証明書のみが含まれている必要があります。ユーザーは、自身の責任において、\fIcacerts\fRファイルにバンドルされている信頼できるルートCA証明書を検証し、信頼性に関する独自の決定を行います。
 .sp
-ǤʤCA\fIcacerts\fRե뤫ˤϡ\fIkeytool\fRޥɤ\fIdelete\fRץѤޤ\fIcacerts\fRեJREΥ󥹥ȡ롦ǥ쥯ȥˤޤΥեԽ륢ʤϡƥԤϢƤ
+信頼できないCA証明書を\fIcacerts\fRファイルから削除するには、\fIkeytool\fRコマンドの\fIdelete\fRオプションを使用します。\fIcacerts\fRファイルはJREのインストール・ディレクトリにあります。このファイルを編集するアクセス権がない場合は、システム管理者に連絡してください
 .RE
 .PP
-󥿡ͥåRFC 1421沽
+インターネットRFC 1421証明書符号化規格
 .RS 4
-¿ξ硢ϡХʥ沽ǤϤʤ󥿡ͥåRFC 1421ʤƤϲǽ沽ѤƳǼޤBase 64沽ȤƤФ뤳ξǤϡŻҥ᡼䤽¾ε̤ơ¾Υץꥱ˾ưפ˥ݡȤǤޤ
+多くの場合、証明書は、バイナリ符号化ではなく、インターネットRFC 1421規格で定義されている出力可能符号化方式を使用して格納されます。Base 64符号化とも呼ばれるこの証明書形式では、電子メールやその他の機構を通じて、他のアプリケーションに証明書を容易にエクスポートできます。
 .sp
-\fI\-importcert\fR\fI\-printcert\fRޥɤǤϡηξȥХʥ沽ξɤ߹ळȤǤޤ\fI\-exportcert\fRޥɤǤϡǥեȤǥХʥ沽ξ񤬽Ϥޤ\fI\-rfc\fRץꤷϡϲǽ沽ξ񤬽Ϥޤ
+\fI\-importcert\fRと\fI\-printcert\fRコマンドでは、この形式の証明書とバイナリ符号化の証明書を読み込むことができます。\fI\-exportcert\fRコマンドでは、デフォルトでバイナリ符号化の証明書が出力されます。ただし、\fI\-rfc\fRオプションを指定した場合は、出力可能符号化方式の証明書が出力されます。
 .sp
-\fI\-list\fRޥɤǤϡǥեȤǾSHA1ե󥬡ץȤϤޤ\fI\-v\fRץ󤬻ꤵƤ硢ϿͤǤǽϤޤ\fI\-rfc\fRץ󤬻ꤵƤ硢Ͻϲǽ沽ǽϤޤ
+\fI\-list\fRコマンドでは、デフォルトで証明書のSHA1フィンガープリントが出力されます。\fI\-v\fRオプションが指定されている場合、証明書は人が理解できる形式で出力されます。\fI\-rfc\fRオプションが指定されている場合、証明書は出力可能符号化方式で出力されます。
 .sp
-ϲǽ沽沽줿ϡΥƥȤǻϤޤꡢΥƥȤǽλޤ
+出力可能符号化方式で符号化された証明書は、次のテキストで始まり、次のテキストで終了します。
 .sp
 .if n \{\
 .RS 4
@@ -1350,21 +1350,21 @@
 .\}
 .RE
 .PP
-X\&.500̾
+X\&.500識別名
 .RS 4
-X\&.500̾ϡƥƥꤹ뤿˻ѤޤȤСX\&.509\fIsubject\fRեɤ\fIissuer\fR(̾)եɤǻꤵ̾ϡX\&.500̾Ǥ\fIkeytool\fRޥɤϡΥ֥ѡȤ򥵥ݡȤƤޤ
+X\&.500識別名は、エンティティを特定するために使用されます。たとえば、X\&.509証明書の\fIsubject\fRフィールドと\fIissuer\fR(署名者)フィールドで指定される名前は、X\&.500識別名です。\fIkeytool\fRコマンドは、次のサブパートをサポートしています。
 .sp
-\fBcommonName\fR: Susan Jonesʤɡͤ̾Ρ
+\fBcommonName\fR: Susan Jonesなど、人の通称。
 .sp
-\fBorganizationUnit\fR: ȿ(ݤʤ)̾ΡPurchasingʤɤǤ
+\fBorganizationUnit\fR: 小さな組織(部、課など)の名称。Purchasingなどです。
 .sp
-\fBlocalityName\fR: ϰ(Ի)̾Palo Altoʤɡ
+\fBlocalityName\fR: 地域(都市)名。Palo Altoなど。
 .sp
-\fBstateName\fR: ̾ޤ̾Californiaʤɡ
+\fBstateName\fR: 州名または地方名。Californiaなど。
 .sp
-\fBcountry\fR: 2ʸι񥳡ɡCHʤɡ
+\fBcountry\fR: 2文字の国コード。CHなど。
 .sp
-̾ʸ\fI\-dname\fRץͤȤƻꤹ(Ȥ\fI\-genkeypair\fRޥɤ)ʸϼηˤɬפޤ
+識別名文字列を\fI\-dname\fRオプションの値として指定する場合(たとえば\fI\-genkeypair\fRコマンドに)、文字列は次の形式にする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1375,7 +1375,7 @@
 .if n \{\
 .RE
 .\}
-åΤιܤϡºݤ˻ꤹͤɽޤû̷Υɤΰ̣ϡΤȤǤ
+イタリック体の項目は、実際に指定する値を表します。短縮形のキーワードの意味は、次のとおりです。
 .sp
 .if n \{\
 .RS 4
@@ -1391,7 +1391,7 @@
 .if n \{\
 .RE
 .\}
-˼Τϡ̾ʸǤ
+次に示すのは、識別名文字列の例です。
 .sp
 .if n \{\
 .RS 4
@@ -1402,7 +1402,7 @@
 .if n \{\
 .RE
 .\}
-ʸѤޥɤǤ
+この文字列を使用したコマンドの例です。
 .sp
 .if n \{\
 .RS 4
@@ -1414,9 +1414,9 @@
 .if n \{\
 .RE
 .\}
-ɤû̷ǤϡʸȾʸ϶̤ޤ󡣤ȤСCNcnCnϡɤƱΤȤưޤ
+キーワードの短縮形では、大文字と小文字は区別されません。たとえば、CN、cnおよびCnは、どれも同じものとして扱われます。
 .sp
-ɤλˤϰ̣ꡢƥ֥ݡͥȤϾ˼ǻꤹɬפޤ֥ݡͥȤ򤹤٤ƻꤹɬפϤޤ󡣤ȤСΤ褦˰Υ֥ݡͥȤΤߤǤޤ
+一方、キーワードの指定順序には意味があり、各サブコンポーネントは上に示した順序で指定する必要があります。ただし、サブコンポーネントをすべて指定する必要はありません。たとえば、次のように一部のサブコンポーネントのみを指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -1427,7 +1427,7 @@
 .if n \{\
 .RE
 .\}
-̾ʸͤ˥ޤޤޤˡޥɥ饤ʸꤹȤˤϡΤ褦˥ޤХååʸ(\e)ǥפɬפޤ
+識別名文字列の値にカンマが含まれる場合に、コマンドラインで文字列を指定するときには、次のようにカンマをバックスラッシュ文字(\e)でエスケープする必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -1438,14 +1438,14 @@
 .if n \{\
 .RE
 .\}
-̾ʸ򥳥ޥɥ饤ǻꤹɬפϤޤ󡣼̾ɬפȤ륳ޥɤ¹ԤȤˡޥɥ饤Ǽ̾ꤷʤäϡƥ֥ݡͥȤϤޤξϡޤХåå(\e)ǥפɬפϤޤ
+識別名文字列をコマンドラインで指定する必要はありません。識別名を必要とするコマンドを実行するときに、コマンドラインで識別名を指定しなかった場合は、各サブコンポーネントの入力を求められます。この場合は、カンマをバックスラッシュ(\e)でエスケープする必要はありません。
 .RE
-.SH "ٹ"
-.SS "ǤΥݡȷٹ"
+.SH "警告"
+.SS "信頼できる証明書のインポート警告"
 .PP
-\fB\fR: ǤȤƾ򥤥ݡȤˡƤ򿵽ŤĴ٤Ƥ
-Windows:.PP
-ޤ\fI\-noprompt\fRץꤻ\fI\-printcert\fRޥɤޤ\fI\-importcert\fRޥɤѤơɽޤɽ줿Υե󥬡ץȤԤե󥬡ץȤȰפ뤳ȤǧޤȤСƤơξ\fI\etmp\ecert\fRȤ̾ǥե˳ǼƤȤޤξϡǤΥꥹȤˤξɲäˡ\fI\-printcert\fRޥɤ¹Ԥƥե󥬡ץȤɽǤޤȤСΤ褦ˤޤ
+\fB重要\fR: 信頼できる証明書として証明書をインポートする前に、証明書の内容を慎重に調べてください。
+Windowsの例:.PP
+まず、\fI\-noprompt\fRオプションを指定せずに\fI\-printcert\fRコマンドまたは\fI\-importcert\fRコマンドを使用して、証明書を表示します。表示された証明書のフィンガープリントが、期待されるフィンガープリントと一致することを確認します。たとえば、証明書が送られてきて、この証明書を\fI\etmp\ecert\fRという名前でファイルに格納しているとします。この場合は、信頼できる証明書のリストにこの証明書を追加する前に、\fI\-printcert\fRコマンドを実行してフィンガープリントを表示できます。たとえば、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -1465,8 +1465,8 @@
 .if n \{\
 .RE
 .\}
-Oracle Solaris:.PP
-ޤ\fI\-noprompt\fRץꤻ\fI\-printcert\fRޥɤޤ\fI\-importcert\fRޥɤѤơɽޤɽ줿Υե󥬡ץȤԤե󥬡ץȤȰפ뤳ȤǧޤȤС桼Ƥơξ\fI/tmp/cert\fRȤ̾ǥե˳ǼƤȤޤξϡǤΥꥹȤˤξɲäˡ\fI\-printcert\fRޥɤ¹Ԥƥե󥬡ץȤɽǤޤȤСΤ褦ˤޤ
+Oracle Solarisの例:.PP
+まず、\fI\-noprompt\fRオプションを指定せずに\fI\-printcert\fRコマンドまたは\fI\-importcert\fRコマンドを使用して、証明書を表示します。表示された証明書のフィンガープリントが、期待されるフィンガープリントと一致することを確認します。たとえば、あるユーザーから証明書が送られてきて、この証明書を\fI/tmp/cert\fRという名前でファイルに格納しているとします。この場合は、信頼できる証明書のリストにこの証明書を追加する前に、\fI\-printcert\fRコマンドを実行してフィンガープリントを表示できます。たとえば、次のようにします。
 .sp
 .if n \{\
 .RS 4
@@ -1487,32 +1487,32 @@
 .RE
 .\}
 .PP
-ˡʪϢοʪ󼨤ե󥬡ץȤȡΥޥɤɽ줿ե󥬡ץȤȤӤޤե󥬡ץȤפС¾βԤ(Ԥʤ)ˤΤؤԤƤʤȤǧǤޤǤμι⤬ԤƤ硢åԤ鷺˾򥤥ݡȤȡԤˤäƽ̾줿٤ƤΤ(Ūտޤĥ饹եޤJARեʤ)ꤹ뤳Ȥˤʤޤ
+次に、証明書を送信した人物に連絡し、この人物が提示したフィンガープリントと、上のコマンドで表示されたフィンガープリントとを比較します。フィンガープリントが一致すれば、送信途中で他の何者か(攻撃者など)による証明書のすり替えが行われていないことを確認できます。送信途中でこの種の攻撃が行われていた場合、チェックを行わずに証明書をインポートすると、攻撃者によって署名されたすべてのもの(攻撃的意図を持つクラス・ファイルを含んだJARファイルなど)を信頼することになります。
 .PP
-\fB:\fR
-򥤥ݡȤ\fI\-printcert\fRޥɤ¹ԤɬפϤޤ󡣥ȥοǤΥꥹȤ˾ɲäˡ\fI\-importcert\fRޥɤˤäƾξɽ졢ǧåɽ뤿Ǥ桼ϥݡߤǤޤ¹ԤǤΤϡ\fI\-noprompt\fRץꤻ\fI\-importcert\fRޥɤƤӽФΤߤǤ\fI\-noprompt\fRץ󤬻ꤵƤ硢桼ȤäϹԤޤ
-.SS "ѥɷٹ"
+\fB注意:\fR
+証明書をインポートする前に\fI\-printcert\fRコマンドを実行する必要はありません。キーストア内の信頼できる証明書のリストに証明書を追加する前に、\fI\-importcert\fRコマンドによって証明書の情報が表示され、確認を求めるメッセージが表示されるためです。ユーザーはインポート操作を停止できます。ただし、これを実行できるのは、\fI\-noprompt\fRオプションを指定せずに\fI\-importcert\fRコマンドを呼び出す場合のみです。\fI\-noprompt\fRオプションが指定されている場合、ユーザーとの対話は行われません。
+.SS "パスワード警告"
 .PP
-ȥФԤۤȤɤΥޥɤǤϡȥΥѥɤɬפǤޤΥޥɤǤϡ/̩Υѥɤɬפˤʤ뤳Ȥޤѥɤϥޥɥ饤ǻǤޤ(\fI\-storepass\fRץ\fI\-keypass\fRץ)ƥȤŪȤ硢ޤϰǤ뤳Ȥ狼äƤ륷ƥǼ¹Ԥʳϡޥɥ饤䥹ץȤǥѥɤꤷʤǤɬפʥѥɤΥץ򥳥ޥɥ饤ǻꤷʤäϡѥɤϤޤ
-.SS "ν˴ؤٹ"
+キーストアに対する操作を行うほとんどのコマンドでは、ストアのパスワードが必要です。また、一部のコマンドでは、非公開/秘密鍵のパスワードが必要になることがあります。パスワードはコマンドラインで指定できます(\fI\-storepass\fRオプションと\fI\-keypass\fRオプションを使用)。ただし、テストを目的とする場合、または安全であることがわかっているシステムで実行する場合以外は、コマンドラインやスクリプトでパスワードを指定しないでください。必要なパスワードのオプションをコマンドラインで指定しなかった場合は、パスワードの入力を求められます。
+.SS "証明書の準拠に関する警告"
 .PP
-󥿡ͥåɸRFC 5280ǤϡX\&.509ν˴ؤץե뤬ƤꡢΥեɤӥƥ󥷥ͭͤͤȹ礻ܤƤޤɸˤĤƤϡ
-http://tools\&.ietf\&.org/rfc/rfc5280\&.txt򻲾ȤƤ
+インターネット標準RFC 5280では、X\&.509証明書の準拠に関するプロファイルが定義されており、証明書のフィールドおよびエクステンションに有効な値および値の組合せが記載されています。標準については、
+http://tools\&.ietf\&.org/rfc/rfc5280\&.txtを参照してください
 .PP
-\fIkeytool\fRޥɤǤϡΥ롼뤹٤ƤŬѤ櫓ǤϤʤᡢɸ˽򤷤ʤǤޤɸ˽򤷤ʤϡJRE¾Υץꥱǵݤ뤳Ȥޤ桼ϡ\fI\-dname\fR\fI\-ext\fRʤɤŬʥץꤹ褦ˤƤ
-.SH ""
-.SS "ǤΥݡ"
+\fIkeytool\fRコマンドでは、これらのルールすべてが適用されるわけではないため、標準に準拠しない証明書を生成できます。標準に準拠しない証明書は、JREや他のアプリケーションで拒否されることがあります。ユーザーは、\fI\-dname\fRや\fI\-ext\fRなどで適正なオプションを指定するようにしてください。
+.SH "注意"
+.SS "新しい信頼できる証明書のインポート"
 .PP
-\fIkeytool\fRޥɤϡȥ˾ɲäˡȥˤǤ¸ߤ뿮ǤѤơݡȤ񤫤(롼CA)ʽ̾˻ޤǤοΥιۤߤޤ
+\fIkeytool\fRコマンドは、キーストアに証明書を追加する前に、キーストア内にすでに存在する信頼できる証明書を使用して、インポートする証明書から(ルートCAの)自己署名証明書に至るまでの信頼のチェーンの構築を試みます。
 .PP
-\fI\-trustcacerts\fRץꤷ硢ɲäξϿǤ뤹ʤ\fIcacerts\fRȤ̾Υե˴ޤޤΥȤߤʤޤ
+\fI\-trustcacerts\fRオプションを指定した場合、追加の証明書は信頼できるすなわち\fIcacerts\fRという名前のファイルに含まれる証明書のチェーンとみなされます。
 .PP
-\fIkeytool\fRޥɤݡȤ񤫤鼫ʽ̾(ȥޤ\fIcacerts\fRե˴ޤޤƤ뼫ʽ̾)˻ޤǤοΥѥιۤ˼ԤϡݡȤξɽ桼˳ǧޤξϡɽ줿Υե󥬡ץȤȡ¾Τʤ餫(Ǥ)(νͭԤʤ)ꤷե󥬡ץȤȤӤޤǤȤƾ򥤥ݡȤȤϡͭǤ뤳Ȥ򿵽Ť˳ǧɬפޤǤΥݡȷٹ򻲾ȤƤݡϡǧߤǤޤ\fI\-noprompt\fRץ󤬻ꤵƤ硢桼ȤäϹԤޤ
-.SS "Υݡ"
+\fIkeytool\fRコマンドが、インポートする証明書から自己署名証明書(キーストアまたは\fIcacerts\fRファイルに含まれている自己署名証明書)に至るまでの信頼のパスの構築に失敗した場合は、インポートする証明書の情報を表示し、ユーザーに確認を求めます。この場合は、表示された証明書のフィンガープリントと、他のなんらかの(信頼できる)情報源(証明書の所有者など)から入手したフィンガープリントとを比較します。信頼できる証明書として証明書をインポートするときは、証明書が有効であることを慎重に確認する必要があります。信頼できる証明書のインポート警告を参照してください。インポート操作は、証明書を確認する時点で中止できます。\fI\-noprompt\fRオプションが指定されている場合、ユーザーとの対話は行われません。
+.SS "証明書応答のインポート"
 .PP
-򥤥ݡȤȤϡȥοǤ񡢤(\fI\-trustcacert\fR\fIs\fRץ󤬻ꤵƤ)\fIcacerts\fRȥեǹ줿Ѥƾޤcacertsե򻲾ȤƤ
+証明書応答をインポートするときは、キーストア内の信頼できる証明書、および(\fI\-trustcacert\fR\fIs\fRオプションが指定されている場合は)\fIcacerts\fRキーストア・ファイルで構成された証明書を使用して証明書応答が検査されます。cacerts証明書ファイルを参照してください。
 .PP
-Ǥ뤫ɤꤹˡϼΤȤǤ
+証明書応答が信頼できるかどうかを決定する方法は次のとおりです。
 .sp
 .RS 4
 .ie n \{\
@@ -1522,7 +1522,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ñX\&.509Ǥ硢\fIkeytool\fRޥɤϡ(롼CA)ʽ̾˻ޤǤογΩߤޤȡǧڤ˻Ѥγع¤ϡaliasοޤ󤬳Ωʤ硢ϥݡȤޤ󡣤ξ硢\fIkeytool\fRޥɤϾϤ桼˸ڤץץȤɽޤ桼οȽǤΤ񤷤Ǥ
+証明書応答が単一のX\&.509証明書である場合、\fIkeytool\fRコマンドは、証明書応答から(ルートCAの)自己署名証明書に至るまでの信頼チェーンの確立を試みます。証明書応答と、証明書応答の認証に使用される証明書の階層構造は、aliasの新しい証明書チェーンを形成します。信頼チェーンが確立されない場合、証明書応答はインポートされません。この場合、\fIkeytool\fRコマンドは証明書を出力せず、ユーザーに検証を求めるプロンプトを表示します。ユーザーが証明書応答の信頼性を判断するのは非常に難しいためです。
 .RE
 .sp
 .RS 4
@@ -1533,13 +1533,13 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-PKCS#7ξޤϰϢX\&.509Ǥ硢ϡ桼ξ񤬺ǽˡ0ʾCA񤬤μˤ褦¤٤ޤ󤬼ʽ̾Υ롼CAǽꡢ\fI \-trustcacerts\fRץ󤬻ꤵƤ硢\fIkeytool\fRޥɤϡξȡȥޤ\fIcacerts\fRȥեοǤ뤹٤Ƥξȹ礷褦Ȥޤ󤬼ʽ̾Υ롼CAǽäƤ餺\fI\-trustcacerts\fRץ󤬻ꤵƤ硢\fIkeytool\fRޥɤϡȥޤ\fIcacerts\fRȥեοǤ񤫤鼫ʽ̾Υ롼CA򸫤ĤƤɲä褦Ȥޤξ񤬸Ĥ餺\fI\-noprompt\fRץ󤬻ꤵƤʤϡκǸξξ󤬽Ϥ졢桼ϳǧޤ
+証明書応答がPKCS#7形式の証明書チェーンまたは一連のX\&.509証明書である場合、チェーンは、ユーザーの証明書が最初に、0以上のCA証明書がその次にくるように並べられます。チェーンが自己署名のルートCA証明書で終わり、\fI \-trustcacerts\fRオプションが指定されている場合、\fIkeytool\fRコマンドは、その証明書と、キーストア内または\fIcacerts\fRキーストア・ファイル内の信頼できるすべての証明書を照合しようとします。チェーンが自己署名のルートCA証明書で終わっておらず、\fI\-trustcacerts\fRオプションが指定されている場合、\fIkeytool\fRコマンドは、キーストア内または\fIcacerts\fRキーストア・ファイル内の信頼できる証明書から自己署名のルートCA証明書を見つけてそれをチェーンの末尾に追加しようとします。その証明書が見つからず、\fI\-noprompt\fRオプションが指定されていない場合は、チェーン内の最後の証明書の情報が出力され、ユーザーは確認を求められます。
 .RE
 .PP
-θ\fIalias\fRǤǤ˳ǼƤ桼θ˰פ硢Ť󤬱ο֤ޤξͭ\fIkeypass\fR֤뤳ȤǤΤϡȥ̩ݸ뤿ΥѥɤꤷΤߤǤѥɤꤷƤ餺̩ΥѥɤȥΥѥɤȰۤʤϡ̩ΥѥɤϤޤ
+証明書応答内の公開鍵が\fIalias\fRですでに格納されているユーザーの公開鍵に一致した場合、古い証明書チェーンが応答内の新しい証明書チェーンで置き換えられます。以前の証明書チェーンを有効な\fIkeypass\fRで置き換えることができるのは、エントリの秘密鍵を保護するためのパスワードを指定した場合のみです。パスワードを指定しておらず、秘密鍵のパスワードがキーストアのパスワードと異なる場合は、秘密鍵のパスワードの入力を求められます。
 .PP
-ΥޥɤϡΥ꡼Ǥ\fI\-import\fRȤ̾ǤΥ꡼Ǥϡ³Ť̾ݡȤƤޤϡ̾\fI\-importcert\fRͥ褵ޤ
-.SH "Ϣ"
+このコマンドは、以前のリリースでは\fI\-import\fRという名前でした。このリリースでは、引き続き古い名前がサポートされています。今後は、新しい名前\fI\-importcert\fRが優先されます。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -1571,8 +1571,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlˤ
-֥: Java SEΥƥǽ
+http://docs\&.oracle\&.com/javase/tutorial/security/index\&.htmlにある
+「コース: Java SEのセキュリティ機能」
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: native2ascii
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ݲġ
+.\" Date: 2013年11月21日
+.\" SectDesc: 国際化ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "native2ascii" "1" "2013ǯ1121" "JDK 8" "ݲġ"
+.TH "native2ascii" "1" "2013年11月21日" "JDK 8" "国際化ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-native2ascii \- ݡȤƤǤդʸ󥳡ǥ󥰤ʸޤեASCIIUnicodeǥפ줿եѴ(ޤϤε)饤ǽʥץꥱޤ
-.SH ""
+native2ascii \- サポートされている任意の文字エンコーディングの文字を含むファイルを、ASCIIおよびUnicodeでエスケープされたファイルに変換して(またはその逆)、ローカライズ可能なアプリケーションを作成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,34 +64,34 @@
 .PP
 \fIinputfile\fR
 .RS 4
-ASCIIѴ륨󥳡ɤ줿ե롣
+ASCIIに変換するエンコードされたファイル。
 .RE
 .PP
 \fIoutputfile\fR
 .RS 4
-Ѵ줿ASCIIե롣
+変換されたASCIIファイル。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fInative2ascii\fRޥɤϡASCII饯åȤ˴ޤޤʤ٤ƤʸUnicode(\fI\eu\fR\fIxxxx\fR)ɽˡѤơJava Runtime Environment (JRE)ǥݡȤƤ륨󥳡ɤ줿եASCIIǥ󥳡ɤ줿եѴޤΥץϡISO\-8859\-1ʸåȤ˴ޤޤʤʸޤޤƤץѥƥեɬפǤΥġϡεդѴ¹Ԥ뤳ȤǤޤ
+\fInative2ascii\fRコマンドは、ASCIIキャラクタ・セットに含まれないすべての文字にUnicodeエスケープ(\fI\eu\fR\fIxxxx\fR)表記法を使用して、Java Runtime Environment (JRE)でサポートされているエンコードされたファイルを、ASCIIでエンコードされたファイルに変換します。このプロセスは、ISO\-8859\-1文字セットに含まれない文字が含まれているプロパティ・ファイルで必要です。このツールは、その逆の変換を実行することもできます。
 .PP
-\fIoutputfile\fRͤά硢ɸϤ˽Ϥޤˡ\fIinputfile\fRͤά硢ɸϤϤޤ
-.SH "ץ"
+\fIoutputfile\fR値を省略した場合、標準出力に出力されます。さらに、\fIinputfile\fR値を省略した場合、標準入力から入力されます。
+.SH "オプション"
 .PP
 \-reverse
 .RS 4
-դνԤޤĤޤꡢISO\-8859\-1UnicodeפѤƥ󥳡ɤ줿եJREǥݡȤʸ󥳡ǥ󥰤ΥեѴޤ
+逆の処理を行います。つまり、ISO\-8859\-1でUnicodeエスケープを使用してエンコードされたファイルを、JREでサポートされる文字エンコーディングのファイルに変換します。
 .RE
 .PP
 \-encoding \fIencoding_name\fR
 .RS 4
-ѴǻѤʸ󥳡ǥ󥰤̾ꤷޤΥץ¸ߤʤϡǥեȤʸ󥳡ǥ(\fIjava\&.nio\&.charset\&.Charset\&.defaultCharset\fR᥽åɤ줿)Ѥޤ\fIencoding_name\fRʸϡJREǥݡȤƤʸ󥳡ǥ󥰤̾ˤɬפޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/intl/encoding\&.doc\&.htmlˤ
-֥ݡȤƤ륨󥳡ǥ󥰡פ򻲾ȤƤ
+変換処理で使用する文字エンコーディングの名前を指定します。このオプションが存在しない場合は、デフォルトの文字エンコーディング(\fIjava\&.nio\&.charset\&.Charset\&.defaultCharset\fRメソッドで定義された)が使用されます。\fIencoding_name\fR文字列は、JREでサポートされている文字エンコーディングの名前にする必要があります。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/intl/encoding\&.doc\&.htmlにある
+「サポートされているエンコーディング」を参照してください
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ(JVM)\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシン(JVM)に\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: orbd
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "orbd" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "orbd" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-orbd \- CORBAĶΥСˤ³֥Ȥ򥯥饤Ȥ鸡ƸƤӽФ褦ˤޤ
-.SH ""
+orbd \- CORBA環境のサーバーにある永続オブジェクトをクライアントから検索して呼び出せるようにします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,11 +64,11 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIorbd\fRޥɤѤȡCORBAĶΥСˤ³֥Ȥ򥯥饤ȤƩŪ˸ƸƤӽФȤǤޤorbdġ˴ޤޤ륵Сޥ͡Ѥȡ饤ȤCORBAĶǥСˤ³֥ȤƩŪ˸ƸƤӽФȤǤޤ³Сϡ͡ߥ󥰡ӥ˱³֥ȻȤȯԤݡСΥݡֹΤORBDΥݡֹ򥪥֥ȻȤ˴ޤޤ³֥ȻȤΥ֥ȻȤORBDݡֹޤ뤳ȤˤϡΤ褦ޤ
+\fIorbd\fRコマンドを使用すると、CORBA環境のサーバーにある永続オブジェクトをクライアントから透過的に検索して呼び出すことができます。orbdツールに含まれるサーバー・マネージャを使用すると、クライアントはCORBA環境でサーバー上にある永続オブジェクトを透過的に検索して呼び出すことができます。永続サーバーは、ネーミング・サービスに永続オブジェクト参照を発行する際、サーバーのポート番号のかわりにORBDのポート番号をオブジェクト参照に含めます。永続オブジェクト参照のオブジェクト参照にORBDポート番号を含めることには、次のような利点があります。
 .sp
 .RS 4
 .ie n \{\
@@ -78,7 +78,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-͡ߥ󥰡ӥˤ륪֥ȻȤСΥ饤ա̵طˤʤޤȤС֥ȻȤϡƥ󥹥ȡ뤵줿Ȥϥ͡ߥ󥰡ӥΥСˤäƥ͡ߥ󥰡ӥȯԤޤθϡСγϤޤϥåȥβˤ餺ƤӽФ饤ȤORBD֥ȻȤ֤ޤ
+ネーミング・サービスにあるオブジェクト参照が、サーバーのライフ・サイクルと無関係になります。たとえば、オブジェクト参照は、初めてインストールされたときはネーミング・サービスのサーバーによってネーミング・サービスに発行されますが、その後は、サーバーの開始またはシャットダウンの回数にかかわらず、呼び出したクライアントにORBDが正しいオブジェクト参照を返します。
 .RE
 .sp
 .RS 4
@@ -89,57 +89,57 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-饤Ȥϰ٤Τߥ͡ߥ󥰡ӥΥ֥ȻȤååפɬפޤθϥСΥ饤աˤѹȤ̵طˤλȤѤ뤳ȤǤޤ
+クライアントは一度のみネーミング・サービスのオブジェクト参照をルックアップする必要がありますが、その後はサーバーのライフ・サイクルによる変更とは無関係にこの参照を利用することができます。
 .RE
 .PP
-ORBDΥСޥ͡˥ˤϡ\fIservertool\fRѤƥСưɬפޤservertoolϡץꥱ󡦥ץޤ³СϿϿưߤԤΥޥɥ饤󡦥󥿥եǤСޥ͡ξܺ٤ϡСޥ͡򻲾ȤƤ
+ORBDのサーバー・マネージャにアクセスするには、\fIservertool\fRを使用してサーバーを起動する必要があります。servertoolは、アプリケーション・プログラマが、永続サーバーの登録、登録解除、起動および停止を行うためのコマンドライン・インタフェースです。サーバー・マネージャの詳細は、サーバー・マネージャを参照してください。
 .PP
-\fIorbd\fRưȡ͡ߥ󥰡ӥⵯưޤ͡ߥ󥰡ӥξܺ١͡ߥ󥰡ӥεưߤ򻲾ȤƤ
-.SH "ץ"
+\fIorbd\fRを起動すると、ネーミング・サービスも起動されます。ネーミング・サービスの詳細。ネーミング・サービスの起動と停止を参照してください。
+.SH "オプション"
 .PP
 \-ORBInitialPort \fInameserverport\fR
 .RS 4
-ɬܡ͡ࡦСưݡȤֹꤷޤ\fIorbd\fRϡưȡΥݡȾ忮ꥯȤꥹ˥󥰤ޤOracle SolarisեȥǤϡ1024꾮ݡȤǥץ򳫻Ϥ硢root桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳Ȥᤷޤ
+必須。ネーム・サーバーを起動するポートの番号を指定します。\fIorbd\fRは、起動されると、このポート上で着信リクエストをリスニングします。Oracle Solarisソフトウェアでは、1024より小さいポートでプロセスを開始する場合、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。
 .RE
-.SS "ɬܤǤʤץ"
+.SS "必須でないオプション"
 .PP
 \-port \fIport\fR
 .RS 4
-ORBDưݡȤꤷޤΥݡȤǡ³֥ȤФꥯȤORBDޤΥݡȤΥǥեͤ1049ǤΥݡֹϡ³Interoperable Object References (IOR)Υݡȡեɤɲäޤ
+ORBDを起動するポートを指定します。このポートで、永続オブジェクトに対するリクエストをORBDが受け取ります。このポートのデフォルト値は1049です。このポート番号は、永続Interoperable Object References (IOR)のポート・フィールドに追加されます。
 .RE
 .PP
 \-defaultdb \fIdirectory\fR
 .RS 4
-ORBD³Ǽǥ쥯ȥ\fIorb\&.db\fR١ǥ쥯ȥꤷޤΥץ󤬻ꤵƤʤ硢ǥեͤ\fI\&./orb\&.db\fRˤʤޤ
+ORBD永続格納ディレクトリ\fIorb\&.db\fRが作成されるベース・ディレクトリを指定します。このオプションが指定されていない場合、デフォルト値は\fI\&./orb\&.db\fRになります。
 .RE
 .PP
 \-serverPollingTime \fImilliseconds\fR
 .RS 4
-\fIservertool\fRѤϿ줿³СΥإ륹֤ORBDåֳ֤ꤷޤǥեͤ1000ߥäǤ\fImilliseconds\fR˻ꤹͤϡͭˤɬפޤ
+\fIservertool\fRを使用して登録された永続サーバーのヘルス状態をORBDがチェックする間隔を指定します。デフォルト値は1000ミリ秒です。\fImilliseconds\fRに指定する値は、有効な正の整数にする必要があります。
 .RE
 .PP
 \-serverStartupDelay milliseconds
 .RS 4
-\fIservertool\fRѤϿ줿³СƵưƤ顢ž㳰ޤǤORBDԵ֤ꤷޤǥեͤ1000ߥäǤ\fImilliseconds\fR˻ꤹͤϡͭˤɬפޤ
+\fIservertool\fRを使用して登録された永続サーバーを再起動してから、位置転送の例外を送信するまでのORBDの待機時間を指定します。デフォルト値は1000ミリ秒です。\fImilliseconds\fRに指定する値は、有効な正の整数にする必要があります。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SS "͡ߥ󥰡ӥεư"
+.SS "ネーミング・サービスの起動と停止"
 .PP
-͡ߥ󥰡ӥϡCORBA֥Ȥ˥͡ߥ󥰤ǽˤCORBAӥǤ͡ߥ󥰤̾򥪥֥ȻȤ˥Хɤ뤳Ȥˤǽˤʤޤ͡ࡦХǥ󥰤͡ߥ󥰡ӥ˳ǼС饤Ȥ̾ꤷŪΥ֥ȻȤǤ褦ˤʤޤ
+ネーミング・サービスは、CORBAオブジェクトにネーミングを可能にするCORBAサービスです。ネーミングは名前をオブジェクト参照にバインドすることにより可能になります。ネーム・バインディングをネーミング・サービスに格納すれば、クライアントが名前を指定して目的のオブジェクト参照を取得できるようになります。
 .PP
-饤ȤޤϥС¹ԤˡORBDưޤORBDˤϡ³͡ߥ󥰡ӥӰ͡ߥ󥰡ӥȤ߹ޤƤޤϤɤCOS͡ߥ󥰡ӥμǤ
+クライアントまたはサーバーを実行する前に、ORBDを起動します。ORBDには、永続ネーミング・サービスおよび一時ネーミング・サービスが組み込まれています。これらはどちらもCOSネーミング・サービスの実装です。
 .PP
-³͡ߥ󥰡ӥϡ͡ߥ󥰡ƥȤФƱ³󶡤ޤĤޤꡢξϡӥߤ䵯ưˤݻ졢ӥ˾㳲ȯǤǤޤORBDƵưȡ³͡ߥ󥰡ӥϥ͡ߥ󥰡ƥȤΥդ٤ƤΥ饤ȤȥС̾ΥХǥ󥰤Τޤ(³Ū)ݻ褦ˤޤ
+永続ネーミング・サービスは、ネーミング・コンテキストに対して永続性を提供します。つまり、この情報は、サービスの停止や起動後にも維持され、サービスに障害が発生した場合でも回復できます。ORBDを再起動すると、永続ネーミング・サービスはネーミング・コンテキストのグラフを復元し、すべてのクライアントとサーバーの名前のバインディングがそのまま(永続的に)保持されるようにします。
 .PP
-̸ߴΤᡢ꡼JDKƱƤ͡ߥ󥰡ӥ\fItnameserv\fRΥ꡼Java SEˤƱƤޤ͡ࡦӥǤϡ͡ࡦӥμ¹ˤΤߥ͡ߥ󥰡ƥȤݻޤӥǤȡ͡ߥ󥰡ƥȡդϼޤ
+下位互換性のため、旧リリースのJDKに同梱されていた一時ネーミング・サービス\fItnameserv\fRが、今回のリリースのJava SEにも同梱されています。一時ネーム・サービスでは、ネーム・サービスの実行中にのみネーミング・コンテキストが保持されます。サービスが中断されると、ネーミング・コンテキスト・グラフは失われます。
 .PP
-\fI\-ORBInitialPort\fRϡ\fIorbd\fRɬܤΥޥɥ饤ǡ͡ߥ󥰡ӥ¹ԤݡȤֹꤹ뤿˻ѤޤμǤϡJava IDL Object Request Broker DaemonѤ˥ݡ1050ѤǤ뤳ȤȤƤޤOracle SolarisեȥѤ硢1024꾮ݡȤǥץ򳫻Ϥˤϡroot桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳ȤᤷޤɬפǤ̤ΥݡȤѹƤ
+\fI\-ORBInitialPort\fR引数は、\fIorbd\fRの必須のコマンドライン引数で、ネーミング・サービスが実行されるポートの番号を設定するために使用されます。次の手順では、Java IDL Object Request Broker Daemon用にポート1050を使用できることを前提としています。Oracle Solarisソフトウェアを使用する場合、1024より小さいポートでプロセスを開始するには、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。必要であれば別のポートに変更してください。
 .PP
-UNIXޥɡ\fIorbd\fRưˤϡΤ褦Ϥޤ
+UNIXコマンド・シェルで\fIorbd\fRを起動するには、次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -151,7 +151,7 @@
 .RE
 .\}
 .PP
-WindowsMS\-DOSƥࡦץץȤǤϡΤ褦Ϥޤ
+WindowsのMS\-DOSシステム・プロンプトでは、次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -163,7 +163,7 @@
 .RE
 .\}
 .PP
-ORBD¹Ԥ졢Сȥ饤ȤΥץꥱ¹ԤǤ褦ˤʤޤ饤ȤȥСΥץꥱϡ¹Իˡ͡ߥ󥰡ӥ¹ԤƤݡȤֹ(ɬפʾϤ˥ޥ̾)ǧƤɬפޤ¸1ĤˡϡΥɤ򥢥ץꥱɲä뤳ȤǤ
+これでORBDが実行され、サーバーとクライアントのアプリケーションを実行できるようになります。クライアントとサーバーのアプリケーションは、実行時に、ネーミング・サービスが実行されているポートの番号(必要な場合はさらにマシン名)を認識している必要があります。これを実現する1つの方法は、次のコードをアプリケーションに追加することです。
 .sp
 .if n \{\
 .RS 4
@@ -178,7 +178,7 @@
 .RE
 .\}
 .PP
-Ǥϡ͡ߥ󥰡ӥϡۥ\fIMyHost\fRΥݡ1050Ǽ¹Ԥޤ̤ˡȤơޥɥ饤󤫤饵Сޤϥ饤ȤΥץꥱ¹ԤȤˡݡֹޤϥޥ̾뤤Ϥξꤹˡ⤢ޤȤСΥޥɥ饤󡦥ץѤơ\fIHelloApplication\fRưǤޤ
+この例では、ネーミング・サービスは、ホスト\fIMyHost\fRのポート1050上で実行されます。別の方法として、コマンドラインからサーバーまたはクライアントのアプリケーションを実行するときに、ポート番号またはマシン名あるいはその両方を指定する方法もあります。たとえば、次のコマンドライン・オプションを使用して、\fIHelloApplication\fRを起動できます。
 .sp
 .if n \{\
 .RS 4
@@ -190,36 +190,36 @@
 .RE
 .\}
 .PP
-͡ߥ󥰡ӥߤˤϡŬڤʥڥ졼ƥ󥰡ƥࡦޥɤѤޤȤСOracle Solaris\fIpkill\fR
-\fIorbd\fR¹Ԥꡢ\fIorbd\fRưDOSɥ\fB[Ctrl]+[C]\fR򲡤ޤ͡ߥ󥰡ӥξϡӥλȡ͡ߥ󥰡ӥϿ줿̾õ礬ޤJava IDL͡ࡦӥϡŪߤޤǼ¹Ԥޤ
+ネーミング・サービスを停止するには、適切なオペレーティング・システム・コマンドを使用します。たとえば、Oracle Solaris上で\fIpkill\fR
+\fIorbd\fRを実行したり、\fIorbd\fRが動作中のDOSウィンドウで\fB[Ctrl]+[C]\fRキーを押します。一時ネーミング・サービスの場合は、サービスが終了されると、ネーミング・サービスに登録された名前が消去される場合があります。Java IDLネーム・サービスは、明示的に停止されるまで実行されます。
 .PP
-ORBD°͡ߥ󥰡ӥξܺ٤ϡ
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlΡNaming Serviceפ򻲾ȤƤ
-.SH "Сޥ͡"
+ORBDに付属するネーミング・サービスの詳細は、
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlの「Naming Service」を参照してください
+.SH "サーバー・マネージャ"
 .PP
-ORBDΥСޥ͡˥ơ³С¹Ԥˤϡ\fIservertool\fRѤƥСưɬפޤservertoolϡץꥱ󡦥ץޤ³СϿϿưߤԤΥޥɥ饤󡦥󥿥եǤ\fIservertool\fRѤƥСưϡ\fIorbd\fR¹ԤƤƱݡȤȥۥȤǵưɬפޤСۤʤݡȤǼ¹Ԥȡ롦ƥѤ˥ǡ١¸Ƥ̵ˤʤꡢӥưޤ
+ORBDのサーバー・マネージャにアクセスして、永続サーバーを実行するには、\fIservertool\fRを使用してサーバーを起動する必要があります。servertoolは、アプリケーション・プログラマが、永続サーバーの登録、登録解除、起動および停止を行うためのコマンドライン・インタフェースです。\fIservertool\fRを使用してサーバーを起動する場合は、\fIorbd\fRが実行されている場所と同じポートとホストで起動する必要があります。サーバーを異なるポートで実行すると、ローカル・コンテキスト用にデータベースに保存されている情報が無効になり、サービスが正しく動作しません。
 .PP
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlExample\&.html
-Java IDL: The "Hello World" Exampleפ򻲾ȤƤ
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlExample\&.htmlの
+「Java IDL: The "Hello World" Example」を参照してください
 .PP
-Ǥϡ塼ȥꥢμ˽ä\fIidlj\fRѥ\fIjavac\fRѥ¹ԤޤORBDΥСޥ͡¹Ԥˤϡμ˽äƥץꥱ¹Ԥޤ
+この例では、チュートリアルの手順に従って\fIidlj\fRコンパイラと\fIjavac\fRコンパイラを実行します。ORBDのサーバー・マネージャを実行するには、次の手順に従ってアプリケーションを実行します。
 .PP
-\fIorbd\fRưޤ
+\fIorbd\fRを起動します。
 .PP
-UNIXޥɡǼΤ褦Ϥޤ:
-\fIorbd \-ORBInitialPort 1050\fR
+UNIXコマンド・シェルで次のように入力します:
+\fIorbd \-ORBInitialPort 1050\fR。
 .PP
-MS\-DOSƥࡦץץ(Windows)ǼΤ褦Ϥޤ:
+MS\-DOSシステム・プロンプト(Windows)で次のように入力します:
 \fIs\fR\fItart orbd \-ORBInitialPort 105\fR\fI0\fR
 .PP
-ݡ1050ϥ͡ࡦС¹ԤݡȤǤ\fI\-ORBInitialPort\fRץɬܥޥɥ饤ǤOracle SolarisեȥѤ硢1024꾮ݡȤǥץ򳫻Ϥˤϡroot桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳Ȥᤷޤ
+ポート1050はネーム・サーバーを実行するポートです。\fI\-ORBInitialPort\fRオプションは必須コマンドライン引数です。Oracle Solarisソフトウェアを使用する場合、1024より小さいポートでプロセスを開始するには、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。
 .PP
-\fIservertool\fRưޤ:
-\fIservertool \-ORBInitialPort 1050\fR
+\fIservertool\fRを起動します:
+\fIservertool \-ORBInitialPort 1050\fR。
 .PP
-μȥ͡ࡦС(\fIorbd\fR)ΥݡȤƱǤ뤳ȤǧޤȤ\fI\-ORBInitialPort 1050\&.\fRΤ褦ˤʤޤ\fIservertool\fRϡ͡ࡦСƱݡȾǵưɬפޤ
+前回の手順とネーム・サーバー(\fIorbd\fR)のポートが同じであることを確認します。たとえば\fI\-ORBInitialPort 1050\&.\fRのようになります。\fIservertool\fRは、ネーム・サーバーと同じポート上で起動する必要があります。
 .PP
-\fIservertool\fRޥɥ饤󡦥󥿥եǡ\fIservertool\fRץץȤ\fIHello\fRСưޤ
+\fIservertool\fRコマンドライン・インタフェースで、\fIservertool\fRプロンプトから\fIHello\fRサーバーを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -232,7 +232,7 @@
 .RE
 .\}
 .PP
-\fIservertool\fRˤäƥСϿơ\fIHelloServerApName\fRȤ̾С˳Ƥ졢ϿƤ뤹٤ƤΥСȤȤ˥СIDɽޤ¾üɥޤϥץץȤ饯饤ȡץꥱ¹Ԥޤ
+\fIservertool\fRによってサーバーが登録されて、\fIHelloServerApName\fRという名前がサーバーに割り当てられ、登録されているすべてのサーバー一覧とともにサーバーIDが表示されます。他の端末ウィンドウまたはプロンプトからクライアント・アプリケーションを実行します。
 .sp
 .if n \{\
 .RS 4
@@ -244,11 +244,11 @@
 .RE
 .\}
 .PP
-\fI\-ORBInitialHost localhost\fRϾά뤳ȤǤޤ͡ࡦС\fIHello\fR饤ȤȤƱۥȾưƤ뤫Ǥ͡ࡦС̤ΥۥȤǼ¹ԤƤϡ\-\fIORBInitialHost nameserverhost\fRץѤIDL͡ࡦС¹ԤƤۥȤꤷޤμǹԤ줿Ȥ˥͡ࡦС(\fIorbd\fR)ݡȤꤷޤ(:
-\fI\-ORBInitialPort 1050\fR)ORBDΥСޥ͡λ顢͡ࡦС(\fIorbd\fR)\fIservertool\fRߤ뤫λƤMS\-DOSץץȤ\fIorbd\fR򥷥åȥ󤹤ˤϡС¹ԤƤ륦ɥ򤷤\fB[Ctrl]+[C]\fR򲡤ޤ
+この例の\fI\-ORBInitialHost localhost\fRは省略することができます。ネーム・サーバーが\fIHello\fRクライアントとして同一ホスト上で動作しているからです。ネーム・サーバーが別のホストで実行されている場合は、\-\fIORBInitialHost nameserverhost\fRオプションを使用してIDLネーム・サーバーが実行されているホストを指定します。前の手順で行われたとおりにネーム・サーバー(\fIorbd\fR)ポートを指定します(例:
+\fI\-ORBInitialPort 1050\fR)。ORBDのサーバー・マネージャの操作が終了したら、ネーム・サーバー(\fIorbd\fR)と\fIservertool\fRを停止するか終了してください。MS\-DOSプロンプトで\fIorbd\fRをシャットダウンするには、サーバーを実行しているウィンドウを選択して\fB[Ctrl]+[C]\fRキーを押します。
 .PP
-Oracle Solaris\fIorbd\fR򥷥åȥ󤹤ˤϡץ򸡺ơ\fIkill\fRޥɤǽλޤСŪߤޤǤϡƽФԵ֤³ޤ\fIservertool\fR򥷥åȥ󤹤ˤϡ\fBquit\fRϤƥܡɤ\fB[Enter]\fR򲡤ޤ
-.SH "Ϣ"
+Oracle Solarisから\fIorbd\fRをシャットダウンするには、プロセスを検索して、\fIkill\fRコマンドで終了します。サーバーを明示的に停止するまでは、呼出し待機状態が続きます。\fIservertool\fRをシャットダウンするには、\fBquit\fRと入力してキーボードの\fB[Enter]\fRキーを押します。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -269,8 +269,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.html
-Naming Service
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlの
+「Naming Service」
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: pack200
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaǥץȡġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaデプロイメント・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "pack200" "1" "2013ǯ1121" "JDK 8" "Javaǥץȡġ"
+.TH "pack200" "1" "2013年11月21日" "JDK 8" "Javaデプロイメント・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-pack200 \- WebǥץȤΤJARեpack200̥ե˥ѥåޤ
-.SH ""
+pack200 \- WebデプロイメントのためにJARファイルをpack200圧縮ファイルにパッケージします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -62,27 +62,27 @@
 .RE
 .\}
 .PP
-ץǤդνǻǤޤޥɥ饤ޤpropertiesե˻ꤵ줿ǸΥץ󤬡˻ꤵ줿٤ƤΥץͥ褵ޤ
+オプションは任意の順序で指定できます。コマンドラインまたはpropertiesファイルに指定された最後のオプションが、それ以前に指定されたすべてのオプションより優先されます。
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIoutput\-file\fR
 .RS 4
-ϥե̾
+出力ファイルの名前。
 .RE
 .PP
 \fIJAR\-file\fR
 .RS 4
-ϥե̾
+入力ファイルの名前。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIpack200\fRޥɤϡJava gzipץåѤJARեpack200̥եѴJavaץꥱǤpack200եϹⰵ̤ΥեǡľܥǥץǤӰɻ֤ṳ̂ǽǤ
+\fIpack200\fRコマンドは、Java gzipコンプレッサを使用してJARファイルをpack200圧縮ファイルに変換するJavaアプリケーションです。pack200ファイルは高圧縮のファイルで、直接デプロイでき、帯域幅の節約やダウンロード時間の短縮が可能です。
 .PP
-\fIpack200\fRޥɤˤϡ̥󥸥ĴԤץ󤬤ޤŪʻˡ򼡤˼ޤ\fImyarchive\&.pack\&.gz\fRǥեȤ\fIpack200\fRޥǺޤ
+\fIpack200\fRコマンドには、圧縮エンジンの設定や微調整を行うオプションがあります。一般的な使用方法を次の例に示します。\fImyarchive\&.pack\&.gz\fRがデフォルトの\fIpack200\fRコマンド設定で作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -93,11 +93,11 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-r, \-\-repack
 .RS 4
-JARեѥå奢ѥåơJARեޤ줿ե\fIjarsigner\fR(1)ġϥեȤƻѤǤޤǤϡmyarchive\&.jarեѥå塢ѥåޤ
+JARファイルをパックした後アンパックして、JARファイルを生成します。生成されたファイルは\fIjarsigner\fR(1)ツールの入力ファイルとして使用できます。次の例では、myarchive\&.jarファイルをパックした後、アンパックします。
 .sp
 .if n \{\
 .RS 4
@@ -109,12 +109,12 @@
 .if n \{\
 .RE
 .\}
-ǤϡϥեΥեνݻޤ
+次の例では、入力ファイル内のファイルの順序を保持します。
 .RE
 .PP
 \-g, \-\-no\-gzip
 .RS 4
-\fIpack200\fRեޤΥץꤹȤϡŬڤʰ̥ġѤɬפޤޤåȡƥǤϡб밵̲ġѤɬפޤ
+\fIpack200\fRファイルを生成します。このオプションを指定するときは、適切な圧縮ツールを使用する必要があります。また、ターゲット・システムでは、対応する圧縮解除ツールを使用する必要があります。
 .sp
 .if n \{\
 .RS 4
@@ -129,104 +129,104 @@
 .PP
 \-G, \-\-strip\-debug
 .RS 4
-ϤǥХå°ޤˤϡ\fISourceFile\fR\fILineNumberTable\fR\fILocalVariableTable\fR\fILocalVariableTypeTable\fRޤޤޤ°Сɤȥ󥹥ȡΥϾʤޤǥХåεǽ¤ޤ
+出力からデバッグ属性を削除します。これには、\fISourceFile\fR、\fILineNumberTable\fR、\fILocalVariableTable\fR、\fILocalVariableTypeTable\fRが含まれます。これらの属性を削除すれば、ダウンロードとインストールのサイズは小さくなりますが、デバッガの機能は制限されます。
 .RE
 .PP
 \-\-keep\-file\-order
 .RS 4
-ϥեΥեνݻޤϡǥեȤưǤ
+入力ファイル内のファイルの順序を保持します。これは、デフォルトの動作です。
 .RE
 .PP
 \-O, \-\-no\-keep\-file\-order
 .RS 4
-ѥåġϡ٤ƤǤ¤ؤޤѥåġϡJARǥ쥯ȥ̾ƥɡ︺뤳ȤǤޤǥåʤɡJARեκŬǽưʤʤ뤳Ȥޤ
+パック・ツールは、すべての要素を並べ替えて送信します。パック・ツールは、JARディレクトリ名を削除してダウンロード・サイズを削減することもできます。ただし、インデックスなど、特定のJARファイルの最適化機能が正常に動作しなくなることがあります。
 .RE
 .PP
 \-S\fIvalue\fR, \-\-segment\-limit=\fIvalue\fR
 .RS 4
-ͤϡƥ֡Ȥͽۥåȡ\fIN\fR
-(Хñ)Ǥñϥեɬץ\fIN\fRХȤĶȡΩȤƤޤüʥȤơͤ\fI\-1\fRξϡ٤Ƥϥեޤ礭ñΥȤ졢ͤ0ξϡ饹Ȥ˥Ȥ1Ĥޤ֡Ȥ礭ʤȡҲʤʤ갵Ψ⤯ʤޤνˤ¿Υ꡼ɬפǤ
+この値は、各アーカイブ・セグメントの予想ターゲット・サイズ\fIN\fR
+(バイト単位)です。単一の入力ファイルの必要サイズが\fIN\fRバイトを超えると、独立したセグメントが割り当てられます。特殊なケースとして、値が\fI\-1\fRの場合は、すべての入力ファイルを含む大きな単一のセグメントが生成され、値が0の場合は、クラスごとにセグメントが1つずつ生成されます。アーカイブ・セグメントが大きくなると、断片化が少なくなり圧縮率が高くなりますが、その処理には多くのメモリーが必要です。
 .sp
-ƥȤΥϡȤѴ뤽줾ϥեΥΤۤ̾¾ץѥƥΥ׻ƿ¬ޤ
+各セグメントのサイズは、セグメントに変換されるそれぞれの入力ファイルのサイズのほか、その名前と他の送信されるプロパティのサイズを計算して推測されます。
 .sp
-ǥեȤ\-1ǤĤޤꡢѥåġñΥȽϥեޤü礭ʽϥե뤬ˤϡϥե򥻥Ȳ(ʬ)Ƥ꾮JARˤ뤳Ȥ򶯤ᤷޤ
+デフォルトは\-1です。つまり、パック・ツールは単一のセグメント出力ファイルを作成します。極端に大きな出力ファイルが生成される場合には、入力ファイルをセグメント化(分割)してより小さなJARにすることを強くお薦めします。
 .sp
-¤ݤƤʤ10 MBJARѥåե̾10%ѥåޤѥåġǤ礭Javaҡ(Ȥ¤10)ɬפȤ⤢ޤ
+この制限が課されていない10 MBのJARパック・ファイルは通常、約10%小さくパックされます。しかし、パック・ツールでより大きなJavaヒープ(セグメントの制限の約10倍)を必要とする場合もあります。
 .RE
 .PP
 \-E\fIvalue\fR, \-\-effort=\fIvalue\fR
 .RS 4
-ñ10ʿͤꤷ硢ѥåġϡꤵ줿Ψǥ֤򰵽̤ޤ٥1ξϡŪû̻֤¿礭Υե뤬ޤ٥9ξϡĹ֤ΤΡ갵Ψι⤤ե뤬ޤü0ꤷϡ\fIpack200\fRޥɤϸJARե򰵽̤ʤľܥԡޤJSR 200ɸǤϡ٤Ƥβץब̤ʾ򥢡ΤΥѥ롼Ȳ᤹褦˵ꤷƤޤ
+単一の10進数値を指定した場合、パック・ツールは、指定された圧縮率でアーカイブを圧縮します。レベル1の場合は、比較的短い圧縮時間で多少大きめのファイルが生成されますが、レベル9の場合は、非常に長い時間がかかるものの、より圧縮率の高いファイルが生成されます。特殊な値0を指定した場合は、\fIpack200\fRコマンドは元のJARファイルを圧縮なしで直接コピーします。JSR 200標準では、すべての解凍プログラムが、この特別な場合をアーカイブ全体のパススルーと解釈するように規定しています。
 .sp
-ǥեȤ5Ǥξ硢ɸŪʻ֤Ŭڤʰ̤Ԥޤ
+デフォルトは5です。この場合、標準的な時間で適切な圧縮が行われます。
 .RE
 .PP
 \-H\fIvalue\fR, \-\-deflate\-hint=\fIvalue\fR
 .RS 4
-Ͼ¸Ȥǥեͤ򥪡С饤ɤޤž륢֤Υ礭ʤ礬ޤǽͤϡ\fItrue\fR\fIfalse\fRޤ\fIkeep\fRǤ
+入力情報を保存するというデフォルト値をオーバーライドします。転送されるアーカイブのサイズは大きくなる場合があります。指定可能な値は、\fItrue\fR、\fIfalse\fRまたは\fIkeep\fRです。
 .sp
-\fIvalue\fR\fItrue\fRޤfalseξ硢\fIpacker200\fRޥɤϻ˽äƥǥե졼󡦥ҥȤϥ֤ꤷޤǤθġΥǥե졼󡦥ҥȤžޤ
+\fIvalue\fRが\fItrue\fRまたはfalseの場合、\fIpacker200\fRコマンドは指定に従ってデフレーション・ヒントを出力アーカイブに設定します。アーカイブ要素の個々のデフレーション・ヒントは転送されません。
 .sp
-\fIkeep\fRͤϡJARdzǧ줿ǥե졼󡦥ҥȤݻޤ줬ǥեȤǤ
+\fIkeep\fR値は、入力JARで確認されたデフレーション・ヒントを保持します。これがデフォルトです。
 .RE
 .PP
 \-m\fIvalue\fR, \-\-modification\-time=\fIvalue\fR
 .RS 4
-ǽͤ\fIlatest\fR\fIkeep\fRǤ
+指定可能な値は\fIlatest\fRと\fIkeep\fRです。
 .sp
-ͤǿξ硢ѥåġϡΥ֤λѲǽʤ٤ƤΥȥΤκǽ狼ΥȤλѲǽʤ٤ƤΥȥκǽꤷ褦ȤޤñͤϥȤΰȤž졢ƥȤȥŬѤޤξ硢٤ƤΥ󥹥ȡ롦եñդꤵȤϤޤ֤ž򾯤뤳ȤǤޤ
+値が最新の場合、パック・ツールは、元のアーカイブの使用可能なすべてのエントリのうちの最終更新時刻か、そのセグメントの使用可能なすべてのエントリの最終更新時刻を特定しようとします。この単一の値はセグメントの一部として転送され、各セグメントの全エントリに適用されます。この場合、すべてのインストール・ファイルに単一の日付が設定されるという問題はありますが、アーカイブの転送サイズを少し小さくすることができます。
 .sp
-ͤ\fIkeep\fRξ硢JARdzǧ줿ѹ֤ݻޤ줬ǥեȤǤ
+値が\fIkeep\fRの場合、入力JARで確認された変更時間が保持されます。これがデフォルトです。
 .RE
 .PP
 \-P\fIfile\fR, \-\-pass\-file=\fIfile\fR
 .RS 4
-ե򰵽̤Хñ̤ž褦˻ꤷޤΥץ֤ѤơʣΥեǤޤƥࡦե롦ѥ졼JARե롦ѥ졼Υå(/)֤ѥ̾ѴϹԤޤ󡣷̤Ȥե̾ϡʸȤΤJARեǤνиȰפƤɬפޤ\fIfile\fR˥ǥ쥯ȥ̾ꤷ硢Υǥ쥯ȥΤ٤ƤΥե뤬žޤ
+ファイルを圧縮せず、バイト単位で転送するように指定します。このオプションを繰返し使用して、複数のファイルを指定できます。システム・ファイル・セパレータがJARファイル・セパレータのスラッシュ(/)に置き換えられる点を除き、パス名の変換は行われません。結果として得られるファイル名は、文字列として正確にJARファイルでの出現と一致している必要があります。\fIfile\fRにディレクトリ名を指定した場合、そのディレクトリ内のすべてのファイルが転送されます。
 .RE
 .PP
 \-U\fIaction\fR, \-\-unknown\-attribute=\fIaction\fR
 .RS 4
-ǥեȤư򥪡С饤ɤޤĤޤꡢ°ޤ९饹ե뤬ꤷ\fIaction\fRˤäϤޤȤƻǽͤϡ\fIerror\fR\fIstrip\fRޤ\fIpass\fRǤ
+デフォルトの動作をオーバーライドします。つまり、不明な属性を含むクラス・ファイルが、指定した\fIaction\fRによって渡されます。アクションとして指定可能な値は、\fIerror\fR、\fIstrip\fRまたは\fIpass\fRです。
 .sp
-ͤ\fIerror\fRξ硢\fIpack200\fRޥΤԤŬڤɽޤ
+値が\fIerror\fRの場合、\fIpack200\fRコマンド操作全体が失敗して適切な説明が表示されます。
 .sp
-ͤ\fIstrip\fRξ硢°ϺޤJavaۥޥ(JVM)ɬ°ȡ饹ξ㳲ȯ뤳Ȥޤ
+値が\fIstrip\fRの場合、属性は削除されます。Java仮想マシン(JVM)必須属性を削除すると、クラス・ローダーの障害が発生することがあります。
 .sp
-ͤ\fIpass\fRξ硢饹Τ1ĤΥ꥽Ȥžޤ
+値が\fIpass\fRの場合、クラス全体が1つのリソースとして転送されます。
 .RE
 .PP
 \-C\fIattribute\-name\fR=\fIlayout\fR, \-\-class\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Υץ򻲾ȤƤ
+次のオプションを参照してください。
 .RE
 .PP
 \-F\fIattribute\-name\fR=\fIlayout\fR, \-\-field\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Υץ򻲾ȤƤ
+次のオプションを参照してください。
 .RE
 .PP
 \-M\fIattribute\-name\fR=\fIlayout\fR, \-\-method\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Υץ򻲾ȤƤ
+次のオプションを参照してください。
 .RE
 .PP
 \-D\fIattribute\-name\fR=\fIlayout\fR, \-\-code\-attribute=\fIattribute\-name\fR=\fIaction\fR
 .RS 4
-Ҥ4ĤΥץǤϡ饹ƥƥ\fIclass\-attribute\fR\fIfield\-attribute\fR\fImethod\-attribute\fR\fIcode\-attribute\fRʤɤ°Υ쥤ȤǤޤ\fIattribute\-name\fRˤϡ줫쥤Ȥޤϥ°̾ꤷޤ\fIaction\fRȤƻǽͤϡ\fIsome\-layout\-string\fR\fIerror\fR\fIstrip\fR\fIpass\fRǤ
+前述の4つのオプションでは、クラス・エンティティに\fIclass\-attribute\fR、\fIfield\-attribute\fR、\fImethod\-attribute\fRおよび\fIcode\-attribute\fRなどの属性のレイアウトを指定できます。\fIattribute\-name\fRには、これからレイアウトまたはアクションを定義する属性の名前を指定します。\fIaction\fRとして指定可能な値は、\fIsome\-layout\-string\fR、\fIerror\fR、\fIstrip\fR、\fIpass\fRです。
 .sp
-\fIsome\-layout\-string\fR: 쥤ȸJSR 200ͤƤޤ:
-\fI\-\-class\-attribute=SourceFile=RUH\fR
+\fIsome\-layout\-string\fR: レイアウト言語はJSR 200仕様で定義されています。例:
+\fI\-\-class\-attribute=SourceFile=RUH\fR。
 .sp
-ͤ\fIerror\fRξ硢\fIpack200\fRԤɽޤ
+値が\fIerror\fRの場合、\fIpack200\fR操作が失敗して説明が表示されます。
 .sp
-ͤ\fIstrip\fRξ硢°ϤޤVMɬ°ȥ饹ξ㳲ȯ뤳ȤޤȤС\fI\-\-class\-attribute=CompilationID=pass\fRȤ°ޤ९饹եžޤѥåġϡ¾ΥԤޤ
+値が\fIstrip\fRの場合、属性が出力から削除されます。VM必須属性を削除するとクラス・ローダーの障害が発生することがあります。たとえば、\fI\-\-class\-attribute=CompilationID=pass\fRというこの属性を含むクラス・ファイルを転送します。パック・ツールは、その他のアクションを行いません。
 .sp
-ͤ\fIpass\fRξ硢饹Τ1ĤΥ꥽Ȥžޤ
+値が\fIpass\fRの場合、クラス全体が1つのリソースとして転送されます。
 .RE
 .PP
 \-f \fIpack\&.properties\fR, \-\-config\-file=\fIpack\&.properties\fR
 .RS 4
-ޥɥ饤ˡѥåġ뤿JavaץѥƥޤޤƤ빽եǤޤ
+コマンドラインに、パック・ツールを初期化するためのJavaプロパティが含まれている構成ファイルを指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -251,42 +251,42 @@
 .PP
 \-v, \-\-verbose
 .RS 4
-Ǿ¤ΥåϤޤΥץʣꤹȡĹåޤ
+最小限のメッセージを出力します。このオプションを複数指定すると、より長いメッセージが作成されます。
 .RE
 .PP
 \-q, \-\-quiet
 .RS 4
-åɽư褦˻ꤷޤ
+メッセージを表示せずに動作するように指定します。
 .RE
 .PP
 \-l\fIfilename\fR, \-\-log\-file=\fIfilename\fR
 .RS 4
-ϥåΥեꤷޤ
+出力メッセージのログ・ファイルを指定します。
 .RE
 .PP
 \-?, \-h, \-\-help
 .RS 4
-Υޥɤ˴ؤإ׾Ϥޤ
+このコマンドに関するヘルプ情報を出力します。
 .RE
 .PP
 \-V, \-\-version
 .RS 4
-Υޥɤ˴ؤСϤޤ
+このコマンドに関するバージョン情報を出力します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-ꤵ줿ץJavaۥޥϤޤܺ٤ϡjava(1)ޥɤΥե󥹡ڡ򻲾ȤƤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤ
+指定されたオプションをJava仮想マシンに渡します。詳細は、java(1)コマンドのリファレンス・ページを参照してください。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。
 .RE
-.SH "λơ"
+.SH "終了ステータス"
 .PP
-νλ֤ͤޤ: ェλξ0顼ȯ0礭͡
-.SH ""
+次の終了値が返されます: 正常終了の場合は0、エラーが発生した場合は0より大きい値。
+.SH "注意"
 .PP
-Υޥɤ\fIpack\fR(1)ƱʤǤ\fIpack\fR\fIpack200\fRޥɤϡ̡ʤǤ
+このコマンドと\fIpack\fR(1)を混同しないでください。\fIpack\fRおよび\fIpack200\fRコマンドは、別々の製品です。
 .PP
-JDK°Java SE APIͤȤ㤬Ĥäˤϡͤͥ褷Ƥ
-.SH "Ϣ"
+JDKに付属するJava SE API仕様との相違が見つかった場合には、仕様を優先してください。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: policytool
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: ƥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: セキュリティ・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "policytool" "1" "2013ǯ1121" "JDK 8" "ƥġ"
+.TH "policytool" "1" "2013年11月21日" "JDK 8" "セキュリティ・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-policytool \- 桼ƥƥGUIͳǼ桼Ϥ˴Ťơץ졼󡦥ƥȤΥݥꥷեɤ߽񤭤ޤ
-.SH ""
+policytool \- ユーティリティGUI経由で取得したユーザー入力に基づいて、プレーン・テキストのポリシー・ファイルを読み書きします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,17 +64,17 @@
 .PP
 \-file
 .RS 4
-ݥꥷեɤ߹褦\fIpolicytool\fR˻ؼޤ
+ポリシー・ファイルを読み込むように\fIpolicytool\fRに指示します。
 .RE
 .PP
 \fIfilename\fR
 .RS 4
-ɤե̾
+ロードするファイルの名前。
 .RE
 .PP
-\fB\fR:
+\fB例\fR:
 .PP
-ݥꥷġ桼ƥƥ¹Ԥޤ:
+ポリシー・ツール管理ユーティリティを実行します:
 .sp
 .if n \{\
 .RS 4
@@ -86,7 +86,7 @@
 .RE
 .\}
 .PP
-\fIpolicytool\fRޥɤ¹Ԥꤵ줿եɤޤ:
+\fIpolicytool\fRコマンドを実行し、指定されたファイルをロードします:
 .sp
 .if n \{\
 .RS 4
@@ -97,17 +97,17 @@
 .if n \{\
 .RE
 .\}
-.SH ""
+.SH "説明"
 .PP
-\fIpolicytool\fRޥɤϡԤGUIƤӽФޤˤꡢƥԤϥ롦ݥꥷեƤǤ褦ˤʤޤݥꥷե\fI\&.policy\fRĥҤĥץ졼ƥȡեǡɥᥤ̤˥⡼ȡꥯ򸢸¥֥Ȥ˥ޥåפޤܺ٤ϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlˤ
-Default Policy Implementation and Policy File Syntaxפ򻲾ȤƤ
-.SH "ץ"
+\fIpolicytool\fRコマンドは、管理者のGUIを呼び出します。これにより、システム管理者はローカル・ポリシー・ファイルの内容を管理できるようになります。ポリシー・ファイルは\fI\&.policy\fR拡張子を持つプレーンテキスト・ファイルで、ドメイン別にリモート・リクエスタを権限オブジェクトにマップします。詳細は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.htmlにある
+「Default Policy Implementation and Policy File Syntax」を参照してください
+.SH "オプション"
 .PP
 \-file
 .RS 4
-ݥꥷեɤ߹褦\fIpolicytool\fR˻ؼޤ
+ポリシー・ファイルを読み込むように\fIpolicytool\fRに指示します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -117,7 +117,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Default Policy Implementation and Policy File Syntax
+「Default Policy Implementation and Policy File Syntax」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyFiles\&.html)
 .RE
 .sp
@@ -129,7 +129,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Policy File Creation and Management
+「Policy File Creation and Management」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/PolicyGuide\&.html)
 .RE
 .sp
@@ -141,7 +141,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Permissions in Java SE Development Kit (JDK)
+「Permissions in Java SE Development Kit (JDK)」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/permissions\&.html)
 .RE
 .sp
@@ -153,7 +153,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java Security Overview
+「Java Security Overview」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/overview/jsoverview\&.html)
 .RE
 .sp
@@ -165,7 +165,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java Cryptography Architecture (JCA) Reference Guide
+「Java Cryptography Architecture (JCA) Reference Guide」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec\&.html)
 .RE
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: rmic
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "rmic" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "rmic" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-rmic \- Java Remote Method Protocol (JRMP)ޤInternet Inter\-Orb protocol (IIOP)Ѥ⡼ȡ֥ȤΥ֡ȥ󤪤Tie饹ޤObject Management Group (OMG)󥿥ե(IDL)ޤ
-.SH ""
+rmic \- Java Remote Method Protocol (JRMP)またはInternet Inter\-Orb protocol (IIOP)を使用するリモート・オブジェクトのスタブ、スケルトンおよびTieクラスを生成します。Object Management Group (OMG)インタフェース定義言語(IDL)も生成します
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,20 +64,20 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤\fIץ\fRץ򻲾ȤƤ
+コマンドライン・\fIオプション\fR。オプションを参照してください。
 .RE
 .PP
 \fIpackage\-qualified\-class\-names\fR
 .RS 4
-ѥåޤ९饹̾:
-\fIjava\&.awt\&.Color\fR
+パッケージを含むクラス名。例:
+\fIjava\&.awt\&.Color\fR。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fB侩˴ؤ:\fR
-Java Remote Method Protocol (JRMP)֤ӥȥŪΥݡȤ侩ˤʤޤưŪJRMP֤򤫤˻ѤơJRMP١ΥץꥱˤΥġѤɬʤȤᤷޤܺ٤ϡ\fIjava\&.rmi\&.server\&.UnicastRemoteObject\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/server/UnicastRemoteObject\&.html)򻲾ȤƤ
+\fB非推奨に関する注意:\fR
+Java Remote Method Protocol (JRMP)スタブおよびスケルトンの静的な生成のサポートは非推奨になりました。動的に生成されるJRMPスタブをかわりに使用して、JRMPベースのアプリケーションにこのツールを使用する必要性をなくすことをお薦めします。詳細は、\fIjava\&.rmi\&.server\&.UnicastRemoteObject\fR仕様(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/server/UnicastRemoteObject\&.html)を参照してください。
 .PP
-\fIrmic\fRѥϡJava Remote Method Protocol (JRMP)ȥ֤Tie饹ե(IIOPץȥ)Ѥơ⡼ȡ֥ȤΥ֤ӥȥ󡦥饹եޤ⡼ȡ֥Ȥμ饹Ǥ뤳Υ饹եϡJavaץߥ󥰸Υ饹򥳥ѥ뤷Ȥޤ⡼ȼ饹ϡ\fIjava\&.rmi\&.Remote\fR󥿥ե륯饹Ǥ\fIrmic\fRޥɤǤΥ饹̾ϡΥ饹\fIjavac\fRޥɤǥѥ뤬ƤơĴѥå̾ǤɬפޤȤС˼饹ե̾\fIHelloImpl\fR\fIrmic\fRޥɤ¹Ԥȡhello֥ǥ쥯ȥ(饹Υѥå̾դ)\fIHelloImpl_Stub\&.class \fRե뤬ޤ
+\fIrmic\fRコンパイラは、Java Remote Method Protocol (JRMP)とスタブおよびTieクラス・ファイル(IIOPプロトコル)を使用して、リモート・オブジェクトのスタブおよびスケルトン・クラス・ファイルを生成します。リモート・オブジェクトの実装クラスであるこれらのクラス・ファイルは、Javaプログラミング言語のクラスをコンパイルしたときに生成されます。リモート実装クラスは、\fIjava\&.rmi\&.Remote\fRインタフェースを実装するクラスです。\fIrmic\fRコマンドでのクラス名は、そのクラスが\fIjavac\fRコマンドでコンパイルが成功していて、かつ完全修飾パッケージ名である必要があります。たとえば、次に示すクラス・ファイル名\fIHelloImpl\fRで\fIrmic\fRコマンドを実行すると、helloサブディレクトリ(クラスのパッケージの名前の付いた)に\fIHelloImpl_Stub\&.class \fRファイルが作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -89,31 +89,31 @@
 .RE
 .\}
 .PP
-⡼ȡ֥ȤΥȥJRMPץȥ롦С¦Υƥƥǡ⡼ȡ֥ȼƤӽФ᥽åɤޤߤޤ
+リモート・オブジェクトのスケルトンはJRMPプロトコル・サーバー側のエンティティで、リモート・オブジェクト実装を呼び出すメソッドを含みます。
 .PP
-⡼ȡ֥ȤTieϡȥƱͤ˥С¦ΥƥƥǤIIOPץȥѤƥ饤Ȥ̿ޤ
+リモート・オブジェクトのTieは、スケルトンと同様にサーバー側のエンティティですが、IIOPプロトコルを使用してクライアントと通信します。
 .PP
-֤Ȥϡ⡼ȡ֥ȤΥ饤¦ǤǤ֤ϡ⡼ȡ֥ȤΥ᥽åɸƽФ򡢼ʪΥ⡼ȡ֥Ȥ󤹤륵С̿ޤäơ饤ȤΥ⡼ȡ֥ȤؤλȤϡºݤϥ롦֤ؤλȤȤʤޤ
+スタブとは、リモート・オブジェクトのクライアント側での代理です。スタブは、リモート・オブジェクトのメソッド呼出しを、実物のリモート・オブジェクトが常駐するサーバーと通信する役割を持ちます。したがって、クライアントのリモート・オブジェクトへの参照は、実際はローカル・スタブへの参照となります。
 .PP
-ǥեȤ\fIrmic\fRޥɤϡ1\&.2 JRMP֡ץȥ롦СΤߤѤ륹֡饹ޤϡ\fI\-v1\&.2\fRץꤷƱưǤ꡼5\&.0Ǥ\fI\-vcompat\fRץ󤬥ǥեȤǤIIOPץȥѤΥ֤Tie饹ˤ\fI\-iiop\fRץѤޤץ򻲾ȤƤ
+デフォルトで\fIrmic\fRコマンドは、1\&.2 JRMPスタブ・プロトコル・バージョンのみを使用するスタブ・クラスを生成します。これは、\fI\-v1\&.2\fRオプションを指定した場合と同じ動作です。リリース5\&.0以前では\fI\-vcompat\fRオプションがデフォルトでした。IIOPプロトコル用のスタブおよびTieクラスを生成するには\fI\-iiop\fRオプションを使用します。オプションを参照してください。
 .PP
-֤ϥ⡼ȡ󥿥եΤߤ⡼ȡ֥Ȥ롦󥿥եϼƤޤJRMP֤ϥ⡼ȡ֥Ȥ⡼ȡ󥿥եƱΤƤΤǡ饤Ȥϡ㥹Ȥ䷿åJavaץߥ󥰸Ȥ߹ޤ줿黻ҤѤ뤳ȤǤޤIIOPξϡ\fIPortableRemoteObject\&.narrow\fR᥽åɤѤɬפޤ
-.SH "ץ"
+スタブはリモート・インタフェースのみを実装し、リモート・オブジェクトが実装するローカル・インタフェースは実装していません。JRMPスタブはリモート・オブジェクトが実装するリモート・インタフェースと同じものを実装しているので、クライアントは、キャストや型チェックにJavaプログラミング言語に組み込まれた演算子を使用することができます。IIOPの場合は、\fIPortableRemoteObject\&.narrow\fRメソッドを使用する必要があります。
+.SH "オプション"
 .PP
 \-bootclasspath \fIpath\fR
 .RS 4
-֡ȥȥåס饹եΰ֤򥪡С饤ɤޤ
+ブートストラップ・クラス・ファイルの位置をオーバーライドします。
 .RE
 .PP
 \-classpath path
 .RS 4
-\fIrmic\fRޥɤ饹õΥѥꤷޤΥץϡǥեȤ\fICLASSPATH\fRĶѿ򥪡С饤ɤޤǥ쥯ȥϥʬ䤷ޤѥΰŪʷ\fI\&.;<your_path>\fRǤ:
+\fIrmic\fRコマンドがクラスを探すためのパスを指定します。このオプションは、デフォルトや\fICLASSPATH\fR環境変数設定をオーバーライドします。ディレクトリはコロンで分割します。パスの一般的な形式は\fI\&.;<your_path>\fRです。例:
 \fI\&.;/usr/local/java/classes\fR
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-줿饹ؤνǥ쥯ȥΥ롼ȤꤷޤΥץѤȡ֡ȥ󡢤TieեǼǥ쥯ȥǤޤȤСΥޥɤMyClassƳФ줿֤ӥȥ󡦥饹ǥ쥯ȥ/java/classes/exampleclass˳Ǽޤ
+生成されたクラス階層の出力先ディレクトリのルートを指定します。このオプションを使用すると、スタブ、スケルトン、およびTieファイルを格納するディレクトリを指定できます。たとえば、次のコマンドはMyClassから導出されたスタブおよびスケルトン・クラスをディレクトリ/java/classes/exampleclassに格納します。
 .sp
 .if n \{\
 .RS 4
@@ -124,25 +124,25 @@
 .if n \{\
 .RE
 .\}
-\fI\-d\fRץ󤬻ꤵƤʤ硢ǥեȤư\fI\-d\fRꤵƤƱǤåȡ饹ΥѥåؤߤΥǥ쥯ȥ˺졢stub/tie/skeletonե뤬ǼޤΥ꡼\fIrmic\fRޥɤǤϡ\fI\-d\fRꤵƤʤϡѥåؤϺ줺ϥեϤ٤ƸߤΥǥ쥯ȥľܳǼƤޤ
+\fI\-d\fRオプションが指定されていない場合、デフォルトの動作は\fI\-d\fRが指定されていた場合と同じです。ターゲット・クラスのパッケージ階層が現在のディレクトリに作成され、stub/tie/skeletonファイルが格納されます。以前のリリースの\fIrmic\fRコマンドでは、\fI\-d\fRが指定されていない場合は、パッケージ階層は作成されず、出力ファイルはすべて現在のディレクトリに直接格納されていました。
 .RE
 .PP
 \-extdirs \fIpath\fR
 .RS 4
-󥹥ȡѳĥǽΰ֤򥪡С饤ɤޤ
+インストール済拡張機能の位置をオーバーライドします。
 .RE
 .PP
 \-g
 .RS 4
-ѿޤह٤ƤΥǥХåޤǥեȤǤϡֹΤޤ
+ローカル変数を含むすべてのデバッグ情報を生成します。デフォルトでは、行番号情報のみ生成されます。
 .RE
 .PP
 \-idl
 .RS 4
-\fIrmic\fRޥɤˤäơꤷ饹ӻȤ줿饹OMG IDLޤIDLǤϡץߥ󥰸˰¸ˡǥ֥ȤAPIꤹ뤳ȤǤޤIDLϡ᥽åɤӥǡλͤȤƻѤޤCORBAХǥ󥰤󶡤Ǥդθǡ᥽åɤӥǡκӸƽФԤȤǤޤθˤϡJavaC++ޤޤƤޤhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.html
-Java IDL: IDL to Java Language Mappingפ򻲾ȤƤ
+\fIrmic\fRコマンドによって、指定したクラスおよび参照されたクラスのOMG IDLが生成されます。IDLでは、プログラミング言語に依存せずに、宣言するだけでオブジェクトのAPIを指定することができます。IDLは、メソッドおよびデータの仕様として使用します。CORBAバインディングを提供する任意の言語で、メソッドおよびデータの作成および呼出しを行うことができます。これらの言語には、JavaおよびC++が含まれています。http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/mapping/jidlMapping\&.htmlの
+「Java IDL: IDL to Java Language Mapping」を参照してください
 .sp
-\fI\-idl\fRץѤȤˤϡ¾ΥץǤޤ
+\fI\-idl\fRオプションを使用するときには、他のオプションも指定できます。
 .sp
 .RS 4
 .ie n \{\
@@ -152,7 +152,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-¸Υ/Tie/IDLϥ饹⿷Ǥ⡢\fI\-always\fRޤ\fI\-alwaysgenerate\fRץϺޤ
+既存のスタブ/Tie/IDLが入力クラスよりも新しい場合でも、\fI\-always\fRまたは\fI\-alwaysgenerate\fRオプションは再生成を強制します。
 .RE
 .sp
 .RS 4
@@ -163,7 +163,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-factory\fRץϡ줿IDL\fIfactory\fRɤѤޤ
+\fI\-factory\fRオプションは、生成されたIDLで\fIfactory\fRキーワードを使用します。
 .RE
 .sp
 .RS 4
@@ -204,9 +204,9 @@
 .PP
 \-iiop
 .RS 4
-\fIrmic\fRޥɤˤäơJRMPΥ֤ȥȥ󡦥饹ΤˡIIOPΥ֤Tie饹ޤ֡饹ϡ⡼ȡ֥ȤΥ롦ץǡ饤Ȥ饵С˸ƽФȤ˻Ѥޤƥ⡼ȡ󥿥եˤϥ֡饹ɬפǤ֡饹ˤäƥ⡼ȡ󥿥եޤ饤Ȥǥ⡼ȡ֥Ȥ򻲾ȤȤϡ֤򻲾Ȥ뤳Ȥˤʤޤ饹ϡС¦ƤθƽФŬڤʼ饹˥ǥѥåȤ˻ѤޤƼ饹ˤϡ饹ɬפǤ
+\fIrmic\fRコマンドによって、JRMPのスタブとスケルトン・クラスのかわりに、IIOPのスタブとTieクラスが生成されます。スタブ・クラスは、リモート・オブジェクトのローカル・プロキシで、クライアントからサーバーに呼出しを送信するときに使用されます。各リモート・インタフェースにはスタブ・クラスが必要です。スタブ・クラスによってリモート・インタフェースが実装されます。クライアントでリモート・オブジェクトを参照するときは、スタブを参照することになります。タイ・クラスは、サーバー側で着呼を処理し、その呼出しを適切な実装クラスにディスパッチするときに使用されます。各実装クラスには、タイ・クラスが必要です。
 .sp
-\fI\-iiop\fRѤ\fIrmic\fRޥɤƤӽФȡ̿̾§˽򤷤֤Tieޤ
+\fI\-iiop\fRを使用して\fIrmic\fRコマンドを呼び出すと、次の命名規則に準拠したスタブとTieが生成されます。
 .sp
 .if n \{\
 .RS 4
@@ -227,7 +227,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-iiop\fRץѤȤˤϡ¾ΥץǤޤ
+\fI\-iiop\fRオプションを使用するときには、他のオプションも指定できます。
 .RE
 .sp
 .RS 4
@@ -238,7 +238,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-¸Υ/Tie/IDLϥ饹⿷Ǥ⡢\fI\-always\fRޤ\fI\-alwaysgenerate\fRץϺޤ
+既存のスタブ/Tie/IDLが入力クラスよりも新しい場合でも、\fI\-always\fRまたは\fI\-alwaysgenerate\fRオプションは再生成を強制します。
 .RE
 .sp
 .RS 4
@@ -249,7 +249,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-nolocalstubs\fRץǤϡƱץΥ饤ȤȥС˺Ŭ줿֤Ϻޤ
+\fI\-nolocalstubs\fRオプションでは、同じプロセスのクライアントとサーバーに最適化されたスタブは作成されません。
 .RE
 .sp
 .RS 4
@@ -260,7 +260,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-noValueMethods\fRץ\fI\-idl\fRץȤȤ˻Ѥɬפޤ\fI\-noValueMethods\fRץϡIDL\fIvaluetype\fR᥽åɤӽҤɲäǤʤ褦ˤޤΥ᥽åɤӽҤϡvaluetypeξϥץǤ\fI\-idl\fRץȤȤ\fI\-noValueMethods\fRץꤷʤޤ
+\fI\-noValueMethods\fRオプションは\fI\-idl\fRオプションとともに使用する必要があります。\fI\-noValueMethods\fRオプションは、送信されるIDLに\fIvaluetype\fRメソッドおよび初期化子を追加できないようにします。このメソッドおよび初期化子は、valuetypeの場合はオプションです。\fI\-idl\fRオプションとともに\fI\-noValueMethods\fRオプションを指定しないかぎり生成されます。
 .RE
 .sp
 .RS 4
@@ -271,57 +271,57 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-poa\fRץϷѾ\fIorg\&.omg\&.CORBA_2_3\&.portable\&.ObjectImpl\fR\fIorg\&.omg\&.PortableServer\&.Servant\fRѹޤݡ֥롦֥ȡץ(POA)\fIPortableServer\fR⥸塼ϡͥƥ֤\fIServant\fRޤJavaץߥ󥰸Ǥϡ\fIServant\fRJava\fIorg\&.omg\&.PortableServer\&.Servant\fR饹˥ޥåפޤϡ٤ƤPOAХȼΥ١饹ȤƵǽץꥱ󡦥ץޤƤӽФȤΤǤ뤤ĤΥ᥽åɡPOAˤäƸƤӽФ졢ХȤư椹뤿˥桼С饤ɤǤ᥽åɤ󶡤ޤOMG IDL to Java Language Mapping SpecificationCORBA V 2\&.3\&.1 ptc/00\-01\-08\&.pdf˽򤷤Ƥޤ
+\fI\-poa\fRオプションは継承を\fIorg\&.omg\&.CORBA_2_3\&.portable\&.ObjectImpl\fRから\fIorg\&.omg\&.PortableServer\&.Servant\fRに変更します。ポータブル・オブジェクト・アダプタ(POA)の\fIPortableServer\fRモジュールは、ネイティブの\fIServant\fR型を定義します。Javaプログラミング言語では、\fIServant\fR型はJavaの\fIorg\&.omg\&.PortableServer\&.Servant\fRクラスにマップされます。これは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッド、およびPOAによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドを提供します。OMG IDL to Java Language Mapping Specification、CORBA V 2\&.3\&.1 ptc/00\-01\-08\&.pdfに準拠しています。
 .RE
 .RE
 .PP
 \-J
 .RS 4
-JavaޥɤȤȤ˻Ѥơ\fI\-J\fRץ\fI\-J\fRθ³Java󥿥ץ꥿Ϥޤ(\fI\-J\fRȰδ֤˥ڡޤ)
+Javaコマンドとともに使用して、\fI\-J\fRオプションは\fI\-J\fRの後ろに続く引数をJavaインタプリタに渡します(\fI\-J\fRと引数の間にスペースは入れません)。
 .RE
 .PP
 \-keep or \-keepgenerated
 .RS 4
-֡ȥ󡢤ޤTie饹Τ줿\fI\&.java\fRեݻ\fI\&.class\fRեƱǥ쥯ȥ˽񤭹ߤޤ
+スタブ、スケルトン、またはTieクラスのために生成された\fI\&.java\fRソース・ファイルを保持し、\fI\&.class\fRファイルと同じディレクトリに書き込みます。
 .RE
 .PP
 \-nowarn
 .RS 4
-ٹ򥪥դˤޤ\fI\-nowarn\fRץ󤬻Ѥ硣ѥϷٹɽޤ
+警告をオフにします。\fI\-nowarn\fRオプションが使用される場合。コンパイラは警告を表示しません。
 .RE
 .PP
 \-nowrite
 .RS 4
-ѥ뤷饹ե롦ƥ˽񤭹ߤޤ
+コンパイルしたクラスをファイル・システムに書き込みません。
 .RE
 .PP
-\-vcompat (侩)
+\-vcompat (非推奨)
 .RS 4
-1\&.11\&.2ξJRMP֡ץȥ롦СȸߴΤ륹֤ӥȥ󡦥饹ޤ5\&.0Υ꡼ǤϤΥץ󤬥ǥեȤǤ줿֡饹ϡJDK 1\&.1ۥޥ˥ɤ1\&.1֡ץȥ롦СѤJDK 1\&.2ʹߤβۥޥ˥ɤ1\&.2֡ץȥ롦СѤޤ줿ȥ󡦥饹Ǥϡ1\&.11\&.2ξΥ֡ץȥ롦С򥵥ݡȤޤ줿饹ξ⡼ɤ򥵥ݡȤ뤿ˡ礭ʤޤ:Υץ侩ˤʤޤ򻲾ȤƤ
+1\&.1と1\&.2の両方のJRMPスタブ・プロトコル・バージョンと互換性のあるスタブおよびスケルトン・クラスを作成します。5\&.0以前のリリースではこのオプションがデフォルトでした。生成されたスタブ・クラスは、JDK 1\&.1仮想マシンにロードされると1\&.1スタブ・プロトコル・バージョンを使用し、JDK 1\&.2以降の仮想マシンにロードされると1\&.2スタブ・プロトコル・バージョンを使用します。生成されたスケルトン・クラスでは、1\&.1と1\&.2の両方のスタブ・プロトコル・バージョンをサポートします。生成されたクラスは両方の操作モードをサポートするために、サイズが大きくなります。注意:このオプションは非推奨になりました。説明を参照してください。
 .RE
 .PP
 \-verbose
 .RS 4
-ѥ󥫡ѥ뤵Ƥ륯饹ɤƤ륯饹եˤĤƤΥåɽ褦ˤޤ
+コンパイラやリンカーが、コンパイルされているクラスやロードされているクラス・ファイルについてのメッセージを表示するようにします。
 .RE
 .PP
-\-v1\&.1 (侩)
+\-v1\&.1 (非推奨)
 .RS 4
-1\&.1 JRMP֡ץȥ롦СΤߤΥ֤ӥȥ󡦥饹ޤ\fI\-v1\&.1\fRץѤǤΤϡJDK 1\&.1\fIrmic\fRޥɤ졢åץ졼ɤǤʤ(˥ʥߥå饹ǥ󥰤ѤƤʤ)¸Ūǥץ줿֡饹Фľ󲽸ߴΤ륹֡饹ΤߤǤ:Υץ侩ˤʤޤ򻲾ȤƤ
+1\&.1 JRMPスタブ・プロトコル・バージョンのみのスタブおよびスケルトン・クラスを生成します。\fI\-v1\&.1\fRオプションを使用できるのは、JDK 1\&.1から\fIrmic\fRコマンドで生成され、アップグレードできない(さらにダイナミック・クラス・ローディングを使用していない)、既存の静的デプロイされたスタブ・クラスに対し、直列化互換性のあるスタブ・クラスを生成する場合のみです。注意:このオプションは非推奨になりました。説明を参照してください。
 .RE
 .PP
-\-v1\&.2 (侩)
+\-v1\&.2 (非推奨)
 .RS 4
-(ǥե)1\&.2 JRMP֡ץȥ롦СΤߤΥ֡饹ޤȥ󡦥饹1\&.2֡ץȥ롦СǻѤǤʤᡢȥ󡦥饹ޤ줿֡饹ϡJDK 1\&.1ۥޥ˥ɤƤưޤ:Υץ侩ˤʤޤ򻲾ȤƤ
+(デフォルト)1\&.2 JRMPスタブ・プロトコル・バージョンのみのスタブ・クラスを生成します。スケルトン・クラスは1\&.2スタブ・プロトコル・バージョンで使用できないため、スケルトン・クラスは生成されません。生成されたスタブ・クラスは、JDK 1\&.1仮想マシンにロードされても動作しません。注意:このオプションは非推奨になりました。説明を参照してください。
 .RE
-.SH "Ķѿ"
+.SH "環境変数"
 .PP
 CLASSPATH
 .RS 4
-桼饹ؤΥѥ򥷥ƥ˻ꤷޤǥ쥯ȥϥǶڤޤ:
+ユーザー定義クラスへのパスをシステムに指定します。ディレクトリはコロンで区切られます。例:
 \fI\&.:/usr/local/java/classes\fR
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: rmid
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "rmid" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "rmid" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-rmid \- ưƥࡦǡ򳫻Ϥȡ֥ȤJavaۥޥ(VM)ϿƥƥֲǤ褦ˤʤޤ
-.SH ""
+rmid \- 起動システム・デーモンを開始すると、オブジェクトをJava仮想マシン(VM)に登録してアクティブ化できるようになります。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,13 +64,13 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIrmid\fRޥɤϡưƥࡦǡ򳫻Ϥޤưƥࡦǡ򳫻ϤƤǤʤȡƥֲǽ֥Ȥ򥢥ƥֲƥϿꡢJVMǥƥֲꤹ뤳ȤǤޤ󡣥ƥֲǽʥ֥ȤѤץκˡξܺ٤ϡ\fIƥֲλ\fR˴ؤ塼ȥꥢ(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi/activation/overview\&.html)򻲾ȤƤ
+\fIrmid\fRコマンドは、起動システム・デーモンを開始します。起動システム・デーモンを開始してからでないと、アクティブ化可能オブジェクトをアクティブ化システムに登録したり、JVM内でアクティブ化したりすることができません。アクティブ化可能なオブジェクトを使用するプログラムの作成方法の詳細は、\fIアクティブ化の使用\fRに関するチュートリアル(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi/activation/overview\&.html)を参照してください
 .PP
-\fIrmid\fRޥɤ¹ԤΤ褦˥ƥݥꥷեꤷơǡưޤ
+\fIrmid\fRコマンドを実行し、次のようにセキュリティ・ポリシー・ファイルを指定して、デーモンを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -82,11 +82,11 @@
 .RE
 .\}
 .PP
-\fIrmid\fRޥɤOracleμ¹Ԥ硢ǥեȤǤϡƥݥꥷեꤹɬפޤϡ\fIrmid\fRޥɤư롼ѤJVMư뤿˳\fIActivationGroupDesc\fRξѤǤ뤫ɤ򸡾ڤǤ褦ˤ뤿Ǥäˡ\fIActivationGroupDesc\fR󥹥ȥ饯Ϥ\fICommandEnvironment\fRǤդΥץѥƥˤäƻꤵ륳ޥɤӥץϡ\fIrmid\fRޥɤΥƥݥꥷեŪ˵Ĥ뤳Ȥɬפˤʤޤ\fIsun\&.rmi\&.activation\&.execPolicy\fRץѥƥͤϡư롼ѤJVMư뤿\fIActivationGroupDesc\fRξѤǤ뤫ɤȽǤȤ\fIrmid\fRޥɤѤݥꥷꤷޤܺ٤ϡ\-J\-Dsun\&.rmi\&.activation\&.execPolicy=policyץ򻲾ȤƤ
+\fIrmid\fRコマンドのOracleの実装を実行する場合、デフォルトでは、セキュリティ・ポリシー・ファイルを指定する必要があります。それは、\fIrmid\fRコマンドが起動グループ用にJVMを起動するために各\fIActivationGroupDesc\fR内の情報を使用できるかどうかを検証できるようにするためです特に、\fIActivationGroupDesc\fRコンストラクタに渡される\fICommandEnvironment\fRや任意のプロパティによって指定されるコマンドおよびオプションは、\fIrmid\fRコマンドのセキュリティ・ポリシー・ファイルの中で明示的に許可することが必要になりました。\fIsun\&.rmi\&.activation\&.execPolicy\fRプロパティの値は、起動グループ用にJVMを起動するために\fIActivationGroupDesc\fR内の情報を使用できるかどうかを判断するときに\fIrmid\fRコマンドが使用するポリシーを決定します。詳細は、\-J\-Dsun\&.rmi\&.activation\&.execPolicy=policyオプションの説明を参照してください。
 .PP
-\fIrmid\fRޥɤ¹Ԥȡǥեȡݡ1098ǥƥ١쥸ȥ꤬ư졢\fIActivationSystem\fR쥸ȥ̾\fIjava\&.rmi\&.activation\&.ActivationSystem\fR˥Хɤޤ
+\fIrmid\fRコマンドを実行すると、デフォルト・ポート1098でアクティベータと内部レジストリが起動され、\fIActivationSystem\fRがこの内部レジストリ内の名前\fIjava\&.rmi\&.activation\&.ActivationSystem\fRにバインドされます。
 .PP
-쥸ȥ¾ΥݡȤꤹˤϡ\fIrmid\fRޥɤμ¹Ի\fI\-port\fRץꤹɬפޤȤСΥޥɤϡ쥸ȥΥǥեȡݡ1099ǡưƥࡦǡȥ쥸ȥưޤ
+レジストリに他のポートを指定するには、\fIrmid\fRコマンドの実行時に\fI\-port\fRオプションを指定する必要があります。たとえば、次のコマンドは、レジストリのデフォルト・ポート1099で、起動システム・デーモンとレジストリを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -97,15 +97,15 @@
 .if n \{\
 .RE
 .\}
-.SH "ɬפ˱RMID򳫻"
+.SH "必要に応じてRMIDを開始"
 .PP
-\fIrmid\fR򥳥ޥɥ饤󤫤鳫Ϥˤϡ\fIinetd\fR
-(Oracle Solarisξ)ޤ\fIxinetd\fR
-(Linuxξ)\fIrmid\fRɬפ˱ƳϤˡ⤢ޤ
+\fIrmid\fRをコマンドラインから開始するには、\fIinetd\fR
+(Oracle Solarisの場合)、または\fIxinetd\fR
+(Linuxの場合)を構成して\fIrmid\fRを必要に応じて開始する方法もあります。
 .PP
-RMID򳫻Ϥȡ\fISystem\&.inheritedChannel\fR᥽åɤƤӽФơѾ줿ͥ(\fIinetd\fR/\fIxinetd\fRѾ)褦ȤޤѾ줿ͥ뤬nullǤ뤫\fIjava\&.nio\&.channels\&.ServerSocketChannel\fRΥ󥹥󥹤Ǥʤä硢RMIDϤΥͥ\fIinetd\fR/\fIxinetd\fRˤäƵư줿ΤǤϤʤȽǤҤΤ褦˵ưޤ
+RMIDを開始すると、\fISystem\&.inheritedChannel\fRメソッドを呼び出して、継承されたチャンネル(\fIinetd\fR/\fIxinetd\fRから継承)を取得しようとします。継承されたチャンネルがnullであるか、\fIjava\&.nio\&.channels\&.ServerSocketChannel\fRのインスタンスでなかった場合、RMIDはそのチャンネルは\fIinetd\fR/\fIxinetd\fRによって起動されたものではないと判断し、前述のように起動します。
 .PP
-Ѿ줿ͥ뤬\fIServerSocketChannel\fR󥹥󥹤ǤϡRMIDϥݡȤ⡼ȡ֥ȡĤޤ\fIjava\&.rmi\&.activation\&.ActivationSystem\fRХɤƤ쥸ȥ\fIjava\&.rmi\&.activation\&.Activator\fR⡼ȡ֥ȤФꥯȤ륵СåȤȤơ\fIServerSocketChannel\fR\fIjava\&.net\&.ServerSocket\fRѤޤΥ⡼ɤǤϡRMIDưϡΤȤơޥɥ饤󤫤鵯ưƱǤ
+継承されたチャンネルが\fIServerSocketChannel\fRインスタンスである場合は、RMIDはエクスポートするリモート・オブジェクト、つまり\fIjava\&.rmi\&.activation\&.ActivationSystem\fRがバインドされているレジストリと\fIjava\&.rmi\&.activation\&.Activator\fRリモート・オブジェクトに対するリクエストを受信するサーバー・ソケットとして、\fIServerSocketChannel\fRから取得した\fIjava\&.net\&.ServerSocket\fRを使用します。このモードでは、RMIDの動作は、次のことを除いて、コマンドラインから起動した場合と同じです。
 .sp
 .RS 4
 .ie n \{\
@@ -115,7 +115,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISystem\&.err\fRФϤϡե˥쥯Ȥ롣Υե\fIjava\&.io\&.tmpdir\fRƥࡦץѥƥǻꤵǥ쥯ȥ(̾\fI/var/tmp\fRޤ\fI/tmp\fR)ˤ롣ե̾Ƭ\fIrmid\-err\fRǡ\fItmp\fRǤ롣
+\fISystem\&.err\fRに対する出力は、ファイルにリダイレクトされる。このファイルは\fIjava\&.io\&.tmpdir\fRシステム・プロパティで指定されるディレクトリ(通常は\fI/var/tmp\fRまたは\fI/tmp\fR)にある。ファイル名の接頭辞は\fIrmid\-err\fRで、接尾辞は\fItmp\fRである。
 .RE
 .sp
 .RS 4
@@ -126,7 +126,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-port\fRץϻѤǤޤ󡣤Υץ󤬻ꤵƤ硢RMIDϥ顼åɽƽλޤ
+\fI\-port\fRオプションは使用できません。このオプションが指定されている場合、RMIDはエラー・メッセージが表示されて終了します。
 .RE
 .sp
 .RS 4
@@ -137,17 +137,17 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fI\-log\fRץɬܡΥץ󤬻ꤵƤʤ硢RMIDϥ顼åɽƽλޤ
+\fI\-log\fRオプションは必須。このオプションが指定されていない場合、RMIDはエラー・メッセージが表示されて終了します。
 .RE
 .PP
-ɬפ˱ƥӥ򳫻Ϥ褦˹ˡξܺ٤ϡ\fIinetd\fR
-(Oracle Solarisξ)ޤ\fIxinetd\fR
-(Linux)Υޥ˥奢롦ڡ򻲾ȤƤ
-.SH "ץ"
+必要に応じてサービスを開始するように構成する方法の詳細は、\fIinetd\fR
+(Oracle Solarisの場合)、または\fIxinetd\fR
+(Linux)のマニュアル・ページを参照してください。
+.SH "オプション"
 .PP
-\-C\fIץ\fR
+\-C\fIオプション\fR
 .RS 4
-\fIrmid\fRޥɤλҥץ(ư롼)줿Ȥˡ줾λҥץ˥ޥɥ饤ȤϤ륪ץꤷޤȤСΤ褦˻ꤹȡưƥࡦǡˤäƲۥޥ˥ץѥƥϤȤǤޤ
+\fIrmid\fRコマンドの子プロセス(起動グループ)が作成されたときに、それぞれの子プロセスにコマンドライン引数として渡されるオプションを指定します。たとえば、次のように指定すると、起動システム・デーモンによって生成される各仮想マシンにプロパティを渡すことができます。
 .sp
 .if n \{\
 .RS 4
@@ -158,7 +158,7 @@
 .if n \{\
 .RE
 .\}
-ޥɥ饤ҥץϤǽϡǥХåԤǤȤСΥޥɤǤϡ٤ƤλJVMserver\-call󥰤ǽǤ
+コマンドライン引数を子プロセスに渡す機能は、デバッグを行う場合に便利です。たとえば、次のコマンドでは、すべての子JVMでserver\-callロギングが可能です。
 .sp
 .if n \{\
 .RS 4
@@ -173,7 +173,7 @@
 .PP
 \-J\fIoption\fR
 .RS 4
-RMID¹ԤƤJava󥿥ץ꥿ϤץꤷޤȤС\fIrmid\fRޥɤ\fIrmid\&.policy\fRȤ̾ΥݥꥷեѤ褦˻ꤹˤϡ\fIrmid\fRΥޥɥ饤\fI\-J\fRץѤơ\fIjava\&.security\&.policy\fRץѥƥޤ򼨤ޤ
+RMIDを実行しているJavaインタプリタに渡すオプションを指定します。たとえば、\fIrmid\fRコマンドが\fIrmid\&.policy\fRという名前のポリシー・ファイルを使用するように指定するには、\fIrmid\fRのコマンドラインで\fI\-J\fRオプションを使用して、\fIjava\&.security\&.policy\fRプロパティを定義します。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -188,7 +188,7 @@
 .PP
 \-J\-Dsun\&.rmi\&.activation\&.execPolicy=\fIpolicy\fR
 .RS 4
-ư롼פ¹Ԥ뤳ȤˤʤJVMεư˻Ѥ륳ޥɤӥޥɥ饤󡦥ץå뤿ˡRMIDѤݥꥷꤷޤΥץϡJava RMIưǡOracleμΤߤ¸ߤ뤳ȤդƤޥɥ饤ˤΥץѥƥꤷʤ硢̤\fI\-J\-Dsun\&.rmi\&.activation\&.execPolicy=default\fRꤷƱˤʤޤ\fIpolicy\fR˻ǽͤϡ\fIdefault\fR\fIpolicyClassName\fRޤ\fInone\fRǤ
+起動グループが実行されることになるJVMの起動に使用するコマンドおよびコマンドライン・オプションをチェックするために、RMIDが採用するポリシーを指定します。このオプションは、Java RMI起動デーモンのOracleの実装のみに存在することに注意してください。コマンドラインにこのプロパティを指定しない場合、結果は\fI\-J\-Dsun\&.rmi\&.activation\&.execPolicy=default\fRを指定した場合と同じになります。\fIpolicy\fRに指定可能な値は、\fIdefault\fR、\fIpolicyClassName\fRまたは\fInone\fRです。
 .sp
 .RS 4
 .ie n \{\
@@ -198,35 +198,35 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ǥե
+デフォルト
 .sp
-\fIdefault\fRޤ̤ͤ\fIexecPolicy\fRξ硢\fIrmid\fRޥɤ¹ԤǤΤϡ\fIrmid\fRޥɤѤ륻ƥݥꥷեǡ¹Ԥ븢¤\fIrmid\fRͿƤ륳ޥɤӥޥɥ饤󡦥ץΤߤǤǥեȤμ¹ԥݥꥷǻѤǤΤϡǥեȤεư롼׼ΤߤǤ
+\fIdefault\fRまたは未指定値の\fIexecPolicy\fRの場合、\fIrmid\fRコマンドが実行できるのは、\fIrmid\fRコマンドが使用するセキュリティ・ポリシー・ファイルの中で、実行する権限が\fIrmid\fRに与えられているコマンドおよびコマンドライン・オプションのみです。デフォルトの実行ポリシーで使用できるのは、デフォルトの起動グループ実装のみです。
 .sp
-\fIrmid\fRޥɤϡư롼ѤJVMưȤˡΥ롼פˤĤϿ줿ư롼׵һҤǤ\fIActivationGroupDesc\fRξѤޤ롼׵һҤϡ\fIActivationGroupDesc\&.CommandEnvironment\fRꤷޤ(άǽ)ˤϡư롼פ򳫻Ϥ륳ޥɤȡΥޥɥ饤ɲäǤ륳ޥɥ饤󡦥ץ󤬴ޤޤƤޤǥեȤǤϡ\fIrmid\fRޥɤ\fIjava\&.home\fRˤ\fIjava\fRޥɤѤޤ롼׵һҤˤϡޥɥ饤˥ץȤɲäץѥƥС饤ɤޤޤޤ(\fI\-D<property>=<value>\fRȤޤ)\fIcom\&.sun\&.rmi\&.rmid\&.ExecPermission\fR¤\fIrmid\fRޥɤˡư롼פ򳫻Ϥ뤿˥롼׵һҤ\fICommandEnvironment\fRǻꤵ줿ޥɤ¹Ԥ븢¤Ϳޤ\fIcom\&.sun\&.rmi\&.rmid\&.ExecOptionPermission\fR¤ϵư롼פγϻˡ롼׵һҤǥץѥƥС饤ɤȤơޤ\fICommandEnvironment\fRǥץȤƻꤵ줿ޥɥ饤󡦥ץ\fIrmid\fRޥɤѤ뤳ȤĤޤ\fIrmid\fRޥɤ͡ʥޥɤӥץ¹Ԥ븢¤Ϳ硢\fIExecPermission\fR\fIExecOptionPermission\fR򤹤٤ƤΥɡͿɬפޤ
+\fIrmid\fRコマンドは、起動グループ用のJVMを起動するときに、そのグループについて登録された起動グループ記述子である\fIActivationGroupDesc\fR内の情報を使用します。グループ記述子は、\fIActivationGroupDesc\&.CommandEnvironment\fRを指定します(省略可能)。これには、起動グループを開始するコマンドと、そのコマンドラインに追加できるコマンドライン・オプションが含まれています。デフォルトでは、\fIrmid\fRコマンドは\fIjava\&.home\fRにある\fIjava\fRコマンドを使用します。グループ記述子には、コマンドラインにオプションとして追加されるプロパティ・オーバーライドも含まれます(\fI\-D<property>=<value>\fRとして定義されます)。\fIcom\&.sun\&.rmi\&.rmid\&.ExecPermission\fR権限は\fIrmid\fRコマンドに、起動グループを開始するためにグループ記述子の\fICommandEnvironment\fRで指定されたコマンドを実行する権限を付与します。\fIcom\&.sun\&.rmi\&.rmid\&.ExecOptionPermission\fR権限は起動グループの開始時に、グループ記述子でプロパティ・オーバーライドとして、または\fICommandEnvironment\fRでオプションとして指定されたコマンドライン・オプションを、\fIrmid\fRコマンドが使用することを許可します。\fIrmid\fRコマンドに様々なコマンドおよびオプションを実行する権限を付与する場合、権限\fIExecPermission\fRおよび\fIExecOptionPermission\fRをすべてのコード・ソースに付与する必要があります。
 .sp
 \fBExecPermission\fR
 .sp
-\fIExecPermission\fR饹ϡư롼פ򳫻Ϥ뤿\fIrmid\fRޥɤΥޥɤ¹Ԥ븢¤ɽޤ
+\fIExecPermission\fRクラスは、起動グループを開始するために\fIrmid\fRコマンドが特定のコマンドを実行する権限を表します。
 .sp
-\fBʸ\fR:
-\fIExecPermission\fR̾ϡ\fIrmid\fRޥɤ˼¹ԤĤ륳ޥɤΥѥ̾Ǥå(/)ӥꥹ(*)ǽѥ̾ϡΥǥ쥯ȥ˴ޤޤ뤹٤ƤΥե򼨤ޤåϥեڤʸ\fIFile\&.separatorChar\fRǤå(/)ӥޥʥ(\-)ǽѥ̾ϡΥǥ쥯ȥ˴ޤޤ뤹٤ƤΥեȥ֥ǥ쥯ȥ(ƵŪ)򼨤ޤѥ̤̾ʥȡ\fI<<ALL FILES>>\fRꤷϡǤդΥե򼨤ޤ
+\fB構文\fR:
+\fIExecPermission\fRの名前は、\fIrmid\fRコマンドに実行を許可するコマンドのパス名です。スラッシュ(/)およびアスタリスク(*)で終わるパス名は、そのディレクトリに含まれるすべてのファイルを示します。スラッシュはファイル区切り文字\fIFile\&.separatorChar\fRです。スラッシュ(/)およびマイナス符号(\-)で終わるパス名は、そのディレクトリに含まれるすべてのファイルとサブディレクトリ(再帰的に)を示します。パス名に特別なトークン\fI<<ALL FILES>>\fRを指定した場合は、任意のファイルを示します。
 .sp
-ѥ̾˥ꥹ(*)ꤷϡߤΥǥ쥯ȥΤ٤ƤΥե򼨤ޤѥ̾˥ޥʥ(\-)ꤷϡߤΥǥ쥯ȥΤ٤ƤΥե뤪(ƵŪ)ߤΥǥ쥯ȥ˴ޤޤ뤹٤ƤΥեȥ֥ǥ쥯ȥ򼨤ޤ
+パス名にアスタリスク(*)を指定した場合は、現在のディレクトリ内のすべてのファイルを示します。パス名にマイナス符号(\-)を指定した場合は、現在のディレクトリ内のすべてのファイルおよび(再帰的に)現在のディレクトリに含まれるすべてのファイルとサブディレクトリを示します。
 .sp
 \fBExecOptionPermission\fR
 .sp
-\fIExecOptionPermission\fR饹ϡư롼פ򳫻ϤȤ\fIrmid\fRޥɤΥޥɥ饤󡦥ץѤǤ븢¤ɽޤ\fIExecOptionPermission\fR̾ϡޥɥ饤󡦥ץͤǤ
+\fIExecOptionPermission\fRクラスは、起動グループを開始するときに\fIrmid\fRコマンドで特定のコマンドライン・オプションを使用できる権限を表します。\fIExecOptionPermission\fRの名前は、コマンドライン・オプションの値です。
 .sp
-\fBʸ\fR: ץǤϡ磻ɥɤŪ˥ݡȤޤꥹϡ磻ɥɡޥåɽޤꥹ(*)ϡץ̾ΤΤȤƻѤǤޤĤޤꡢǤդΥץɽȤǤޤޤץ̾˻Ѥ뤳ȤǤޤɥå(\&.)(=)ľ˥ꥹ(*)ꤹɬפޤ
+\fB構文\fR: オプションでは、ワイルドカードが限定的にサポートされます。アスタリスクは、ワイルドカード・マッチを表します。アスタリスク(*)は、オプション名そのものとして使用できます。つまり、任意のオプションを表すことができます。また、オプション名の末尾に使用することもできます。ただし、ドット(\&.)か等号(=)の直後にアスタリスク(*)を指定する必要があります。
 .sp
-:
-\fI*\fR\fI\-Dmydir\&.*\fR\fI\-Da\&.b\&.c=*\fRͭǤ\fI*mydir\fR\fI\-Da*b\fR\fIab*\fR̵Ǥ
+例:
+\fI*\fRや\fI\-Dmydir\&.*\fRや\fI\-Da\&.b\&.c=*\fRは有効ですが、\fI*mydir\fRや\fI\-Da*b\fRや\fIab*\fRは無効です。
 .sp
-\fBrmidΥݥꥷե\fR
+\fBrmidのポリシー・ファイル\fR
 .sp
-\fIrmid\fRޥɤ͡ʥޥɤӥץ¹Ԥ븢¤Ĥϡ\fIExecPermission\fR\fIExecOptionPermission\fR򤹤٤ƤΥɡͿɬפޤ(Ū)θ¤åΤ\fIrmid\fRޥɤΤߤʤΤǡθ¤ŪͿƤǤ
+\fIrmid\fRコマンドに様々なコマンドおよびオプションを実行する権限を許可する場合は、権限\fIExecPermission\fRおよび\fIExecOptionPermission\fRをすべてのコード・ソースに付与する必要があります(汎用的に)。これらの権限をチェックするのは\fIrmid\fRコマンドのみなので、これらの権限を汎用的に付与しても安全です。
 .sp
-\fIrmid\fRޥɤ˳Ƽμ¹Ը¤Ϳݥꥷե򡢼˼ޤ
+\fIrmid\fRコマンドに各種の実行権限を付与するポリシー・ファイルの例を、次に示します。
 .sp
 .if n \{\
 .RS 4
@@ -252,11 +252,11 @@
 .if n \{\
 .RE
 .\}
-ǽͿƤ븢¤ϡ\fIrmid\fRޥɤФѥ̾ˤŪ˻ꤵ\fIjava\fRޥɤ1\&.7\&.0꡼μ¹ԤĤޤǥեȤǤϡ\fIjava\&.home\fRˤС\fIjava\fRޥɤѤޤ\fIrmid\fRޥɤѤΤƱС󤬻Ѥ뤿ᡢΥޥɤϡݥꥷեǻꤹɬפϤޤ2ܤθ¤ϡ\fIrmid\fRޥɤФơǥ쥯ȥ\fI/files/apps/rmidcmds\fRǤդΥޥɤμ¹Ը¤Ĥޤ
+最初に付与されている権限は、\fIrmid\fRコマンドに対し、パス名により明示的に指定される\fIjava\fRコマンドの1\&.7\&.0リリースの実行を許可します。デフォルトでは、\fIjava\&.home\fRにあるバージョンの\fIjava\fRコマンドを使用します。\fIrmid\fRコマンドが使用するのと同じバージョンが使用されるため、そのコマンドは、ポリシー・ファイルで指定する必要はありません。2番目の権限は、\fIrmid\fRコマンドに対して、ディレクトリ\fI/files/apps/rmidcmds\fR内の任意のコマンドの実行権限を許可します。
 .sp
-3ܤͿƤ븢\fIExecOptionPermission\fRϡ\fIrmid\fRޥɤФơƥݥꥷե\fI/files/policies/group\&.policy\fRȤƤ뵯ư롼פγϤĤޤθ¤ϡư롼פ\fIjava\&.security\&.debug property\fRѤ뤳ȤĤƤޤǸθ¤ϡư롼פ\fIsun\&.rmi property\fR̾γǤդΥץѥƥѤ뤳ȤĤƤޤ
+3番目に付与されている権限\fIExecOptionPermission\fRは、\fIrmid\fRコマンドに対して、セキュリティ・ポリシー・ファイルを\fI/files/policies/group\&.policy\fRとして定義している起動グループの開始を許可します。次の権限は、起動グループが\fIjava\&.security\&.debug property\fRを使用することを許可しています。最後の権限は、起動グループが\fIsun\&.rmi property\fR名の階層内の任意のプロパティを使用することを許可しています。
 .sp
-ݥꥷեꤷ\fIrmid\fRޥɤưˤϡ\fIrmid\fRΥޥɥ饤\fIjava\&.security\&.policy\fRץѥƥꤹɬפޤ򼨤ޤ
+ポリシー・ファイルを指定して\fIrmid\fRコマンドを起動するには、\fIrmid\fRのコマンドラインで\fIjava\&.security\&.policy\fRプロパティを指定する必要があります。次に例を示します。
 .sp
 \fIrmid \-J\-Djava\&.security\&.policy=rmid\&.policy\fR\&.
 .RE
@@ -271,9 +271,9 @@
 .\}
 <policyClassName>
 .sp
-ǥեȤưǤϽʬʽʤ硢Ԥϡ\fIrmid\fRεưˡ\fIcheckExecCommand\fR᥽åɤ°륯饹̾ꤷơ\fIrmid\fRޥɤ¹Ԥ륳ޥɤå뤳ȤǤޤ
+デフォルトの動作では十分な柔軟性が得られない場合、管理者は、\fIrmid\fRの起動時に、\fIcheckExecCommand\fRメソッドが所属するクラスの名前を指定して、\fIrmid\fRコマンドが実行するコマンドをチェックすることができます。
 .sp
-\fIpolicyClassName\fRˤϡʤΥ󥹥ȥ饯Τ褦\fIcheckExecCommand\fR᥽åɤƤpublic饹ꤷޤ
+\fIpolicyClassName\fRには、引数なしのコンストラクタを持ち、次のような\fIcheckExecCommand\fRメソッドを実装しているpublicクラスを指定します。
 .sp
 .if n \{\
 .RS 4
@@ -285,7 +285,7 @@
 .if n \{\
 .RE
 .\}
-ư롼פ򳫻Ϥˡ\fIrmid\fRޥɤϡݥꥷ\fIcheckExecCommand\fR᥽åɤƤӽФޤΤȤư롼פεһҤȡư롼פ򳫻Ϥ뤿δʥޥɤޤ򤽤Υ᥽åɤϤޤ\fIcheckExecCommand\fR\fISecurityException\fR򥹥ȡ\fIrmid\fRޥɤϤεư롼פ򳫻Ϥ֥ȤεưԤƤƽФ¦ˤ\fIActivationException\fRޤ
+起動グループを開始する前に、\fIrmid\fRコマンドは、ポリシーの\fIcheckExecCommand\fRメソッドを呼び出します。このとき、起動グループの記述子と、起動グループを開始するための完全なコマンドを含む配列をそのメソッドに渡します。\fIcheckExecCommand\fRが\fISecurityException\fRをスローすると、\fIrmid\fRコマンドはその起動グループを開始せず、オブジェクトの起動を試行している呼出し側には\fIActivationException\fRがスローされます。
 .RE
 .sp
 .RS 4
@@ -298,18 +298,18 @@
 .\}
 none
 .sp
-\fIsun\&.rmi\&.activation\&.execPolicy\fRץѥƥͤ\fInone\fRξ硢\fIrmid\fRޥɤϡư롼פ򳫻Ϥ륳ޥɤޤäڤޤ
+\fIsun\&.rmi\&.activation\&.execPolicy\fRプロパティの値が\fInone\fRの場合、\fIrmid\fRコマンドは、起動グループを開始するコマンドをまったく検証しません。
 .RE
 .RE
 .PP
 \-log \fIdir\fR
 .RS 4
-ưƥࡦǡ󤬥ǡ١ӴϢ񤭹Τ˻Ѥǥ쥯ȥ̾ꤷޤǥեȤǤϡ\fIrmid\fRޥɤ¹Ԥǥ쥯ȥˡlogȤǥ쥯ȥ꤬ޤ
+起動システム・デーモンがデータベースおよび関連情報を書き込むのに使用するディレクトリの名前を指定します。デフォルトでは、\fIrmid\fRコマンドを実行したディレクトリに、logというログ・ディレクトリが作成されます。
 .RE
 .PP
 \-port \fIport\fR
 .RS 4
-쥸ȥ꤬ѤݡȤꤷޤưƥࡦǡϡΥ쥸ȥǡ\fIjava\&.rmi\&.activation\&.ActivationSystem\fRȤ̾\fIActivationSystem\fRХɤޤ롦ޥ\fIActivationSystem\fRϡΤ褦\fINaming\&.lookup\fR᥽åɤƤӽФȤˤäƼǤޤ
+レジストリが使用するポートを指定します。起動システム・デーモンは、このレジストリの中で、\fIjava\&.rmi\&.activation\&.ActivationSystem\fRという名前で\fIActivationSystem\fRをバインドします。ローカル・マシン上の\fIActivationSystem\fRは、次のように\fINaming\&.lookup\fRメソッドを呼び出すことによって取得できます。
 .sp
 .if n \{\
 .RS 4
@@ -328,16 +328,16 @@
 .PP
 \-stop
 .RS 4
-\fI\-port\fRץˤäƻꤵ줿ݡȤΡߤ\fIrmid\fRޥɤθƽФߤޤݡȤꤵƤʤϡΥץϥݡ1098Ǽ¹ԤƤ\fIrmid\fRθƽФߤޤ
+\fI\-port\fRオプションによって指定されたポートの、現在の\fIrmid\fRコマンドの呼出しを停止します。ポートが指定されていない場合は、このオプションはポート1098で実行されている\fIrmid\fRの呼出しを停止します。
 .RE
-.SH "Ķѿ"
+.SH "環境変数"
 .PP
 CLASSPATH
 .RS 4
-桼饹ؤΥѥ򥷥ƥ˻ꤷޤǥ쥯ȥϥǶڤޤ:
+ユーザー定義クラスへのパスをシステムに指定します。ディレクトリはコロンで区切られます。例:
 \fI\&.:/usr/local/java/classes\fR
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: rmiregistry
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "rmiregistry" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "rmiregistry" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-rmiregistry \- ߤΥۥȤλꤷݡȾ˥⡼ȡ֥ȡ쥸ȥ򳫻Ϥޤ
-.SH ""
+rmiregistry \- 現在のホストの指定したポート上にリモート・オブジェクト・レジストリを開始します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,11 +64,11 @@
 .PP
 \fIport\fR
 .RS 4
-⡼ȡ֥ȡ쥸ȥ򳫻Ϥ븽ߤΥۥȾ\fIport\fRο
+リモート・オブジェクト・レジストリを開始する現在のホスト上の\fIport\fRの数。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIrmiregistry\fRޥɤϡߤΥۥȤλꤷݡȾ˥⡼ȡ֥ȡ쥸ȥϤޤportλά硢쥸ȥϥݡ1099dzϤޤ\fIrmiregistry\fRޥɤˡϵǽϤޤ̾ϥХå饦ɤǼ¹Ԥޤ򼨤ޤ
+\fIrmiregistry\fRコマンドは、現在のホストの指定したポート上にリモート・オブジェクト・レジストリを作成し、開始します。portの指定を省略した場合、レジストリはポート1099で開始します。\fIrmiregistry\fRコマンドに、出力機能はありません。通常、これはバックグラウンドで実行されます。次に例を示します。
 .sp
 .if n \{\
 .RS 4
@@ -80,20 +80,20 @@
 .RE
 .\}
 .PP
-⡼ȡ֥ȡ쥸ȥϡ֡ȥȥåפΥ͡ࡦӥǤƱۥȤRMIС⡼ȡ֥Ȥ̾˥Хɤ뤿˻Ѥޤˡ뤪ӥ⡼ȡۥȤΥ饤Ȥϥ⡼ȡ֥Ȥ򸡺⡼ȡ᥽åɤθƽФԤޤ
+リモート・オブジェクト・レジストリは、ブートストラップのネーム・サービスです。同一ホストのRMIサーバーが、リモート・オブジェクトを名前にバインドするために使用されます。次に、ローカルおよびリモート・ホストのクライアントはリモート・オブジェクトを検索し、リモート・メソッドの呼出しを行います。
 .PP
-쥸ȥϡŪˡǽΥ⡼ȡ֥Ȥΰ֤ꤷޤǡץꥱϥ᥽åɤƤӽФɬפޤθ塢Υ֥ȤϥץꥱΥݡȤ󶡤¾Υ֥Ȥõޤ
+レジストリは、一般的に、最初のリモート・オブジェクトの位置を指定します。そこで、アプリケーションはメソッドを呼び出す必要があります。その後、そのオブジェクトはアプリケーション指定のサポートを提供し、他のオブジェクトを探します。
 .PP
-\fIjava\&.rmi\&.registry\&.LocateRegistry\fR饹Υ᥽åɤϡ롦ۥȡޤϥ롦ۥȤȥݡȤư쥸ȥ뤿˻Ѥޤ
+\fIjava\&.rmi\&.registry\&.LocateRegistry\fRクラスのメソッドは、ローカル・ホスト、またはローカル・ホストとポートで動作するレジストリを取得するために使用されます。
 .PP
-\fIjava\&.rmi\&.Naming\fR饹URL١᥽åɤϥ쥸ȥФ¹ԤǤդΥۥȤӥ롦ۥȤǤΥ⡼ȡ֥Ȥθ˻ѤǤޤñ̾(ʸ)⡼ȡ֥Ȥ˥Хɤ̾⡼ȡ֥Ȥ˺ƥХɤ(ŤХɤ򥪡С饤)⡼ȡ֥Ȥ򥢥Хɤ쥸ȥ˥ХɤƤURLꥹɽޤ
-.SH "ץ"
+\fIjava\&.rmi\&.Naming\fRクラスのURLベース・メソッドはレジストリに対して操作を実行し、任意のホストおよびローカル・ホストでのリモート・オブジェクトの検索に使用できます。単純名(文字列)をリモート・オブジェクトにバインドし、新しい名前をリモート・オブジェクトに再バインドし(古いバインドをオーバーライド)、リモート・オブジェクトをアンバインドし、レジストリにバインドされているURLをリスト表示します。
+.SH "オプション"
 .PP
 \-J
 .RS 4
-JavaץȤȤ˻Ѥơ\fI\-J\fRθ³ץJava󥿥ץ꥿˰Ϥޤ(\fI\-J\fRȥץδ֤˥ڡޤ)
+Javaオプションとともに使用して、\fI\-J\fRの後ろに続くオプションをJavaインタプリタに引き渡します(\fI\-J\fRとオプションの間にスペースは入れません)。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -114,7 +114,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjava\&.rmi\&.registry\&.LocateRegistry\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/registry/LocateRegistry\&.html)
+\fI「java\&.rmi\&.registry\&.LocateRegistry」\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/registry/LocateRegistry\&.html)
 .RE
 .sp
 .RS 4
@@ -125,7 +125,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIjava\&.rmi\&.Naming class description\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/Naming\&.html)
+\fI「java\&.rmi\&.Naming class description」\fR(http://docs\&.oracle\&.com/javase/8/docs/api/java/rmi/Naming\&.html)
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: schemagen
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "schemagen" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "schemagen" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-schemagen \- Java饹ǻȤƤ͡ॹڡȤ˥ޤޤ
-.SH ""
+schemagen \- Javaクラス内で参照されているネームスペースごとにスキーマを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,19 +64,19 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIjava\-files\fR
 .RS 4
-Java饹ե롣
+処理するJavaクラス・ファイル。
 .RE
-.SH ""
+.SH "説明"
 .PP
-ޡͥ졼ϡJava饹ǻȤƤ͡ॹڡȤ1ĤΥޡեޤߡ륹ޡե̾Ǥޤ󡣥ޡե̾椹ϡhttp://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/schemagenTask\&.htmlˤ
-Using SchemaGen with Antפ򻲾ȤƤ
+スキーマ・ジェネレータは、Javaクラス内で参照されているネームスペースごとに1つのスキーマ・ファイルを作成します。現在、生成されるスキーマ・ファイルの名前は制御できません。スキーマ・ファイル名を制御する場合は、http://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/schemagenTask\&.htmlにある
+「Using SchemaGen with Ant」を参照してください
 .PP
-ץåȥեbinǥ쥯ȥˤŬڤ\fIschemagen\fR롦ץȤѤơޡͥ졼ưޤߤΥޡͥ졼ϡJavaեȥ饹եΤǤޤ
+プラットフォームのbinディレクトリにある適切な\fIschemagen\fRシェル・スクリプトを使用して、スキーマ・ジェネレータを起動します。現在のスキーマ・ジェネレータは、Javaソース・ファイルとクラス・ファイルのいずれも処理できます。
 .sp
 .if n \{\
 .RS 4
@@ -89,44 +89,44 @@
 .RE
 .\}
 .PP
-javaե뤬¾Υ饹򻲾ȤƤ硢Υ饹˥ƥ\fICLASSPATH\fRĶѿǥǤɬפޤޤϡ饹ѥץꤷ\fIschemagen\fRޥɡ饤ǻꤹɬפޤץ򻲾ȤƤȤե˥ǤʤޤϻȤե뤬ꤵƤʤ硢ޤ˥顼ɽޤ
-.SH "ץ"
+javaファイルが他のクラスを参照している場合、それらのクラスにシステム\fICLASSPATH\fR環境変数でアクセスできる必要があります。または、クラス・パス・オプションを指定して\fIschemagen\fRコマンド・ラインで指定する必要があります。オプションを参照してください。参照されるファイルにアクセスできない、または参照されるファイルが指定されていない場合、スキーマの生成時にエラーが表示されます。
+.SH "オプション"
 .PP
 \-d \fIpath\fR
 .RS 4
-\fIschemagen\fRޥɤץå\fIjavac\fR饹ե֤ꡣ
+\fIschemagen\fRコマンドがプロセッサ生成および\fIjavac\fR生成クラス・ファイルを配置する場所。
 .RE
 .PP
 \-cp \fIpath\fR
 .RS 4
-\fIschemagen\fRޥɤ桼ե֤ꡣ
+\fIschemagen\fRコマンドがユーザー指定ファイルを配置する場所。
 .RE
 .PP
 \-classpath \fIpath\fR
 .RS 4
-\fIschemagen\fRޥɤ桼ե֤ꡣ
+\fIschemagen\fRコマンドがユーザー指定ファイルを配置する場所。
 .RE
 .PP
 \-encoding \fIencoding\fR
 .RS 4
-\fIapt\fRޤ\fIjavac\fRޥɤθƽФ˻Ѥ륨󥳡ǥ󥰤ꤷޤ
+\fIapt\fRまたは\fIjavac\fRコマンドの呼出しに使用するエンコーディングを指定します。
 .RE
 .PP
 \-episode \fIfile\fR
 .RS 4
-ѥ뤴Ȥ˥ԥɡեޤ
+コンパイルごとにエピソード・ファイルを生成します。
 .RE
 .PP
 \-version
 .RS 4
-꡼ɽޤ
+リリース情報を表示します。
 .RE
 .PP
 \-help
 .RS 4
-إסåɽޤ
+ヘルプ・メッセージを表示します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: serialver
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Remote Method Invocation (RMI)ġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Remote Method Invocation (RMI)ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "serialver" "1" "2013ǯ1121" "JDK 8" "Remote Method Invocation (RMI)"
+.TH "serialver" "1" "2013年11月21日" "JDK 8" "Remote Method Invocation (RMI)"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-serialver \- ꤷ饹Υꥢ롦СUIDᤷޤ
-.SH ""
+serialver \- 指定したクラスのシリアル・バージョンUIDを戻します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,35 +64,35 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIclassnames\fR
 .RS 4
-\fIserialVersionUID\fR᤹饹Ǥ
+\fIserialVersionUID\fRを戻すクラスです。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIserialver\fRޥɤϡ1İʾΥ饹\fIserialVersionUID\fRŸƤ륯饹إԡΤŬ֤ޤʤǸƤӽФ줿硢\fIserialver\fRޥɤϻΨԤϤޤ
-.SH "ץ"
+\fIserialver\fRコマンドは、1つ以上のクラスの\fIserialVersionUID\fRを、展開しているクラスへコピーするのに適した形式で返します。引数なしで呼び出された場合、\fIserialver\fRコマンドは使用率行を出力します。
+.SH "オプション"
 .PP
 \-classpath \fIpath\-files\fR
 .RS 4
-ץꥱΥ饹ӥ꥽θѥꤷޤ饹ȥ꥽򥳥(:)Ƕڤޤ
+アプリケーションのクラスおよびリソースの検索パスを設定します。クラスとリソースをコロン(:)で区切ります。
 .RE
 .PP
 \-show
 .RS 4
-ñʥ桼󥿥եɽޤΥ饹̾ϤơEnterɽץܥ򲡤\fIserialVersionUID\fRɽޤ
+簡単なユーザー・インタフェースを表示します。完全指定のクラス名を入力して、Enterキーか「表示」ボタンを押し、\fIserialVersionUID\fRを表示します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤoptionˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。optionには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH ""
+.SH "注意"
 .PP
-\fIserialver\fRޥɤϡꤵ줿饹򤽤βۥޥɤ߹ǽޤǥեȤǤϥƥޥ͡ϹԤޤ󡣿Ǥʤ饹ȤȤ\fIserialver\fRޥɤ¹ԤˤϡΥץѤƥƥޥ͡Ǥޤ
+\fIserialver\fRコマンドは、指定されたクラスをその仮想マシン内に読み込んで初期化しますが、デフォルトではセキュリティ・マネージャの設定は行いません。信頼できないクラスとともに\fIserialver\fRコマンドを実行する場合には、次のオプションを使用してセキュリティ・マネージャを設定できます。
 .sp
 .if n \{\
 .RS 4
@@ -104,7 +104,7 @@
 .RE
 .\}
 .PP
-ɬפǤСΥץѤƥƥݥꥷǤޤ
+必要であれば、次のオプションを使用してセキュリティ・ポリシーを指定できます。
 .sp
 .if n \{\
 .RS 4
@@ -115,7 +115,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -136,8 +136,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://docs\&.oracle\&.com/javase/8/docs/api/java/io/ObjectStreamClass\&.htmlˤ
-\fIjava\&.io\&.ObjectStream\fR饹
+http://docs\&.oracle\&.com/javase/8/docs/api/java/io/ObjectStreamClass\&.htmlにある
+\fIjava\&.io\&.ObjectStream\fRクラス記述
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: servertool
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "servertool" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "servertool" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-servertool \- ȯԤ³СϿϿưߤ뤿λȤ䤹桼󥿥ե󶡤ޤ
-.SH ""
+servertool \- 開発者が永続サーバーを登録、登録解除、起動、停止するための使いやすいユーザー・インタフェースを提供します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,35 +64,35 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 commands
 .RS 4
-ޥɥ饤󡦥ޥɡޥɤ򻲾ȤƤ
+コマンドライン・コマンド。コマンドを参照してください。
 .RE
 .PP
 \fIservertool\fR\fIservertool >\fR\fIservertool >\fR
-.SH ""
+.SH "説明"
 .PP
-\fIservertool\fRޥɤϡȯԤ³СϿϿưߤ뤿Υޥɥ饤󡦥󥿥ե󶡤ޤޥɥ饤󡦥ޥɤѤȡС˴ؤ͡׾Ǥޤޥɤ򻲾ȤƤ
-.SH "ץ"
+\fIservertool\fRコマンドは、開発者が永続サーバーを登録、登録解除、起動、停止するためのコマンドライン・インタフェースを提供します。コマンドライン・コマンドを使用すると、サーバーに関する様々な統計情報を取得できます。コマンドを参照してください。
+.SH "オプション"
 .PP
 \-ORBInitialHost \fInameserverhost\fR
 .RS 4
-ΥץɬܤǤ͡ࡦС¹Ԥ졢忮ꥯȤꥹ˥󥰤ۥȡޥꤷޤ\fInameserverhost\fRͤϡ\fIorb\fR¹Ԥ졢ꥯȤꥹ˥󥰤ƤݡȤꤹɬפޤΥץꤷʤ硢ͤϥǥեȤ\fIlocalhost\fRꤵޤ\fIorbd\fR\fIservertool\fRۤʤޥǼ¹ԤƤϡ\fIorbd\fR¹ԤƤۥȤ̾ޤIPɥ쥹ꤹɬפޤ
+このオプションは必須です。ネーム・サーバーが実行され、着信リクエストをリスニングするホスト・マシンを指定します。\fInameserverhost\fR値は、\fIorb\fRが実行され、リクエストをリスニングしているポートを指定する必要があります。このオプションを指定しない場合、値はデフォルトで\fIlocalhost\fRに設定されます。\fIorbd\fRと\fIservertool\fRが異なるマシン上で実行されている場合は、\fIorbd\fRが実行されているホストの名前またはIPアドレスを指定する必要があります。
 .sp
-\fB:\fR
-Oracle SolarisǤϡ1024꾮ݡȾǥץ򳫻Ϥˤϡroot桼ˤʤɬפޤ\fInameserverport\fRͤˤϡ1024ʾΥݡֹѤ뤳Ȥᤷޤ
+\fB注意:\fR
+Oracle Solarisでは、1024より小さいポート上でプロセスを開始するには、rootユーザーになる必要があります。\fInameserverport\fR値には、1024以上のポート番号を使用することをお薦めします。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH "ޥ"
+.SH "コマンド"
 .PP
-\fIservertool\fRޥɤϡޥɥ饤󡦥ޥɤѤơޤϻѤ˵ưǤޤ
+\fIservertool\fRコマンドは、コマンドライン・コマンドを使用して、または使用せずに起動できます。
 .sp
 .RS 4
 .ie n \{\
@@ -102,8 +102,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIservertool\fRεư˥ޥɤꤷʤä硢ޥɥ饤󡦥ġ˥ޥϤ\fIservertool\fRץץȤɽޤ:
-\fIservertool >\fR
+\fIservertool\fRの起動時にコマンドを指定しなかった場合、コマンドライン・ツールにコマンド入力を求める\fIservertool\fRプロンプトが表示されます:
+\fIservertool >\fR。
 .RE
 .sp
 .RS 4
@@ -114,75 +114,75 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIservertool\fRεư˥ޥɤꤷ硢Java IDL Server Toolưƥޥɤ¹Ԥλޤ
+\fIservertool\fRの起動時にコマンドを指定した場合、Java IDL Server Toolが起動してコマンドを実行し、終了します。
 .RE
 .PP
 register \-server \fIserver\-class\-name\fR \-classpath \fIclasspath\-to\-server\fR [ \-applicationName \fIapplication\-name\fR \-args \fIargs\-to\-server\fR \-vmargs \fIflags\-for\-JVM\fR ]
 .RS 4
-Object Request Broker Daemon (ORBD)˿³СϿޤС̤Ͽξ硢ϿƥƥֲޤΥޥɤˤäơ\fI\-server\fRץǼ̤륵С\fIᥤ\fR饹ǥ󥹥ȡ롦᥽åɤƤӽФޤΥ󥹥ȡ롦᥽åɤϡ\fIpublic static void install(org\&.omg\&.CORBA\&.ORB)\fRˤʤäƤɬפޤ󥹥ȡ롦᥽åɤϥץǤꡢȯԤϥǡ١ޤκʤȼΥС󥹥ȡưǤޤ
+Object Request Broker Daemon (ORBD)に新規永続サーバーを登録します。サーバーが未登録の場合、登録してアクティブ化します。このコマンドによって、\fI\-server\fRオプションで識別されるサーバーの\fIメイン\fR・クラス内でインストール・メソッドが呼び出されます。このインストール・メソッドは、\fIpublic static void install(org\&.omg\&.CORBA\&.ORB)\fRになっている必要があります。インストール・メソッドはオプションであり、開発者はデータベース・スキーマの作成など独自のサーバー・インストール動作を指定できます。
 .RE
 .PP
 unregister \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR
 .RS 4
-СIDޤϥץꥱ̾ǡСORBDϿޤΥޥɤˤäơ\fI\-server\fRץǼ̤륵С\fIᥤ\fR饹ǥ󥤥󥹥ȡ롦᥽åɤƤӽФޤ
-\fIuninstall\fR᥽åɤϡ\fIpublic static void uninstall(org\&.omg\&.CORBA\&.ORB)\fRˤʤäƤɬפޤ\fIuninstall\fR᥽åɤϥץǤꡢȯԤ\fIinstall\fR᥽åɤưμäʤɡȼΥС󥤥󥹥ȡưǤޤ
+サーバーIDまたはアプリケーション名で、サーバーをORBDから登録解除します。このコマンドによって、\fI\-server\fRオプションで識別されるサーバーの\fIメイン\fR・クラス内でアンインストール・メソッドが呼び出されます。
+\fIuninstall\fRメソッドは、\fIpublic static void uninstall(org\&.omg\&.CORBA\&.ORB)\fRになっている必要があります。\fIuninstall\fRメソッドはオプションであり、開発者は\fIinstall\fRメソッドの動作の取消など、独自のサーバー・アンインストール動作を指定できます。
 .RE
 .PP
 getserverid \-applicationName \fIapplication\-name\fR
 .RS 4
-\fIapplication\-name\fRͤб륵СID֤ޤ
+\fIapplication\-name\fR値に対応するサーバーIDを返します。
 .RE
 .PP
 list
 .RS 4
-ORBDϿƤ뤹٤Ƥα³С˴ؤɽޤ
+ORBDに登録されているすべての永続サーバーに関する情報を一覧表示します。
 .RE
 .PP
 listappnames
 .RS 4
-ORBDϿƤ뤹٤ƤΥСΥץꥱ̾ɽޤ
+現在ORBDに登録されているすべてのサーバーのアプリケーション名を一覧表示します。
 .RE
 .PP
 listactive
 .RS 4
-ORBDˤäƵư졢߼¹ԤƤ뤹٤Ƥα³С˴ؤɽޤ
+ORBDによって起動され、現在実行されているすべての永続サーバーに関する情報を一覧表示します。
 .RE
 .PP
 locate \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR [ \-endpointType \fIendpointType\fR ]
 .RS 4
-Ͽ줿СǺ٤ƤORBΥפˤĤƥɥݥ(ݡ)򸡽ФޤС¹ԤƤʤ硢ƥֲޤ\fIendpointType\fRͤꤵƤʤ硢СORBȤ˴ϢդƤplainפޤnon\-protectedפΥɥݥȤ֤ޤ
+登録されたサーバーで作成したすべてのORBの特定のタイプについてエンドポイント(ポート)を検出します。サーバーが実行されていない場合、アクティブ化されます。\fIendpointType\fR値が指定されていない場合、サーバーのORBごとに関連付けられているplainタイプまたはnon\-protectedタイプのエンドポイントが返されます。
 .RE
 .PP
 locateperorb \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR [ \-orbid \fIORB\-name\fR ]
 .RS 4
-Ͽ줿СObject Request Broker (ORB)Ͽ줿ɥݥ(ݡ)򸡽ФޤС¹ԤƤʤ硢ƥֲޤ\fIorbid\fRꤵƤʤ硢ǥեͤ\fI""\fR\fIorbid\fR˳ƤޤORBʸ\fIorbid\fRǺƤ硢ϿݡȤ٤֤ޤ
+登録されたサーバーの特定のObject Request Broker (ORB)で登録されたエンドポイント(ポート)を検出します。サーバーが実行されていない場合、アクティブ化されます。\fIorbid\fRが指定されていない場合、デフォルト値の\fI""\fRが\fIorbid\fRに割り当てられます。ORBが空文字列の\fIorbid\fRで作成されている場合、登録したポートがすべて返されます。
 .RE
 .PP
 orblist \-serverid \fIserver\-id\fR | \-applicationName \fIapplication\-name\fR
 .RS 4
-С줿ORB\fIORBId\fRɽޤ\fIORBId\fRϥСǺ줿ORBʸ̾ǤС¹ԤƤʤ硢ƥֲޤ
+サーバー上に定義されたORBの\fIORBId\fRを一覧表示します。\fIORBId\fRはサーバーで作成されたORBの文字列名です。サーバーが実行されていない場合、アクティブ化されます。
 .RE
 .PP
 shutdown \-serverid \fIserver\-id\fR | \-applicationName application\-name
 .RS 4
-ORBDϿ줿ƥ֤ʥСߤޤΥޥɤμ¹ˡ\fI\-serverid\fRѥ᡼ޤ\fI\-applicationName\fRѥ᡼ǻꤵ줿饹줿\fIshutdown\fR᥽åɤƤӽФƥСץߤޤ
+ORBDに登録されたアクティブなサーバーを停止します。このコマンドの実行中に、\fI\-serverid\fRパラメータまたは\fI\-applicationName\fRパラメータで指定されたクラス内に定義された\fIshutdown\fRメソッドも呼び出されてサーバー・プロセスを停止します。
 .RE
 .PP
 startup \-serverid \fIserver\-id\fR | \-applicationName application\-name
 .RS 4
-ORBDϿ줿СưޤϥƥֲޤС¹ԤƤʤ硢ΥޥɤСưޤСǤ˼¹ԤƤϡ顼åɽޤ
+ORBDに登録されたサーバーを起動またはアクティブ化します。サーバーが実行されていない場合、このコマンドがサーバーを起動します。サーバーがすでに実行されている場合は、エラー・メッセージが表示されます。
 .RE
 .PP
 help
 .RS 4
-\fIservertool\fRޥɤ𤷤ƥСѤǤ뤹٤ƤΥޥɤꥹȤޤ
+\fIservertool\fRコマンドを介してサーバーが利用できるすべてのコマンドをリストします。
 .RE
 .PP
 quit
 .RS 4
-\fIservertool\fRޥɤλޤ
+\fIservertool\fRコマンドを終了します。
 .RE
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: tnameserv
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java IDLRMI-IIOPġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java IDLおよびRMI-IIOPツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "tnameserv" "1" "2013ǯ1121" "JDK 8" "Java IDLRMI-IIOPġ"
+.TH "tnameserv" "1" "2013年11月21日" "JDK 8" "Java IDLおよびRMI-IIOPツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-tnameserv \- 󥿥ե(IDL)
-.SH ""
+tnameserv \- インタフェース定義言語(IDL)。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,27 +64,27 @@
 .PP
 \-ORBInitialPort \fInameserverport\fR
 .RS 4
-͡ߥ󥰡ӥORB\fIresolve_initial_references\fR᥽åɤ\fIlist_initial_references\fR᥽åɤμ˻Ѥ֡ȥȥåסץȥꥹ˥󥰤ݡȤǤ
+ネーミング・サービスがORBの\fIresolve_initial_references\fRメソッドと\fIlist_initial_references\fRメソッドの実装に使用するブートストラップ・プロトコルをリスニングする初期ポートです。
 .RE
-.SH ""
+.SH "説明"
 .PP
-Java IDLˤϡObject Request Broker Daemon (ORBD)ޤޤޤORBDϡ֡ȥȥåסӥ͡ߥ󥰡ӥ³͡ߥ󥰡ӥӥСޥ͡ޤǡ󡦥ץǤJava IDLΤ٤ƤΥ塼ȥꥢǤORBDѤƤޤ͡ߥ󥰡ӥѤǤϡ\fIorbd\fRΤ\fItnameserv\fRѤǤޤ
+Java IDLには、Object Request Broker Daemon (ORBD)が含まれます。ORBDは、ブートストラップ・サービス、一時ネーミング・サービス、永続ネーミング・サービスおよびサーバー・マネージャを含むデーモン・プロセスです。Java IDLのすべてのチュートリアルではORBDを使用していますが、一時ネーミング・サービスを使用する例では、\fIorbd\fRのかわりに\fItnameserv\fRを使用できます。
 .PP
-http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlˤ
-orbd(1)ޤϡNaming Serviceפ򻲾ȤƤ
+http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/jidlNaming\&.htmlにある
+orbd(1)または「Naming Service」を参照してください。
 .PP
-CORBACOS (Common Object Services)͡ߥ󥰡ӥϡե롦ƥबեФƥǥ쥯ȥ깽¤󶡤ƤΤƱ褦ˡ֥ȻȤФƥĥ꡼¤Υǥ쥯ȥ󶡤ޤJava IDLΰ͡ࡦӥǤ\fItnameserv\fRϡCOS͡ࡦӥλͤñʷǼΤǤ
+CORBAのCOS (Common Object Services)ネーミング・サービスは、ファイル・システムがファイルに対してディレクトリ構造を提供しているのと同じように、オブジェクト参照に対してツリー構造のディレクトリを提供します。Java IDLの一時ネーム・サービスである\fItnameserv\fRは、COSネーム・サービスの仕様を単純な形で実装したものです。
 .PP
-֥ȻȤϥ͡ॹڡ̾dzǼ졢֥ȻȤ̾Υڥϡ줾͡ࡦХǥ󥰤ȸƤФޤ͡ࡦХǥ󥰤ϥ͡ߥ󥰡ƥȤȤ߹ळȤǤޤ͡ߥ󥰡ƥȤϥ͡ࡦХǥ󥰤Ǥꡢե롦ƥΥ֥ǥ쥯ȥƱǽޤ٤ƤΥХǥ󥰤Ͻ͡ߥ󥰡ƥȤβ˳Ǽޤ͡ߥ󥰡ƥȤϡ͡ॹڡͣα³Хǥ󥰤ǤJava IDL͡ߥ󥰡ӥץߤƺƵưȡĤΥ͡ॹڡϼޤ
+オブジェクト参照はネームスペースに名前で格納され、オブジェクト参照と名前のペアは、それぞれネーム・バインディングと呼ばれます。ネーム・バインディングはネーミング・コンテキストに組み込むことができます。ネーミング・コンテキストはネーム・バインディングであり、ファイル・システムのサブディレクトリと同じ編成機能を持ちます。すべてのバインディングは初期ネーミング・コンテキストの下に格納されます。初期ネーミング・コンテキストは、ネームスペースの唯一の永続バインディングです。Java IDLネーミング・サービス・プロセスを停止して再起動すると、残りのネームスペースは失われます。
 .PP
-ץåȤޤϥץꥱ󤫤COS͡ߥ󥰡ӥѤ뤿ˤϡORB͡ߥ󥰡ӥưƤۥȤΥݡȤΤäƤ뤫Υ͡ߥ󥰡ӥν͡ߥ󥰡ƥʸ˥Ǥɬפޤ͡ࡦӥϡJava IDLΥ͡ࡦӥǤ⤽¾COSΥ͡ࡦӥǤ⤫ޤޤ
-.SS "͡ߥ󥰡ӥεư"
+アプレットまたはアプリケーションからCOSネーミング・サービスを使用するためには、そのORBがネーミング・サービスが動作しているホストのポートを知っているか、そのネーミング・サービスの初期ネーミング・コンテキスト文字列にアクセスできる必要があります。ネーム・サービスは、Java IDLのネーム・サービスでもその他のCOS準拠のネーム・サービスでもかまいません。
+.SS "ネーミング・サービスの起動"
 .PP
-Java IDL͡ࡦӥϡ͡ࡦӥѤ륢ץꥱޤϥץåȤ˵ưƤɬפޤJava IDLʤ򥤥󥹥ȡ뤹ȡJava IDL͡ߥ󥰡ӥư륹ץ(Oracle Solaris:
-\fItnameserv\fR)ޤϼ¹Բǽե(Windows:
-\fItnameserv\&.exe\fR)ޤХå饦ɤư褦ˡ͡ࡦӥưƤ
+Java IDLネーム・サービスは、ネーム・サービスを使用するアプリケーションまたはアプレットより前に起動しておく必要があります。Java IDL製品をインストールすると、Java IDLネーミング・サービスを起動するスクリプト(Oracle Solaris:
+\fItnameserv\fR)または実行可能ファイル(Windows:
+\fItnameserv\&.exe\fR)が作成されます。バックグラウンドで動作するように、ネーム・サービスを起動してください。
 .PP
-ä˻ꤷʤ硢Java IDL͡ߥ󥰡ӥϡORB\fIresolve_initial_references\fR᥽åɤ\fIlist_initial_references methods\fR᥽åɤμ˻Ѥ֡ȥȥåסץȥФƥݡ900ǥꥹ˥󥰤ޤ
+特に指定しない場合、Java IDLネーミング・サービスは、ORBの\fIresolve_initial_references\fRメソッドと\fIlist_initial_references methods\fRメソッドの実装に使用するブートストラップ・プロトコルに対してポート900でリスニングします。
 .sp
 .if n \{\
 .RS 4
@@ -96,7 +96,7 @@
 .RE
 .\}
 .PP
-͡ࡦСݡȤꤷʤ硢ǥեȤǥݡ900ѤޤOracle Solarisեȥμ¹Ի1024꾮ݡȤǥץ򳫻Ϥϡroot桼ˤʤɬפޤΤᡢ1024ʾΥݡֹѤ뤳Ȥᤷޤ1050Τ褦̤ΥݡȤꤷ͡ࡦӥХå饦ɤǼ¹ԤˤϡUNIXޥɡǼΤ褦Ϥޤ
+ネーム・サーバー・ポートを指定しない場合、デフォルトでポート900が使用されます。Oracle Solarisソフトウェアの実行時、1024より小さいポートでプロセスを開始する場合は、rootユーザーになる必要があります。このため、1024以上のポート番号を使用することをお薦めします。1050のように別のポートを指定し、ネーム・サービスをバックグラウンドで実行するには、UNIXコマンド・シェルで次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -108,7 +108,7 @@
 .RE
 .\}
 .PP
-WindowsMS\-DOSƥࡦץץȤǤϡΤ褦Ϥޤ
+WindowsのMS\-DOSシステム・プロンプトでは、次のように入力します。
 .sp
 .if n \{\
 .RS 4
@@ -120,20 +120,20 @@
 .RE
 .\}
 .PP
-͡ࡦСΥ饤ȤˤϡݡֹΤ餻ɬפޤԤˤϡORB֥Ȥκ\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRץѥƥ˿ݡֹꤷޤ
-.SS "ۤʤۥȾǤΥСȥ饤Ȥμ¹"
+ネーム・サーバーのクライアントには、新しいポート番号を知らせる必要があります。これを行うには、ORBオブジェクトの作成時に\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRプロパティに新しいポート番号を設定します。
+.SS "異なるホスト上でのサーバーとクライアントの実行"
 .PP
-Java IDLRMI\-IIOPΤۤȤɤΥ塼ȥꥢǤϡ͡ߥ󥰡ӥСӥ饤ȤϤ٤ƳȯѤΥޥǼ¹Ԥޤºݤ˥ǥץȤˤϡ饤ȤȥС򡢥͡ߥ󥰡ӥȤϰۤʤۥȡޥǼ¹Ԥ뤳Ȥ¿ʤޤ
+Java IDLとRMI\-IIOPのほとんどのチュートリアルでは、ネーミング・サービス、サーバーおよびクライアントはすべて開発用のマシン上で実行されます。実際にデプロイメントする場合には、クライアントとサーバーを、ネーミング・サービスとは異なるホスト・マシン上で実行することが多くなります。
 .PP
-饤ȤȥС͡ࡦӥ򸫤Ĥˤϡ饤ȤȥС͡ࡦӥ¹ԤƤݡȤֹȥۥȤǧƤɬפޤΤˤϡ饤ȤȥСΥե\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRץѥƥ\fIorg\&.omg\&.CORBA\&.ORBInitialHost\fRץѥƥ͡ࡦӥ¹ԤƤݡȤֹȥޥ̾ꤷޤϡGetting Started Using RMI\-IIOP
-(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi\-iiop/rmiiiopexample\&.html)˼Ƥޤ
+クライアントとサーバーがネーム・サービスを見つけるには、クライアントとサーバーが、ネーム・サービスが実行されているポートの番号とホストを認識している必要があります。そのためには、クライアントとサーバーのファイル内の\fIorg\&.omg\&.CORBA\&.ORBInitialPort\fRプロパティと\fIorg\&.omg\&.CORBA\&.ORBInitialHost\fRプロパティをネーム・サービスが実行されているポートの番号とマシンの名前に設定します。この例は、「Getting Started Using RMI\-IIOP」
+(http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/rmi\-iiop/rmiiiopexample\&.html)に示されています
 .PP
-ޥɥ饤󡦥ץ\fI\-ORBInitialPort nameserverport#\fR\fI\-ORBInitialHost nameserverhostname\fRѤơ饤ȤȥСФƥ͡ߥ󥰡ӥõꤹ뤳ȤǤޤޥɥ饤󡦥ץѤƤԤˡ1Ĥϡhttp://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/tutorial/jidl2machines\&.htmlΡJava IDL: The Hello World Example on Two Machines
-򻲾ȤƤ
+コマンドライン・オプション\fI\-ORBInitialPort nameserverport#\fRと\fI\-ORBInitialHost nameserverhostname\fRを使用して、クライアントとサーバーに対してネーミング・サービスを探す場所を指定することもできます。コマンドライン・オプションを使用してこれを行う方法の1つの例は、http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/idl/tutorial/jidl2machines\&.htmlの「Java IDL: The Hello World Example on Two Machines」
+を参照してください
 .PP
-ȤС͡ࡦӥ\fItnameserv\fRۥ\fInameserverhost\fRΥݡ1050Ǽ¹ԤƤȤޤˡ饤Ȥۥ\fIclienthost\fRǼ¹Ԥ졢Сϥۥ\fIserverhost\fRǼ¹ԤƤȤޤ
+たとえば、一時ネーム・サービス\fItnameserv\fRが、ホスト\fInameserverhost\fRのポート1050上で実行されているとします。さらに、クライアントがホスト\fIclienthost\fR上で実行され、サーバーはホスト\fIserverhost\fR上で実行されているとします。
 .PP
-ۥ\fInameserverhost\fR\fItnameserv\fRưޤ
+ホスト\fInameserverhost\fR上で\fItnameserv\fRを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -145,7 +145,7 @@
 .RE
 .\}
 .PP
-\fIserverhost\fRǥСưޤ
+\fIserverhost\fR上でサーバーを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -158,7 +158,7 @@
 .\}
 .PP
 
-\fIclienthost\fRǥ饤Ȥưޤ
+\fIclienthost\fR上でクライアントを起動します。
 .sp
 .if n \{\
 .RS 4
@@ -169,19 +169,19 @@
 .if n \{\
 .RE
 .\}
-.SS "͡ߥ󥰡ӥ"
+.SS "ネーミング・サービスの停止"
 .PP
-Java IDL͡ߥ󥰡ӥߤˤϡUnixξϡ\fIkill\fRʤɤΥڥ졼ƥ󥰡ƥΥޥɤѤWindowsξϡ\fI[Ctrl]+[C]\fRѤޤ͡ߥ󥰡ӥŪߤޤǤϡƽФԵ֤³ޤӥλȡJava IDL͡ࡦӥϿƤ̾ϼޤ
-.SH "ץ"
+Java IDLネーミング・サービスを停止するには、Unixの場合は、\fIkill\fRなどのオペレーティング・システムのコマンドを使用し、Windowsの場合は、\fI[Ctrl]+[C]\fRキーを使用します。ネーミング・サービスを明示的に停止するまでは、呼出し待機状態が続きます。サービスを終了させると、Java IDLネーム・サービスに登録されている名前は失われます。
+.SH "オプション"
 .PP
 \-J\fIoption\fR
 .RS 4
-Javaۥޥ\fIoption\fRϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンに\fIoption\fRを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH ""
-.SS "͡ॹڡؤΥ֥Ȥɲ"
+.SH "例"
+.SS "ネームスペースへのオブジェクトの追加"
 .PP
-Ǥϡ͡ॹڡ̾ɲäˡ򼨤ޤΥץ롦ץϡΤޤޤξ֤Ǵư͡ࡦӥ饤ȤǡΤ褦ñʥĥ꡼ΤǤ
+次の例では、ネームスペースに名前を追加する方法を示します。このサンプル・プログラムは、このままの状態で完全に動作する一時ネーム・サービス・クライアントで、次のような単純なツリーを作成するものです。
 .sp
 .if n \{\
 .RS 4
@@ -197,7 +197,7 @@
 .RE
 .\}
 .PP
-ǡ\fIplans\fRϥ֥Ȼȡ\fIPersonal\fR\fIcalendar\fR\fIschedule\fR2ĤΥ֥ȻȤޤ͡ߥ󥰡ƥȤǤ
+この例で、\fIplans\fRはオブジェクト参照、\fIPersonal\fRは\fIcalendar\fRと\fIschedule\fRの2つのオブジェクト参照を含むネーミング・コンテキストです。
 .sp
 .if n \{\
 .RS 4
@@ -217,7 +217,7 @@
 .RE
 .\}
 .PP
-͡ߥ󥰡ӥεưǡ\fInameserver\fRϥݡ1050ǵưޤΥɤǡΥݡֹ򥯥饤ȡƥΤ餻ޤ
+ネーミング・サービスの起動で、\fInameserver\fRはポート1050で起動されました。次のコードで、このポート番号をクライアント・システムに知らせます。
 .sp
 .if n \{\
 .RS 4
@@ -231,7 +231,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ͡ߥ󥰡ƥȤ\fIctx\fRޤ2ܤǤϡ\fIctx\fRߡΥ֥Ȼ\fIobjref\fR˥ԡޤobjrefˤϡȤ̾͡Ƥƥ͡ॹڡɲäޤ
+次のコードでは、初期ネーミング・コンテキストを取得し、それを\fIctx\fRに代入します。2行目では、\fIctx\fRをダミーのオブジェクト参照\fIobjref\fRにコピーします。このobjrefには、あとで様々な名前を割り当ててネームスペースに追加します。
 .sp
 .if n \{\
 .RS 4
@@ -246,7 +246,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ\fItext\fRפ̾\fIplans\fRߡΥ֥ȻȤ˥Хɤޤθ塢\fIrebind\fR᥽åɤѤƽ͡ߥ󥰡ƥȤβ\fIplans\fRɲäƤޤ\fIrebind\fR᥽åɤѤС\fIbind\fR᥽åɤѤȯ㳰ȯˡΥץ٤֤ⷫ¹ԤǤޤ
+次のコードでは、\fItext\fRタイプの名前\fIplans\fRを作成し、それをダミーのオブジェクト参照にバインドします。その後、\fIrebind\fRメソッドを使用して初期ネーミング・コンテキストの下に\fIplans\fRを追加しています。\fIrebind\fRメソッドを使用すれば、\fIbind\fRメソッドを使用した場合に発生する例外を発生させずに、このプログラムを何度も繰返し実行できます。
 .sp
 .if n \{\
 .RS 4
@@ -261,7 +261,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ\fIdirectory\fRפ\fIPersonal\fRȤ͡ߥ󥰡ƥȤޤη륪֥Ȼ\fIctx2\fR\fIname\fR˥Хɤ͡ߥ󥰡ƥȤɲäޤ
+次のコードでは、\fIdirectory\fRタイプの\fIPersonal\fRというネーミング・コンテキストを作成します。その結果得られるオブジェクト参照\fIctx2\fRを\fIname\fRにバインドし、初期ネーミング・コンテキストに追加します。
 .sp
 .if n \{\
 .RS 4
@@ -276,7 +276,7 @@
 .RE
 .\}
 .PP
-ĤΥɤǤϡߡΥ֥ȻȤ\fIschedule\fR\fIcalendar\fRȤ̾ǥ͡ߥ󥰡ƥ\fIPersonal\fR(\fIctx2\fR)˥Хɤޤ
+残りのコードでは、ダミーのオブジェクト参照を\fIschedule\fRと\fIcalendar\fRという名前でネーミング・コンテキスト\fIPersonal\fR(\fIctx2\fR)にバインドします。
 .sp
 .if n \{\
 .RS 4
@@ -300,9 +300,9 @@
 .if n \{\
 .RE
 .\}
-.SS "͡ॹڡλ"
+.SS "ネームスペースの参照"
 .PP
-Υץ롦ץǤϡ͡ॹڡ֥饦ˡ򼨤ޤ
+次のサンプル・プログラムでは、ネームスペースをブラウズする方法を示します。
 .sp
 .if n \{\
 .RS 4
@@ -322,7 +322,7 @@
 .RE
 .\}
 .PP
-͡ߥ󥰡ӥεưǡ\fInameserver\fRϥݡ1050ǵưޤΥɤǡΥݡֹ򥯥饤ȡƥΤ餻ޤ
+ネーミング・サービスの起動で、\fInameserver\fRはポート1050で起動されました。次のコードで、このポート番号をクライアント・システムに知らせます。
 .sp
 .if n \{\
 .RS 4
@@ -336,7 +336,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ͡ߥ󥰡ƥȤƤޤ
+次のコードでは、初期ネーミング・コンテキストを取得しています。
 .sp
 .if n \{\
 .RS 4
@@ -350,7 +350,7 @@
 .RE
 .\}
 .PP
-\fIlist\fR᥽åɤϡ͡ߥ󥰡ƥȤΥХǥ󥰤ꥹȤޤξ硢1000ĤޤǤΥХǥ󥰤͡ߥ󥰡ƥȤ\fIBindingListHolder\fR֤ޤĤΥХǥ󥰤ϡ\fIBindingIteratorHolder\fR֤ޤ
+\fIlist\fRメソッドは、ネーミング・コンテキストのバインディングをリストします。この場合、最大1000個までのバインディングが初期ネーミング・コンテキストから\fIBindingListHolder\fRに返されます。残りのバインディングは、\fIBindingIteratorHolder\fRに返されます。
 .sp
 .if n \{\
 .RS 4
@@ -364,7 +364,7 @@
 .RE
 .\}
 .PP
-ΥɤǤϡ֤줿\fIBindingListHolder\fRХǥ󥰤ޤХǥ󥰤ʤϡץबλޤ
+次のコードでは、返された\fIBindingListHolder\fRからバインディングの配列を取得します。バインディングがない場合は、プログラムが終了します。
 .sp
 .if n \{\
 .RS 4
@@ -377,7 +377,7 @@
 .RE
 .\}
 .PP
-ĤΥɤǤϡХǥ󥰤Фƥ롼׽Ԥ̾Ϥޤ
+残りのコードでは、バインディングに対してループ処理を行い、名前を出力します。
 .sp
 .if n \{\
 .RS 4
@@ -408,7 +408,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
--- a/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: unpack200
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Javaǥץȡġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Javaデプロイメント・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "unpack200" "1" "2013ǯ1121" "JDK 8" "Javaǥץȡġ"
+.TH "unpack200" "1" "2013年11月21日" "JDK 8" "Javaデプロイメント・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-unpack200 \- pack200(1)Ǻ줿ѥåեWebǥץȤΤJARեѴޤ
-.SH ""
+unpack200 \- pack200(1)で作成されたパック・ファイルを、WebデプロイメントのためにJARファイルに変換します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,21 +64,21 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIinput\-file\fR
 .RS 4
-ϥե̾pack200 gzipե뤫pack200եǤޤϥեˤϡ\fIpack200\fR(1)Ǻ줿JARեꤹ뤳ȤǤޤ(֤\fI0\fRǤ)ξ硢ϥեƤPack2000ޡǽJARե˥ԡޤ
+入力ファイルの名前。pack200 gzipファイルかpack200ファイルを指定できます。入力ファイルには、\fIpack200\fR(1)で作成されたJARファイルを指定することもできます(手間は\fI0\fRです)。この場合、入力ファイルの内容はPack2000マーカーで出力JARファイルにコピーされます。
 .RE
 .PP
 \fIJAR\-file\fR
 .RS 4
-JARե̾
+出力JARファイル名。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIunpack200\fRޥɤϡ\fIpack200\fR\fI(1)\fRǺ줿ѥåեJARեѴͥƥּǤŪʻˡϼΤȤǤǤϡǥեȤ\fIunpack200\fRޥǡ\fImyarchive\&.jar\fRե뤬\fImyarchive\&.pack\&.gz\fRޤ
+\fIunpack200\fRコマンドは、\fIpack200\fR\fI(1)\fRで作成されたパック・ファイルをJARファイルに変換するネイティブ実装です。一般的な使用方法は次のとおりです。次の例では、デフォルトの\fIunpack200\fRコマンド設定で、\fImyarchive\&.jar\fRファイルが\fImyarchive\&.pack\&.gz\fRから作成されます。
 .sp
 .if n \{\
 .RS 4
@@ -89,56 +89,56 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-Hvalue \-\-deflate\-hint=\fIvalue\fR
 .RS 4
-JARեΤ٤ƤΥȥ\fItrue\fR\fIfalse\fRޤ\fIkeep\fRΥǥե졼ꤷޤǥեȡ⡼ɤ\fIkeep\fRǤͤ\fItrue\fRޤ\fIfalse\fR硢\fI\-\-deflate=hint\fRץϥǥեȤư򥪡С饤ɤơJARեΤ٤ƤΥȥΥǥե졼󡦥⡼ɤꤵޤ
+JARファイル内のすべてのエントリに\fItrue\fR、\fIfalse\fRまたは\fIkeep\fRのデフレーションを設定します。デフォルト・モードは\fIkeep\fRです。値が\fItrue\fRまたは\fIfalse\fR場合、\fI\-\-deflate=hint\fRオプションはデフォルトの動作をオーバーライドして、出力JARファイル内のすべてのエントリのデフレーション・モードが設定されます。
 .RE
 .PP
 \-r \-\-remove\-pack\-file
 .RS 4
-ϥѥåեޤ
+入力パック・ファイルを削除します。
 .RE
 .PP
 \-v \-\-verbose
 .RS 4
-Ǿ¤ΥåɽޤΥץʣλͤˤϡܺ٤ʥåɽޤ
+最小限のメッセージが表示されます。このオプションの複数の仕様には、より詳細なメッセージが表示されます。
 .RE
 .PP
 \-q \-\-quiet
 .RS 4
-åɽư褦˻ꤷޤ
+メッセージを表示せずに動作するように指定します。
 .RE
 .PP
 \-lfilename \-\-log\-file=\fIfilename\fR
 .RS 4
-ϥåϿեꤷޤ
+出力メッセージが記録されるログ・ファイルを指定します。
 .RE
 .PP
 \-? \-h \-\-help
 .RS 4
-\fIunpack200\fRޥɤ˴ؤإ׾Ϥޤ
+\fIunpack200\fRコマンドに関するヘルプ情報を出力します。
 .RE
 .PP
 \-V \-\-version
 .RS 4
-\fIunpack200\fRޥɤ˴ؤСϤޤ
+\fIunpack200\fRコマンドに関するバージョン情報を出力します。
 .RE
 .PP
 \-J\fIoption\fR
 .RS 4
-JavaۥޥoptionϤޤ\fIoption\fRˤϡJavaץꥱưġΥե󥹡ڡ˵ܤƤ륪ץ1ĻꤷޤȤС\fI\-J\-Xms48m\fRȻꤹȡȥåס꡼48MBꤵޤjava(1)򻲾ȤƤ
+Java仮想マシンにoptionを渡します。\fIoption\fRには、Javaアプリケーション起動ツールのリファレンス・ページに記載されているオプションを1つ指定します。たとえば、\fI\-J\-Xms48m\fRと指定すると、スタートアップ・メモリーは48MBに設定されます。java(1)を参照してください。
 .RE
-.SH ""
+.SH "注意"
 .PP
-Υޥɤ\fIunpack\fRޥɤƱʤǤʤǤ
+このコマンドと\fIunpack\fRコマンドを混同しないでください。これらは別製品です。
 .PP
-JDK°Java SE APIͤȤ㤬Ĥäˤϡͤͥ褷Ƥ
-.SH "λơ"
+JDKに付属するJava SE API仕様との相違が見つかった場合には、仕様を優先してください。
+.SH "終了ステータス"
 .PP
-νλ֤ͤޤ: ェλξ0顼ȯ0礭͡
-.SH "Ϣ"
+次の終了値が返されます: 正常終了の場合は0、エラーが発生した場合は0より大きい値。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -181,7 +181,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Pack200 and Compression
+「Pack200 and Compression」
 (http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/deployment/deployment\-guide/pack200\&.html)
 .RE
 .sp
@@ -193,7 +193,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Java SE Technical Documentation
+「Java SE Technical Documentation」
 (http://docs\&.oracle\&.com/javase/)
 .RE
 .br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: wsgen
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "wsgen" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "wsgen" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-wsgen \- WebӥΥɥݥȼ(SEI)饹ɼꡢWebӥΥǥץȤȸƽФɬפʤ٤ƤΥƥեȤޤ
-.SH ""
+wsgen \- Webサービスのエンドポイント実装(SEI)クラスを読取り、Webサービスのデプロイメントと呼出しに必要なすべてのアーティファクトを生成します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,20 +64,20 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fISEI\fR
 .RS 4
-ɤ߼WebӥΥɥݥȼ饹(SEI)Ǥ
+読み取るWebサービスのエンドポイント実装クラス(SEI)です。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIwsgen\fRޥɤϡJAX\-WS WebӥǻѤJAX\-WSݡ֥롦ƥեȤޤΥġϡWebӥΥɥݥȡ饹ɼꡢWebӥΥǥץȤȸƽФɬפʤ٤ƤΥƥեȤޤJAXWS 2\&.1\&.1 RIǤ\fIwsgen\fR
-Ant󶡤ޤ
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.htmlJAX\-WS (wsgen)ڡTools֤򻲾ȤƤ
+\fIwsgen\fRコマンドは、JAX\-WS Webサービスで使用されるJAX\-WSポータブル・アーティファクトを生成します。このツールは、Webサービスのエンドポイント・クラスを読取り、Webサービスのデプロイメントと呼出しに必要なすべてのアーティファクトを生成します。JAXWS 2\&.1\&.1 RIでは\fIwsgen\fR
+Antタスクも提供されます。
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.htmlのJAX\-WS (wsgen)ページのToolsタブを参照してください。
 .PP
-\fIwsgen\fRޥɤưˤϡԤޤ
+\fIwsgen\fRコマンドを起動するには、次を行います。
 .sp
 .if n \{\
 .RS 4
@@ -89,79 +89,79 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-classpath \fIpath\fR
 .RS 4
-ϥ饹եξꡣ
+入力クラス・ファイルの場所。
 .RE
 .PP
 \-cp \fIpath\fR
 .RS 4
-ϥ饹եξꡣ
+入力クラス・ファイルの場所。
 .RE
 .PP
 \-d \fIdirectory\fR
 .RS 4
-줿ϥեǼꡣ
+生成された出力ファイルを格納する場所。
 .RE
 .PP
 \-extension
 .RS 4
-٥ĥѲǽˤޤĥѤȡץꥱΰܿ줿ꡢ¾μϢȤǤʤʤǽޤ
+ベンダー拡張を使用可能にします。拡張を使用すると、アプリケーションの移植性が失われたり、他の実装と連携できなくなる可能性があります。
 .RE
 .PP
 \-help
 .RS 4
-\fIwsgen\fRޥɤ˴ؤإסåɽޤ
+\fIwsgen\fRコマンドに関するヘルプ・メッセージを表示します。
 .RE
 .PP
 \-keep
 .RS 4
-줿ե¸ޤ
+生成されたファイルを保存します。
 .RE
 .PP
 \-r \fIdirectory\fR
 .RS 4
-Υץ\fI\-wsdl\fRץȤȤ˻ѤơWSDLʤ줿꥽ե֤ꤷޤ
+このオプションを\fI\-wsdl\fRオプションとともに使用して、WSDLなど生成されたリソース・ファイルを配置する場所を指定します。
 .RE
 .PP
 \-s \fIdirectory\fR
 .RS 4
-줿եǼꡣ
+生成されたソース・ファイルを格納する場所。
 .RE
 .PP
 \-verbose
 .RS 4
-ѥ顦åɽޤ
+コンパイラ・メッセージを表示します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-wsdl [ :protocol ]
 .RS 4
-ɥݥȤǥץ˳ǧWSDLե륪ץ󡦥ޥɡWSDLեˤϡӥƤӽФˡѥ᡼ɬפ֤͡ǡ¤ˤĤƤΥԥ塼ɼǽʵҤޤޤޤ
+エンドポイントをデプロイする前に確認するWSDLファイルを生成するオプション・コマンド。WSDLファイルには、サービスを呼び出す方法、パラメータに必要な値、返されるデータ構造についてのコンピュータで読取り可能な記述が含まれます。
 .sp
-ǥեȤǤ\fIwsgen\fRޥɤWSDLեޤ\fIprotocol\fRͤϾάǽǤꡢWSDLХǥ(\fIwsdl:binding\fR)ǻѤץȥꤹ뤿˻Ѥޤͭʥץȥϡ\fIsoap1\&.1\fR\fIXsoap1\&.2\fRǤǥեȤ\fIsoap1\&.1\fRǤ\fIXsoap1\&.2\fRץȥɸǤϤʤᡢ\fI\-extension\fRץȤȤˤΤ߻ѲǽǤ
+デフォルトでは\fIwsgen\fRコマンドはWSDLファイルを生成しません。\fIprotocol\fR値は省略可能であり、WSDLバインディング(\fIwsdl:binding\fR)で使用するプロトコルを指定するために使用されます。有効なプロトコルは、\fIsoap1\&.1\fRと\fIXsoap1\&.2\fRです。デフォルトは\fIsoap1\&.1\fRです。\fIXsoap1\&.2\fRプロトコルは標準ではないため、\fI\-extension\fRオプションとともにのみ使用可能です。
 .RE
 .PP
 \-servicename \fIname\fR
 .RS 4
-\fI\-wsdl\fRץȤȤˤΤ߻ѤơWSDLWSDLӥ(\fIwsdl:service\fR)̾ꤷޤ:
-\fI\-servicename "{http://mynamespace/}MyService"\fR
+\fI\-wsdl\fRオプションとともにのみ使用して、WSDLで生成される特定のWSDLサービス(\fIwsdl:service\fR)名を指定します。例:
+\fI\-servicename "{http://mynamespace/}MyService"\fR。
 .RE
 .PP
 \-portname \fIname\fR
 .RS 4
-\fI\-wsdl\fRץȤȤˤΤ߻ѤơWSDLWSDLݡ(\fIwsdl:port\fR)̾ꤷޤ:
-\fI\-portname "{http://mynamespace/}MyPort"\fR
+\fI\-wsdl\fRオプションとともにのみ使用して、WSDLで生成される特定のWSDLポート(\fIwsdl:port\fR)名を指定します。例:
+\fI\-portname "{http://mynamespace/}MyPort"\fR。
 .RE
-.SH ""
+.SH "例"
 .PP
-ǤϡStockǥ쥯ȥ\fI@WebService\fR\fIStockService\fRΥåѡ饹ޤ
+次の例では、Stockディレクトリ内に\fI@WebService\fR注釈を持つ\fIStockService\fRのラッパー・クラスを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -173,7 +173,7 @@
 .RE
 .\}
 .PP
-ǤϡSOAP 1\&.1 WSDL\fI@WebService\fR\fIstock\&.StockService\fR饹Υޤޤ
+次の例では、SOAP 1\&.1 WSDLおよび\fI@WebService\fR注釈を持つ\fIstock\&.StockService\fRクラスのスキーマを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -185,7 +185,7 @@
 .RE
 .\}
 .PP
-ǤϡSOAP 1\&.2 WSDLޤ
+次の例では、SOAP 1\&.2 WSDLを生成します。
 .sp
 .if n \{\
 .RS 4
@@ -197,9 +197,9 @@
 .RE
 .\}
 .PP
-\fB:\fR
-ӥΥǥץJAXWS¹ԻĶWSDL뤿ᡢȯWSDLɬפϤޤ
-.SH "Ϣ"
+\fB注意:\fR
+サービスのデプロイ時にJAXWS実行時環境でWSDLが生成されるため、開発時にWSDLを生成する必要はありません。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -220,8 +220,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.html
-JAX\-WS (wsgen)ڡTools֤򻲾ȤƤ
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsgenant\&.htmlの
+JAX\-WS (wsgen)ページのToolsタブを参照してください。
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: wsimport
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "wsimport" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "wsimport" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-wsimport \- Webץꥱ󡦥(WAR)ե˥ѥåǤJAX\-WSݡ֥롦ƥեȤơAntꤷޤ
-.SH ""
+wsimport \- Webアプリケーション・アーカイブ(WAR)ファイルにパッケージできるJAX\-WSポータブル・アーティファクトを生成して、Antタスクを指定します。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,18 +64,18 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 \fIwsdl\fR
 .RS 4
-WebӥƤӽФˡѥ᡼ɬפ֤͡ǡ¤ˤĤƤΥԥ塼ɼǽʵҤޤޤޤեǤ
+Webサービスを呼び出す方法、パラメータに必要な値、返されるデータ構造についてのコンピュータで読取り可能な記述が含まれまるファイルです。
 .RE
-.SH ""
+.SH "説明"
 .PP
-\fIwsimport\fRޥɤϡJAX\-WSݡ֥롦ƥեȤޤΥƥեȤϡǥץWSDLӥޡɥȤӥɥݥȼȤȤˡWARե˥ѥåǤޤ\fIwsimport\fRޥɤǤ\fIwsimport\fR
-Ant󶡤ޤ
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlWsimport Ant TaskڡTools֤򻲾ȤƤ
+\fIwsimport\fRコマンドは、次のJAX\-WSポータブル・アーティファクトを生成します。これらのアーティファクトは、デプロイするWSDLおよびスキーマ・ドキュメントおよびエンドポイント実装とともに、WARファイルにパッケージできます。\fIwsimport\fRコマンドでは\fIwsimport\fR
+Antタスクも提供されます。
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlのWsimport Ant TaskページのToolsタブを参照してください。
 .sp
 .RS 4
 .ie n \{\
@@ -85,7 +85,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ӥɥݥȡ󥿥ե(SEI)
+サービス・エンドポイント・インタフェース(SEI)
 .RE
 .sp
 .RS 4
@@ -96,7 +96,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}

+サービス
 .RE
 .sp
 .RS 4
@@ -107,7 +107,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-㳰饹\fIwsdl:fault\fRޥåפޤ(¸ߤ)
+例外クラスは\fIwsdl:fault\fRからマップされます(存在する場合)
 .RE
 .sp
 .RS 4
@@ -118,7 +118,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Ʊ쥹ݥBeanϥ쥹ݥ\fIwsdl:message\fRޤ(¸ߤ)
+非同期レスポンスBeanはレスポンス\fIwsdl:message\fRから派生します(存在する場合)
 .RE
 .sp
 .RS 4
@@ -129,10 +129,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-JAXBͥ(ޤΥפޥåפ줿Java饹)
+JAXBが生成する値タイプ(スキーマのタイプからマップされたJavaクラス)
 .RE
 .PP
-\fIwsgen\fRޥɤưˤϡԤޤ
+\fIwsgen\fRコマンドを起動するには、次を行います。
 .PP
 \fBOracle Solaris/Linux\fR:
 .sp
@@ -146,7 +146,7 @@
 .RE
 .\}
 .PP
-\fBWindows\fRξ:
+\fBWindows\fRの場合:
 .sp
 .if n \{\
 .RS 4
@@ -157,118 +157,118 @@
 .if n \{\
 .RE
 .\}
-.SH "ץ"
+.SH "オプション"
 .PP
 \-d \fIdirectory\fR
 .RS 4
-ϥեǼꤷޤ
+生成される出力ファイルを格納する場所を指定します。
 .RE
 .PP
 \-b \fIpath\fR
 .RS 4
-JAX\-WSޤJAXBХǥ󥰡եꤷޤ\fI\-b\fRץʣJAX\-WSJAXBХǥ󥰡եǤޤΥեѤơѥå̾Bean̾ʤɤ򥫥ޥǤޤJAX\-WSJAXBХǥ󥰡եξܺ٤ϡ
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlWSDL CustomizationUsers Guide֤򻲾ȤƤ
+外部JAX\-WSまたはJAXBバインディング・ファイルを指定します。\fI\-b\fRオプションで複数のJAX\-WSおよびJAXBバインディング・ファイルを指定できます。これらのファイルを使用して、パッケージ名、Bean名などをカスタマイズできます。JAX\-WSおよびJAXBバインディング・ファイルの詳細は、
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlのWSDL CustomizationのUsers Guideタブを参照してください
 .RE
 .PP
 \-B \fIjaxbOption\fR
 .RS 4
-JAXBޡѥ\fIjaxbOption\fRץϤޤ
+JAXBスキーマ・コンパイラに\fIjaxbOption\fRオプションを渡します。
 .RE
 .PP
 \-catalog
 .RS 4
-ƥƥȤ褹륫եꤷޤ\fI\-catalog\fRץϡTR9401XCatalogOASIS XML CatalogγƷ򥵥ݡȤƤޤhttp://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.html
-Catalog SupportڡUsers Guide֤򻲾ȤƤ
+外部エンティティ参照を解決するカタログ・ファイルを指定します。\fI\-catalog\fRオプションは、TR9401、XCatalog、OASIS XML Catalogの各形式をサポートしています。http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.htmlの
+Catalog SupportページのUsers Guideタブを参照してください。
 .RE
 .PP
 \-extension
 .RS 4
-٥ĥѲǽˤޤĥѤȡץꥱΰܿ줿ꡢ¾μϢȤǤʤʤǽޤ
+ベンダー拡張を使用可能にします。拡張を使用すると、アプリケーションの移植性が失われたり、他の実装と連携できなくなる可能性があります。
 .RE
 .PP
 \-help
 .RS 4
-\fIwsimport\fRޥɤ˴ؤإסåɽޤ
+\fIwsimport\fRコマンドに関するヘルプ・メッセージを表示します。
 .RE
 .PP
 \-httpproxy: \fIhost\fR:\fIport\fR
 .RS 4
-HTTPץСꤷޤǥեȤ8080Ǥ
+HTTPプロキシ・サーバーを指定します。デフォルトは8080です。
 .RE
 .PP
 \-keep
 .RS 4
-줿եݻޤ
+生成されたファイルを保持します
 .RE
 .PP
 \-p \fIname\fR
 .RS 4
-åȡѥå\fIname\fRꤷơWSDLӥޡХǥ󥰤Υޥӻ줿ǥեȤΥ르ꥺ򥪡С饤ɤޤ
+ターゲット・パッケージ\fIname\fRを指定して、WSDLおよびスキーマ・バインディングのカスタマイズ、および仕様部で定義されたデフォルトのアルゴリズムをオーバーライドします。
 .RE
 .PP
 \-s \fIdirectory\fR
 .RS 4
-륽եǼꤷޤ
+生成されるソース・ファイルを格納する場所を指定します
 .RE
 .PP
 \-verbose
 .RS 4
-ѥ顦åɽޤ
+コンパイラ・メッセージを表示します。
 .RE
 .PP
 \-version
 .RS 4
-꡼Ϥޤ
+リリース情報を出力します。
 .RE
 .PP
 \-wsdllocation \fIlocation\fR
 .RS 4
-\fI@WebServiceClient\&.wsdlLocation\fRͤꤷޤ
+\fI@WebServiceClient\&.wsdlLocation\fRの値を指定します。
 .RE
 .PP
 \-target
 .RS 4
-ꤵ줿JAX\-WSͥС˽äơɤޤС2\&.0ǤϡJAX\-WS 2\&.0ͤ˽򤷤ɤޤ
+指定されたJAX\-WS仕様バージョンに従って、コードを生成します。バージョン2\&.0では、JAX\-WS 2\&.0仕様に準拠したコードを生成します。
 .RE
 .PP
 \-quiet
 .RS 4
-\fIwsimport\fRޥɽϤޤ
+\fIwsimport\fRコマンド出力を抑制します。
 .RE
 .PP
-\fI\-b\fRץѤơʣ\fIJAX\-WS\fR\fIJAXB\fRХǥ󥰡եǤޤΥեѤơѥå̾Bean̾ʤɡ͡ʤΤ򥫥ޥǤޤ\fIJAX\-WS\fR\fIJAXB\fRХǥ󥰡եξܺ٤ϡ
-https://jax\-ws\&.dev\&.java\&.net/nonav/2\&.1\&.1/docs/customizations\&.htmlJAXB֤򻲾ȤƤ
-.SH "ɸ४ץ"
+\fI\-b\fRオプションを使用して、複数の\fIJAX\-WS\fRおよび\fIJAXB\fRバインディング・ファイルを指定できます。これらのファイルを使用して、パッケージ名やBean名など、様々なものをカスタマイズできます。\fIJAX\-WS\fRおよび\fIJAXB\fRバインディング・ファイルの詳細は、
+https://jax\-ws\&.dev\&.java\&.net/nonav/2\&.1\&.1/docs/customizations\&.htmlのJAXBタブを参照してください
+.SH "非標準オプション"
 .PP
 \-XadditionalHeaders
 .RS 4
-ꥯȤޤϥ쥹ݥ󥹡å˥ХɤʤإåJava᥽åɤΥѥ᡼˥ޥåפޤ
+リクエストまたはレスポンス・メッセージにバインドされないヘッダーをJavaメソッドのパラメータにマップします
 .RE
 .PP
 \-Xauthfile \fIfile\fR
 .RS 4
-ǧھޤեꤹWSDL URIǤURIηϼΤȤǤ
+認証情報を含むファイルを指定するWSDL URIです。このURIの形式は次のとおりです。
 .sp
 http://\fIuser\-name\fR:\fIpassword\fR@\fIhost\-name\fR/\fIweb\-service\-name\fR>?wsdl
 .RE
 .PP
 \-Xdebug
 .RS 4
-ǥХåϤޤ
+デバッグ情報を出力します
 .RE
 .PP
 \-Xno\-addressing\-databinding
 .RS 4
-W3C EndpointReferenceTypeJavaΥХǥ󥰤ͭˤޤ
+W3C EndpointReferenceTypeとJavaのバインディングを有効にします。
 .RE
 .PP
 \-Xnocompile
 .RS 4
-줿Javaե򥳥ѥ뤷ޤ
+生成されたJavaファイルをコンパイルしません
 .RE
-.SH ""
+.SH "例"
 .PP
-ǤϡJavaƥեȤ\fIhttp://stockquote\&.example\&.com/quote?wsdl\fR򥤥ݡȤƥƥեȤ򥳥ѥ뤷ޤ
+次の例では、Javaアーティファクトを生成し、\fIhttp://stockquote\&.example\&.com/quote?wsdl\fRをインポートしてアーティファクトをコンパイルします。
 .sp
 .if n \{\
 .RS 4
@@ -279,7 +279,7 @@
 .if n \{\
 .RE
 .\}
-.SH "Ϣ"
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -300,8 +300,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.html
-Wsimport Ant TaskڡTools
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlの
+Wsimport Ant TaskページのToolsタブ
 .RE
 .sp
 .RS 4
@@ -312,8 +312,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.html
-Catalog SupportڡUsers Guide
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/catalog\-support\&.htmlの
+Catalog SupportページのUsers Guideタブ
 .RE
 .sp
 .RS 4
@@ -324,8 +324,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.html
-WSDL CustomizationڡUsers Guide
+http://jax\-ws\&.java\&.net/nonav/2\&.1\&.1/docs/wsimportant\&.htmlの
+WSDL CustomizationページのUsers Guideタブ
 .RE
 .br
 'pl 8.5i
--- a/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1	Thu May 07 20:50:07 2015 -0700
@@ -2,10 +2,10 @@
 .\" Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 .\" Title: xjc
 .\" Language: English
-.\" Date: 2013ǯ1121
-.\" SectDesc: Java Webӥġ
+.\" Date: 2013年11月21日
+.\" SectDesc: Java Webサービス・ツール
 .\" Software: JDK 8
-.\" Arch: 
+.\" Arch: 汎用
 .\"
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
@@ -28,7 +28,7 @@
 .\" questions.
 .\"
 .pl 99999
-.TH "xjc" "1" "2013ǯ1121" "JDK 8" "Java Webӥġ"
+.TH "xjc" "1" "2013年11月21日" "JDK 8" "Java Webサービス・ツール"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-xjc \- XMLޡեդJava饹˥ѥ뤷ޤ
-.SH ""
+xjc \- XMLスキーマ・ファイルを完全注釈付きのJavaクラスにコンパイルします。
+.SH "概要"
 .sp
 .if n \{\
 .RS 4
@@ -64,23 +64,23 @@
 .PP
 \fIoptions\fR
 .RS 4
-ޥɥ饤󡦥ץ󡣥ץ򻲾ȤƤ
+コマンドライン・オプション。オプションを参照してください。
 .RE
 .PP
 schema \fIfile/URL/dir/jar \&.\&.\&.\fR
 .RS 4
-XMLޡեξꡣ\fIdir\fRꤵƤϡ٤ƤΥޡե뤬ѥ뤵ޤ\fIjar\fRꤵƤϡ\fI/META\-INF/sun\-jaxb\&.episode\fRХǥ󥰡ե뤬ѥ뤵ޤ
+XMLスキーマ・ファイルの場所。\fIdir\fRが指定されている場合は、すべてのスキーマ・ファイルがコンパイルされます。\fIjar\fRが指定されている場合は、\fI/META\-INF/sun\-jaxb\&.episode\fRバインディング・ファイルがコンパイルされます。
 .RE
 .PP
 \-b \fIbindinfo\fR
 .RS 4
-Хǥ󥰡եξꡣ
+バインディング・ファイルの場所。
 .RE
-.SH ""
+.SH "説明"
 .PP
-ץåȥեbinǥ쥯ȥˤŬڤ\fIxjc\fR롦ץȤѤơХǥ󥰡ѥưޤХǥ󥰡ѥ¹ԤAnt⤢ޤhttp://jaxb\&.java\&.net/nonav/2\&.1\&.3/docs/xjcTask\&.html
-Using the XJC with Ant򻲾ȤƤ
-.SH "ץ"
+プラットフォームのbinディレクトリにある適切な\fIxjc\fRシェル・スクリプトを使用して、バインディング・コンパイラを起動します。バインディング・コンパイラを実行するAntタスクもあります。http://jaxb\&.java\&.net/nonav/2\&.1\&.3/docs/xjcTask\&.htmlの
+Using the XJC with Antを参照してください
+.SH "オプション"
 .sp
 .RS 4
 .ie n \{\
@@ -90,7 +90,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-ɸ४ץ⻲ȤƤ
+非標準オプションも参照してください
 .RE
 .sp
 .RS 4
@@ -101,167 +101,167 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-侩Ǻ줿ץ⻲ȤƤ
+非推奨で削除されたオプションも参照してください
 .RE
 .PP
 \-nv
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡޤ˸̩ʸڤ¹ԤޤΥץѤȡ̩ʥ޸ڤ̵ˤʤޤϡХǥ󥰡ѥ餬ڤڼ¹ԤʤȤȤǤϤޤ󡣤긷̩Ǥʤڤ¹ԤȤȤǤ
+デフォルトでは、XJCバインディング・コンパイラは、ソース・スキーマを処理する前に厳密な検証を実行します。このオプションを使用すると、厳密なスキーマ検証か無効になります。これは、バインディング・コンパイラが検証を一切実行しないということではありません。より厳密でない検証を実行するということです。
 .RE
 .PP
 \-extension
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡJAXBͤCompatibilityξϤƤ롼̩˶ޤϿE\&.2ˤϡJAXB v1\&.0ǴˤϥݡȤƤʤϢW3C XML޵ǽƤޤˤäƤϡΥåͭˤʤ\fI\-extension\fR⡼ɤǤεǽѤǤ礬ޤޤǥեȤθ̩ʥ⡼ɤǤϡͤƤХǥ󥰡ޥΤߤѤǤޤ\fI\-extension\fRåꤹСJAXB Vendor ExtensionѤǤޤ
+デフォルトでは、XJCバインディング・コンパイラは、JAXB仕様のCompatibilityの章で説明されているルールを厳密に強制します。付録E\&.2には、JAXB v1\&.0で完全にはサポートされていない一連のW3C XMLスキーマ機能が定義されています。場合によっては、このスイッチで有効になる\fI\-extension\fRモードでそれらの機能が使用できる場合があります。また、デフォルトの厳密なモードでは、仕様に定義されているバインディング・カスタマイズのみが使用できます。\fI\-extension\fRスイッチを指定すれば、JAXB Vendor Extensionを使用できます。
 .RE
 .PP
 \-b \fIfile\fR
 .RS 4
-볰Хǥ󥰡ե1ĤޤʣꤷޤХǥ󥰡ե뤴Ȥ\fI\-b\fRåꤹɬפޤХǥ󥰡եιʸϽǤʣΥޤΥޥޤޤ1ĤΥХǥ󥰡եѤꡢΥޥʣΥХǥ󥰡եʬ䤷Ǥޤ򼨤ޤ\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings123\&.xjb\fR
-\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings1\&.xjb \-b bindings2\&.xjb \-b bindings3\&.xjb\fRޤޥɥ饤˥ޡեȥХǥ󥰡եꤹ֤ǤդǤ
+処理する外部バインディング・ファイルを1つまたは複数指定します。バインディング・ファイルごとに\fI\-b\fRスイッチを指定する必要があります。外部バインディング・ファイルの構文は柔軟です。複数のスキーマのカスタマイズが含まれる1つのバインディング・ファイルを使用したり、それらのカスタマイズを複数のバインディング・ファイルに分割したりできます。次に例を示します。\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings123\&.xjb\fR
+\fIxjc schema1\&.xsd schema2\&.xsd schema3\&.xsd \-b bindings1\&.xjb \-b bindings2\&.xjb \-b bindings3\&.xjb\fRまた、コマンドラインにスキーマ・ファイルとバインディング・ファイルを指定する順番は任意です。
 .RE
 .PP
 \-d \fIdir\fR
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡJavaƥġ饹򸽺ߤΥǥ쥯ȥޤΥץѤȡؽϥǥ쥯ȥǤޤϥǥ쥯ȥϤǤ¸ߤƤɬפޤXJCХǥ󥰡ѥǤϺޤ
+デフォルトでは、XJCバインディング・コンパイラは、Javaコンテンツ・クラスを現在のディレクトリに生成します。このオプションを使用すると、代替出力ディレクトリを指定できます。出力ディレクトリはすでに存在している必要があります。XJCバインディング・コンパイラでは作成されません。
 .RE
 .PP
 \-p \fIpkg\fR
 .RS 4
-Υޥɥ饤󡦥ץǥåȡѥåꤷ硢λƤϡѥå̾Ф뤹٤ƤΥХǥ󥰡ޥ䡢ͤǵꤵƤǥեȤΥѥå̾르ꥺͥ褵ޤ
+このコマンドライン・オプションでターゲット・パッケージを指定した場合、その指定内容は、パッケージ名に対するすべてのバインディング・カスタマイズや、仕様で規定されているデフォルトのパッケージ名アルゴリズムよりも優先されます。
 .RE
 .PP
 \-httpproxy \fIproxy\fR
 .RS 4
-\fI[user[:password]@]proxyHost[:proxyPort]\fRHTTPޤHTTPSץꤷޤŤ\fI\-host\fR\fI\-port\fRץϡ̸ߴΤ˰³RIǥݡȤޤ侩ȤʤޤΥץǻꤵ줿ѥɤϡtopޥɤѤ¾Υ桼ɽǤǤƥˤϡ\fI\-httpproxyfile\fRѤƤ
+\fI[user[:password]@]proxyHost[:proxyPort]\fR形式でHTTPまたはHTTPSプロキシを指定します。古い\fI\-host\fRおよび\fI\-port\fRオプションは、下位互換性のために引き続きRIでサポートされますが、非推奨となりました。このオプションで指定されたパスワードは、topコマンドを使用する他のユーザーが表示できる引数です。セキュリティを高めるには、\fI\-httpproxyfile\fRを使用してください。
 .RE
 .PP
 \-httpproxyfile file
 .RS 4
-եѤơHTTPޤHTTPSץꤷޤ\fI\-httpproxy\fRץƱǤΥե˻ꤵ줿ѥɤ¾Υ桼ɽ뤳ȤϤǤޤ
+ファイルを使用して、HTTPまたはHTTPSプロキシを指定します。形式は\fI\-httpproxy\fRオプションと同じですが、このファイル内に指定されたパスワードを他のユーザーが表示することはできません。
 .RE
 .PP
 \-classpath arg
 .RS 4
-\fIjxb:javaType\fRxjc:\fIsuperClass\fRޥѤ륯饤ȡץꥱΥ饹եθꤷޤ
+\fIjxb:javaType\fRおよびxjc:\fIsuperClass\fRカスタマイズが使用するクライアント・アプリケーションのクラス・ファイルの検索場所を指定します。
 .RE
 .PP
 \-catalog file
 .RS 4
-ƥƥȤ褹륫եꤷޤTR9401XCatalogOASIS XML CatalogγƷݡȤޤhttp://xerces\&.apache\&.org/xml\-commons/components/resolver/resolver\-article\&.html
-XML Entity and URI Resolvers򻲾ȤƤ
+外部エンティティ参照を解決するカタログ・ファイルを指定します。TR9401、XCatalogおよびOASIS XML Catalogの各形式がサポートされます。http://xerces\&.apache\&.org/xml\-commons/components/resolver/resolver\-article\&.htmlの
+XML Entity and URI Resolversを参照してください
 .RE
 .PP
 \-readOnly
 .RS 4
-ǥեȤǤϡXJCХǥ󥰡ѥϡJavaեߤݸޤ󡣤ΥץѤȡXJCХǥ󥰡ѥJavaŪɼѤˤޤ
+デフォルトでは、XJCバインディング・コンパイラは、生成するJavaソース・ファイルを書込みから保護しません。このオプションを使用すると、XJCバインディング・コンパイラは生成されるJavaソースを強制的に読取り専用にします。
 .RE
 .PP
 \-npa
 .RS 4
-\fI**/package\-info\&.java\fRؤΥѥå٥ޤΥåѤ륳ɤǤϡ᤬¾ѥ饹ޤ
+\fI**/package\-info\&.java\fRへのパッケージ・レベルの注釈の生成を抑制します。このスイッチを使用して生成するコードでは、これらの注釈が他の生成済クラスに内部化されます。
 .RE
 .PP
 \-no\-header
 .RS 4
-¿Υȥॹפޤե롦إåȤޤѤȡ줿ɤ\fIdiff\fRޥɤȤθߴ궯ʤޤ
+多少のメモとタイムスタンプを含むファイル・ヘッダー・コメントの生成を抑制します。これを使用すると、生成されたコードと\fIdiff\fRコマンドとの互換性がより強くなります。
 .RE
 .PP
 \-target 2\&.0
 .RS 4
-JAXB 2\&.1ǽ˰¸륳ɤʤ褦ˤޤˤꡢ줿ɤJAXB 2\&.0󥿥Ķ(Java SE 6ʤ)Ǽ¹ԤǤ褦ˤʤޤ
+JAXB 2\&.1機能に依存するコードを生成しないようにします。これにより、生成されたコードをJAXB 2\&.0ランタイム環境(Java SE 6など)で実行できるようになります。
 .RE
 .PP
 \-xmlschema
 .RS 4
-ϥޤW3C XMLޤȤưޤ(ǥե)Υåꤷʤ硢ϥޤW3C XMLޤƱ褦˰ޤ
+入力スキーマをW3C XMLスキーマとして扱います(デフォルト)。このスイッチを指定しない場合、入力スキーマはW3C XMLスキーマと同じように扱われます。
 .RE
 .PP
 \-relaxing
 .RS 4
-ϥޤRELAX NGȤưޤ(Ṳ̄ݡ)RELAX NGޤΥݡȤJAXB Vendor ExtensionȤ󶡤Ƥޤ
+入力スキーマをRELAX NGとして扱います(試験的および未サポート)。RELAX NGスキーマのサポートはJAXB Vendor Extensionとして提供されています。
 .RE
 .PP
 \-relaxing\-compact
 .RS 4
-ϥޤRELAX NG̹ʸȤƽޤ(Ṳ̄ݡ)RELAX NGޤΥݡȤJAXB Vendor ExtensionȤ󶡤Ƥޤ
+入力スキーマをRELAX NG圧縮構文として処理します(試験的および未サポート)。RELAX NGスキーマのサポートはJAXB Vendor Extensionとして提供されています。
 .RE
 .PP
 \-dtd
 .RS 4
-ϥޤXML DTDȤưޤ(Ṳ̄ݡ)RELAX NGޤΥݡȤJAXB Vendor ExtensionȤ󶡤Ƥޤ
+入力スキーマをXML DTDとして扱います(試験的および未サポート)。RELAX NGスキーマのサポートはJAXB Vendor Extensionとして提供されています。
 .RE
 .PP
 \-wsdl
 .RS 4
-ϤWSDLȤưΥޤ򥳥ѥ뤷ޤ(Ṳ̄ݡ)
+入力をWSDLとして扱い、その内部のスキーマをコンパイルします(試験的および未サポート)。
 .RE
 .PP
 \-quiet
 .RS 4
-ĽٹʤɡѥνϤޤ
+進捗情報や警告など、コンパイラの出力を抑制します。
 .RE
 .PP
 \-verbose
 .RS 4
-åϤΥ顼ȯ˥åȥ졼ɽꤹʤɡƾĹˤʤޤ
+情報メッセージを出力したり特定のエラー発生時にスタック・トレースを表示したりするなど、きわめて冗長になります。
 .RE
 .PP
 \-help
 .RS 4
-ѥ顦åΥޥ꡼ɽޤ
+コンパイラ・スイッチのサマリーを表示します。
 .RE
 .PP
 \-version
 .RS 4
-ѥΥСɽޤ
+コンパイラのバージョン情報を表示します。
 .RE
 .PP
 \fIschema file/URL/dir\fR
 .RS 4
-ѥоݤȤʤ1ĤޤʣΥޡեꤷޤǥ쥯ȥꤹ硢\fIxjc\fRޥɤϤ٤ƤΥޡե򥹥󤷤ƥѥ뤷ޤ
+コンパイル対象となる1つまたは複数のスキーマ・ファイルを指定します。ディレクトリを指定する場合、\fIxjc\fRコマンドはすべてのスキーマ・ファイルをスキャンしてコンパイルします。
 .RE
-.SS "ɸ४ץ"
+.SS "非標準オプション"
 .PP
 \-XLocator
 .RS 4
-줿ɤǤϡ󲽤θJava Bean󥹥󥹤˴ޤޤ륽XML˴ؤSAX Locator󤬸ޤ
+生成されたコードでは、非整列化の後にJava Beanインスタンスに含まれるソースXMLに関するSAX Locator情報が公開されます。
 .RE
 .PP
 \-Xsync\-methods
 .RS 4
-줿٤ƤΥ᥽åɡ˥\fIsynchronized\fRɤޤޤ
+生成されたすべてのメソッド・シグニチャに\fIsynchronized\fRキーワードが含められます。
 .RE
 .PP
 \-mark\-generated
 .RS 4
-줿ɤ\fI@javax\&.annotation\&.Generated\fRդޤ
+生成されたコードに注釈\fI@javax\&.annotation\&.Generated\fRを付けます。
 .RE
 .PP
 \-episode file
 .RS 4
-ѥ뤴Ȥ˻ꤵ줿ԥɡեޤ
+コンパイルごとに指定されたエピソード・ファイルを生成します。
 .RE
-.SS "侩Ǻ줿ץ"
+.SS "非推奨で削除されたオプション"
 .PP
 \-host & \-port
 .RS 4
-Υץ\fI\-httpproxy\fRץ֤ޤΥץϡ̸ߴݤ뤿˥ݡȤޤɥȤˤϵܤ줺Υ꡼Ǻǽ⤢ޤ
+これらのオプションは\fI\-httpproxy\fRオプションで置き換えられました。これらのオプションは、下位互換性を確保するためにサポートされますが、ドキュメントには記載されず、将来のリリースで削除される可能性もあります。
 .RE
 .PP
 \-use\-runtime
 .RS 4
-JAXB 2\&.0ͤǤϡܿΤ󥿥Ķ줿ᡢJAXB RI\fI**/impl/runtime \fRѥåɬפʤʤޤΤᡢΥåפȤʤꡢޤ
+JAXB 2\&.0仕様では、移植性のあるランタイム環境が定義されたため、JAXB RIが\fI**/impl/runtime \fRパッケージを生成する必要がなくなりました。このため、このスイッチは不要となり、削除されました。
 .RE
 .PP
 \-source
 .RS 4
-\fI\-source\fRߴåϡJAXB 2\&.0κǽEarly AccessǤƳޤΥåJAXB 2\&.0κΥ꡼ޤ1\&.0\&.xɤɬפϡ1\&.0\&.xɡ١Υ󥹥ȡѤƤ
+\fI\-source\fR互換性スイッチは、JAXB 2\&.0の最初のEarly Access版で導入されました。このスイッチはJAXB 2\&.0の今後のリリースから削除されます。1\&.0\&.xコードを生成する必要がある場合は、1\&.0\&.xコード・ベースのインストールを使用してください。
 .RE
-.SH "ѥ"
+.SH "コンパイラの制限"
 .PP
-̾ϡϢ뤹٤ƤΥޤƱХǥ󥰡ѥ顦åꤷ1Ĥñ̤Ȥƥѥ뤹ΤǤǤ\fIxjc\fRޥɤμ¹Իˤϡ¥ꥹȤαդƤΤۤȤɤϡ\fIxjc\fRޥɤ٤ƤӽФʣΥޤ򥳥ѥ뤹ˤΤƤϤޤޤ
+通常は、関連するすべてのスキーマを、同じバインディング・コンパイラ・スイッチを指定して1つの単位としてコンパイルするのが最も安全です。\fIxjc\fRコマンドの実行時には、次の制限リストに留意してください。これらの問題のほとんどは、\fIxjc\fRコマンドを何度か呼び出して複数のスキーマをコンパイルする場合にのみ当てはまります。
 .PP
-ʣΥޤƱ˥ѥ뤹ϡåȤJavaѥå̾˼̤ͥΥ롼뤬ŬѤ뤳ȤդƤ
+複数のスキーマを同時にコンパイルする場合は、ターゲットのJavaパッケージ名に次の優先順位のルールが適用されることに注意してください。
 .sp
 .RS 4
 .ie n \{\
@@ -271,7 +271,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-\fI\-p\fRץ󤬺Ǥͥ褵ޤ
+\fI\-p\fRオプションが最も優先されます。
 .RE
 .sp
 .RS 4
@@ -282,7 +282,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-\fIjaxb:package\fRΥޥ
+\fIjaxb:package\fRのカスタマイズ。
 .RE
 .sp
 .RS 4
@@ -293,7 +293,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-\fItargetNamespace\fRƤϡ\fIt\fR\fIargetNamespace\fRͤƤJavaѥå̾Υ르ꥺŬѤޤ
+\fItargetNamespace\fRが宣言されている場合は、\fIt\fR\fIargetNamespace\fRを仕様で定義されているJavaパッケージ名のアルゴリズムに適用します。
 .RE
 .sp
 .RS 4
@@ -304,15 +304,15 @@
 .sp -1
 .IP "  4." 4.2
 .\}
-\fItargetNamespace\fRƤʤϡ\fIgenerated\fRȤ̾Υϡɥɤ줿ѥåѤޤ
+\fItargetNamespace\fRが宣言されていない場合は、\fIgenerated\fRという名前のハードコードされたパッケージを使用します。
 .RE
 .PP
-1ĤΥ͡ॹڡʣ\fIjaxb:schemaBindings\fRĤȤϤǤʤᡢۤʤJavaѥå˥ѥ餵Ʊ쥿åȡ͡ॹڡ2ĤΥޤĤȤϤǤޤ
+1つのネームスペースが複数の\fIjaxb:schemaBindings\fRを持つことはできないため、異なるJavaパッケージにコンパイラされる同一ターゲット・ネームスペースが2つのスキーマを持つことはできません。
 .PP
-ƱJavaѥå˥ѥ餵륹ޤϤ٤ơƱXJCХǥ󥰡ѥɬפޤ̡˥ѥ뤹ȡͽۤɤ˵ǽޤ
+同じJavaパッケージにコンパイラされるスキーマはすべて、同時にXJCバインディング・コンパイラに送信される必要があります。別々にコンパイルすると、予想どおりに機能しません。
 .PP
-ʣΥޡեˤޤִ롼פϡƱ˥ѥ뤹ɬפޤ
-.SH "Ϣ"
+複数のスキーマ・ファイルにまたがる要素置換グループは、同時にコンパイルする必要があります。
+.SH "関連項目"
 .sp
 .RS 4
 .ie n \{\
@@ -322,7 +322,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/xjc\&.html
+http://jaxb\&.java\&.net/nonav/2\&.2\&.3u1/docs/xjc\&.htmlの
 Binding Compiler (xjc)
 .RE
 .sp
@@ -334,7 +334,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-http://www\&.oracle\&.com/technetwork/articles/javase/index\-140168\&.html
+http://www\&.oracle\&.com/technetwork/articles/javase/index\-140168\&.htmlの
 Java Architecture for XML Binding (JAXB)
 .RE
 .br
--- a/jdk/test/ProblemList.txt	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/ProblemList.txt	Thu May 07 20:50:07 2015 -0700
@@ -136,13 +136,6 @@
 
 ############################################################################
 
-# jdk_management
-
-# 8058492
-java/lang/management/ThreadMXBean/FindDeadlocks.java                                      generic-all
-
-############################################################################
-
 # jdk_jmx
 
 # 8030957
@@ -353,9 +346,6 @@
 # 8068645
 com/sun/jdi/CatchPatternTest.sh                                 generic-all
 
-# 8069402
-com/sun/jdi/ConnectedVMs.java					generic-all
-
 # 8067354
 com/sun/jdi/GetLocalVariables4Test.sh				windows-all
 
@@ -380,13 +370,7 @@
 # 8072131
 sun/tools/jmap/heapconfig/JMapHeapConfigTest.java macosx-all
 
-# 8027668
-sun/tools/jstatd/TestJstatdDefaults.java                generic-all
-sun/tools/jstatd/TestJstatdServer.java                  generic-all
-sun/tools/jstatd/TestJstatdPort.java                    generic-all
-sun/tools/jstatd/TestJstatdPortAndServer.java                    generic-all
-
-# 8046285 8027668
+# 8046285
 sun/tools/jstatd/TestJstatdExternalRegistry.java                generic-all
 
 # 6456333
--- a/jdk/test/TEST.ROOT	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/TEST.ROOT	Thu May 07 20:50:07 2015 -0700
@@ -20,5 +20,5 @@
 # Group definitions
 groups=TEST.groups [closed/TEST.groups]
 
-# Tests using jtreg 4.1 b10 features
-requiredVersion=4.1 b10
+# Tests using jtreg 4.1 b11 features
+requiredVersion=4.1 b11
--- a/jdk/test/com/sun/jdi/AcceptTimeout.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/AcceptTimeout.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -25,6 +25,7 @@
  * @bug 6198277
  * @summary Test that each ListeningConnector that supports a "timeout" argument will
  *     timeout with TransportTimeoutException
+ * @modules jdk.jdi
  */
 import com.sun.jdi.Bootstrap;
 import com.sun.jdi.connect.Connector;
--- a/jdk/test/com/sun/jdi/AccessSpecifierTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/AccessSpecifierTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g AccessSpecifierTest.java
  *  @run driver AccessSpecifierTest
--- a/jdk/test/com/sun/jdi/AfterThreadDeathTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/AfterThreadDeathTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g AfterThreadDeathTest.java
  *  @run driver AfterThreadDeathTest
--- a/jdk/test/com/sun/jdi/AllLineLocations.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/AllLineLocations.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -28,6 +28,7 @@
  *  @author Gordon Hirsch
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g RefTypes.java
  *  @run build AllLineLocations
--- a/jdk/test/com/sun/jdi/ArrayRangeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ArrayRangeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -30,6 +30,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ArrayRangeTest.java
  *  @run driver ArrayRangeTest
--- a/jdk/test/com/sun/jdi/BacktraceFieldTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/BacktraceFieldTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g BacktraceFieldTest.java
  *  @run driver BacktraceFieldTest
--- a/jdk/test/com/sun/jdi/BadHandshakeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/BadHandshakeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -44,6 +44,8 @@
  * @summary Check that a bad handshake doesn't cause a debuggee to abort
  * @library /lib/testlibrary
  *
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
  * @run driver BadHandshakeTest
  */
--- a/jdk/test/com/sun/jdi/BreakpointTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/BreakpointTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g BreakpointTest.java
  *  @run driver BreakpointTest
@@ -44,7 +45,7 @@
 // the debuggee, waits a bit, and enables the bkpt again.
 
 class BreakpointTarg {
-    public final static int BKPT_LINE = 54;
+    public final static int BKPT_LINE = 55;
             // LINE NUMBER SENSITIVE
 
     public static long count;
--- a/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -30,6 +30,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ClassLoaderClassesTest.java
  *  @run driver ClassLoaderClassesTest
--- a/jdk/test/com/sun/jdi/ClassesByName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ClassesByName.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -27,6 +27,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run build ClassesByName
--- a/jdk/test/com/sun/jdi/ClassesByName2Test.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ClassesByName2Test.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,8 @@
  *
  *  @author Tim Bell (based on ClassesByName by Robert Field)
  *
+ *  @modules java.corba
+ *           jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ClassesByName2Test.java
  *  @run driver ClassesByName2Test
--- a/jdk/test/com/sun/jdi/CompatibleConnectors.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/CompatibleConnectors.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  *
  * This test checks that VirtualMachineManager creates Connectors that
  * are "compatible" those created by 1.4 or earilier releases.
+ * @modules jdk.jdi
  */
 
 import com.sun.jdi.*;
--- a/jdk/test/com/sun/jdi/ConnectedVMs.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ConnectedVMs.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -26,6 +26,7 @@
  *  @bug 4329140
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InstTarg.java
  *  @run driver ConnectedVMs Kill
--- a/jdk/test/com/sun/jdi/ConstantPoolInfo.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ConstantPoolInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Swamy Venkataramanappa
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection
  *  @run compile -g ConstantPoolInfo.java
  *  @run driver ConstantPoolInfo
--- a/jdk/test/com/sun/jdi/CountEvent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/CountEvent.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g CountEvent.java
  *  @run driver CountEvent
--- a/jdk/test/com/sun/jdi/CountFilterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/CountFilterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g CountFilterTest.java
  *  @run driver CountFilterTest
--- a/jdk/test/com/sun/jdi/DebuggerThreadTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/DebuggerThreadTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g DebuggerThreadTest.java
  *  @run driver DebuggerThreadTest
--- a/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -29,6 +29,7 @@
  *  @author jjh
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build  TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g DeleteAllBkptsTest.java
  *  @run driver DeleteAllBkptsTest
--- a/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g DeleteEventRequestsTest.java
  *  @run driver DeleteEventRequestsTest
--- a/jdk/test/com/sun/jdi/DoubleAgentTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/DoubleAgentTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -30,6 +30,7 @@
  * @summary Check that multiple -agentlib statements in command line fails
  *
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibarary.*
  * @build DoubleAgentTest Exit0
  * @run driver DoubleAgentTest
--- a/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -27,6 +27,7 @@
  *  @summary Unexpected ClassCastException in ThreadReference.forceEarlyReturn
  *  @author Jim Holmlund
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g EarlyReturnNegativeTest.java
  *  @run driver EarlyReturnNegativeTest
--- a/jdk/test/com/sun/jdi/EarlyReturnTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/EarlyReturnTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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,6 +34,7 @@
  *
  *  @author Tim Bell (based on MethodExitReturnValuesTest by Jim Holmlund)
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g EarlyReturnTest.java
  *  @run driver EarlyReturnTest
--- a/jdk/test/com/sun/jdi/EnumTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/EnumTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g EnumTest.java
  *  @run driver EnumTest
--- a/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -26,6 +26,7 @@
  *  @bug 4425852
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build VMConnection
  *  @run compile -g EventQueueDisconnectTest.java
  *  @run driver EventQueueDisconnectTest
--- a/jdk/test/com/sun/jdi/ExceptionEvents.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ExceptionEvents.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection
  *  @run compile -g ExceptionEvents.java
  *
--- a/jdk/test/com/sun/jdi/ExclusiveBind.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ExclusiveBind.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,8 @@
  *          at the same time.
  * @library /lib/testlibrary
  *
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* VMConnection ExclusiveBind HelloWorld
  * @run driver ExclusiveBind
  */
--- a/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ExpiredRequestDeletionTest.java
  *  @run driver ExpiredRequestDeletionTest
--- a/jdk/test/com/sun/jdi/FieldWatchpoints.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/FieldWatchpoints.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FieldWatchpoints.java
  *  @run driver FieldWatchpoints
--- a/jdk/test/com/sun/jdi/FilterMatch.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/FilterMatch.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field/Jim Holmlund
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run driver FilterMatch
--- a/jdk/test/com/sun/jdi/FilterNoMatch.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/FilterNoMatch.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field/Jim Holmlund
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run driver FilterNoMatch
--- a/jdk/test/com/sun/jdi/FinalLocalsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/FinalLocalsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -30,6 +30,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FinalLocalsTest.java
  *  @run driver FinalLocalsTest
--- a/jdk/test/com/sun/jdi/FinalizerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/FinalizerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -27,6 +27,7 @@
  *  @summary Test debugger operations in finalize() methods
  *  @author Gordon Hirsch  (modified for HotSpot by tbell & rfield)
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FinalizerTest.java
  *
--- a/jdk/test/com/sun/jdi/FramesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/FramesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FramesTest.java
  *  @run driver FramesTest
--- a/jdk/test/com/sun/jdi/GenericsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/GenericsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g GenericsTest.java
  *  @run driver GenericsTest
--- a/jdk/test/com/sun/jdi/GetLocalVariables2Test.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/GetLocalVariables2Test.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g GetLocalVariables2Test.java
  *  @run driver GetLocalVariables2Test
--- a/jdk/test/com/sun/jdi/GetUninitializedStringValue.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/GetUninitializedStringValue.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g GetUninitializedStringValue.java
  *  @run driver GetUninitializedStringValue
--- a/jdk/test/com/sun/jdi/HomeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/HomeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell (based on "HomeTest.java" by Eugene I. Latkin)
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g HomeTest.java
  *  @run driver HomeTest
--- a/jdk/test/com/sun/jdi/InstanceFilter.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/InstanceFilter.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field/Jim Holmlund
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g InstanceFilter.java
  *  @run driver InstanceFilter
@@ -104,7 +105,10 @@
             return;
         }
         if (theThis == null) {
-            // This happens when the thread has exited.
+            // This happens when the thread has exited or when a
+            // static method is called. Setting an instance
+            // filter does not prevent this event from being
+            // emitted with a this that is null.
             methodEntryRequest.disable();
             return;
         }
@@ -138,6 +142,10 @@
         EventRequestManager mgr = vm().eventRequestManager();
         methodEntryRequest = mgr.createMethodEntryRequest();
         methodEntryRequest.addInstanceFilter(theInstance);
+        // Thread filter is needed to prevent MethodEntry events
+        // to be emitted by the debugee when a static method
+        // is called on any thread.
+        methodEntryRequest.addThreadFilter(bpe.thread());
         methodEntryRequest.enable();
 
         listenUntilVMDisconnect();
--- a/jdk/test/com/sun/jdi/InstancesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/InstancesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  *  @summary Add ReferenceType.getAllInstances () method to JDI.
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InstancesTest.java
  *  @run driver InstancesTest
--- a/jdk/test/com/sun/jdi/InterfaceMethodsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/InterfaceMethodsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
  *  @bug 8071657
  *  @summary  JDI: Add support for static and default methods in interfaces
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run build InterfaceMethodsTest
  *  @run driver InterfaceMethodsTest
--- a/jdk/test/com/sun/jdi/InterruptHangTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/InterruptHangTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) 2006, 2015, 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.
+ */
+
+import com.sun.jdi.*;
+import com.sun.jdi.event.*;
+import com.sun.jdi.request.*;
+
 /**
  *  @test
  *  @bug 6459476
@@ -5,15 +32,13 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InterruptHangTest.java
  *  @run driver InterruptHangTest
  */
-import com.sun.jdi.*;
-import com.sun.jdi.event.*;
-import com.sun.jdi.request.*;
 
-/*
+/**
  * Debuggee has two threads.  Debugger keeps stepping in
  * the first thread.  The second thread keeps interrupting the first
  * thread.  If a long time goes by with the debugger not getting
--- a/jdk/test/com/sun/jdi/InvokeHangTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/InvokeHangTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InvokeHangTest.java
  *  @run driver InvokeHangTest
--- a/jdk/test/com/sun/jdi/InvokeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/InvokeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build  TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InvokeTest.java
  *  @run driver InvokeTest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/jdi/InvokeVarArgs.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+/**
+ *  @test
+ *  @bug 8075331
+ *  @summary Verify that we can call varargs methods
+ *  @run build TestScaffold VMConnection TargetAdapter TargetListener
+ *  @run compile -g InvokeVarArgs.java
+ *  @run driver InvokeVarArgs
+ */
+
+import com.sun.jdi.*;
+import com.sun.jdi.event.*;
+import java.util.Arrays;
+
+interface MyInterface {
+}
+
+class SomeClass implements MyInterface {
+}
+
+class InvokeVarArgsTarg {
+
+    public static void main(String args[]) {
+        new InvokeVarArgsTarg().run();
+    }
+
+    SomeClass someClass1 = new SomeClass();
+    SomeClass someClass2 = new SomeClass();
+
+    MyInterface[] array = new MyInterface[]{someClass1, someClass2};
+    SomeClass[] array2 = new SomeClass[]{someClass1, someClass2};
+
+    public void run() {
+        System.out.println("size(array) : " + size(array));
+        System.out.println("size(array2) : " + size(array2));
+    }
+
+    int size(Object... value) {
+        return value.length;
+    }
+}
+
+public class InvokeVarArgs extends TestScaffold {
+
+    public static void main(String args[]) throws Exception {
+        new InvokeVarArgs(args).startTests();
+    }
+
+    InvokeVarArgs(String args[]) throws Exception {
+        super(args);
+    }
+
+    protected void runTests() throws Exception {
+
+        BreakpointEvent bpe = startTo("InvokeVarArgsTarg", "run", "()V");
+        StackFrame frame = bpe.thread().frame(0);
+        ObjectReference targetObj = frame.thisObject();
+        ReferenceType targetType = (ReferenceType) targetObj.type();
+        Value arrayVal = targetObj.getValue(targetType.fieldByName("array"));
+        Value array2Val = targetObj.getValue(targetType.fieldByName("array2"));
+        Method sizeMethod = targetType.methodsByName("size", "([Ljava/lang/Object;)I").get(0);
+
+        IntegerValue size = (IntegerValue) targetObj.invokeMethod(bpe.thread(), sizeMethod, Arrays.asList(new Value[]{arrayVal}), 0);
+        if (size.value() != 2) {
+            throw new Exception("size(array) should be 2, but was " + size.value());
+        }
+
+        size = (IntegerValue) targetObj.invokeMethod(bpe.thread(), sizeMethod, Arrays.asList(new Value[]{array2Val}), 0);
+        if (size.value() != 2) {
+            throw new Exception("size(array2) should be 2, but was " + size.value());
+        }
+
+        listenUntilVMDisconnect();
+    }
+}
--- a/jdk/test/com/sun/jdi/JITDebug.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/JITDebug.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,7 +1,7 @@
 #!/bin/ksh -p
 
 #
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2015, 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
@@ -31,6 +31,7 @@
 #   @author     Tim Bell
 #   Based on test/java/awt/TEMPLATE/AutomaticShellTest.sh
 #
+#   @modules jdk.jdi
 #   @run build TestScaffold VMConnection TargetListener TargetAdapter
 #   @run compile -g JITDebug.java
 #   @run shell JITDebug.sh
--- a/jdk/test/com/sun/jdi/Java_gTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/Java_gTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g Java_gTest.java
  *  @run driver Java_gTest
--- a/jdk/test/com/sun/jdi/LambdaBreakpointTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/LambdaBreakpointTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LambdaBreakpointTest.java
  *  @run driver LambdaBreakpointTest
@@ -51,7 +52,7 @@
 class LambdaBreakpointTestTarg {
 
     static int[] breakpointLines = {
-            62, 66, 63, 64, 65, 67
+            63, 67, 64, 65, 66, 68
     };
 
     public static void main(String[] args) {
--- a/jdk/test/com/sun/jdi/LambdaStepTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/LambdaStepTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -27,6 +27,7 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LambdaStepTest.java
  *  @run driver LambdaStepTest
--- a/jdk/test/com/sun/jdi/LaunchCommandLine.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/LaunchCommandLine.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -28,6 +28,7 @@
  *  @author Gordon Hirsch
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run build LaunchCommandLine
--- a/jdk/test/com/sun/jdi/LineNumberInfo.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/LineNumberInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -27,6 +27,7 @@
  *  @summary Test javac regressions in the generation of line number info
  *  @author Gordon Hirsch
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LineNumberInfo.java ControlFlow.java
  *
--- a/jdk/test/com/sun/jdi/LineNumberOnBraceTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/LineNumberOnBraceTest.java	Thu May 07 20:50:07 2015 -0700
@@ -18,8 +18,8 @@
     /********** LINE NUMBER SENSITIVE! *****************************************************************/
 class LineNumberOnBraceTarg {
 
-    public final static int stopLine = 28;   // THIS MUST BE THE LINE NUMBER OF THE // stopline LINE
-    public final static int stopLine2 = 34;  // THIS MUST BE THE LINE NUMBER OF THE // stopline2 LINE
+    public final static int stopLine = 29;   // THIS MUST BE THE LINE NUMBER OF THE // stopline LINE
+    public final static int stopLine2 = 35;  // THIS MUST BE THE LINE NUMBER OF THE // stopline2 LINE
 
 
     public static void main(String[] args){
--- a/jdk/test/com/sun/jdi/ListenAddress.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ListenAddress.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @summary Test that startListening(Map) method of the com.sun.jdi.SocketListen
  *          Connector returns an address that is usable for the address option on
  *          remove debuggees.
+ * @modules jdk.jdi
  */
 import java.net.InetAddress;
 import java.net.Inet4Address;
--- a/jdk/test/com/sun/jdi/LocalVariableEqual.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/LocalVariableEqual.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Serguei Spitsyn
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LocalVariableEqual.java
  *  @run driver LocalVariableEqual
--- a/jdk/test/com/sun/jdi/LocationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/LocationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LocationTest.java
  *  @run driver LocationTest
--- a/jdk/test/com/sun/jdi/MethodEntryExitEvents.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/MethodEntryExitEvents.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -27,6 +27,7 @@
  *  @summary Test the bug fix for: MethodExitEvents disappear when Object-Methods are called from main
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MethodEntryExitEvents.java
  *  @run driver MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee
--- a/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  *  @summary JDWP, JDI: Add return value to Method Exit Event
  *  @author Jim Holmlund
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MethodExitReturnValuesTest.java
  *  @run driver MethodExitReturnValuesTest
--- a/jdk/test/com/sun/jdi/MixedSuspendTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/MixedSuspendTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015 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
@@ -29,6 +29,7 @@
 # 
 #  @author Jim Holmlund
 # 
+#  @modules jdk.jdi
 #  @run build TestScaffold VMConnection TargetListener TargetAdapter
 #  @run shell MixedSuspendTest.sh
 
--- a/jdk/test/com/sun/jdi/ModificationWatchpoints.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ModificationWatchpoints.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -30,6 +30,7 @@
  *  @author Robert Field (modified to JDIScaffold)
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g ModificationWatchpoints.java
  *  @run driver ModificationWatchpoints
--- a/jdk/test/com/sun/jdi/MonitorEventTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/MonitorEventTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Swamy Venkataramanappa
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MonitorEventTest.java
  *  @run driver MonitorEventTest
--- a/jdk/test/com/sun/jdi/MonitorFrameInfo.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/MonitorFrameInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -29,6 +29,7 @@
  *  @summary MonitorInfo objects aren't invalidated when the owning thread is resumed
  *  @author Swamy Venkataramanappa
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MonitorFrameInfo.java
  *  @run driver MonitorFrameInfo
--- a/jdk/test/com/sun/jdi/MultiBreakpointsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/MultiBreakpointsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author tbell, jjh
  *
+ *  @modules jdk.jdi
  *  @build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MultiBreakpointsTest.java
  *  @run driver MultiBreakpointsTest
--- a/jdk/test/com/sun/jdi/NativeInstanceFilter.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/NativeInstanceFilter.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Keith McGuigan
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @compile -XDignore.symbol.file NativeInstanceFilterTarg.java
  *  @run driver NativeInstanceFilter
--- a/jdk/test/com/sun/jdi/NewInstanceTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/NewInstanceTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g NewInstanceTest.java
  *  @run driver NewInstanceTest
--- a/jdk/test/com/sun/jdi/NoLaunchOptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/NoLaunchOptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -27,6 +27,7 @@
  *   @summary    Test for -Xrunjdwp:[onthrow,onuncaught] suboptions require launch suboption
  *   @author     Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run compile -g NoLaunchOptionTest.java
  *  @build VMConnection
  *  @run driver NoLaunchOptionTest
--- a/jdk/test/com/sun/jdi/NoLocInfoTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/NoLocInfoTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Serguei Spitsyn
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g:none NoLocInfoTest.java
  *  @run driver NoLocInfoTest
--- a/jdk/test/com/sun/jdi/NullThreadGroupNameTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/NullThreadGroupNameTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015 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
@@ -26,6 +26,7 @@
  *  @bug 7105883
  *  @summary Ensure that JDWP doesn't crash with a null thread group name
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run driver NullThreadGroupNameTest
  */
--- a/jdk/test/com/sun/jdi/OnThrowTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/OnThrowTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  *   @summary    Test for -agentlib::[onthrow,launch]
  *   @author     Kelly O'Hair
  *
+ *  @modules jdk.jdi
  *  @run compile -g OnThrowTest.java
  *  @run compile -g OnThrowTarget.java
  *  @run compile -g VMConnection.java
--- a/jdk/test/com/sun/jdi/OptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/OptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  *   @summary    Test for misc jdwp options, just that the option is parsed
  *   @author     Kelly O'Hair (copied from Tim Bell's NoLaunchOptionTest)
  *
+ *  @modules jdk.jdi
  *  @run compile -g OptionTest.java
  *  @run compile -g HelloWorld.java
  *  @run compile -g VMConnection.java
--- a/jdk/test/com/sun/jdi/PopAndInvokeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/PopAndInvokeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -24,6 +24,7 @@
 /**
  *  @test
  *  @bug 6517249
+ *  @modules jdk.jdi
  *  @ignore 6951287
  *  @summary JDWP: Cannot do an invokeMethod after a popFrames operation
  *
--- a/jdk/test/com/sun/jdi/PopAndStepTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/PopAndStepTest.java	Thu May 07 20:50:07 2015 -0700
@@ -8,6 +8,7 @@
  *  @author jjh
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g PopAndStepTest.java
  *  @run driver PopAndStepTest
@@ -23,20 +24,20 @@
 class PopAndStepTarg {
     public void B() {
         System.out.println("debuggee: in B");
-        System.out.println("debuggee: in B, back to A");   // add line breakpoint here line 26 !!!
+        System.out.println("debuggee: in B, back to A");   // add line breakpoint here line 27 !!!
     }
 
     public void A() {
-        System.out.println("debuggee: in A, about to call B");  // line 30
+        System.out.println("debuggee: in A, about to call B");  // line 31
         B();
-        System.out.println("debuggee: in A, back from B");      // line 32
-        throw new RuntimeException("debuggee: Got to line 33");
+        System.out.println("debuggee: in A, back from B");      // line 33
+        throw new RuntimeException("debuggee: Got to line 34");
     }
 
     public static void main(String[] args) {
-        System.out.println("debuggee: Howdy!");      // line 37
-        PopAndStepTarg xxx = new PopAndStepTarg();   // line 39
-        xxx.A();                                     // line 40
+        System.out.println("debuggee: Howdy!");      // line 38
+        PopAndStepTarg xxx = new PopAndStepTarg();   // line 40
+        xxx.A();                                     // line 41
         System.out.println("debugee: Goodbye from PopAndStepTarg!");
     }
 }
@@ -115,10 +116,10 @@
         BreakpointEvent bpe = startToMain("PopAndStepTarg");
         targetClass = bpe.location().declaringType();
         mainThread = bpe.thread();
-        getDebuggeeLineNum(37);
+        getDebuggeeLineNum(38);
 
-        println("Resuming to line 26");
-        bpe = resumeTo("PopAndStepTarg", 26); getDebuggeeLineNum(26);
+        println("Resuming to line 27");
+        bpe = resumeTo("PopAndStepTarg", 27); getDebuggeeLineNum(27);
 
         // The failure is this:
         //   create step request
@@ -140,21 +141,21 @@
         srInto.enable(); // This fails
         mainThread.popFrames(frameFor("A"));
         //srInto.enable();   // if the enable is moved here, it passes
-        println("Popped back to line 40 in main, the call to A()");
-        println("Stepping into line 30");
+        println("Popped back to line 41 in main, the call to A()");
+        println("Stepping into line 31");
         waitForRequestedEvent(srInto);   // println
         srInto.disable();
 
-        getDebuggeeLineNum(30);
+        getDebuggeeLineNum(31);
 
         // The failure occurs here.
-        println("Stepping over to line 31");
+        println("Stepping over to line 32");
         stepOverLine(mainThread);   // println
-        getDebuggeeLineNum(31);
+        getDebuggeeLineNum(32);
 
-        println("Stepping over to line 32");
+        println("Stepping over to line 33");
         stepOverLine(mainThread);        // call to B()
-        getDebuggeeLineNum(32);
+        getDebuggeeLineNum(33);
 
         vm().exit(0);
 
--- a/jdk/test/com/sun/jdi/PopAsynchronousTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/PopAsynchronousTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g PopAsynchronousTest.java
  *  @run driver PopAsynchronousTest
--- a/jdk/test/com/sun/jdi/PopSynchronousTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/PopSynchronousTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g PopSynchronousTest.java
  *  @run driver PopSynchronousTest
--- a/jdk/test/com/sun/jdi/ProcessAttachTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ProcessAttachTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -41,6 +41,8 @@
  * @summary Unit test for ProcessAttachingConnector
  *
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* ProcessAttachTest
  * @run driver ProcessAttachTest
  */
--- a/jdk/test/com/sun/jdi/RedefineCrossEvent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/RedefineCrossEvent.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -28,6 +28,8 @@
  *
  *  @author Robert Field
  *
+ *  @modules java.corba
+ *           jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g AccessSpecifierTest.java
  *  @run compile -g AfterThreadDeathTest.java
--- a/jdk/test/com/sun/jdi/RedefineCrossStart.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/RedefineCrossStart.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -31,6 +31,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g CountEvent.java
  *  @run compile -g CountFilterTest.java
--- a/jdk/test/com/sun/jdi/ReferrersTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ReferrersTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  *  @summary Add support for backtracking reference graph.
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ReferrersTest.java
  *  @run driver ReferrersTest
--- a/jdk/test/com/sun/jdi/RepStep.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/RepStep.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -26,6 +26,7 @@
  *  @bug 4334008
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run compile -g RepStepTarg.java
  *  @run build VMConnection RepStep
  *
--- a/jdk/test/com/sun/jdi/RequestReflectionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/RequestReflectionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -26,6 +26,7 @@
  *  @bug 4425840
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g RequestReflectionTest.java
  *  @run driver RequestReflectionTest
--- a/jdk/test/com/sun/jdi/ResumeOneThreadTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ResumeOneThreadTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ResumeOneThreadTest.java
  *  @run driver ResumeOneThreadTest
--- a/jdk/test/com/sun/jdi/RunToExit.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/RunToExit.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -25,6 +25,8 @@
  * @bug 4997445
  * @summary Test that with server=y, when VM runs to System.exit() no error happens
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* VMConnection RunToExit Exit0
  * @run driver RunToExit
  */
--- a/jdk/test/com/sun/jdi/SDENullTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/SDENullTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build  TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SDENullTest.java
  *  @run driver SDENullTest
--- a/jdk/test/com/sun/jdi/SimulResumerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/SimulResumerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SimulResumerTest.java
  *  @run driver SimulResumerTest
--- a/jdk/test/com/sun/jdi/SourceNameFilterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/SourceNameFilterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SourceNameFilterTest.java
  *  @run driver SourceNameFilterTest
--- a/jdk/test/com/sun/jdi/StepTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/StepTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -26,6 +26,7 @@
  *  @bug 4270488 4787861
  *  @author Gordon Hirsch
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g MethodCalls.java
  *  @run compile -g MethodCallsReflection.java
--- a/jdk/test/com/sun/jdi/SuspendNoFlagTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/SuspendNoFlagTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  * @bug 4914611
  * @summary Test for JDWP: -agentlib:jdwp=suspend=n hanging
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibarary.*
  * @compile -g HelloWorld.java
  * @run driver SuspendNoFlagTest
--- a/jdk/test/com/sun/jdi/SuspendThreadTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/SuspendThreadTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SuspendThreadTest.java
  *  @run driver SuspendThreadTest
--- a/jdk/test/com/sun/jdi/TemplateTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/TemplateTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -31,6 +31,7 @@
  *
  *  @author <AUTHOR>
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g TemplateTest.java
  *  @run driver TemplateTest
--- a/jdk/test/com/sun/jdi/ThreadGroupTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/ThreadGroupTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *           destroyed this should not impact subsequent thread creation by
  *           the virtual machine manager.
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile ThreadGroupTest.java
  *  @run driver ThreadGroupTest
--- a/jdk/test/com/sun/jdi/TwoThreadsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/TwoThreadsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g TwoThreadsTest.java
  *  @run driver TwoThreadsTest
--- a/jdk/test/com/sun/jdi/UTF8Test.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/UTF8Test.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g UTF8Test.java
  *  @run driver UTF8Test
--- a/jdk/test/com/sun/jdi/UnpreparedByName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/UnpreparedByName.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
  *  @run build UnpreparedByName
--- a/jdk/test/com/sun/jdi/UnpreparedClasses.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/UnpreparedClasses.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
  *  @run build UnpreparedClasses
--- a/jdk/test/com/sun/jdi/VMDeathLastTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/VMDeathLastTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g HelloWorld.java
  *  @run build VMDeathLastTest
--- a/jdk/test/com/sun/jdi/VMDeathRequestTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/VMDeathRequestTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -26,6 +26,7 @@
  *  @bug 4419314
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g HelloWorld.java
  *  @run build VMDeathRequestTest
--- a/jdk/test/com/sun/jdi/VarargsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/VarargsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g VarargsTest.java
  *  @run driver VarargsTest
--- a/jdk/test/com/sun/jdi/Vars.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/Vars.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -28,6 +28,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g Vars.java
  *  @run driver Vars
--- a/jdk/test/com/sun/jdi/VisibleMethods.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/VisibleMethods.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -28,6 +28,7 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g VisibleMethods.java
  *  @run driver VisibleMethods
--- a/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  *
  * This tests launches a debuggee using a custom LaunchingConnector.
  *
+ * @modules jdk.jdi/com.sun.tools.jdi
  * @build DebugUsingCustomConnector SimpleLaunchingConnector Foo NullTransportService
  * @run main/othervm DebugUsingCustomConnector
  */
--- a/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -30,6 +30,7 @@
  * to encapsulate the transport. This tests that the connectors are
  * created and that they have an "address" argument.
  *
+ * @modules jdk.jdi
  * @build GeneratedConnectors NullTransportService
  * @run main/othervm GeneratedConnectors
  */
--- a/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2015, 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
--- a/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -93,7 +93,7 @@
 
     public SimpleLaunchingConnector() {
         try {
-            Class c = Class.forName("com.sun.tools.jdi.SocketTransportService");
+            Class<?> c = Class.forName("com.sun.tools.jdi.SocketTransportService");
             ts = (TransportService)c.newInstance();
         } catch (Exception x) {
             throw new Error(x);
--- a/jdk/test/com/sun/jdi/redefine/RedefineTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/redefine/RedefineTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -31,6 +31,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g RedefineTest.java
  *  @run shell RedefineSetUp.sh
--- a/jdk/test/com/sun/jdi/redefineMethod/RedefineTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/redefineMethod/RedefineTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g RedefineTest.java
  *  @run shell RedefineSetUp.sh
--- a/jdk/test/com/sun/jdi/sde/FilterMangleTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/sde/FilterMangleTest.java	Thu May 07 20:50:07 2015 -0700
@@ -6,6 +6,7 @@
  *  @author Robert Field / Jim Holmlund
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile FilterMangleTest.java
  *  @run compile -g onion/pickle/Mangle.java
--- a/jdk/test/com/sun/jdi/sde/MangleStepTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/sde/MangleStepTest.java	Thu May 07 20:50:07 2015 -0700
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile MangleStepTest.java
  *  @run compile -g  onion/pickle/Mangle.java
--- a/jdk/test/com/sun/jdi/sde/MangleTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/sde/MangleTest.java	Thu May 07 20:50:07 2015 -0700
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile MangleTest.java
  *  @run compile -g onion/pickle/Mangle.java
--- a/jdk/test/com/sun/jdi/sde/SourceDebugExtensionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/sde/SourceDebugExtensionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile SourceDebugExtensionTest.java
  *  @run compile -g SourceDebugExtensionTarg.java
--- a/jdk/test/com/sun/jdi/sde/TemperatureTableTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jdi/sde/TemperatureTableTest.java	Thu May 07 20:50:07 2015 -0700
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE HelloWorld
  *  @run compile TemperatureTableTest.java
  *  @run compile -g TemperatureTableServlet.java
--- a/jdk/test/com/sun/jmx/remote/CCAdminReconnectTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jmx/remote/CCAdminReconnectTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 7009998
  * @summary Tests the correct processing of concurrent ClientComunicatorAdmin reconnect requests.
  * @author Jaroslav Bachorik
+ * @modules java.management/com.sun.jmx.remote.internal
  * @run clean CCAdminReconnectTest
  * @run build CCAdminReconnectTest
  * @run main CCAdminReconnectTest
--- a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -33,6 +33,8 @@
  * @author Jaroslav Bachorik
  * @bug 6937053 8005472
  *
+ * @modules java.management
+ *          jdk.compiler
  * @run clean TestSerializationMismatch
  * @run main/othervm TestSerializationMismatch
  *
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/management/CheckSomeMXBeanImplPackage.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.PlatformManagedObject;
+
+/*
+ * @test
+ * @bug     8042901
+ * @summary If jdk.management is present, GarbageCollectorMXBean and ThreadMXBean
+ *          must be from com.sun.management.internal
+ * @author  Shanliang Jiang
+ */
+public class CheckSomeMXBeanImplPackage {
+    private static String implPackageName = "com.sun.management.internal";
+
+    public static void main(String[] args) throws Exception {
+        boolean present = false;
+        try {
+            Class.forName("com.sun.management.GarbageCollectorMXBean");
+            present = true;
+        } catch (ClassNotFoundException cnfe) {}
+
+        if (present) {
+            Class <? extends PlatformManagedObject> klazz =
+                    java.lang.management.GarbageCollectorMXBean.class;
+            for (Object obj :
+                    ManagementFactory.getPlatformMXBeans(klazz)) {
+                check(klazz.getName(), obj);
+            }
+
+            klazz = com.sun.management.GarbageCollectorMXBean.class;
+            for (Object obj :
+                    ManagementFactory.getPlatformMXBeans(klazz)) {
+                check(klazz.getName(), obj);
+            }
+
+            klazz = java.lang.management.ThreadMXBean.class;
+            check(klazz.getName(),
+                    ManagementFactory.getPlatformMXBean(klazz));
+
+            klazz = com.sun.management.ThreadMXBean.class;
+            check(klazz.getName(),
+                    ManagementFactory.getPlatformMXBean(klazz));
+
+            System.out.println("--- PASSED!");
+        } else {
+            System.out.println("--- Skip the test, jdk.management module is not present!");
+        }
+    }
+
+    private static void check(String mbeanName, Object impl) {
+        if (!impl.getClass().getName().startsWith(implPackageName)) {
+            throw new RuntimeException(mbeanName+" implementation package "
+                    + "should be: " + implPackageName
+                    + ", but got: " + impl.getClass());
+        } else {
+            System.out.println("--- Good, "+mbeanName+" got right implementation: " + impl);
+        }
+    }
+}
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for the DiagnosticCommandMBean
  * @author  Frederic Parain, Shanliang JIANG
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanDoubleInvocationTest
  */
 
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for the DiagnosticCommandMBean
  * @author  Frederic Parain, Shanliang JIANG
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanInvocationTest
  */
 
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Permissions Tests for the DiagnosticCommandMBean
  * @author  Frederic Parain
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanPermissionsTest
  */
 
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for the DiagnosticCommandMBean
  * @author  Frederic Parain, Shanliang JIANG
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanTest
  */
 
--- a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that GarbageCollectionNotification contents are reasonable
  * @author  Frederic Parain
  * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false
+ * @modules jdk.management
  * @run     main/othervm GarbageCollectionNotificationContentTest
  */
 
--- a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that GarbageCollection notification are thrown by every GarbageCollectorMXBean
  * @author  Frederic Parain
  * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false
+ * @modules jdk.management
  * @run     main/othervm GarbageCollectionNotificationTest
  */
 
--- a/jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015 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
@@ -27,6 +27,7 @@
  * @summary Sanity Test for GarbageCollectorMXBean.getLastGcInfo().
  * @author  Mandy Chung
  *
+ * @modules jdk.management
  * @run main/othervm -XX:-ExplicitGCInvokesConcurrent LastGCInfo
  */
 // Passing "-XX:-ExplicitGCInvokesConcurrent" to force System.gc()
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -26,6 +26,8 @@
  * @bug 8028994
  * @author Staffan Larsen
  * @library /lib/testlibrary
+ * @modules jdk.attach/sun.tools.attach
+ *          jdk.management
  * @build jdk.testlibrary.*
  * @run main CheckOrigin
  */
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, 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
@@ -29,6 +29,7 @@
 # @summary Sanity test for com.sun.management.HotSpotDiagnosticMXBean.dumpHeap 
 #          method 
 #
+# @modules jdk.management
 # @build DumpHeap
 # @run shell DumpHeap.sh
 
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotSpotDiagnosticMXBean.getDiagnosticOptions()
  * @author  Daniel Fuchs
  *
+ * @modules jdk.management
  * @run main GetDiagnosticOptions
  */
 
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotSpotDiagnosticMXBean.getVMOption() and double values
  * @author  Jaroslav Bachorik
  *
+ * @modules jdk.management
  * @run main/othervm -XX:CompileThresholdScaling=0.14 GetDoubleVMOption
  */
 
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotSpotDiagnosticMXBean.getVMOption()
  * @author  Mandy Chung
  *
+ * @modules jdk.management
  * @run main/othervm -XX:+PrintGCDetails GetVMOption
  */
 
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotSpotDiagnosticMXBean.setVMOption()
  * @author  Tomas Hurka, Daniel Fuchs
  *
+ * @modules jdk.management
  * @run main SetAllVMOptions
  */
 
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -29,6 +29,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
+ * @modules jdk.management
  * @run main/othervm -XX:+PrintGCDetails SetVMOption
  */
 
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522 6191542
  * @summary Basic unit test of OperatingSystemMXBean.getCommittedVirtualMemorySize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getFreePhysicalMemorySize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getFreeSwapSpaceSize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     7028071
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
  *
+ * @modules jdk.management
  * @run main GetProcessCpuLoad
  */
 
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuTime()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     7028071
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
  *
+ * @modules jdk.management
  * @run main GetSystemCpuLoad
  */
 
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getTotalPhysicalMemorySize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -29,6 +29,7 @@
  *      the GlobalMemoryStatus function can return incorrect information,
  *      reporting a value of -1 to indicate an overflow.
  *
+ * @modules jdk.management
  * @run main MemoryStatusOverflow
  */
 
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Basic unit test of OperatingSystemMXBean.getTotalSwapSpaceSize()
  *
  * @library /lib/testlibrary
+ * @modules jdk.management
  * @build TestTotalSwap jdk.testlibrary.*
  * @run main TestTotalSwap
  *
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     6173675
  * @summary Basic test of ThreadMXBean.getThreadAllocatedBytes
  * @author  Paul Hohensee
+ * @modules jdk.management
  */
 
 import java.lang.management.*;
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     6173675
  * @summary Basic test of ThreadMXBean.getThreadAllocatedBytes(long[])
  * @author  Paul Hohensee
+ * @modules jdk.management
  */
 
 import java.lang.management.*;
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -28,6 +28,7 @@
  *          getThreadUserTime(long[]).
  * @author  Paul Hohensee
  * @key randomness
+ * @modules jdk.management
  */
 
 import java.lang.management.*;
--- a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Steve Bohne
 #
+# @modules jdk.management
 # @run shell GetMaxFileDescriptorCount.sh
 #
 
--- a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Steve Bohne
 #
+# @modules jdk.management
 # @run shell GetOpenFileDescriptorCount.sh
 #
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/management/VMOptionOpenDataTest.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import com.sun.management.VMOption;
+import java.io.InvalidObjectException;
+import java.util.Objects;
+import javax.management.openmbean.OpenDataException;
+import sun.management.MappedMXBeanType;
+
+/*
+ * @test
+ * @bug     8042901
+ * @summary Check that MappedMXBeanType.toOpenTypeData supports VMOption
+ * @author  Shanliang Jiang
+ */
+public class VMOptionOpenDataTest {
+    public static void main(String[] args) throws Exception {
+        System.out.println("--- VMOptionOpenDataTest-main: Checking that "
+                + "MappedMXBeanType.toOpenTypeData supports VMOption");
+        Exception failed = null;
+        try {
+            VMOption vo = new VMOption("toto", "titi", true, VMOption.Origin.OTHER);
+            System.out.println("--- Construct a VMOption object: \"" + vo + "\"");
+
+            Object open = MappedMXBeanType.toOpenTypeData(vo, VMOption.class);
+            System.out.println("--- Map it to an open type:  \"" + open +" \"");
+
+            Object back = MappedMXBeanType.toJavaTypeData(open, VMOption.class);
+            System.out.println("--- Map it back to java type:  \"" + back +" \"");
+
+            if (back == null) {
+                failed = new RuntimeException("Failed, mapping back got null.");
+            } else if (!(back instanceof VMOption)) {
+                failed = new RuntimeException("Failed, not mapped back to a VMOption: "
+                        +back.getClass());
+            } else {
+                VMOption mapBack = (VMOption)back;
+                if (!Objects.equals(vo.getName(), mapBack.getName()) ||
+                        !Objects.equals(vo.getOrigin(), mapBack.getOrigin()) ||
+                        !Objects.equals(vo.getValue(), mapBack.getValue()) ||
+                        vo.isWriteable() != mapBack.isWriteable()) {
+                    failed = new RuntimeException(
+                            "Failed, failed to map back the original VMOtion.");
+                }
+            }
+        } catch (OpenDataException | InvalidObjectException ode) {
+            failed = ode;
+        }
+        if (failed == null) {
+            System.out.println("--- PASSED!");
+        } else {
+            System.out.println("--- Failed: "+failed.getMessage());
+            throw failed;
+        }
+    }
+}
--- a/jdk/test/com/sun/tools/attach/BasicTests.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -38,6 +38,9 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
+ * @modules java.instrument
+ *          java.management
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* Agent BadAgent RedefineAgent Application RedefineDummy RunnerUtil
  * @run main BasicTests
  *
--- a/jdk/test/com/sun/tools/attach/PermissionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/PermissionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015 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
@@ -33,6 +33,9 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* Application
  * @run main PermissionTest
  *
--- a/jdk/test/com/sun/tools/attach/ProviderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/ProviderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015 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
@@ -33,6 +33,9 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* SimpleProvider
  * @run main ProviderTest
  *
--- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015 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
@@ -40,6 +40,9 @@
  * @test
  * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.jartool/sun.tools.jar
  * @run build Application SimpleProvider jdk.testlibrary.*
  * @run main/timeout=300 StartManagementAgent
  */
--- a/jdk/test/com/sun/tools/attach/TempDirTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/TempDirTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015 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
@@ -38,6 +38,8 @@
  * @bug 8033104
  * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* Application RunnerUtil
  * @run main/timeout=200 TempDirTest
  */
--- a/jdk/test/demo/jvmti/minst/MinstTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/demo/jvmti/minst/MinstTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -38,7 +38,7 @@
         DemoRun demo;
 
         /* Run demo that uses JVMTI minst agent (no options) */
-        demo = new DemoRun("minst", "exclude=java/*,exclude=javax/*,exclude=com/*,exclude=sun/*" /* options to minst */ );
+        demo = new DemoRun("minst", "exclude=java/*,exclude=javax/*,exclude=com/*,exclude=jdk/*,exclude=sun/*" /* options to minst */ );
         demo.runit(args[0]);
 
         /* Make sure patterns in output look ok */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+/* @test
+ * @bug 8057919
+ * @summary Class.getSimpleName() should work for non-JLS compliant class names
+ */
+import jdk.internal.org.objectweb.asm.*;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+public class GetSimpleNameTest {
+    static class NestedClass {}
+    class InnerClass {}
+
+    static Class<?> f1() {
+        class LocalClass {}
+        return LocalClass.class;
+    }
+
+    public static void main(String[] args) throws Exception {
+        assertEquals(NestedClass.class.getSimpleName(), "NestedClass");
+        assertEquals( InnerClass.class.getSimpleName(),  "InnerClass");
+        assertEquals(             f1().getSimpleName(),  "LocalClass");
+
+        java.io.Serializable anon = new java.io.Serializable() {};
+        assertEquals(anon.getClass().getSimpleName(), "");
+
+        // Java class names, prepended enclosing class name.
+        testNested("p.Outer$Nested", "p.Outer", "Nested");
+        testInner( "p.Outer$Inner",  "p.Inner",  "Inner");
+        testLocal( "p.Outer$1Local", "p.Outer",  "Local");
+        testAnon(  "p.Outer$1",      "p.Outer",       "");
+
+        // Non-Java class names, prepended enclosing class name.
+        testNested("p.$C1$Nested", "p.$C1$", "Nested");
+        testInner( "p.$C1$Inner",  "p.$C1$",  "Inner");
+        testLocal( "p.$C1$Local",  "p.$C1$",  "Local");
+        testAnon(  "p.$C1$1",      "p.$C1$",       "");
+
+        // Non-Java class names, unrelated class names.
+        testNested("p1.$Nested$", "p2.$C1$", "Nested");
+        testInner( "p1.$Inner$",  "p2.$C1$",  "Inner");
+        testLocal( "p1.$Local$",  "p2.$C1$",  "Local");
+        testAnon(  "p1.$anon$",   "p2.$C1$",       "");
+    }
+
+    static void testNested(String innerName, String outerName, String simpleName) throws Exception {
+        BytecodeGenerator bg = new BytecodeGenerator(innerName, outerName, simpleName);
+        CustomCL cl = new CustomCL(innerName, outerName, bg.getNestedClasses(true), bg.getNestedClasses(false));
+        assertEquals(cl.loadClass(innerName).getSimpleName(), simpleName);
+    }
+
+    static void testInner(String innerName, String outerName, String simpleName) throws Exception {
+        BytecodeGenerator bg = new BytecodeGenerator(innerName, outerName, simpleName);
+        CustomCL cl = new CustomCL(innerName, outerName, bg.getInnerClasses(true), bg.getInnerClasses(false));
+        assertEquals(cl.loadClass(innerName).getSimpleName(), simpleName);
+    }
+
+    static void testLocal(String innerName, String outerName, String simpleName) throws Exception {
+        BytecodeGenerator bg = new BytecodeGenerator(innerName, outerName, simpleName);
+        CustomCL cl = new CustomCL(innerName, outerName, bg.getLocalClasses(true), bg.getLocalClasses(false));
+        assertEquals(cl.loadClass(innerName).getSimpleName(), simpleName);
+    }
+
+    static void testAnon(String innerName, String outerName, String simpleName) throws Exception {
+        BytecodeGenerator bg = new BytecodeGenerator(innerName, outerName, simpleName);
+        CustomCL cl = new CustomCL(innerName, outerName, bg.getAnonymousClasses(true), bg.getAnonymousClasses(false));
+        assertEquals(cl.loadClass(innerName).getSimpleName(), simpleName);
+    }
+
+    static void assertEquals(Object o1, Object o2) {
+        if (!java.util.Objects.equals(o1, o2)) {
+            throw new AssertionError(o1 + " != " + o2);
+        }
+    }
+
+    static class CustomCL extends ClassLoader {
+        final String  innerName;
+        final String  outerName;
+
+        final byte[] innerClassFile;
+        final byte[] outerClassFile;
+
+        CustomCL(String innerName, String outerName, byte[] innerClassFile, byte[] outerClassFile) {
+            this.innerName = innerName;
+            this.outerName = outerName;
+            this.innerClassFile = innerClassFile;
+            this.outerClassFile = outerClassFile;
+        }
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            if (innerName.equals(name)) {
+                return defineClass(innerName, innerClassFile, 0, innerClassFile.length);
+            } else if (outerName.equals(name)) {
+                return defineClass(outerName, outerClassFile, 0, outerClassFile.length);
+            } else {
+                throw new ClassNotFoundException(name);
+            }
+        }
+    }
+
+    static class BytecodeGenerator {
+        final String innerName;
+        final String outerName;
+        final String simpleName;
+
+        BytecodeGenerator(String innerName, String outerName, String simpleName) {
+            this.innerName = intl(innerName);
+            this.outerName = intl(outerName);
+            this.simpleName = simpleName;
+        }
+
+        static String intl(String name) { return name.replace('.', '/'); }
+
+        static void makeDefaultCtor(ClassWriter cw) {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        void makeCtxk(ClassWriter cw, boolean isInner) {
+            if (isInner) {
+                cw.visitOuterClass(outerName, "f", "()V");
+            } else {
+                MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "f", "()V", null, null);
+                mv.visitCode();
+                mv.visitInsn(RETURN);
+                mv.visitMaxs(0, 0);
+                mv.visitEnd();
+            }
+        }
+
+        byte[] getNestedClasses(boolean isInner) {
+            String name = (isInner ? innerName : outerName);
+            ClassWriter cw = new ClassWriter(0);
+            cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, name, null, "java/lang/Object", null);
+
+            cw.visitInnerClass(innerName, outerName, simpleName, ACC_PUBLIC | ACC_STATIC);
+
+            makeDefaultCtor(cw);
+            cw.visitEnd();
+            return cw.toByteArray();
+        }
+
+        byte[] getInnerClasses(boolean isInner) {
+            String name = (isInner ? innerName : outerName);
+            ClassWriter cw = new ClassWriter(0);
+            cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, name, null, "java/lang/Object", null);
+
+            cw.visitInnerClass(innerName, outerName, simpleName, ACC_PUBLIC);
+
+            makeDefaultCtor(cw);
+            cw.visitEnd();
+            return cw.toByteArray();
+        }
+
+        byte[] getLocalClasses(boolean isInner) {
+            String name = (isInner ? innerName : outerName);
+            ClassWriter cw = new ClassWriter(0);
+            cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, name, null, "java/lang/Object", null);
+
+            cw.visitInnerClass(innerName, null, simpleName, ACC_PUBLIC | ACC_STATIC);
+            makeCtxk(cw, isInner);
+
+            makeDefaultCtor(cw);
+            cw.visitEnd();
+            return cw.toByteArray();
+        }
+
+        byte[] getAnonymousClasses(boolean isInner) {
+            String name = (isInner ? innerName : outerName);
+            ClassWriter cw = new ClassWriter(0);
+            cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, name, null, "java/lang/Object", null);
+
+            cw.visitInnerClass(innerName, null, null, ACC_PUBLIC | ACC_STATIC);
+            makeCtxk(cw, isInner);
+
+            makeDefaultCtor(cw);
+            cw.visitEnd();
+            return cw.toByteArray();
+        }
+    }
+}
--- a/jdk/test/java/lang/Thread/ThreadStateController.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/Thread/ThreadStateController.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015 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
@@ -28,6 +28,7 @@
 import java.util.concurrent.locks.LockSupport;
 
 import jdk.testlibrary.LockFreeLogManager;
+import jdk.testlibrary.Utils;
 
 /**
  * ThreadStateController allows a thread to request this thread to transition
@@ -73,7 +74,7 @@
 
     public static void pause(long ms) {
         try {
-            Thread.sleep(ms);
+            Thread.sleep(Utils.adjustTimeout(ms));
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -135,7 +136,7 @@
                         try {
                             // this thread has escaped the BLOCKED state
                             // release the lock and a short wait before continue
-                            lock.wait(10);
+                            lock.wait(Utils.adjustTimeout(10));
                         } catch (InterruptedException e) {
                             // ignore
                             interrupted.incrementAndGet();
@@ -165,7 +166,7 @@
                             getId(), getName(), iterations.get(), interrupted.get());
                         try {
                             stateChange(nextState);
-                            lock.wait(10000);
+                            lock.wait(Integer.MAX_VALUE);
                             log("%d:   %s wakes up from timed waiting (iterations %d interrupted %d)%n",
                                 getId(), getName(), iterations.get(), interrupted.get());
                         } catch (InterruptedException e) {
@@ -185,7 +186,8 @@
                 case S_TIMED_PARKED: {
                     log("%d: %s is going to timed park (iterations %d)%n",
                         getId(), getName(), iterations.get());
-                    long deadline = System.currentTimeMillis() + 10000*1000;
+                    long deadline = System.currentTimeMillis() +
+                                        Utils.adjustTimeout(10000*1000);
                     stateChange(nextState);
                     LockSupport.parkUntil(deadline);
                     break;
@@ -195,7 +197,7 @@
                         getId(), getName(), iterations.get(), interrupted.get());
                     try {
                         stateChange(nextState);
-                        Thread.sleep(1000000);
+                        Thread.sleep(Utils.adjustTimeout(1000000));
                     } catch (InterruptedException e) {
                         // finish sleeping
                         interrupted.incrementAndGet();
--- a/jdk/test/java/lang/instrument/AddTransformerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/AddTransformerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary confirms that added transformers all really run
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build AddTransformerTest ATransformerManagementTestCase
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar AddTransformerTest AddTransformerTest
--- a/jdk/test/java/lang/instrument/AppendToBootstrapClassPathTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/AppendToBootstrapClassPathTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary simple test for the Boot-Class-Path manifest attribute
  * @author Gabriel Adauto, Wily Technology, Robert Field, Sun Microsystems
  *
+ * @modules java.instrument
  * @run build AppendToBootstrapClassPathTest ExampleForBootClassPath
  * @run shell AppendToBootstrapClassPathSetUp.sh
  * @run shell MakeJAR.sh bootclasspathAgent
--- a/jdk/test/java/lang/instrument/AppendToClassPathTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/AppendToClassPathTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary simple test for the Class-Path manifest attribute
  * @author Gabriel Adauto, Wily Technology; Robert Field, Sun Microsystems
  *
+ * @modules java.instrument
  * @run build AppendToClassPathTest
  * @run shell AppendToClassPathSetUp.sh
  * @run shell MakeJAR.sh classpathAgent
--- a/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Test non US-ASCII characters in the value of the Boot-Class-Path
 #          attribute.
 #
+# @modules java.instrument
 # @run shell/timeout=240 BootClassPathTest.sh
 
 if [ "${TESTJAVA}" = "" ]
--- a/jdk/test/java/lang/instrument/DaemonThread/TestDaemonThread.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/DaemonThread/TestDaemonThread.java	Thu May 07 20:50:07 2015 -0700
@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Goldman Sachs.
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -26,6 +26,8 @@
  * @summary Assert in java.lang.instrument agents during shutdown when classloading occurs after shutdown
  * @library /lib/testlibrary
  *
+ * @modules java.instrument
+ *          java.management
  * @build jdk.testlibrary.* DummyAgent DummyClass TestDaemonThreadLauncher TestDaemonThread
  * @run shell ../MakeJAR3.sh DummyAgent
  * @run main/timeout=240 TestDaemonThreadLauncher
--- a/jdk/test/java/lang/instrument/FromShutdownHook.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/FromShutdownHook.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5050487
  * @summary Check that Instrumentation methods can execute from a runtime
  *          shutdown hook
+ * @modules java.instrument
  * @run build FromShutdownHook
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar FromShutdownHook FromShutdownHook
--- a/jdk/test/java/lang/instrument/GetAllLoadedClassesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/GetAllLoadedClassesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary simple tests for getAllLoadedClasses (is Object there? does a newly loaded class show up?)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build GetAllLoadedClassesTest DummyClass
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetAllLoadedClassesTest GetAllLoadedClassesTest
--- a/jdk/test/java/lang/instrument/GetInitiatedClassesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/GetInitiatedClassesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary simple tests for getInitiatedClasses (does a newly loaded class show up?)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build GetInitiatedClassesTest DummyClass
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetInitiatedClassesTest GetInitiatedClassesTest
--- a/jdk/test/java/lang/instrument/GetObjectSizeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/GetObjectSizeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary round-trip test for getObjectSize (does it return, and is the result non-zero?)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build GetObjectSizeTest
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetObjectSizeTest GetObjectSizeTest
--- a/jdk/test/java/lang/instrument/IsModifiableClassAgent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/IsModifiableClassAgent.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
  * @summary test isModifiableClass
  * @author Robert Field, Sun Microsystems
  *
+ * @modules java.instrument
  * @run build IsModifiableClassApp IsModifiableClassAgent
  * @run shell MakeJAR3.sh IsModifiableClassAgent 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:IsModifiableClassAgent.jar IsModifiableClassApp
--- a/jdk/test/java/lang/instrument/ManifestTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/ManifestTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
 # @summary JLI JAR manifest processing should ignore leading and trailing white space.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run build ManifestTestApp ExampleForBootClassPath
 # @run shell/timeout=900 ManifestTest.sh
 #
--- a/jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,9 @@
  * @summary Tests and benchmarks the JVMTI RedefineClasses when a
  *          single class (and its parent) contains many methods.
  *
+ * @modules java.compiler
+ *          java.instrument
+ *          jdk.compiler
  * @run build ManyMethodsBenchmarkApp ManyMethodsBenchmarkAgent
  * @run shell MakeJAR3.sh ManyMethodsBenchmarkAgent 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:ManyMethodsBenchmarkAgent.jar ManyMethodsBenchmarkApp
--- a/jdk/test/java/lang/instrument/NMTHelper.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/NMTHelper.java	Thu May 07 20:50:07 2015 -0700
@@ -27,8 +27,9 @@
 import java.util.regex.Pattern;
 import java.util.Arrays;
 import java.util.stream.Collectors;
-import sun.management.ManagementFactoryHelper;
-import com.sun.management.DiagnosticCommandMBean;
+import java.lang.management.ManagementFactory;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 public class NMTHelper
 {
@@ -53,7 +54,12 @@
     }
 
     private static String executeDcmd(String cmd, String ... args) {
-        DiagnosticCommandMBean dcmd = ManagementFactoryHelper.getDiagnosticCommandMBean();
+        ObjectName oname = null;
+        try {
+            oname = ObjectName.getInstance("com.sun.management:type=DiagnosticCommand");
+        } catch (MalformedObjectNameException mone) {
+            throw new RuntimeException(mone);
+        }
         Object[] dcmdArgs = {args};
         String[] signature = {String[].class.getName()};
 
@@ -63,7 +69,8 @@
         System.out.println("Output from Dcmd '" + cmdString + "' is being written to file " + f);
         try (FileWriter fw = new FileWriter(f)) {
             fw.write("> " + cmdString + ":");
-            String result = (String) dcmd.invoke(cmd, dcmdArgs, signature);
+            String result = (String)ManagementFactory.getPlatformMBeanServer().
+                    invoke(oname, cmd, dcmdArgs, signature);
             fw.write(result);
             return result;
         } catch(Exception ex) {
--- a/jdk/test/java/lang/instrument/NativeMethodPrefixAgent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/NativeMethodPrefixAgent.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test setNativeMethodPrefix
  * @author Robert Field, Sun Microsystems
  *
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @run shell/timeout=240 MakeJAR2.sh NativeMethodPrefixAgent NativeMethodPrefixApp 'Can-Retransform-Classes: true' 'Can-Set-Native-Method-Prefix: true'
  * @run main/othervm -javaagent:NativeMethodPrefixAgent.jar NativeMethodPrefixApp
  */
--- a/jdk/test/java/lang/instrument/NoTransformerAddedTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/NoTransformerAddedTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary make sure no transformers run when none are registered
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NoTransformerAddedTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NoTransformerAddedTest NoTransformerAddedTest
--- a/jdk/test/java/lang/instrument/NullGetObjectSizeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/NullGetObjectSizeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary make sure getObjectSize(null) throws NullPointerException.
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullGetObjectSizeTest
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar NullGetObjectSizeTest NullGetObjectSizeTest
--- a/jdk/test/java/lang/instrument/NullRedefineClassesTests.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/NullRedefineClassesTests.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary make sure redefineClasses throws NullPointerException in the right places.
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullRedefineClassesTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullRedefineClassesTests NullRedefineClassesTests
--- a/jdk/test/java/lang/instrument/NullTransformerAddTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/NullTransformerAddTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary make sure addTransformer(null) throws what it should
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullTransformerAddTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullTransformerAddTest NullTransformerAddTest
--- a/jdk/test/java/lang/instrument/NullTransformerRemoveTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/NullTransformerRemoveTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary make sure removeTransformer(null) throws NullPointerException
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullTransformerRemoveTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullTransformerRemoveTest NullTransformerRemoveTest
--- a/jdk/test/java/lang/instrument/ParallelTransformerLoader.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/ParallelTransformerLoader.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Test parallel class loading by parallel transformers.
 # @author Daniel D. Daugherty as modified from the code of Daryl Puryear @ Wily
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh ParallelTransformerLoaderAgent
 # @run build ParallelTransformerLoaderApp
 # @run shell/timeout=240 ParallelTransformerLoader.sh
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0010.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0010.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (0,0,1,0): declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0010
  * @run main/othervm -javaagent:InheritAgent0010.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0011.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0011.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (0,0,1,1): declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0011
  * @run main/othervm -javaagent:InheritAgent0011.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0110.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0110.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (0,1,1,0): inherited 1-arg and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0110
  * @run main/othervm -javaagent:InheritAgent0110.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0111.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0111.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (0,1,1,1): inherited 1-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0111
  * @run main/othervm -javaagent:InheritAgent0111.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1000.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1000.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,0,0): inherited 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1000
  * @run main/othervm -javaagent:InheritAgent1000.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1001.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1001.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,0,1): inherited 2-arg, and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1001
  * @run main/othervm -javaagent:InheritAgent1001.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1010.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1010.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,1,0): inherited 2-arg, and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1010
  * @run main/othervm -javaagent:InheritAgent1010.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1011.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1011.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,1,1): inherited 2-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1011
  * @run main/othervm -javaagent:InheritAgent1011.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1100.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1100.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,0,0): inherited 2-arg and inherited 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1100
  * @run main/othervm -javaagent:InheritAgent1100.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1101.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1101.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,0,1): inherited 2-arg, inherited 1-arg, and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1101
  * @run main/othervm -javaagent:InheritAgent1101.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1110.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1110.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,1,0): inherited 2-arg, inherited 1-arg, and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1110
  * @run main/othervm -javaagent:InheritAgent1110.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1111.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1111.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,1,1): inherited 2-arg, inherited 1-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1111
  * @run main/othervm -javaagent:InheritAgent1111.jar DummyMain
  */
--- a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -30,6 +30,7 @@
  * @bug 6289149
  * @summary test when the agent's class is missing the premain() function.
  * @library /lib/testlibrary
+ * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh NoPremainAgent
  * @run main NoPremainAgentTest
--- a/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -30,6 +30,7 @@
  * @bug 5055293
  * @summary Test non ascii characters in the Premain-Class attribute.
  * @library /lib/testlibrary
+ * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run main PremainClassTest
  */
--- a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -30,6 +30,7 @@
  * @bug 6289149
  * @summary test when the agent's class has a zero arg premain() function.
  * @library /lib/testlibrary
+ * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh ZeroArgPremainAgent
  * @run main ZeroArgPremainAgentTest
--- a/jdk/test/java/lang/instrument/RedefineBigClass.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineBigClass.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015 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
@@ -26,6 +26,7 @@
 # @summary Redefine a big class.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
 # @run build BigClass RedefineBigClassApp NMTHelper
 # @run shell/timeout=600 RedefineBigClass.sh
--- a/jdk/test/java/lang/instrument/RedefineClassWithNativeMethod.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineClassWithNativeMethod.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Redefine a class with a native method.
 # @author Daniel D. Daugherty as modified from the test submitted by clovis@par.univie.ac.at
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineClassWithNativeMethodAgent 'Can-Redefine-Classes: true'
 # @run build RedefineClassWithNativeMethodApp
 # @run shell RedefineClassWithNativeMethod.sh
--- a/jdk/test/java/lang/instrument/RedefineClassesDisabledTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineClassesDisabledTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test that redefineClasses and isRedefineClassesSupported behave correctly when redefine is not enabled
  * @author Robert Field, Sun Microsystems -- as modified from the work of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RedefineClassesDisabledTest
  * @run shell RedefineSetUp.sh
  * @run shell MakeJAR.sh basicAgent
--- a/jdk/test/java/lang/instrument/RedefineClassesTests.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineClassesTests.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary insure redefine is supported. exercise a class, then redefine it and do it again
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RedefineClassesTests
  * @run shell RedefineSetUp.sh
  * @run shell MakeJAR.sh redefineAgent
--- a/jdk/test/java/lang/instrument/RedefineMethodAddInvoke.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodAddInvoke.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Reflexive invocation of newly added methods broken.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodAddInvokeAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodAddInvokeApp
 # @run shell RedefineMethodAddInvoke.sh
--- a/jdk/test/java/lang/instrument/RedefineMethodDelInvoke.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodDelInvoke.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, 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
@@ -27,6 +27,7 @@
 # @author Daniel D. Daugherty
 # @author Serguei Spitsyn
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodDelInvokeAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodDelInvokeApp
 # @run shell RedefineMethodDelInvoke.sh
--- a/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Redefine a class with a method stored in a backtrace.
 # @author Stefan Karlsson
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodInBacktraceAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodInBacktraceTarget RedefineMethodInBacktraceApp
 # @run shell RedefineMethodInBacktrace.sh
@@ -77,7 +78,7 @@
 
 cat output.log
 
-MESG="Exception"
+MESG="Test failed"
 grep "$MESG" output.log
 result=$?
 if [ "$result" = 0 ]; then
--- a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -31,7 +31,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.concurrent.CountDownLatch;
-import sun.management.ManagementFactoryHelper;
+import javax.management.JMX;
+import javax.management.ObjectName;
 
 /**
  * When an exception is thrown, the JVM collects just enough information
@@ -46,12 +47,15 @@
  * could be freed, since class redefinition didn't know about the backtraces.
  */
 public class RedefineMethodInBacktraceApp {
+    static boolean failed = false;
+
     public static void main(String args[]) throws Exception {
         System.out.println("Hello from RedefineMethodInBacktraceApp!");
-
         new RedefineMethodInBacktraceApp().doTest();
 
-        System.exit(0);
+        if (failed) {
+            throw new Exception("ERROR: RedefineMethodInBacktraceApp failed.");
+        }
     }
 
     public static CountDownLatch stop = new CountDownLatch(1);
@@ -63,13 +67,18 @@
     }
 
     private void doMethodInBacktraceTest() throws Exception {
-        Throwable t = getThrowableFromMethodToRedefine();
+        Throwable t1 = getThrowableFromMethodToRedefine();
+        Throwable t2 = getThrowableFromMethodToDelete();
 
         doRedefine(RedefineMethodInBacktraceTarget.class);
 
         doClassUnloading();
 
-        touchRedefinedMethodInBacktrace(t);
+        System.out.println("checking backtrace for throwable from methodToRedefine");
+        touchRedefinedMethodInBacktrace(t1);
+
+        System.out.println("checking backtrace for throwable from methodToDelete");
+        touchRedefinedMethodInBacktrace(t2);
     }
 
     private void doMethodInBacktraceTestB() throws Exception {
@@ -95,8 +104,11 @@
         String[] threadPrintArgs = {};
         Object[] dcmdArgs = {threadPrintArgs};
         String[] signature = {String[].class.getName()};
-        DiagnosticCommandMBean dcmd = ManagementFactoryHelper.getDiagnosticCommandMBean();
-        System.out.println(dcmd.invoke("threadPrint", dcmdArgs, signature));
+        System.out.println(ManagementFactory.getPlatformMBeanServer().invoke(
+                ObjectName.getInstance("com.sun.management:type=DiagnosticCommand"),
+                "threadPrint",
+                dcmdArgs,
+                signature));
 
         // release the thread
         stop.countDown();
@@ -115,6 +127,10 @@
             if (!(thrownFromMethodToRedefine instanceof RuntimeException)) {
                 throw e;
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("\nTest failed: unexpected exception: " + e.toString());
+            failed = true;
         }
         method = null;
         c = null;
@@ -122,15 +138,49 @@
         return thrownFromMethodToRedefine;
     }
 
+    private static Throwable getThrowableFromMethodToDelete() throws Exception {
+        Class<RedefineMethodInBacktraceTarget> c =
+                RedefineMethodInBacktraceTarget.class;
+        Method method = c.getMethod("callMethodToDelete");
+
+        Throwable thrownFromMethodToDelete = null;
+        try {
+            method.invoke(null);
+        } catch (InvocationTargetException e) {
+            thrownFromMethodToDelete = e.getCause();
+            if (!(thrownFromMethodToDelete instanceof RuntimeException)) {
+                throw e;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("\nTest failed: unexpected exception: " + e.toString());
+            failed = true;
+        }
+        return thrownFromMethodToDelete;
+    }
+
+
     private static void doClassUnloading() {
         // This will clean out old, unused redefined methods.
         System.gc();
     }
 
     private static void touchRedefinedMethodInBacktrace(Throwable throwable) {
+        throwable.printStackTrace();
         // Make sure that we can convert the backtrace, which is referring to
         // the redefined method, to a  StrackTraceElement[] without crashing.
-        throwable.getStackTrace();
+        StackTraceElement[] stackTrace = throwable.getStackTrace();
+        for (int i = 0; i < stackTrace.length; i++) {
+          StackTraceElement frame = stackTrace[i];
+          if (frame.getClassName() == null) {
+              System.out.println("\nTest failed: trace[" + i + "].getClassName() returned null");
+              failed = true;
+          }
+          if (frame.getMethodName() == null) {
+              System.out.println("\nTest failed: trace[" + i + "].getMethodName() returned null");
+              failed = true;
+          }
+        }
     }
 
     private static void doRedefine(Class<?> clazz) throws Exception {
--- a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java	Thu May 07 20:50:07 2015 -0700
@@ -29,4 +29,13 @@
     public static void methodToRedefine() {
         throw new RuntimeException("Test exception");
     }
+
+    public static void callMethodToDelete() {
+        methodToDelete();
+    }
+
+    private static void methodToDelete() {
+        throw new RuntimeException("Test exception in methodToDelete");
+    }
+
 }
--- a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB.java	Thu May 07 20:50:07 2015 -0700
@@ -37,4 +37,16 @@
             // ignore, test will fail
         }
     }
+
+    public static void callMethodToDelete() {
+        try {
+            // signal that we are here
+            RedefineMethodInBacktraceApp.called.countDown();
+
+            // wait until test is done
+            RedefineMethodInBacktraceApp.stop.await();
+        } catch (InterruptedException ex) {
+            // ignore, test will fail
+        }
+    }
 }
--- a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB_2.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB_2.java	Thu May 07 20:50:07 2015 -0700
@@ -28,4 +28,7 @@
 public class RedefineMethodInBacktraceTargetB {
     public static void methodToRedefine() {
     }
+
+    public static void callMethodToDelete() {
+    }
 }
--- a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java	Thu May 07 20:50:07 2015 -0700
@@ -29,4 +29,8 @@
     public static void methodToRedefine() {
         throw new RuntimeException("Test exception 2");
     }
+
+    public static void callMethodToDelete() {
+        throw new RuntimeException("Test exception 2 in callMethodToDelete");
+    }
 }
--- a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Method annotations are incorrectly set when redefining classes.
 # @author Stefan Karlsson
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations
 # @run shell RedefineMethodWithAnnotations.sh
--- a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, 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
@@ -28,6 +28,7 @@
 #   verify that the right methods are called.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineSubclassWithTwoInterfacesAgent 'Can-Redefine-Classes: true'
 # @run build RedefineSubclassWithTwoInterfacesApp
 # @run shell RedefineSubclassWithTwoInterfaces.sh
--- a/jdk/test/java/lang/instrument/RemoveAbsentTransformerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RemoveAbsentTransformerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary remove an transformer that was never added
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RemoveAbsentTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar RemoveAbsentTransformerTest RemoveAbsentTransformerTest
--- a/jdk/test/java/lang/instrument/RemoveTransformerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RemoveTransformerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary simple remove of a transformer that was added
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RemoveTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar RemoveTransformerTest RemoveTransformerTest
--- a/jdk/test/java/lang/instrument/RetransformAgent.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RetransformAgent.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test retransformClasses
  * @author Robert Field, Sun Microsystems
  *
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @run shell/timeout=240 MakeJAR2.sh RetransformAgent RetransformApp 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:RetransformAgent.jar RetransformApp
  */
--- a/jdk/test/java/lang/instrument/RetransformBigClass.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/RetransformBigClass.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Retransform a big class.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
 # @run build BigClass RetransformBigClassApp NMTHelper
 # @run shell/timeout=600 RetransformBigClass.sh
--- a/jdk/test/java/lang/instrument/SingleTransformerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/SingleTransformerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary simple test with one transformer (makes sure it gets called)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build SingleTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar SingleTransformerTest SingleTransformerTest
--- a/jdk/test/java/lang/instrument/StressGetObjectSizeTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/StressGetObjectSizeTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
 # @summary stress getObjectSize() API
 # @author Daniel D. Daugherty as modified from the code of fischman@google.com
 #
+# @modules java.instrument
 # @run build StressGetObjectSizeApp
 # @run shell MakeJAR.sh basicAgent
 # @run shell StressGetObjectSizeTest.sh
--- a/jdk/test/java/lang/instrument/TransformMethodTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/TransformMethodTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary test transformer add/remove pairs in sequence
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build TransformMethodTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformMethodTest TransformMethodTest
--- a/jdk/test/java/lang/instrument/TransformerManagementThreadAddTests.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/TransformerManagementThreadAddTests.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary multi-thread test to exercise sync and contention for adds to transformer registry
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build TransformerManagementThreadAddTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadAddTests TransformerManagementThreadAddTests
--- a/jdk/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary multi-thread test to exercise sync and contention for removes to transformer registry
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build TransformerManagementThreadRemoveTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadRemoveTests TransformerManagementThreadRemoveTests
--- a/jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, 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
@@ -29,6 +29,7 @@
 # transform() on a retransform operation.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run build VerifyLocalVariableTableOnRetransformTest
 # @run compile -g DummyClassWithLVT.java
 # @run shell MakeJAR.sh retransformAgent
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
+# @modules java.instrument
 # @run shell/timeout=240 CircularityErrorTest.sh
 
 if [ "${TESTSRC}" = "" ]
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
+# @modules java.instrument
 # @build ClassUnloadTest
 # @run shell ClassUnloadTest.sh
 
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, 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
@@ -29,6 +29,7 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
+# @modules java.instrument
 # @build Agent AgentSupport BootSupport BasicTest PrematureLoadTest DynamicTest
 # @run shell/timeout=240 run_tests.sh
 
--- a/jdk/test/java/lang/management/BufferPoolMXBean/Basic.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/BufferPoolMXBean/Basic.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -24,6 +24,7 @@
 /* @test
  * @bug 6606598 7024172
  * @summary Unit test for java.lang.management.BufferPoolMXBean
+ * @modules java.management
  * @run main/othervm Basic
  * @key randomness
  */
--- a/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *                             ClassLoadingMXBean.getTotalLoadedClassCount()
  *                             ClassLoadingMXBean.getUnloadedClassCount()
  * @author  Alexei Guibadoulline
+ * @modules java.management
  * @run main/othervm LoadCounts
  */
 
--- a/jdk/test/java/lang/management/CompilationMXBean/Basic.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/CompilationMXBean/Basic.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5011189 8004928
  * @summary Unit test for java.lang.management.CompilationMXBean
  *
+ * @modules java.management
  * @run main/othervm -Xcomp -Xbatch Basic
  */
 import java.lang.management.*;
--- a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -29,6 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
+ * @modules java.management/sun.management
  * @compile OpenTypeConverter.java
  * @build MemoryNotifInfoCompositeData
  * @run main MemoryNotifInfoCompositeData
--- a/jdk/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -28,6 +28,7 @@
  *          or throw exception if the input CompositeData is invalid.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MemoryUsageCompositeData
  * @run main MemoryUsageCompositeData
  */
--- a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -29,6 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @compile OpenTypeConverter.java
  * @build ThreadInfoCompositeData
  * @run main ThreadInfoCompositeData
--- a/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015 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
@@ -26,6 +26,8 @@
  * @bug     6396794
  * @summary Check that LastGcInfo contents are reasonable
  * @author  Eamonn McManus
+ * @modules java.management
+ *          jdk.management
  * @run     main/othervm -XX:-ExplicitGCInvokesConcurrent GcInfoCompositeType
  */
 // Passing "-XX:-ExplicitGCInvokesConcurrent" to force System.gc()
--- a/jdk/test/java/lang/management/MXBean/MXBeanBehavior.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MXBean/MXBeanBehavior.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,8 @@
  * @summary Check that java.lang.management MXBeans have the same behavior
  *          as user MXBeans
  * @author  Eamonn McManus
+ * @modules java.management
+ *          jdk.management
  * @run     main/othervm MXBeanBehavior
  */
 
--- a/jdk/test/java/lang/management/ManagementFactory/GetObjectName.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/GetObjectName.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -26,6 +26,7 @@
  * @summary Test if getObjectName handles properly when called by
  *          multiple threads simultaneously. Run in othervm mode to
  *          make sure the object name is not initialized to begin with.
+ * @modules java.management
  * @run main/othervm GetObjectName
  */
 
--- a/jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -28,6 +28,7 @@
  *          methods and PlatformManagedObject.getObjectName()
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main GetPlatformMXBeans
  */
 
--- a/jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -28,6 +28,7 @@
  *          ManagementFactory.getPlatformManagementInterfaces() method
  * @author  Frederic Parain
  *
+ * @modules java.management
  * @run main GetPlatformManagementInterfaces
  */
 
--- a/jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -27,6 +27,8 @@
  * @summary Test that all the platform MXBeans are wrapped in StandardMBean so
  *          an MBeanServer which does not have support for MXBeans can be used.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
+ *          jdk.management
  * @run clean MBeanServerMXBeanUnsupportedTest
  * @run build MBeanServerMXBeanUnsupportedTest
  * @run main/othervm MBeanServerMXBeanUnsupportedTest
--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanException.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanException.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -29,6 +29,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MXBeanException
  * @run main MXBeanException
  */
--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug     5024531
  * @summary Basic Test for ManagementFactory.newPlatformMXBean().
+ * @modules java.management
  * @run main/othervm MXBeanProxyTest
  * @author  Mandy Chung
  */
--- a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4947536
  * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer()
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,8 @@
  * @summary Test type mapping of the platform MXBean proxy
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
+ * @modules java.management
+ *          jdk.management
  */
 import java.lang.management.*;
 import javax.management.*;
--- a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -28,6 +28,8 @@
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
  *
+ * @modules java.management
+ *          jdk.management
  * @compile ProxyTypeMapping.java
  * @run main/othervm -verbose:gc ProxyTypeMapping
  */
--- a/jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -29,6 +29,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main ThreadMXBeanProxy
  */
 
--- a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -28,6 +28,8 @@
  *          MBeanServer.
  * @author  Mandy Chung
  *
+ * @modules java.management
+ *          jdk.management
  * @compile ValidateOpenTypes.java
  * @run main/othervm -verbose:gc ValidateOpenTypes
  */
--- a/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -31,6 +31,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
+ * @modules java.management
  * @build jdk.testlibrary.* CollectionUsageThreshold MemoryUtil RunUtil
  * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null"
  * @run main/timeout=300 CollectionUsageThreshold
--- a/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Make sure MemoryMXBean has two notification types.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main GetMBeanInfo
  */
 
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Thu May 07 20:50:07 2015 -0700
@@ -31,6 +31,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
+ * @modules java.management
  * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil
   * @run main/timeout=600 LowMemoryTest
  * @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
 # @bug     4982128
 # @summary Test low memory detection of non-heap memory pool
 # @requires vm.gc=="null"
+# @modules java.management
 # @run build LowMemoryTest2 MemoryUtil
 # @run shell/timeout=600 LowMemoryTest2.sh
 #
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -30,6 +30,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MemoryManagement MemoryUtil
  * @run main/othervm/timeout=600 -Xmn8m -XX:+IgnoreUnrecognizedVMOptions -XX:G1HeapRegionSize=1 -XX:-UseLargePages MemoryManagement
  */
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
 # @summary Run MemoryManagement test with concurrent mark sweep GC
 # @author  Mandy Chung
 # @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+# @modules java.management
 # @run build MemoryManagement
 # @run shell/timeout=600 MemoryManagementConcMarkSweepGC.sh
 #
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
 # @summary Run MemoryManagement test with parallel GC
 # @author  Mandy Chung
 # @requires vm.gc=="Parallel" | vm.gc=="null"
+# @modules java.management
 # @run build MemoryManagement
 # @run shell/timeout=600 MemoryManagementParallelGC.sh
 #
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
 # @summary Run MemoryManagement test with serial GC
 # @author  Mandy Chung
 # @requires vm.gc=="Serial" | vm.gc=="null"
+# @modules java.management
 # @run build MemoryManagement
 # @run shell/timeout=600 MemoryManagementSerialGC.sh
 #
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *          MemoryMXBean.getMemoryManager().
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main MemoryTest 2
  */
 
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Mandy Chung
 # @requires vm.gc=="Parallel" | vm.gc=="null"
+# @modules java.management
 # @run compile MemoryTest.java
 # @run shell MemoryTestAllGC.sh
 #
--- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,6 +24,8 @@
 /*
  * @test
  * @bug     4530538
+ * @modules java.base/sun.misc
+ *          java.management
  * @summary Basic unit test of
  *          RuntimeMXBean.getObjectPendingFinalizationCount()
  *          1. GC and runFinalization() to get the current pending number
@@ -32,7 +34,6 @@
  *          4. GC and runFinalization() and the finalizable objects should
  *             be garbage collected.
  * @author  Alexei Guibadoulline and Mandy Chung
- *
  */
 
 import java.lang.management.*;
--- a/jdk/test/java/lang/management/MemoryMXBean/PendingAllGC.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/PendingAllGC.sh	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Mandy Chung
 # @requires vm.gc=="null"
+# @modules java.base/sun.misc
 # @run compile Pending.java
 # @run shell PendingAllGC.sh
 #
--- a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -33,6 +33,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
+ * @modules java.management
  * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil
  * @run main ResetPeakMemoryUsage
  */
--- a/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -28,6 +28,7 @@
  *          MemoryPoolMXBean.isCollectionThresholdExceeded().
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main/othervm ThresholdTest
  */
 
--- a/jdk/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -28,6 +28,8 @@
  *          ManagementFactory.getPlatformMXBeans()
  * @author  Mandy Chung
  *
+ * @modules java.management
+ *          jdk.management
  * @run main PlatformMXBeanTest
  */
 
--- a/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
 # @author   Mandy Chung
 # @bug      6336608 6367473 6511738
 #
+# @modules java.management
 # @run build GetSystemLoadAverage
 # @run shell/timeout=300 TestSystemLoadAvg.sh
 #
--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -27,6 +27,8 @@
  * @summary Test if proxy for PlatformLoggingMXBean is equivalent
  *          to proxy for LoggingMXBean
  *
+ * @modules java.management
+ *          jdk.management
  * @build LoggingMXBeanTest
  * @run main LoggingMXBeanTest
  */
--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -29,6 +29,8 @@
  *          This test performs similar testing as
  *          java/util/logging/LoggingMXBeanTest.
  *
+ * @modules java.management
+ *          jdk.management
  * @build PlatformLoggingMXBeanTest
  * @run main PlatformLoggingMXBeanTest
  */
--- a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4990512
  * @summary Basic Test for RuntimeMXBean.getSystemProperties().
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.ManagementFactory;
--- a/jdk/test/java/lang/management/RuntimeMXBean/PropertiesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/RuntimeMXBean/PropertiesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          properties contain another list of properties as the defaults.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run build PropertiesTest
  * @run main  PropertiesTest
  */
--- a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
 # @bug     4530538
 # @summary 
 # @author  Mandy Chung
+# @modules java.management
 # @run compile InputArgument.java
 # @run shell TestInputArgument.sh
 #
--- a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4530538
  * @summary Basic unit test of RuntimeMXBean.getUptime()
  * @author  Alexei Guibadoulline
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Basic unit test of ThreadMXBean.getAllThreadIds()
  * @author  Alexei Guibadoulline and Mandy Chung
  *
+ * @modules java.management
  * @run main/othervm AllThreadIds
  */
 
--- a/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary The capability is disabled regardless of number of times
  *          it was enabled.
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.ThreadMXBean;
--- a/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -29,6 +29,7 @@
  *          and ThreadMXBean.setThreadCpuTimeEnabled().
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main EnableTest
  */
 
--- a/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -25,11 +25,13 @@
 /*
  * @test
  * @bug     5086470
+ * @key intermittent
  * @summary Basic Test for the following methods:
  *          - ThreadMXBean.findDeadlockedThreads()
  *          - ThreadMXBean.findMonitorDeadlockedThreads()
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MonitorDeadlock
  * @build SynchronizerDeadlock
  * @build ThreadDump
--- a/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *          - ThreadMXBean.findMonitorDeadlockedThreads()
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MonitorDeadlock
  * @build ThreadDump
  * @run main/othervm FindMonitorDeadlock
--- a/jdk/test/java/lang/management/ThreadMXBean/InvalidThreadID.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/InvalidThreadID.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  *          if id <= 0 and returns -1 if the thread doesn't exist.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main InvalidThreadID
  */
 
--- a/jdk/test/java/lang/management/ThreadMXBean/LockedMonitors.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/LockedMonitors.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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,6 +34,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build Barrier
  * @build LockingThread
  * @build ThreadDump
--- a/jdk/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -30,6 +30,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build Barrier
  * @build SynchronizerLockingThread
  * @build ThreadDump
--- a/jdk/test/java/lang/management/ThreadMXBean/Locks.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/Locks.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -30,6 +30,7 @@
  * @author  Jaroslav Bachorik
  *
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run main/othervm Locks
  */
--- a/jdk/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          and getThreadInfo of customized JSR-166 synchronizers.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build Barrier
  * @build ThreadDump
  * @run main/othervm MyOwnSynchronizer
--- a/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -29,6 +29,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
+ * @modules java.management
  * @build ResetPeakThreadCount
  * @build ThreadDump
  * @run main/othervm ResetPeakThreadCount
--- a/jdk/test/java/lang/management/ThreadMXBean/Semaphore.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-/*
- * @bug     4530538
- * @summary A semaphore utility class.
- * @author  Mandy Chung
- */
-
-public class Semaphore {
-    private Object go = new Object();
-    private int semaCount;
-    private int waiters = 0;
-
-    public Semaphore() {
-        semaCount = 0;
-    }
-
-    public Semaphore(int initialCount) {
-        semaCount = initialCount;
-    }
-
-    public void semaP() {
-        synchronized (go) {
-            waiters++;
-            while (semaCount == 0) {
-                try {
-                    go.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                    throw new InternalError();
-                }
-            }
-            semaCount--;
-            waiters--;
-        }
-    }
-    public void semaV() {
-        synchronized (go) {
-            semaCount++;
-            go.notify();
-        }
-    }
-
-    public int getWaiterCount() {
-        synchronized (go) {
-            return waiters;
-        }
-    }
-
-    public Object getLock() {
-        return go;
-    }
-}
--- a/jdk/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          in shared mode which has no owner when a thread is parked.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main/othervm SharedSynchronizer
  */
 
--- a/jdk/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java	Thu May 07 20:50:07 2015 -0700
@@ -29,6 +29,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
+ * @modules java.management
  * @run main/othervm SynchronizationStatistics
  */
 
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic unit test of ThreadInfo.getBlockedCount()
  * @author  Alexei Guibadoulline and Mandy Chung
  * @author  Jaroslav Bachorik
+ * @modules java.management
  * @run main ThreadBlockedCount
  */
 
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -30,6 +30,7 @@
  *                             mbean.getDaemonThreadCount()
  * @author  Alexei Guibadoulline
  *
+ * @modules java.management
  * @run main ThreadCounts
  */
 
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic test of ThreadMXBean.getThreadCpuTime and
  *          getCurrentThreadCpuTime.
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java	Thu May 07 20:50:07 2015 -0700
@@ -31,6 +31,7 @@
  * @bug     6588467
  * @summary Basic test of ThreadInfo.isDaemon
  * @author  Jeremy Manson
+ * @modules java.management
  */
 public class ThreadDaemonTest {
 
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -23,27 +23,44 @@
 
 /*
  * @test
- * @bug     5058327
- * @summary Test if getThreadInfo(long[]) returns a ThreadInfo[]
- *          with null elements with no exception.
+ * @bug     5058327 8074368
+ * @summary Tests the correct behaviour of getThreadInfo(long[]) for non-existent
+ *          thread IDs and the empty thread id array.
  *
  * @author  Mandy Chung
+ * @author  Jaroslav Bachorik
  *
+ * @modules java.management
  * @build ThreadInfoArray
  * @run main ThreadInfoArray
  */
 
 import java.lang.management.*;
 import javax.management.*;
-import java.util.*;
 import static java.lang.management.ManagementFactory.*;
 
 public class ThreadInfoArray {
     public static void main(String[] argv) throws Exception {
+        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+        ObjectName on = new ObjectName(THREAD_MXBEAN_NAME);
+
         ThreadMXBean mbean = ManagementFactory.getThreadMXBean();
+        ThreadMXBean proxy = newPlatformMXBeanProxy(mbs,
+                                 on.toString(),
+                                 ThreadMXBean.class);
 
+        checkNullElement(mbean, proxy, mbs, on);
+        checkEmptyArray(mbean, proxy, mbs, on);
+        System.out.println("Test passed");
+    }
+
+    private static void checkNullElement(ThreadMXBean mbean, ThreadMXBean proxy,
+                                         MBeanServer mbs, ObjectName on)
+        throws Exception {
+        System.out.println("--- Check null element");
         // ID for a new thread
         long [] ids = {new Thread().getId()};
+        // direct call
         ThreadInfo[] tinfos = mbean.getThreadInfo(ids);
 
         if (tinfos[0] != null) {
@@ -52,8 +69,6 @@
         }
 
         // call getThreadInfo through MBeanServer
-        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-        ObjectName on = new ObjectName(THREAD_MXBEAN_NAME);
         Object[] params = {ids};
         String[] sigs = {"[J"};
         Object[] result = (Object[]) mbs.invoke(on, "getThreadInfo", params, sigs);
@@ -64,14 +79,57 @@
         }
 
         // call getThreadInfo through proxy
-        ThreadMXBean proxy = newPlatformMXBeanProxy(mbs,
-                                 on.toString(),
-                                 ThreadMXBean.class);
         tinfos = proxy.getThreadInfo(ids);
         if (tinfos[0] != null) {
             throw new RuntimeException("TEST FAILED: " +
                 "Expected to have a null element");
         }
-        System.out.println("Test passed");
+        System.out.println("--- PASSED");
+    }
+
+    private static void checkEmptyArray(ThreadMXBean mbean, ThreadMXBean proxy,
+                                        MBeanServer mbs, ObjectName on)
+        throws Exception {
+        System.out.println("--- Check empty TID array");
+
+        long[] ids = new long[0];
+        // direct call
+        assertEmptyArray(mbean.getThreadInfo(ids), "Expected empty ThreadInfo array");
+        assertEmptyArray(mbean.getThreadInfo(ids, 1), "Expected empty ThreadInfo array");
+        assertEmptyArray(mbean.getThreadInfo(ids, true, true), "Expected empty ThreadInfo array");
+
+        // call getThreadInfo through MBeanServer
+        assertEmptyArray(
+            (Object[]) mbs.invoke(
+                on, "getThreadInfo", new Object[]{ids}, new String[]{"[J"}
+            ),
+            "Expected empty ThreadInfo array via MBeanServer"
+        );
+        assertEmptyArray(
+            (Object[]) mbs.invoke(
+                on, "getThreadInfo", new Object[]{ids, 1},
+                new String[]{"[J", "int"}
+            ),
+            "Expected empty ThreadInfo array via MBeanServer"
+        );
+        assertEmptyArray(
+            (Object[]) mbs.invoke(
+                on, "getThreadInfo", new Object[]{ids, true, true},
+                new String[]{"[J", "boolean", "boolean"}
+            ),
+            "Expected empty ThreadInfo array via MBeanServer"
+        );
+
+        // call getThreadInfo through proxy
+        assertEmptyArray(proxy.getThreadInfo(ids), "Expected empty ThreadInfo array");
+        assertEmptyArray(proxy.getThreadInfo(ids, 1), "Expected empty ThreadInfo array");
+        assertEmptyArray(proxy.getThreadInfo(ids, true, true), "Expected empty ThreadInfo array");
+        System.out.println("--- PASSED");
+    }
+
+    private static void assertEmptyArray(Object[] arr, String message) throws Exception {
+        if (arr.length > 0) {
+            throw new RuntimeException("TEST FAILED: " + message);
+        }
     }
 }
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadLists.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadLists.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5047639
  * @summary Check that the "java-level" APIs provide a consistent view of
  *          the thread list
+ * @modules java.management
  */
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -32,6 +32,7 @@
  *
  * @library ../../Thread
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @build ThreadMXBeanStateTest ThreadStateController
  * @run main ThreadMXBeanStateTest
@@ -64,60 +65,61 @@
         Thread.currentThread().getState();
         ThreadStateController thread = new ThreadStateController("StateChanger", globalLock);
         thread.setDaemon(true);
-
-        // before myThread starts
-        thread.checkThreadState(NEW);
+        try {
+            // before myThread starts
+            thread.checkThreadState(NEW);
 
-        thread.start();
-        thread.transitionTo(RUNNABLE);
-        thread.checkThreadState(RUNNABLE);
-        checkLockInfo(thread, RUNNABLE, null, null);
+            thread.start();
+            thread.transitionTo(RUNNABLE);
+            thread.checkThreadState(RUNNABLE);
+            checkLockInfo(thread, RUNNABLE, null, null);
 
-        thread.suspend();
-        ThreadStateController.pause(10);
-        thread.checkThreadState(RUNNABLE);
-        checkSuspendedThreadState(thread, RUNNABLE);
-        thread.resume();
+            thread.suspend();
+            ThreadStateController.pause(10);
+            thread.checkThreadState(RUNNABLE);
+            checkSuspendedThreadState(thread, RUNNABLE);
+            thread.resume();
 
-        synchronized (globalLock) {
-            thread.transitionTo(BLOCKED);
-            thread.checkThreadState(BLOCKED);
-            checkLockInfo(thread, BLOCKED,
-                          globalLock, Thread.currentThread());
-        }
+            synchronized (globalLock) {
+                thread.transitionTo(BLOCKED);
+                thread.checkThreadState(BLOCKED);
+                checkLockInfo(thread, BLOCKED,
+                              globalLock, Thread.currentThread());
+            }
 
-        thread.transitionTo(WAITING);
-        thread.checkThreadState(WAITING);
-        checkLockInfo(thread, Thread.State.WAITING,
-                      globalLock, null);
+            thread.transitionTo(WAITING);
+            thread.checkThreadState(WAITING);
+            checkLockInfo(thread, Thread.State.WAITING,
+                          globalLock, null);
 
-        thread.transitionTo(TIMED_WAITING);
-        thread.checkThreadState(TIMED_WAITING);
-        checkLockInfo(thread, TIMED_WAITING,
-                      globalLock, null);
+            thread.transitionTo(TIMED_WAITING);
+            thread.checkThreadState(TIMED_WAITING);
+            checkLockInfo(thread, TIMED_WAITING,
+                          globalLock, null);
 
 
-        thread.transitionToPark(true /* timed park */);
-        thread.checkThreadState(TIMED_WAITING);
-        checkLockInfo(thread, TIMED_WAITING, null, null);
+            thread.transitionToPark(true /* timed park */);
+            thread.checkThreadState(TIMED_WAITING);
+            checkLockInfo(thread, TIMED_WAITING, null, null);
 
-        thread.transitionToPark(false /* indefinite park */);
-        thread.checkThreadState(WAITING);
-        checkLockInfo(thread, WAITING, null, null);
+            thread.transitionToPark(false /* indefinite park */);
+            thread.checkThreadState(WAITING);
+            checkLockInfo(thread, WAITING, null, null);
 
-        thread.transitionToSleep();
-        thread.checkThreadState(TIMED_WAITING);
-        checkLockInfo(thread, TIMED_WAITING, null, null);
-
-        thread.transitionTo(TERMINATED);
-        thread.checkThreadState(TERMINATED);
+            thread.transitionToSleep();
+            thread.checkThreadState(TIMED_WAITING);
+            checkLockInfo(thread, TIMED_WAITING, null, null);
 
-        try {
-            System.out.println(thread.getLog());
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            System.out.println("TEST FAILED: Unexpected exception.");
-            throw new RuntimeException(e);
+            thread.transitionTo(TERMINATED);
+            thread.checkThreadState(TERMINATED);
+        } finally {
+            try {
+                System.out.println(thread.getLog());
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                System.out.println("TEST FAILED: Unexpected exception.");
+                throw new RuntimeException(e);
+            }
         }
         System.out.println("Test passed.");
     }
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,25 +28,27 @@
  *          ThreadInfo.getThreadState()
  * @author  Mandy Chung
  *
- * @run build Semaphore Utils
+ * @modules java.management
+ * @run build Utils
  * @run main ThreadStackTrace
  */
 
 import java.lang.management.*;
+import java.util.concurrent.Phaser;
 
 public class ThreadStackTrace {
-    private static ThreadMXBean mbean
+    private static final ThreadMXBean mbean
         = ManagementFactory.getThreadMXBean();
     private static boolean notified = false;
-    private static Object lockA = new Object();
-    private static Object lockB = new Object();
+    private static final Object lockA = new Object();
+    private static final Object lockB = new Object();
     private static volatile boolean testFailed = false;
-    private static String[] blockedStack = {"run", "test", "A", "B", "C", "D"};
-    private static int bsDepth = 6;
-    private static int methodB = 4;
-    private static String[] examinerStack = {"run", "examine1", "examine2"};
-    private static int esDepth = 3;
-    private static int methodExamine1= 2;
+    private static final String[] blockedStack = {"run", "test", "A", "B", "C", "D"};
+    private static final int bsDepth = 6;
+    private static final int methodB = 4;
+    private static final String[] examinerStack = {"run", "examine1", "examine2"};
+    private static final int esDepth = 3;
+    private static final int methodExamine1= 2;
 
     private static void checkNullThreadInfo(Thread t) throws Exception {
         ThreadInfo ti = mbean.getThreadInfo(t.getId());
@@ -69,8 +71,10 @@
             trace = true;
         }
 
-        Examiner examiner = new Examiner("Examiner");
-        BlockedThread blocked = new BlockedThread("BlockedThread");
+        final Phaser p = new Phaser(2);
+
+        Examiner examiner = new Examiner("Examiner", p);
+        BlockedThread blocked = new BlockedThread("BlockedThread", p);
         examiner.setThread(blocked);
 
         checkNullThreadInfo(examiner);
@@ -79,8 +83,8 @@
         // Start the threads and check them in  Blocked and Waiting states
         examiner.start();
 
-        // block until examiner begins doing its real work
-        examiner.waitForStarted();
+        // #1 - block until examiner begins doing its real work
+        p.arriveAndAwaitAdvance();
 
         System.out.println("Checking stack trace for the examiner thread " +
                            "is waiting to begin.");
@@ -145,35 +149,11 @@
     }
 
     static class BlockedThread extends Thread {
-        private Semaphore handshake = new Semaphore();
-
-        BlockedThread(String name) {
-            super(name);
-        }
-        boolean hasWaitersForBlocked() {
-            return (handshake.getWaiterCount() > 0);
-        }
-
-        void waitUntilBlocked() {
-            handshake.semaP();
+        private final Phaser phaser;
 
-            // give a chance for the examiner thread to really wait
-            Utils.goSleep(20);
-        }
-
-        void waitUntilLockAReleased() {
-            handshake.semaP();
-
-            // give a chance for the examiner thread to really wait
-            Utils.goSleep(50);
-        }
-
-        private void notifyWaiter() {
-            // wait until the examiner waits on the semaphore
-            while (handshake.getWaiterCount() == 0) {
-                Utils.goSleep(20);
-            }
-            handshake.semaV();
+        BlockedThread(String name, Phaser phaser) {
+            super(name);
+            this.phaser = phaser;
         }
 
         private void test() {
@@ -185,25 +165,24 @@
         private void B() {
             C();
 
-            // notify the examiner about to block on lockB
-            notifyWaiter();
+            // #4 - notify the examiner about to block on lockB
+            phaser.arriveAndAwaitAdvance();
 
-            synchronized (lockB) {
-            };
+            synchronized (lockB) {};
         }
         private void C() {
             D();
         }
         private void D() {
-            // Notify that examiner about to enter lockA
-            notifyWaiter();
+            // #2 - Notify that examiner about to enter lockA
+            phaser.arriveAndAwaitAdvance();
 
             synchronized (lockA) {
                 notified = false;
                 while (!notified) {
                     try {
-                        // notify the examiner about to release lockA
-                        notifyWaiter();
+                        // #3 - notify the examiner about to release lockA
+                        phaser.arriveAndAwaitAdvance();
                         // Wait and let examiner thread check the mbean
                         lockA.wait();
                     } catch (InterruptedException e) {
@@ -216,6 +195,7 @@
             }
         }
 
+        @Override
         public void run() {
             test();
         } // run()
@@ -223,28 +203,17 @@
 
     static class Examiner extends Thread {
         private static BlockedThread blockedThread;
-        private Semaphore handshake = new Semaphore();
+        private final Phaser phaser;
 
-        Examiner(String name) {
+        Examiner(String name, Phaser phaser) {
             super(name);
+            this.phaser = phaser;
         }
 
         public void setThread(BlockedThread thread) {
             blockedThread = thread;
         }
 
-        public synchronized void waitForStarted() {
-            // wait until the examiner is about to block
-            handshake.semaP();
-
-            // wait until the examiner is waiting for blockedThread's notification
-            while (!blockedThread.hasWaitersForBlocked()) {
-                Utils.goSleep(50);
-            }
-            // give a chance for the examiner thread to really wait
-            Utils.goSleep(20);
-        }
-
         private Thread itself;
         private void examine1() {
             synchronized (lockB) {
@@ -254,8 +223,9 @@
                     Utils.checkThreadState(itself, Thread.State.RUNNABLE);
                     checkStack(itself, examinerStack, methodExamine1);
 
-                    // wait until blockedThread is blocked on lockB
-                    blockedThread.waitUntilBlocked();
+                    // #4 - wait until blockedThread is blocked on lockB
+                    phaser.arriveAndAwaitAdvance();
+                    Utils.waitForThreadState(blockedThread, State.BLOCKED);
 
                     System.out.println("Checking stack trace for " +
                         "BlockedThread - should be blocked on lockB.");
@@ -271,15 +241,12 @@
 
         private void examine2() {
             synchronized (lockA) {
-                // wait until main thread gets signalled of the semaphore
-                while (handshake.getWaiterCount() == 0) {
-                    Utils.goSleep(20);
-                }
-
-                handshake.semaV();  // notify the main thread
+                // #1 - examiner ready to do the real work
+                phaser.arriveAndAwaitAdvance();
                 try {
-                    // Wait until BlockedThread is about to block on lockA
-                    blockedThread.waitUntilBlocked();
+                    // #2 - Wait until BlockedThread is about to block on lockA
+                    phaser.arriveAndAwaitAdvance();
+                    Utils.waitForThreadState(blockedThread, State.BLOCKED);
 
                     System.out.println("Checking examiner's its own stack trace");
                     Utils.checkThreadState(itself, Thread.State.RUNNABLE);
@@ -297,9 +264,10 @@
                 }
             }
 
-            // release lockA and let BlockedThread to get the lock
+            // #3 - release lockA and let BlockedThread to get the lock
             // and wait on lockA
-            blockedThread.waitUntilLockAReleased();
+            phaser.arriveAndAwaitAdvance();
+            Utils.waitForThreadState(blockedThread, State.WAITING);
 
             synchronized (lockA) {
                 try {
@@ -321,6 +289,7 @@
             Utils.goSleep(50);
         } // examine2()
 
+        @Override
         public void run() {
             itself = Thread.currentThread();
             examine1();
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadUserTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadUserTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic test of ThreadMXBean.getThreadUserTime and
  *          getCurrentThreadUserTime.
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/jdk/test/java/nio/file/Files/CheckPermissions.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/nio/file/Files/CheckPermissions.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, 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
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 6866804 7006126 8028270
+ * @bug 6866804 7006126 8028270 8065109
  * @summary Unit test for java.nio.file.Files
  * @library ..
  * @build CheckPermissions
@@ -37,6 +37,7 @@
 import java.nio.channels.SeekableByteChannel;
 import java.security.Permission;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 /**
@@ -426,8 +427,40 @@
             }
             createFile(file); // restore file
 
+            // -- newBufferedReader/newBufferedWriter --
 
-            // -- newInputStream/newOutptuStream --
+            prepare();
+            try (BufferedReader br = newBufferedReader(file)) {
+                assertCheckRead(file);
+            }
+
+            prepare();
+            try (BufferedWriter bw = newBufferedWriter(file, WRITE)) {
+                assertCheckWrite(file);
+            }
+
+            prepare();
+            try (BufferedWriter bw = newBufferedWriter(file, DELETE_ON_CLOSE)) {
+                assertCheckWrite(file);
+                assertCheckDelete(file);
+            }
+            createFile(file); // restore file
+
+            prepare();
+            try (BufferedWriter bw = newBufferedWriter(file,
+                StandardCharsets.UTF_16, WRITE)) {
+                assertCheckWrite(file);
+            }
+
+            prepare();
+            try (BufferedWriter bw = newBufferedWriter(file,
+                StandardCharsets.UTF_16, DELETE_ON_CLOSE)) {
+                assertCheckWrite(file);
+                assertCheckDelete(file);
+            }
+            createFile(file); // restore file
+
+            // -- newInputStream/newOutputStream --
 
             prepare();
             try (InputStream in = newInputStream(file)) {
@@ -438,6 +471,42 @@
                 assertCheckWrite(file);
             }
 
+            // -- write --
+
+            prepare();
+            Files.write(file, new byte[]{(byte) 42, (byte) 666}, WRITE);
+            assertCheckWrite(file);
+
+            prepare();
+            Files.write(file, new byte[]{(byte) 42, (byte) 666}, WRITE,
+                DELETE_ON_CLOSE);
+            assertCheckWrite(file);
+            assertCheckDelete(file);
+            createFile(file); // restore file
+
+            List<String> lines = Arrays.asList("42", "666");
+
+            prepare();
+            Files.write(file, lines, StandardCharsets.UTF_16, WRITE);
+            assertCheckWrite(file);
+
+            prepare();
+            Files.write(file, lines, StandardCharsets.UTF_16, WRITE,
+                DELETE_ON_CLOSE);
+            assertCheckWrite(file);
+            assertCheckDelete(file);
+            createFile(file); // restore file
+
+            prepare();
+            Files.write(file, lines, WRITE);
+            assertCheckWrite(file);
+
+            prepare();
+            Files.write(file, lines, WRITE, DELETE_ON_CLOSE);
+            assertCheckWrite(file);
+            assertCheckDelete(file);
+            createFile(file); // restore file
+
             // -- newDirectoryStream --
 
             prepare();
--- a/jdk/test/java/util/regex/RegExTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/java/util/regex/RegExTest.java	Thu May 07 20:50:07 2015 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @summary tests RegExp framework
+ * @summary tests RegExp framework (use -Dseed=X to set PRNG seed)
  * @author Mike McCloskey
  * @bug 4481568 4482696 4495089 4504687 4527731 4599621 4631553 4619345
  * 4630911 4672616 4711773 4727935 4750573 4792284 4803197 4757029 4808962
@@ -33,7 +33,10 @@
  * 6350801 6676425 6878475 6919132 6931676 6948903 6990617 7014645 7039066
  * 7067045 7014640 7189363 8007395 8013252 8013254 8012646 8023647 6559590
  * 8027645 8035076 8039124 8035975 8074678
- * @key randomness
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
+ * @run main RegExTest
+ * @key intermittent randomness
  */
 
 import java.util.function.Function;
@@ -50,7 +53,7 @@
  */
 public class RegExTest {
 
-    private static Random generator = new Random();
+    private static Random generator = RandomFactory.getRandom();
     private static boolean failure = false;
     private static int failCount = 0;
     private static String firstFailure = null;
--- a/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -29,6 +29,7 @@
  * is run with a security manager and the test codebase has the java permission
  * to read the "java.runtime.version" system property.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ImplVersionTest ImplVersionCommand
  * @run build ImplVersionTest ImplVersionCommand ImplVersionReader
  * @run main ImplVersionTest
@@ -76,7 +77,6 @@
                 checkVersion = false;
             String command =
                 javaHome + File.separator + "bin" + File.separator + "java " +
-                " -Xbootclasspath/p:" + bootClassPath +
                 " -classpath " + testClasses +
                 " -Djava.security.manager -Djava.security.policy==" + testSrc +
                 File.separator + "policy -Dtest.classes=" + testClasses +
--- a/jdk/test/javax/management/Introspector/AnnotationSecurityTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/AnnotationSecurityTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -27,6 +27,8 @@
  * @summary Test that having a security manager doesn't trigger a
  *          NotCompliantMBeanException
  * @author Daniel Fuchs, Yves Joan
+ * @modules java.desktop
+ *          java.management
  * @run clean AnnotationSecurityTest Described UnDescribed DescribedMBean
  *            UnDescribedMBean SqeDescriptorKey DescribedMX DescribedMXBean
  * @run build AnnotationSecurityTest Described UnDescribed DescribedMBean
--- a/jdk/test/javax/management/Introspector/AnnotationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/AnnotationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that annotations in Standard MBean interfaces
  * correctly produce Descriptor entries
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean AnnotationTest
  * @run build AnnotationTest
  * @run main AnnotationTest
--- a/jdk/test/javax/management/Introspector/ChangingNotifsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/ChangingNotifsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that Standard MBeans can change their MBeanNotificationInfo[]
  * and MXBeans cannot
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ChangingNotifsTest
  * @run build ChangingNotifsTest
  * @run main ChangingNotifsTest
--- a/jdk/test/javax/management/Introspector/ClassLeakTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/ClassLeakTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,12 +26,15 @@
  * @bug 4909536
  * @summary Ensure that the Introspector does not retain refs to classes
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ClassLeakTest
  * @run build ClassLeakTest
  * @run main ClassLeakTest
  */
 
 import java.lang.ref.WeakReference;
+import java.io.File;
+import java.nio.file.Paths;
 import java.net.*;
 import java.util.*;
 
@@ -44,17 +47,16 @@
                            "Standard MBean does not retain a reference to " +
                            "the MBean's class");
 
-        ClassLoader myClassLoader = ClassLeakTest.class.getClassLoader();
-        if (!(myClassLoader instanceof URLClassLoader)) {
-            System.out.println("TEST INVALID: test's class loader is not " +
-                               "a URLClassLoader");
-            System.exit(1);
+
+        String[] cpaths = System.getProperty("test.classes", ".")
+                                .split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        for (int i=0; i < cpaths.length; i++) {
+            urls[i] = Paths.get(cpaths[i]).toUri().toURL();
         }
 
-        URLClassLoader myURLClassLoader = (URLClassLoader) myClassLoader;
-        URL[] urls = myURLClassLoader.getURLs();
         PrivateMLet mlet = new PrivateMLet(urls, null, false);
-        Class shadowClass = mlet.loadClass(TestMBean.class.getName());
+        Class<?> shadowClass = mlet.loadClass(TestMBean.class.getName());
         if (shadowClass == TestMBean.class) {
             System.out.println("TEST INVALID: MLet got original " +
                                "TestMBean not shadow");
--- a/jdk/test/javax/management/Introspector/DuplicateGetterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/DuplicateGetterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that an MBean interface can inherit two methods with
  * the same signature from two unrelated parent interfaces
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.util.*;
--- a/jdk/test/javax/management/Introspector/FeatureOrderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/FeatureOrderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that attributes and operations appear in the same order
  * in MBeanInfo as they did in the Standard MBean or MXBean Interface.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 /*
--- a/jdk/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that the exception thrown by DynamicMBean.getMBeanInfo()
  *          keeps the init cause.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean GetMBeanInfoExceptionTest
  * @run build GetMBeanInfoExceptionTest
  * @run main GetMBeanInfoExceptionTest
--- a/jdk/test/javax/management/Introspector/IdenticalMBeanInfoTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/IdenticalMBeanInfoTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that MBeans with the same class have identical MBeanInfo
  * unless they are NotificationBroadcasters
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean IdenticalMBeanInfoTest
  * @run build IdenticalMBeanInfoTest
  * @run main IdenticalMBeanInfoTest
--- a/jdk/test/javax/management/Introspector/ImmutableNotificationInfoTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/ImmutableNotificationInfoTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that a StandardMBean has immutableInfo=true if it is
  * a NotificationBroadcasterSupport that doesn't override getNotificationInfo()
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ImmutableNotificationInfoTest
  * @run build ImmutableNotificationInfoTest
  * @run main ImmutableNotificationInfoTest
--- a/jdk/test/javax/management/Introspector/InvokeGettersTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/InvokeGettersTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6317101
  * @summary Test that the jmx.invoke.getters system property works
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean InvokeGettersTest
  * @run build InvokeGettersTest
  * @run main InvokeGettersTest
--- a/jdk/test/javax/management/Introspector/IsMethodTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/IsMethodTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4947001 4954369 4954409 4954410
  * @summary Test that "Boolean isX()" and "int isX()" define operations
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean IsMethodTest
  * @run build IsMethodTest
  * @run main IsMethodTest
--- a/jdk/test/javax/management/Introspector/NotAnMBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/NotAnMBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4914805
  * @summary Ensure that the right exception is thrown for illegal MBeans
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NotAnMBeanTest
  * @run build NotAnMBeanTest
  * @run main NotAnMBeanTest
--- a/jdk/test/javax/management/Introspector/NotCompliantCauseTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/NotCompliantCauseTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that NotCompliantMBeanException has a cause in case of
  *          type mapping problems.
  * @author Daniel Fuchs, Alexander Shusherov
+ * @modules java.management
  * @run clean NotCompliantCauseTest
  * @run build NotCompliantCauseTest
  * @run main NotCompliantCauseTest
--- a/jdk/test/javax/management/Introspector/SetWrongTypeAttributeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/SetWrongTypeAttributeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that setting the wrong type of an attribute in a Standard
  * MBean or MXBean causes InvalidAttributeValueException
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean SetWrongTypeAttributeTest
  * @run build SetWrongTypeAttributeTest
  * @run main SetWrongTypeAttributeTest
--- a/jdk/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          the supplied MBean although DynamicMBean.getMBeanInfo() throws
  *          a runtime exception.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean UnregisterMBeanExceptionTest
  * @run build UnregisterMBeanExceptionTest
  * @run main UnregisterMBeanExceptionTest
--- a/jdk/test/javax/management/MBeanInfo/EqualExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/EqualExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5071110
  * @summary Test whether an null descriptor will cause an NullPointerException.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean EqualExceptionTest
  * @run build EqualExceptionTest
  * @run main EqualExceptionTest
--- a/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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,6 +36,7 @@
  * @bug 8023954
  * @summary Test that MBean*Info.equals do not throw NPE
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MBeanInfoEqualsNPETest
  * @run build MBeanInfoEqualsNPETest
  * @run main MBeanInfoEqualsNPETest
--- a/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4719923
  * @summary Test that MBeanInfo.equals works even for mutable subclasses
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MBeanInfoEqualsTest
  * @run build MBeanInfoEqualsTest
  * @run main MBeanInfoEqualsTest
--- a/jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -35,6 +35,7 @@
  * @bug 8023669
  * @summary Test that hashCode()throws NullPointerException
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MBeanInfoHashCodeNPETest
  * @run build MBeanInfoHashCodeNPETest
  * @run main MBeanInfoHashCodeNPETest
--- a/jdk/test/javax/management/MBeanInfo/NotificationInfoTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/NotificationInfoTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that JMX classes use fully-qualified class names
  * in MBeanNotificationInfo
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NotificationInfoTest
  * @run build NotificationInfoTest
  * @run main NotificationInfoTest
--- a/jdk/test/javax/management/MBeanInfo/NullInfoArraysTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/NullInfoArraysTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that an MBeanInfo works even if it is deserialized from
  * an implementation where its array fields can be null.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NullInfoArraysTest
  * @run build NullInfoArraysTest
  * @run main NullInfoArraysTest
--- a/jdk/test/javax/management/MBeanInfo/SerializationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/SerializationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6288100
  * @summary Test the new serialization/deserialization methods.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean SerializationTest
  * @run build SerializationTest
  * @run main SerializationTest
--- a/jdk/test/javax/management/MBeanInfo/SerializationTest1.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/SerializationTest1.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6783290
  * @summary Test correct reading of an empty Descriptor.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean SerializationTest1
  * @run build SerializationTest1
  * @run main SerializationTest1
--- a/jdk/test/javax/management/MBeanInfo/TooManyFooTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanInfo/TooManyFooTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that a method inherited from two different interfaces
  *          appears only once in MBeanInfo.
  * @author dfuchs
+ * @modules java.management
  * @run clean TooManyFooTest
  * @run build TooManyFooTest
  * @run main TooManyFooTest
--- a/jdk/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6336968
  * @summary Test adding non-Attribute values to an AttributeList.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.util.Collections;
--- a/jdk/test/javax/management/MBeanServer/MBeanExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/MBeanExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -28,6 +28,7 @@
  * RuntimeMBeanException and (for Standard MBeans) that checked exceptions
  * are wrapped in MBeanException
  * @author Eamonn McManus
+ * @modules java.management
  * @compile MBeanExceptionTest.java
  * @run main MBeanExceptionTest
  */
--- a/jdk/test/javax/management/MBeanServer/MBeanFallbackTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/MBeanFallbackTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -33,6 +33,7 @@
  *          It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic"
  *          system property must be set before c.s.j.m.MBeanAnalyzer has been loaded.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean MBeanFallbackTest
  * @run build MBeanFallbackTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MBeanFallbackTest
--- a/jdk/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5092515
  * @summary Test how to unwrap a user specific exception
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MBeanServerInvocationHandlerExceptionTest
  * @run build MBeanServerInvocationHandlerExceptionTest
  * @run main MBeanServerInvocationHandlerExceptionTest
--- a/jdk/test/javax/management/MBeanServer/MBeanServerNotificationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/MBeanServerNotificationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Checks that MBeanServerNotification.toString contains the
  *          MBean name.
  * @author Daniel Fuchs
+ * @modules java.management/com.sun.jmx.mbeanserver
  * @compile MBeanServerNotificationTest.java
  * @run main MBeanServerNotificationTest
  */
--- a/jdk/test/javax/management/MBeanServer/MBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/MBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -31,6 +31,7 @@
  * @bug 8010285
  * @summary General MBean test.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean MBeanTest
  * @run build MBeanTest
  * @run main MBeanTest
--- a/jdk/test/javax/management/MBeanServer/NewMBeanListenerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/NewMBeanListenerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4757273
  * @summary Test that registered notification is sent early enough
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NewMBeanListenerTest
  * @run build NewMBeanListenerTest
  * @run main NewMBeanListenerTest
--- a/jdk/test/javax/management/MBeanServer/NotifDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/NotifDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4757273
  * @summary Test deadlock in MBeanServerDelegate listeners
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NotifDeadlockTest
  * @run build NotifDeadlockTest
  * @run main NotifDeadlockTest
--- a/jdk/test/javax/management/MBeanServer/OldMBeanServerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/OldMBeanServerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -97,6 +97,7 @@
  * @bug 5072268
  * @summary Test that nothing assumes a post-1.2 MBeanServer
  * @author Eamonn McManus
+ * @modules java.management
  * @run main/othervm -ea OldMBeanServerTest
  */
 
--- a/jdk/test/javax/management/MBeanServer/PostExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/PostExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check behaviour of MBeanServer when postRegister and postDeregister
  *          throw exceptions.
  * @author Daniel Fuchs
+ * @modules java.management
  * @compile PostExceptionTest.java
  * @run main PostExceptionTest
  */
--- a/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6417044
  * @summary Test deadlock in MBeanRegistration.postRegister method
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean PostRegisterDeadlockTest
  * @run build PostRegisterDeadlockTest
  * @run main PostRegisterDeadlockTest
--- a/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6417044
  * @summary Test that a failing MBean registration does not lead to a deadlock
  * @author Eamonn McManus
+ * @modules java.management
  * @run main PostRegisterDeadlockTest2
  */
 
--- a/jdk/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6318664
  * @summary Test deadlock in MBeanRegistration.preDeregister method
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean PreDeregisterDeadlockTest
  * @run build PreDeregisterDeadlockTest
  * @run main PreDeregisterDeadlockTest
--- a/jdk/test/javax/management/MBeanServer/PreRegisterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServer/PreRegisterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4911846
  * @summary Test that MBeanRegistration can change caller ObjectName
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean PreRegisterTest
  * @run build PreRegisterTest
  * @run main PreRegisterTest
--- a/jdk/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that the releaseMBeanServer(MBeanServer mbeanServer) method
  *          throws IllegalArgumentException as expected
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ReleaseMBeanServerTest
  * @run build ReleaseMBeanServerTest
  * @run main ReleaseMBeanServerTest
--- a/jdk/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  * IllegalArgumentException when attribute names, operation names, and
  * Java type names do not strictly follow the expected Java syntax.
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean MustBeValidCommand
  * @run build MustBeValidCommand
  * @run main MustBeValidCommand
--- a/jdk/test/javax/management/ObjectInstance/MBeanInfoFailTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectInstance/MBeanInfoFailTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5001857
  * @summary Test queryNames() and queryMBeans() with a buggy DynamicMBean
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean MBeanInfoFailTest
  * @run build MBeanInfoFailTest
  * @run main MBeanInfoFailTest
--- a/jdk/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5015663
  * @summary Test ObjectInstance(name,null).hashCode() and .equals()
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean ObjectInstanceNullTest
  * @run build ObjectInstanceNullTest
  * @run main ObjectInstanceNullTest
--- a/jdk/test/javax/management/ObjectInstance/ToStringMethodTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectInstance/ToStringMethodTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5080083
  * @summary Test new added method "toString"
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean ToStringMethodTest
  * @run build ToStringMethodTest
  * @run main ToStringMethodTest
--- a/jdk/test/javax/management/ObjectName/ApplyWildcardTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/ApplyWildcardTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test the ObjectName.apply(ObjectName) method
  *          with wildcards in the key properties value part.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ApplyWildcardTest
  * @run build ApplyWildcardTest
  * @run main ApplyWildcardTest
--- a/jdk/test/javax/management/ObjectName/ComparatorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/ComparatorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5036680
  * @summary Test the ObjectName.compareTo() method.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ComparatorTest
  * @run build ComparatorTest
  * @run main ComparatorTest
--- a/jdk/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that MBeanServerDelegate.DELEGATE_NAME and ObjectName.WILDCARD
  *          public constants have been initialized properly.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean DelegateNameWildcardNameTest
  * @run build DelegateNameWildcardNameTest
  * @run main DelegateNameWildcardNameTest
--- a/jdk/test/javax/management/ObjectName/NullEmptyKeyValueTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/NullEmptyKeyValueTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6229396
  * @summary Test null/empty key/values in ObjectName constructors.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean NullEmptyKeyValueTest
  * @run build NullEmptyKeyValueTest
  * @run main NullEmptyKeyValueTest
--- a/jdk/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4894801
  * @summary Test that ObjectName.getInstance(ObjectName) preserves key order
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ObjectNameGetInstanceTest
  * @run build ObjectNameGetInstanceTest
  * @run main ObjectNameGetInstanceTest
--- a/jdk/test/javax/management/ObjectName/RepositoryWildcardTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/RepositoryWildcardTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test if the repository supports correctly the use of
  *          wildcards in the ObjectName key properties value part.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean RepositoryWildcardTest
  * @run build RepositoryWildcardTest
  * @run main RepositoryWildcardTest
--- a/jdk/test/javax/management/ObjectName/SerialCompatTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/SerialCompatTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6211220 6616825
  * @summary Test that jmx.serial.form=1.0 works for ObjectName
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean SerialCompatTest
  * @run build SerialCompatTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true -Djmx.serial.form=1.0 SerialCompatTest
--- a/jdk/test/javax/management/ObjectName/ValueWildcardTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/ObjectName/ValueWildcardTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4716807
  * @summary Test wildcards in ObjectName key properties value part.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ValueWildcardTest
  * @run build ValueWildcardTest
  * @run main ValueWildcardTest
--- a/jdk/test/javax/management/descriptor/DefaultDescriptorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/DefaultDescriptorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6204469
  * @summary Test that MBean*Info can be constructed with default descriptor
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DefaultDescriptorTest
  * @run build DefaultDescriptorTest
  * @run main DefaultDescriptorTest
--- a/jdk/test/javax/management/descriptor/DescriptorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/DescriptorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6204469 6273765
  * @summary Test various aspects of the Descriptor interface
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorTest
  * @run build DescriptorTest
  * @run main DescriptorTest
--- a/jdk/test/javax/management/descriptor/EqualsHashCodeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/EqualsHashCodeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6255956
  * @summary Test equals and hashCode for descriptors
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean EqualsHashCodeTest
  * @run build EqualsHashCodeTest
  * @run main EqualsHashCodeTest
--- a/jdk/test/javax/management/descriptor/ImmutableArrayFieldTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/ImmutableArrayFieldTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that immutability of ImmutableDescriptor cannot be
  * compromised by modifying field values that are arrays.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ImmutableArrayFieldTest
  * @run build ImmutableArrayFieldTest
  * @run main ImmutableArrayFieldTest
--- a/jdk/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6204469
  * @summary Test ImmutableDescriptor serialization.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ImmutableDescriptorSerialTest
  * @run build ImmutableDescriptorSerialTest
  * @run main ImmutableDescriptorSerialTest
--- a/jdk/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  * null name in it and calling setFields with a field names array with an
  * empty name in it throw the expected exceptions.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ImmutableDescriptorSetFieldsTest
  * @run build ImmutableDescriptorSetFieldsTest
  * @run main ImmutableDescriptorSetFieldsTest
--- a/jdk/test/javax/management/descriptor/MBeanInfoInteropTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/MBeanInfoInteropTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6204469
  * @summary Check that descriptors have not broken serial interop.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MBeanInfoInteropTest SerializedInfo
  * @run build MBeanInfoInteropTest SerializedInfo
  * @run main MBeanInfoInteropTest SerializedInfo
--- a/jdk/test/javax/management/descriptor/UnionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/descriptor/UnionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6273752
  * @summary Test ImmutableDescriptor.union
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean UnionTest
  * @run build UnionTest
  * @run main UnionTest
--- a/jdk/test/javax/management/generified/GenericTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/generified/GenericTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4847959 6191402
  * @summary Test newly-generified APIs
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean GenericTest
  * @run build GenericTest
  * @run main GenericTest
--- a/jdk/test/javax/management/generified/ListTypeCheckTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/generified/ListTypeCheckTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6250772
  * @summary Test that *List objects are checked after asList is called.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ListTypeCheckTest
  * @run build ListTypeCheckTest
  * @run main ListTypeCheckTest
--- a/jdk/test/javax/management/loading/ArrayClassTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/ArrayClassTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that array classes can be found in signatures always
  * and can be deserialized by the deprecated MBeanServer.deserialize method
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ArrayClassTest
  * @run build ArrayClassTest
  * @run main ArrayClassTest
@@ -35,6 +36,7 @@
 import java.io.*;
 import java.lang.reflect.*;
 import java.net.*;
+import java.nio.file.Paths;
 import javax.management.*;
 import javax.management.loading.*;
 
@@ -42,15 +44,16 @@
     public static void main(String[] args) throws Exception {
         MBeanServer mbs = MBeanServerFactory.createMBeanServer();
 
-        /* If this test isn't loaded by a URLClassLoader we will get
-           a ClassCastException here, which is good because it means
-           this test isn't valid.  */
-        URLClassLoader testLoader =
-            (URLClassLoader) ArrayClassTest.class.getClassLoader();
+        String[] cpaths = System.getProperty("test.classes", ".")
+                                .split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        for (int i=0; i < cpaths.length; i++) {
+            urls[i] = Paths.get(cpaths[i]).toUri().toURL();
+        }
 
         // Create an MLet that can load the same class names but
         // will produce different results.
-        ClassLoader loader = new SpyLoader(testLoader.getURLs());
+        ClassLoader loader = new SpyLoader(urls);
         ObjectName loaderName = new ObjectName("test:type=SpyLoader");
         mbs.registerMBean(loader, loaderName);
 
--- a/jdk/test/javax/management/loading/DocumentRootTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/DocumentRootTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test parsing error when the mlet file is
  *          located in the web server's document root.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean DocumentRootTest
  * @run build DocumentRootTest
  * @run main DocumentRootTest
--- a/jdk/test/javax/management/loading/GetMBeansFromURLTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/GetMBeansFromURLTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -28,6 +28,7 @@
  *          given MLet instance throws a ServiceNotFoundException exception
  *          with a non null cause.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean GetMBeansFromURLTest
  * @run build GetMBeansFromURLTest
  * @run main GetMBeansFromURLTest
--- a/jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015 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
@@ -27,6 +27,7 @@
  * @summary Test that the same native library coming from the same jar file can
  * be loaded twice by two different MLets on the same JVM without conflict.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean LibraryLoaderTest
  * @run build LibraryLoaderTest
  * @run main/othervm LibraryLoaderTest
--- a/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  * for the test codebase as it is executed by the MLet code using
  * doPrivileged.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MLetCommand
  * @run build MLetCommand
  * @run main/othervm/policy=policy MLetCommand
--- a/jdk/test/javax/management/loading/MLetContentTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/MLetContentTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4796780
  * @summary The class MLetContentTest becomes public
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MLetContentTest
  * @run build MLetContentTest
  * @run main MLetContentTest
--- a/jdk/test/javax/management/loading/MLetInternalsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/MLetInternalsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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,6 +36,7 @@
  * @bug 8058089
  * @summary Tests various internal functions provided by MLet for correctness
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run testng MLetInternalsTest
  */
 public class MLetInternalsTest {
--- a/jdk/test/javax/management/loading/ParserInfiniteLoopTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/ParserInfiniteLoopTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -29,6 +29,7 @@
  * terminated with the corresponding '>' and an opening '<' for
  * the subsequent tag is encountered.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ParserInfiniteLoopTest
  * @run build ParserInfiniteLoopTest
  * @run main/othervm/timeout=5 ParserInfiniteLoopTest mlet1.html
--- a/jdk/test/javax/management/loading/SystemClassLoaderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/loading/SystemClassLoaderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that a class can load MBeans from its class loader
  * (at least if it is the system class loader)
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean SystemClassLoaderTest
  * @run build SystemClassLoaderTest
  * @run main SystemClassLoaderTest
--- a/jdk/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -30,6 +30,7 @@
  * no other attributes.
  * @author Yves Joan
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean AddAttributeChangeNotificationListenerTest
  * @run build AddAttributeChangeNotificationListenerTest
  * @run main AddAttributeChangeNotificationListenerTest
--- a/jdk/test/javax/management/modelmbean/DescriptorSupportSerialTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/DescriptorSupportSerialTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6332962
  * @summary Test that DescriptorSupport does not serialize targetObject
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorSupportSerialTest
  * @run build DescriptorSupportSerialTest
  * @run main DescriptorSupportSerialTest
--- a/jdk/test/javax/management/modelmbean/DescriptorSupportTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/DescriptorSupportTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4883712 4869006 4894856 5016685
  * @summary Test that DescriptorSupport correctly validates fields
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorSupportTest
  * @run build DescriptorSupportTest
  * @run main DescriptorSupportTest
--- a/jdk/test/javax/management/modelmbean/DescriptorSupportXMLTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/DescriptorSupportXMLTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that DescriptorSupport.toXMLString() can be used to
  * reconstruct an equivalent DescriptorSupport
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorSupportXMLTest
  * @run build DescriptorSupportXMLTest
  * @run main DescriptorSupportXMLTest
--- a/jdk/test/javax/management/modelmbean/ExoticTargetTypeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/ExoticTargetTypeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that a custom ModelMBean implementation can have custom
  * targetType values in its ModelMBeanOperationInfo descriptors.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ExoticTargetTypeTest
  * @run build ExoticTargetTypeTest
  * @run main ExoticTargetTypeTest
--- a/jdk/test/javax/management/modelmbean/InfoSupportTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/InfoSupportTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -29,6 +29,7 @@
  * that getDescriptors("mbean") works, and that default values for
  * MBean descriptors are correctly assigned.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean InfoSupportTest
  * @run build InfoSupportTest
  * @run main InfoSupportTest
--- a/jdk/test/javax/management/modelmbean/LoggingExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/LoggingExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -29,6 +29,7 @@
  * when traces enabled and no attributes.
  * @author Luis-Miguel Alventosa
  * @author Paul Cheeseman
+ * @modules java.management
  */
 
 import java.util.logging.ConsoleHandler;
--- a/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that  ModelMBeanInfoSupport.getDescriptors(null) also
  *          returns the MBean's descriptor.
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean GetAllDescriptorsTest
  * @run build GetAllDescriptorsTest
  * @run main/othervm/policy=policy  GetAllDescriptorsTest
--- a/jdk/test/javax/management/modelmbean/OnUnregisterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/OnUnregisterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that OnUnregister is an allowed value for persistPolicy
  * in ModelMBeanAttributeInfo
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OnUnregisterTest
  * @run build OnUnregisterTest
  * @run main OnUnregisterTest
--- a/jdk/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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,6 +36,7 @@
  * - the declared name can be loaded by the value's class loader and
  *   produces a class to which the value can be assigned.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean RequiredModelMBeanGetAttributeTest
  * @run build RequiredModelMBeanGetAttributeTest
  * @run main RequiredModelMBeanGetAttributeTest
--- a/jdk/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  * from the RequiredModelMBean class itself if they are not in the
  * ModelMBeanInfo
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean RequiredModelMBeanMethodTest
  * @run build RequiredModelMBeanMethodTest
  * @run main RequiredModelMBeanMethodTest
--- a/jdk/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  * MBeanException wrapping a ServiceNotFoundException is thrown is setAttribute
  * called but no setMethod field has been provided.
  * @author Jean-Francois Denise
+ * @modules java.management
  * @run clean RequiredModelMBeanSetAttributeTest
  * @run build RequiredModelMBeanSetAttributeTest
  * @run main RequiredModelMBeanSetAttributeTest
--- a/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  * IllegalArgumentException when attribute names, operation names, and
  * Java type names do not strictly follow the expected Java syntax.
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean SimpleModelMBeanCommand
  * @run build SimpleModelMBeanCommand
  * @run main/othervm/policy=policy  SimpleModelMBeanCommand
--- a/jdk/test/javax/management/modelmbean/UnserializableTargetObjectTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/modelmbean/UnserializableTargetObjectTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that a RequiredModelMBean operation can have a targetObject
  * that is not serializable
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean UnserializableTargetObjectTest
  * @run build UnserializableTargetObjectTest
  * @run main UnserializableTargetObjectTest
--- a/jdk/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,8 @@
  * @summary Test that the counter/gauge/string monitors
  *          support attributes of arbitrary data types.
  * @author Luis-Miguel Alventosa
+ * @modules java.desktop
+ *          java.management
  * @run clean AttributeArbitraryDataTypeTest
  * @run build AttributeArbitraryDataTypeTest
  * @run main AttributeArbitraryDataTypeTest
--- a/jdk/test/javax/management/monitor/CounterMonitorDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/CounterMonitorDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test that no locks are held when a monitor attribute is sampled
  * or notif delivered.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean CounterMonitorDeadlockTest
  * @run build CounterMonitorDeadlockTest
  * @run main CounterMonitorDeadlockTest 1
--- a/jdk/test/javax/management/monitor/CounterMonitorInitThresholdTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/CounterMonitorInitThresholdTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          objects added before the counter monitor is started as well as by
  *          the observed objects which are added once the monitor is started.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean CounterMonitorInitThresholdTest
  * @run build CounterMonitorInitThresholdTest
  * @run main CounterMonitorInitThresholdTest
--- a/jdk/test/javax/management/monitor/CounterMonitorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/CounterMonitorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that the counter monitor, when running in difference mode,
  *          emits a notification every time the threshold is exceeded.
  * @author Luis-Miguel Alventosa, Shanliang JIANG
+ * @modules java.management
  * @run clean CounterMonitorTest
  * @run build CounterMonitorTest
  * @run main CounterMonitorTest
--- a/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6229368 8025207
  * @summary Wrong threshold value in CounterMonitor with offset and modulus.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean CounterMonitorThresholdTest
  * @run build CounterMonitorThresholdTest
  * @run main CounterMonitorThresholdTest
--- a/jdk/test/javax/management/monitor/DerivedGaugeMonitorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/DerivedGaugeMonitorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6683213
  * @summary Test that the initial derived gauge is (Integer)0
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean DerivedGaugeMonitorTest
  * @run build DerivedGaugeMonitorTest
  * @run main DerivedGaugeMonitorTest
--- a/jdk/test/javax/management/monitor/GaugeMonitorDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/GaugeMonitorDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that no locks are held when a monitor attribute is sampled
  * or notif delivered.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean GaugeMonitorDeadlockTest
  * @run build GaugeMonitorDeadlockTest
  * @run main GaugeMonitorDeadlockTest 1
--- a/jdk/test/javax/management/monitor/MultiMonitorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/MultiMonitorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4984057
  * @summary Test that monitors can sample a large number of attributes
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MultiMonitorTest
  * @run build MultiMonitorTest
  * @run main MultiMonitorTest
--- a/jdk/test/javax/management/monitor/NonComparableAttributeValueTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/NonComparableAttributeValueTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          jmx.monitor.error.type notification when the attribute
  *          being monitored returns a non comparable value.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean NonComparableAttributeValueTest
  * @run build NonComparableAttributeValueTest
  * @run main NonComparableAttributeValueTest
--- a/jdk/test/javax/management/monitor/NullAttributeValueTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/NullAttributeValueTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -29,6 +29,7 @@
  *          being monitored returns a null value.
  * @author Luis-Miguel Alventosa
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NullAttributeValueTest
  * @run build NullAttributeValueTest
  * @run main NullAttributeValueTest
--- a/jdk/test/javax/management/monitor/ReflectionExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/ReflectionExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that the jmx.monitor.error.runtime monitor notification
  *          is emitted when getAttribute throws ReflectionException.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ReflectionExceptionTest MBeanServerBuilderImpl
  *            MBeanServerForwarderInvocationHandler
  * @run build ReflectionExceptionTest MBeanServerBuilderImpl
--- a/jdk/test/javax/management/monitor/RuntimeExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/RuntimeExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that the jmx.monitor.error.runtime monitor notification
  *          is emitted when getAttribute throws RuntimeException.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean RuntimeExceptionTest MBeanServerBuilderImpl
  *            MBeanServerForwarderInvocationHandler
  * @run build RuntimeExceptionTest MBeanServerBuilderImpl
--- a/jdk/test/javax/management/monitor/StartStopTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/StartStopTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          monitors are started and stopped in a loop.
  * @author Luis-Miguel Alventosa
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run clean StartStopTest
  * @run build StartStopTest
--- a/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that no locks are held when a monitor attribute is sampled
  * or notif delivered.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean StringMonitorDeadlockTest
  * @run build StringMonitorDeadlockTest
  * @run main StringMonitorDeadlockTest 1
--- a/jdk/test/javax/management/monitor/ThreadPoolAccTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/ThreadPoolAccTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015 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
@@ -27,6 +27,7 @@
  * @summary Test that each thread in the thread pool runs
  *          in the context of the monitor.start() caller.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ThreadPoolAccTest
  * @run build ThreadPoolAccTest
  * @run main ThreadPoolAccTest
--- a/jdk/test/javax/management/monitor/ThreadPoolTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/monitor/ThreadPoolTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that all monitors will be well started when sharing
  * a single thread pool.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ThreadPoolTest
  * @run build ThreadPoolTest
  * @run main/othervm/timeout=300 ThreadPoolTest 1
--- a/jdk/test/javax/management/mxbean/AmbiguousConstructorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/AmbiguousConstructorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,8 @@
  * @bug 6175517 6278707
  * @summary Test that ambiguous ConstructorProperties annotations are detected.
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  * @run clean AmbiguousConstructorTest
  * @run build AmbiguousConstructorTest
  * @run main AmbiguousConstructorTest
--- a/jdk/test/javax/management/mxbean/ComparatorExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/ComparatorExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6601652
  * @summary Test exception when SortedMap or SortedSet has non-null Comparator
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.util.SortedMap;
--- a/jdk/test/javax/management/mxbean/ExceptionDiagnosisTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/ExceptionDiagnosisTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,8 @@
  * @bug 6713777
  * @summary Test that exception messages include all relevant information
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  */
 
 import java.beans.ConstructorProperties;
--- a/jdk/test/javax/management/mxbean/GenericArrayTypeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/GenericArrayTypeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6292705
  * @summary Test support for arrays in parameterized types.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean GenericArrayTypeTest
  * @run build GenericArrayTypeTest
  * @run main GenericArrayTypeTest
--- a/jdk/test/javax/management/mxbean/GenericTypeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/GenericTypeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6376416 6406447
  * @summary Test use of generic types in MXBeans (mostly illegal).
  * @author Eamonn McManus
+ * @modules java.management
  * @run main GenericTypeTest
  */
 
--- a/jdk/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Ensure the registration of an invalid MXBean
  *          throws NotCompliantMBeanException.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean InvalidMXBeanRegistrationTest
  * @run build InvalidMXBeanRegistrationTest
  * @run main InvalidMXBeanRegistrationTest
--- a/jdk/test/javax/management/mxbean/LeakTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/LeakTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -25,6 +25,8 @@
  * @bug 6482247
  * @summary Test that creating MXBeans does not introduce memory leaks.
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  * @run build LeakTest RandomMXBeanTest
  * @run main LeakTest
  */
@@ -38,12 +40,14 @@
  * This test can be applied to any jtreg test, not just the MXBean tests.
  */
 
+import java.io.File;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Paths;
 
 public class LeakTest {
     /* Ideally we would include MXBeanTest in the list of tests, since it
@@ -95,11 +99,15 @@
 
     private static WeakReference<ClassLoader>
             testShadow(Class<?> originalTestClass) throws Exception {
-        URLClassLoader originalLoader =
-                (URLClassLoader) originalTestClass.getClassLoader();
-        URL[] urls = originalLoader.getURLs();
+        String[] cpaths = System.getProperty("test.classes", ".")
+                                .split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        for (int i=0; i < cpaths.length; i++) {
+            urls[i] = Paths.get(cpaths[i]).toUri().toURL();
+        }
+
         URLClassLoader shadowLoader =
-                new ShadowClassLoader(urls, originalLoader.getParent());
+                new ShadowClassLoader(urls, originalTestClass.getClassLoader().getParent());
         System.out.println("Shadow loader is " + shadowLoader);
         String className = originalTestClass.getName();
         Class<?> testClass = Class.forName(className, false, shadowLoader);
--- a/jdk/test/javax/management/mxbean/MBeanOperationInfoTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MBeanOperationInfoTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6359948
  * @summary Check that MXBean operations have the expected ReturnType in MBeanOperationInfo
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MBeanOperationInfoTest
  * @run build MBeanOperationInfoTest
  * @run main MBeanOperationInfoTest
--- a/jdk/test/javax/management/mxbean/MXBeanAnnotationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MXBeanAnnotationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6316491
  * @summary Check that the MXBean annotation works as advertised
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MXBeanAnnotationTest
  * @run build MXBeanAnnotationTest
  * @run main MXBeanAnnotationTest
--- a/jdk/test/javax/management/mxbean/MXBeanFallbackTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MXBeanFallbackTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic"
  *          system property must be set before c.s.j.m.MBeanAnalyzer has been loaded.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean MXBeanFallbackTest
  * @run build MXBeanFallbackTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MXBeanFallbackTest
--- a/jdk/test/javax/management/mxbean/MXBeanFlagTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MXBeanFlagTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6335337
  * @summary Test correctness of mxbean flag in descriptor.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MXBeanFlagTest
  * @run build MXBeanFlagTest
  * @run main MXBeanFlagTest
--- a/jdk/test/javax/management/mxbean/MXBeanPreRegisterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MXBeanPreRegisterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Ensure that preRegister etc are called, but not when wrapped
  * by the class StandardMBean
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MXBeanPreRegisterTest
  * @run build MXBeanPreRegisterTest
  * @run main MXBeanPreRegisterTest
--- a/jdk/test/javax/management/mxbean/MXBeanRefTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MXBeanRefTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6296433 6283873
  * @summary Test that inter-MXBean references work as expected.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MXBeanRefTest
  * @run build MXBeanRefTest
  * @run main MXBeanRefTest
--- a/jdk/test/javax/management/mxbean/MXBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MXBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,8 @@
  * @summary General MXBean test.
  * @author Eamonn McManus
  * @author Jaroslav Bachorik
+ * @modules java.desktop
+ *          java.management
  * @run clean MXBeanTest MerlinMXBean TigerMXBean
  * @run build MXBeanTest MerlinMXBean TigerMXBean
  * @run main MXBeanTest
--- a/jdk/test/javax/management/mxbean/MiscTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/MiscTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          interfaceClassName, openType, originalType, StandardMBean,
  *          StandardEmitterMBean.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MiscTest
  * @run build MiscTest
  * @run main MiscTest
--- a/jdk/test/javax/management/mxbean/OperationImpactTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/OperationImpactTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6320104
  * @summary Check that MXBean operations have impact UNKNOWN.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OperationImpactTest
  * @run build OperationImpactTest
  * @run main OperationImpactTest
--- a/jdk/test/javax/management/mxbean/OverloadTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/OverloadTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6175517
  * @summary Test that MXBean interfaces can contain overloaded methods
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OverloadTest
  * @run build OverloadTest
  * @run main OverloadTest
--- a/jdk/test/javax/management/mxbean/PreRegisterNameTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/PreRegisterNameTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6448042
  * @summary Test that MXBeans can define their own names in preRegister
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.lang.management.ManagementFactory;
--- a/jdk/test/javax/management/mxbean/PropertyNamesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/PropertyNamesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,8 @@
  * @bug 6175517
  * @summary Test the PropertyNames annotation with MXBeans
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  * @run clean PropertyNamesTest
  * @run build PropertyNamesTest
  * @run main PropertyNamesTest
--- a/jdk/test/javax/management/mxbean/SameObjectTwoNamesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/SameObjectTwoNamesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -28,6 +28,7 @@
  * names produces an exception
  * @author Alexander Shusherov
  * @author Eamonn McManus
+ * @modules java.management
  * @run main SameObjectTwoNamesTest
  * @run main/othervm -Djmx.mxbean.multiname=true SameObjectTwoNamesTest
  */
--- a/jdk/test/javax/management/mxbean/StandardMBeanOverrideTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/StandardMBeanOverrideTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -29,6 +29,7 @@
  *          getMBeanInfo and getNotificationInfo in StandardMBean and
  *          StandardEmitterMBean.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean StandardMBeanOverrideTest
  * @run build StandardMBeanOverrideTest
  * @run main StandardMBeanOverrideTest
--- a/jdk/test/javax/management/mxbean/ThreadMXBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/ThreadMXBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6305746
  * @summary Test that the null values returned by the ThreadMXBean work.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ThreadMXBeanTest
  * @run build ThreadMXBeanTest
  * @run main ThreadMXBeanTest
--- a/jdk/test/javax/management/mxbean/TypeNameTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/mxbean/TypeNameTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6757225 6763051
  * @summary Test that type names in MXBeans match their spec.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.lang.reflect.Field;
--- a/jdk/test/javax/management/notification/BroadcasterSupportDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/notification/BroadcasterSupportDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that NotificationBroadcasterSupport can be subclassed
  * and used with synchronized(this) without causing deadlock
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean BroadcasterSupportDeadlockTest
  * @run build BroadcasterSupportDeadlockTest
  * @run main BroadcasterSupportDeadlockTest
--- a/jdk/test/javax/management/notification/FilterExceptionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/notification/FilterExceptionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6244855 6244863
  * @summary Exception thrown by NotificationFilter should be ignored
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean FilterExceptionTest
  * @run build FilterExceptionTest
  * @run main FilterExceptionTest
--- a/jdk/test/javax/management/notification/NotifExecutorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/notification/NotifExecutorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4661545
  * @summary Tests to use an executor to send notifications.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NotifExecutorTest
  * @run build NotifExecutorTest
  * @run main NotifExecutorTest
--- a/jdk/test/javax/management/notification/NotifInfoTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/notification/NotifInfoTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4506105 6303698
  * @summary NotificationBroadcasterSupport should have a ctor with MBeanNotificationInfo[]
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NotifInfoTest
  * @run build NotifInfoTest
  * @run main NotifInfoTest
--- a/jdk/test/javax/management/openmbean/ArrayTypeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/ArrayTypeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5045358
  * @summary Test that Open MBeans support arrays of primitive types.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ArrayTypeTest
  * @run build ArrayTypeTest
  * @run main ArrayTypeTest
--- a/jdk/test/javax/management/openmbean/BadConstraintTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/BadConstraintTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that Open MBean attributes and parameters cannot have
  * illegal constraints like min greater than max
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean BadConstraintTest
  * @run build BadConstraintTest
  * @run main BadConstraintTest
--- a/jdk/test/javax/management/openmbean/CompositeDataStringTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/CompositeDataStringTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6610174
  * @summary Test that CompositeDataSupport.toString() represents arrays correctly
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import javax.management.openmbean.ArrayType;
--- a/jdk/test/javax/management/openmbean/ConstraintTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/ConstraintTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6204469
  * @summary Test that Open MBean attributes and parameters check constraints
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ConstraintTest
  * @run build ConstraintTest
  * @run main ConstraintTest
--- a/jdk/test/javax/management/openmbean/EqualsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/EqualsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5072174
  * @summary Test CompositeDataSupport.equals with ArrayType
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean EqualsTest
  * @run build EqualsTest
  * @run main EqualsTest
--- a/jdk/test/javax/management/openmbean/IsValueTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/IsValueTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5072004
  * @summary Test new rules for isValue
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import javax.management.openmbean.*;
--- a/jdk/test/javax/management/openmbean/NullConstructorParamsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/NullConstructorParamsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6434298
  * @summary Test IAE is thrown when typeName or description parameter is null for TabularType and CompositeType constructors
  * @author Joel FERAUD
+ * @modules java.management
  */
 
 import javax.management.openmbean.*;
--- a/jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -41,6 +41,7 @@
  * @bug 8023529
  * @summary Test that OpenMBean*Info.equals do not throw NPE
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean OpenMBeanInfoEqualsNPETest
  * @run build OpenMBeanInfoEqualsNPETest
  * @run main OpenMBeanInfoEqualsNPETest
--- a/jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -40,6 +40,7 @@
  * @bug 8023529
  * @summary Test that OpenMBean*Info.hashCode do not throw NPE
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean OpenMBeanInfoHashCodeNPETest
  * @run build OpenMBeanInfoHashCodeNPETest
  * @run main OpenMBeanInfoHashCodeNPETest
--- a/jdk/test/javax/management/openmbean/OpenTypeDescriptorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/OpenTypeDescriptorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  * @summary Test that Open*MBeanInfo classes include "openType" in descriptor
  *          and also test serial compatibility with Java 5.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OpenTypeDescriptorTest
  * @run build OpenTypeDescriptorTest
  * @run main OpenTypeDescriptorTest
--- a/jdk/test/javax/management/openmbean/TabularDataOrderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/openmbean/TabularDataOrderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6334663
  * @summary Test that TabularDataSupport preserves the order elements were added
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.io.ByteArrayInputStream;
--- a/jdk/test/javax/management/proxy/JMXProxyFallbackTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/proxy/JMXProxyFallbackTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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,6 +34,7 @@
  *          It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic"
  *          system property must be set before c.s.j.m.MBeanAnalyzer has been loaded.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean JMXProxyFallbackTest
  * @run build JMXProxyFallbackTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true JMXProxyFallbackTest
--- a/jdk/test/javax/management/proxy/JMXProxyTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/proxy/JMXProxyTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -33,6 +33,7 @@
  * @summary Tests that javax.management.JMX creates proxies only for the
  *          compliant MBeans/MXBeans
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean JMXProxyTest
  * @run build JMXProxyTest
  * @run main JMXProxyTest
--- a/jdk/test/javax/management/proxy/NotificationEmitterProxy.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/proxy/NotificationEmitterProxy.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @summary Test that we can create proxies which are NotificationEmitters.
  * @bug 6411747
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean NotificationEmitterProxy
  * @run build NotificationEmitterProxy
  * @run main NotificationEmitterProxy
--- a/jdk/test/javax/management/proxy/ProxyObjectMethodsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/proxy/ProxyObjectMethodsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6177524
  * @summary Test how to execute the 3 Object methods by a Proxy.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean ProxyObjectMethodsTest
  * @run build ProxyObjectMethodsTest
  * @run main ProxyObjectMethodsTest
--- a/jdk/test/javax/management/query/CustomQueryTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/query/CustomQueryTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6692027
  * @summary Check that custom subclasses of QueryEval can be serialized.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.io.ByteArrayInputStream;
--- a/jdk/test/javax/management/query/InstanceOfExpTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/query/InstanceOfExpTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5072174 6335848
  * @summary test the new method javax.management.Query.isInstanceOf("className")
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean InstanceOfExpTest
  * @run build InstanceOfExpTest
  * @run main InstanceOfExpTest
--- a/jdk/test/javax/management/query/QueryExpStringTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/query/QueryExpStringTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4886011
  * @summary Test that QueryExp.toString() is reversible
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean QueryExpStringTest
  * @run build QueryExpStringTest
  * @run main QueryExpStringTest
--- a/jdk/test/javax/management/query/QueryMatchTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/query/QueryMatchTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6266438
  * @summary Query.match code for character sequences like [a-z] is wrong.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean QueryMatchTest
  * @run build QueryMatchTest
  * @run main QueryMatchTest
--- a/jdk/test/javax/management/query/QuerySubstringTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/query/QuerySubstringTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Query.{initial,any,final}SubString fail if the
  *          matching constraint string contains wildcards.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean QuerySubstringTest
  * @run build QuerySubstringTest
  * @run main QuerySubstringTest
--- a/jdk/test/javax/management/relation/NonArrayListTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/relation/NonArrayListTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4848474
  * @summary Test that relation service doesn't require List params to be ArrayList
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NonArrayListTest
  * @run build NonArrayListTest
  * @run main NonArrayListTest
--- a/jdk/test/javax/management/relation/RelationNotificationSeqNoTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/relation/RelationNotificationSeqNoTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6701459
  * @summary Test sequence numbers in RelationService notifications.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 /*
--- a/jdk/test/javax/management/relation/RelationNotificationSourceTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/relation/RelationNotificationSourceTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4892674
  * @summary Test that RelationNotification can be constructed with ObjectName.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean RelationNotificationSourceTest
  * @run build RelationNotificationSourceTest
  * @run main RelationNotificationSourceTest
--- a/jdk/test/javax/management/relation/RelationTypeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/relation/RelationTypeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4716675
  * @summary Test that relation type checking uses isInstanceOf
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean RelationTypeTest
  * @run build RelationTypeTest
  * @run main RelationTypeTest
--- a/jdk/test/javax/management/remote/mandatory/URLTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/URLTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5057532
  * @summary Tests that host names are parsed correctly in URLs
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean URLTest
  * @run build URLTest
  * @run main URLTest
--- a/jdk/test/javax/management/remote/mandatory/connection/AddressableTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/AddressableTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6238815
  * @summary test the new interface Addressable
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean AddressableTest
  * @run build AddressableTest
  * @run main AddressableTest
--- a/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4940957 8025205
  * @summary Tests behaviour when connections break
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean BrokenConnectionTest
  * @run build BrokenConnectionTest
  * @run main BrokenConnectionTest
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4921888
  * @summary Tests that we do not get a NullPointException.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean CloseFailedClientTest
  * @run build CloseFailedClientTest
  * @run main CloseFailedClientTest
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseServerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/CloseServerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4838640
  * @summary test server close in different conditions.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean CloseServerTest
  * @run build CloseServerTest
  * @run main CloseServerTest
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4897052
  * @summary Tests that opening and immediately closing a connector works
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean CloseUnconnectedTest
  * @run build CloseUnconnectedTest
  * @run main CloseUnconnectedTest
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseableTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/CloseableTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -28,6 +28,7 @@
  *          the method "void close() throws IOException;" extend
  *          or implement the java.io.Closeable interface.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean CloseableTest
  * @run build CloseableTest
  * @run main CloseableTest
--- a/jdk/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4943248
  * @summary Tests that NullPointerException is thrown when listener is null.
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean ConnectionListenerNullTest
  * @run build ConnectionListenerNullTest
  * @run main ConnectionListenerNullTest
--- a/jdk/test/javax/management/remote/mandatory/connection/ConnectionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/ConnectionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4865397
  * @summary Tests remote JMX connections
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ConnectionTest
  * @run build ConnectionTest
  * @run main ConnectionTest
--- a/jdk/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,7 @@
  * @summary test the connector server option that causes it not to prevent the
  * VM from exiting
  * @author Shanliang JIANG, Eamonn McManus
+ * @modules java.management
  * @run main/othervm DaemonRMIExporterTest
  */
 import java.util.Arrays;
--- a/jdk/test/javax/management/remote/mandatory/connection/DeadLockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/DeadLockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5039210
  * @summary test on a client notification deadlock.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean DeadLockTest
  * @run build DeadLockTest
  * @run main DeadLockTest
--- a/jdk/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @bug 4939578
  * @summary test to get an IOException.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean FailedConnectionTest
  * @run build FailedConnectionTest
  * @run main FailedConnectionTest
--- a/jdk/test/javax/management/remote/mandatory/connection/GetConnectionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/GetConnectionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4951414
  * @summary Try to get an IOException.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean GetConnectionTest
  * @run build GetConnectionTest
  * @run main GetConnectionTest
--- a/jdk/test/javax/management/remote/mandatory/connection/IIOPURLTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/IIOPURLTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4886799
  * @summary Check that IIOP URLs have /ior/ in the path
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean IIOPURLTest
  * @run build IIOPURLTest
  * @run main IIOPURLTest
--- a/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4886838 4886830 8025204
  * @summary Tests that idle timeouts happen at appropriate times
  * @author Eamonn McManus
+ * @modules java.management/com.sun.jmx.remote.util
  * @run clean IdleTimeoutTest
  * @run build IdleTimeoutTest
  * @run main IdleTimeoutTest
--- a/jdk/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 1234567
  * @summary Open, connect then close multi-connectors.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MultiOpenCloseTest
  * @run build MultiOpenCloseTest
  * @run main MultiOpenCloseTest
--- a/jdk/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -45,6 +45,7 @@
  * @bug 6697180
  * @summary test on a client notification deadlock.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MultiThreadDeadLockTest
  * @run build MultiThreadDeadLockTest
  * @run main MultiThreadDeadLockTest
--- a/jdk/test/javax/management/remote/mandatory/connection/NoIIOP.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/NoIIOP.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -25,6 +25,7 @@
  * @bug 8004502
  * @summary Sanity check that attempts to use the IIOP transport or
  *   RMIIIOPServerImpl when RMI/IIOP not present throws the expected exceptions
+ * @modules java.management
  */
 
 import javax.management.MBeanServer;
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4901808 7183800
  * @summary Check that RMI connection ids include client host name
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean RMIConnectionIdTest
  * @run build RMIConnectionIdTest
  * @run main RMIConnectionIdTest
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -42,6 +42,7 @@
  * @bug 6566891
  * @summary Check no memory leak on RMIConnector's rmbscMap
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean RMIConnectorInternalMapTest
  * @run build RMIConnectorInternalMapTest
  * @run main RMIConnectorInternalMapTest
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -38,6 +38,7 @@
  * @bug 6566891
  * @summary Check no memory leak on RMIConnector's nullSubjectConn
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean RMIConnectorNullSubjectConnTest
  * @run build RMIConnectorNullSubjectConnTest
  * @run main RMIConnectorNullSubjectConnTest
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -26,6 +26,11 @@
  * @summary NPE IN RMIConnector.connect
  * @bug 6984520
  * @library /java/rmi/testlibrary
+ * @modules java.management
+ *          java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @run clean RMIConnector_NPETest
  * @run build TestLibrary RMID
  * @run build RMIConnector_NPETest
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIExitTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/RMIExitTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @bug 4917237
  * @summary test that process exit immediately after stop() / close() called
  * @author Jean Francois Denise
+ * @modules java.management
  * @run clean RMIExitTest
  * @run build RMIExitTest
  * @run main RMIExitTest
--- a/jdk/test/javax/management/remote/mandatory/connection/RMISerializeTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/RMISerializeTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @summary Tests to serialize RMIConnector
  * @bug 5032052
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean RMISerializeTest
  * @run build RMISerializeTest
  * @run main RMISerializeTest
--- a/jdk/test/javax/management/remote/mandatory/connection/ReconnectTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/ReconnectTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4927217
  * @summary test to reconnect
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean ReconnectTest
  * @run build ReconnectTest
  * @run main ReconnectTest
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6475157
  * @summary Tests deadlock in simultaneous connection and connector-server close
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 /* This test is somewhat dependent on implementation details.  If it suddenly
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests that JNDI bind failure doesn't leave an orphan RMI
  * Connector Server object
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean JNDIFailureTest
  * @run build JNDIFailureTest
  * @run main JNDIFailureTest
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that setting an MBeanServerForwarder on an already
  *          started RMI connector server has the expected behavior.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MBSFPreStartPostStartTest
  * @run build MBSFPreStartPostStartTest
  * @run main MBSFPreStartPostStartTest
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5016705
  * @summary Tests the use of the RMIExporter class.
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.internal
  * @run clean RMIExporterTest
  * @run build RMIExporterTest
  * @run main RMIExporterTest
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests that IllegalArgumentException is thrown when
  *          MBeanServerForwrder is null.
  * @author Daniel Fuchs
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean SetMBeanServerForwarder
  * @run build SetMBeanServerForwarder
  * @run main SetMBeanServerForwarder
--- a/jdk/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4884913
  * @summary Tests that default protocols are loaded correctly
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DefaultProviderTest
  * @run build DefaultProviderTest
  * @run main DefaultProviderTest
--- a/jdk/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4924683
  * @summary Check RMI/JRMP stubs can be deserialized using user's loader
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DeserializeEncodedURLTest SingleClassLoader
  * @run build DeserializeEncodedURLTest SingleClassLoader
  * @run main DeserializeEncodedURLTest
--- a/jdk/test/javax/management/remote/mandatory/loading/MethodResultTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/loading/MethodResultTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,12 +26,14 @@
  * @bug 4898478
  * @summary Tests client default class loader used before JSR 160 loader
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MethodResultTest
  * @run build MethodResultTest
  * @run main MethodResultTest
  */
 
 import java.io.*;
+import java.nio.file.Paths;
 import java.net.*;
 import java.util.*;
 import javax.management.*;
@@ -56,24 +58,23 @@
  */
 public class MethodResultTest {
     public static void main(String[] args) throws Exception {
-        Class thisClass = MethodResultTest.class;
-        Class exoticClass = Exotic.class;
+        Class<?> thisClass = MethodResultTest.class;
+        Class<?> exoticClass = Exotic.class;
         String exoticClassName = Exotic.class.getName();
-        ClassLoader testClassLoader = thisClass.getClassLoader();
-        if (!(testClassLoader instanceof URLClassLoader)) {
-            System.out.println("TEST INVALID: Not loaded by a " +
-                               "URLClassLoader: " + testClassLoader);
-            System.exit(1);
+
+        String[] cpaths = System.getProperty("test.classes", ".")
+                                .split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        for (int i=0; i < cpaths.length; i++) {
+            urls[i] = Paths.get(cpaths[i]).toUri().toURL();
         }
 
-        URLClassLoader tcl = (URLClassLoader) testClassLoader;
-        URL[] urls = tcl.getURLs();
         ClassLoader shadowLoader =
-            new ShadowLoader(urls, testClassLoader,
+            new ShadowLoader(urls, thisClass.getClassLoader(),
                              new String[] {exoticClassName,
                                            ExoticMBeanInfo.class.getName(),
                                            ExoticException.class.getName()});
-        Class cl = shadowLoader.loadClass(exoticClassName);
+        Class<?> cl = shadowLoader.loadClass(exoticClassName);
         if (cl == exoticClass) {
             System.out.println("TEST INVALID: Shadow class loader loaded " +
                                "same class as test class loader");
@@ -197,12 +198,12 @@
     }
 
     private static boolean checkType(String what, Object object,
-                                     Class wrongClass) {
+                                     Class<?> wrongClass) {
         return checkType(what, object, wrongClass, false);
     }
 
     private static boolean checkType(String what, Object object,
-                                     Class wrongClass, boolean isException) {
+                                     Class<?> wrongClass, boolean isException) {
         final String type = isException ? "exception" : "object";
         final String rendered = isException ? "thrown" : "returned";
         System.out.println("For " + type + " " + rendered + " by " + what +
@@ -224,7 +225,7 @@
     }
 
     private static boolean checkExceptionType(String what, Exception exception,
-                                              Class wrongClass) {
+                                              Class<?> wrongClass) {
         if (!(exception instanceof MBeanException)) {
             System.out.println("Exception thrown by " + what + " is not an " +
                                MBeanException.class.getName() +
@@ -320,7 +321,7 @@
             this.shadowClassNames = Arrays.asList(shadowClassNames);
         }
 
-        protected Class findClass(String name) throws ClassNotFoundException {
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
             if (shadowClassNames.contains(name))
                 return super.findClass(name);
             else
--- a/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4915825 4921009 4934965 4977469 8019584
  * @summary Tests behavior when client or server gets object of unknown class
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MissingClassTest SingleClassLoader
  * @run build MissingClassTest SingleClassLoader
  * @run main MissingClassTest
--- a/jdk/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5021246
  * @summary Check that class downloading is supported by RMI connector
  * @author Eamonn McManus
+ * @modules java.management
  * @run main RMIDownloadTest receive without
  * @run main RMIDownloadTest send without
  * @run main RMIDownloadTest receive with
--- a/jdk/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4910428
  * @summary Tests target MBean class loader used before JSR 160 loader
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean TargetMBeanTest
  * @run build TargetMBeanTest
  * @run main TargetMBeanTest
--- a/jdk/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6356458
  * @summary test to not lose a user classloader
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean UserClassLoaderTest
  * @run build UserClassLoaderTest
  * @run main UserClassLoaderTest
--- a/jdk/test/javax/management/remote/mandatory/notif/AddRemoveTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/AddRemoveTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @bug 4838640 4917194
  * @summary test on add/remove NotificationListener
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean AddRemoveTest
  * @run build AddRemoveTest
  * @run main AddRemoveTest
--- a/jdk/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 7120365
  * @summary test on Concurrent Modification
  * @author Shanliang JIANG
+ * @modules java.management
  * @run main ConcurrentModificationTest
  */
 
@@ -164,4 +165,4 @@
             mserver.removeNotificationListener(delegateName, listener);
         }
     }
-}
\ No newline at end of file
+}
--- a/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 6957378
  * @summary Test that a listener can be removed remotely from an MBean that no longer exists.
+ * @modules java.management/com.sun.jmx.remote.internal
  * @author Eamonn McManus
  */
 
--- a/jdk/test/javax/management/remote/mandatory/notif/DiffHBTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/DiffHBTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4911721
  * @summary test on add/remove NotificationListener
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean DiffHBTest
  * @run build DiffHBTest
  * @run main DiffHBTest
--- a/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check that the expected notification is received by the JMX
  *          client even when the domain in the ObjectName is not specified
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean EmptyDomainNotificationTest
  * @run build EmptyDomainNotificationTest
  * @run main EmptyDomainNotificationTest
--- a/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6338874
  * @summary Check that notification dispatch is not linear in number of MBeans.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 /*
--- a/jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java	Thu May 07 20:50:07 2015 -0700
@@ -26,6 +26,7 @@
  * @summary Tests to send a not serializable notification.
  * @bug 5022196
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NotSerializableNotifTest
  * @run build NotSerializableNotifTest
  * @run main NotSerializableNotifTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6174229
  * @summary Verify the property name specifying server notification buffer size.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NotifBufferSizePropertyNameTest
  * @run build NotifBufferSizePropertyNameTest
  * @run main NotifBufferSizePropertyNameTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6199899
  * @summary Tests reconnection done by a fetching notif thread.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NotifReconnectDeadlockTest
  * @run build NotifReconnectDeadlockTest
  * @run main NotifReconnectDeadlockTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5106721
  * @summary Check the NotificationAccessController methods are properly called.
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean NotificationAccessControllerTest
  * @run build NotificationAccessControllerTest
  * @run main NotificationAccessControllerTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4934236
  * @summary Tests that NotificationBuffer is created when used.
  * @author jfd@...
+ * @modules java.management
  * @run clean NotificationBufferCreationTest NotificationSender
  * @run build NotificationBufferCreationTest
  * @run main NotificationBufferCreationTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Tests NotificationBuffer doesn't hold locks when adding listeners,
  *  if test times out then deadlock is suspected.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NotificationBufferDeadlockTest
  * @run build NotificationBufferDeadlockTest
  * @run main NotificationBufferDeadlockTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,8 @@
  * @bug 7654321
  * @summary Tests the NotificationBuffer class.
  * @author Eamonn McManus
+ * @modules java.management/com.sun.jmx.remote.internal
+ *          java.management/com.sun.jmx.remote.util
  * @run clean NotificationBufferTest
  * @run build NotificationBufferTest NotificationSender NotificationSenderMBean
  * @run main NotificationBufferTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Check the emission of notifications when a Security Manager is
  * installed. Test the property "jmx.remote.x.check.notification.emission".
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean NotificationEmissionTest
  * @run build NotificationEmissionTest
  * @run main NotificationEmissionTest 1
--- a/jdk/test/javax/management/remote/mandatory/notif/RMINotifTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/RMINotifTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests to receive notifications for opened and closed connections
 ions
  * @author sjiang
+ * @modules java.management
  * @run clean RMINotifTest
  * @run build RMINotifTest
  * @run main RMINotifTest
--- a/jdk/test/javax/management/remote/mandatory/notif/ServerNotifs.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/ServerNotifs.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests the reception of the notifications for opened and closed
  * connections
  * @author sjiang
+ * @modules java.management
  * @run clean ServerNotifs
  * @run build ServerNotifs
  * @run main ServerNotifs
--- a/jdk/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests whether a listener receives notifs emitted before the
  * listener is registered.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean UnexpectedNotifTest
  * @run build UnexpectedNotifTest
  * @run main UnexpectedNotifTest
--- a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests that MBeanServerFileAccessController supports
  *          principals other than JMXPrincipal.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean
  * @run build NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean
  * @run main NonJMXPrincipalsTest
--- a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests the use of the "jmx.remote.x.password.file" and
  *          "jmx.remote.x.access.file" environment map properties.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean PasswordAccessFileTest SimpleStandard SimpleStandardMBean
  * @run build PasswordAccessFileTest SimpleStandard SimpleStandardMBean
  * @run main PasswordAccessFileTest
--- a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5016508
  * @summary Supplies an alternative JAAS configuration for authenticating RMI clients
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean RMIAltAuthTest
  * @run build RMIAltAuthTest SimpleStandard SimpleStandardMBean
  * @run main RMIAltAuthTest
--- a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 5016508
  * @summary Tests the default JAAS configuration for authenticating RMI clients
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean RMIPasswdAuthTest
  * @run build RMIPasswdAuthTest SimpleStandard SimpleStandardMBean
  * @run main RMIPasswdAuthTest
--- a/jdk/test/javax/management/remote/mandatory/provider/ProviderTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/provider/ProviderTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,6 +24,7 @@
 /*
  * @test ProviderTest.java
  * @summary Tests jar services provider are called
+ * @modules java.management
  * @run clean ProviderTest provider.JMXConnectorProviderImpl provider.JMXConnectorServerProviderImpl
  * @run build ProviderTest provider.JMXConnectorProviderImpl provider.JMXConnectorServerProviderImpl
  * @run main ProviderTest
--- a/jdk/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 4871761
  * @summary Tests that JMXServiceErrorException is correctly emitted.
  * @author Daniel Fuchs
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean JMXServerErrorTest
  * @run build JMXServerErrorTest
  * @run main  JMXServerErrorTest
--- a/jdk/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 7654321
  * @summary Tests the use of the custom RMI socket factories.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean RMISocketFactoriesTest
  * @run build RMISocketFactoriesTest RMIClientFactory RMIServerFactory
  * @run main RMISocketFactoriesTest test_server_factory
--- a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests the use of the subject delegation feature in the
  *          RMI connector
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean SubjectDelegation1Test SimpleStandard SimpleStandardMBean
  * @run build SubjectDelegation1Test SimpleStandard SimpleStandardMBean
  * @run main SubjectDelegation1Test policy11 ok
--- a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java	Thu May 07 20:50:07 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Tests the use of the subject delegation feature on the authenticated
  *          principals within the RMI connector server's creator codebase.
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean SubjectDelegation2Test SimpleStandard SimpleStandardMBean
  * @run build SubjectDelegation2Test SimpleStandard SimpleStandardMBean
  * @run main SubjectDelegation2Test policy21 ok
--- a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java	Thu May 07 20:50:07 2015 -0700
@@ -28,6 +28,7 @@
  *          principals within the RMI connector server's creator codebase with
  *          subject delegation.
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.security
  * @run clean SubjectDelegation3Test SimpleStandard SimpleStandardMBean
  * @run build SubjectDelegation3Test SimpleStandard SimpleStandardMBean
  * @run main SubjectDelegation3Test policy31 ok
--- a/jdk/test/javax/management/remote/mandatory/threads/ExecutorTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/threads/ExecutorTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6190873
  * @summary Tests that thread creation can use a user-supplied Executor
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ExecutorTest
  * @run build ExecutorTest
  * @run main ExecutorTest
--- a/jdk/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6192124
  * @summary Tests that you can turn off the server connection timeout thread
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NoServerTimeoutTest
  * @run build NoServerTimeoutTest
  * @run main NoServerTimeoutTest
--- a/jdk/test/javax/management/remote/mandatory/util/MapNullValuesTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/util/MapNullValuesTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -31,6 +31,7 @@
  *          Check also that null values for keys are not allowed in
  *          the maps passed to the JMXConnector[Server] factories.
  * @author Luis-Miguel Alventosa
+ * @modules java.management/com.sun.jmx.remote.util
  * @run clean MapNullValuesTest
  * @run build MapNullValuesTest
  * @run main MapNullValuesTest
--- a/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -29,6 +29,7 @@
  * security manager and the test codebase has the java permission to read
  * the "java.runtime.version" system property.
  * @author Luis-Miguel Alventosa, Joel Feraud
+ * @modules java.management
  * @run clean ImplVersionTest ImplVersionCommand
  * @run build ImplVersionTest ImplVersionCommand ImplVersionReader
  * @run main ImplVersionTest
@@ -66,13 +67,9 @@
             // Get test classes
             String testClasses = System.getProperty("test.classes");
 
-            // Get boot class path
-            String bootClassPath = System.getProperty("sun.boot.class.path");
-
             // Build command string
             String command =
                 javaHome + File.separator + "bin" + File.separator + "java " +
-                " -Xbootclasspath/p:" + bootClassPath +
                 " -classpath " + testClasses +
                 " -Djava.security.manager -Djava.security.policy==" + testSrc +
                 File.separator + "policy -Dtest.classes=" + testClasses +
--- a/jdk/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Test that MBeanServer.queryNames doesn't call getMBeanInfo on every
  *          resultant MBean when there is no security manager installed.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean AvoidGetMBeanInfoCallsTest
  * @run build AvoidGetMBeanInfoCallsTest
  * @run main AvoidGetMBeanInfoCallsTest
--- a/jdk/test/javax/management/security/MBeanPermissionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/security/MBeanPermissionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6228749
  * @summary MBeanPermission(null,"") should throw IllegalArgumentException.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MBeanPermissionTest
  * @run build MBeanPermissionTest
  * @run main MBeanPermissionTest
--- a/jdk/test/javax/management/standardmbean/DeadlockTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/standardmbean/DeadlockTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6331746
  * @summary Test a deadlock and will be blocked forever if the deadlock is present.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run main DeadlockTest
  */
 
--- a/jdk/test/javax/management/timer/MissingNotificationTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/timer/MissingNotificationTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6809322
  * @summary Test for missing notifications in a high concurrency environment
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean MissingNotificationTest
  * @run build MissingNotificationTest
  * @run main MissingNotificationTest
--- a/jdk/test/javax/management/timer/StartTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/management/timer/StartTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -26,6 +26,7 @@
  * @bug 6659215
  * @summary Test on timer start method with past notifications
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean StartTest
  * @run build StartTest
  * @run main StartTest
--- a/jdk/test/javax/security/auth/Subject/doAs/NestedActions.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/javax/security/auth/Subject/doAs/NestedActions.java	Thu May 07 20:50:07 2015 -0700
@@ -34,6 +34,7 @@
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
@@ -144,7 +145,7 @@
         }
         cmds.add(sb.toString());
         if (JAVA_OPTS != null && !JAVA_OPTS.isEmpty()) {
-            cmds.add(JAVA_OPTS);
+            Collections.addAll(cmds, JAVA_OPTS.trim().split("\\s+"));
         }
         cmds.add("-Djava.security.manager");
         cmds.add("-Djava.security.policy=" + TEST_SOURCES + FS + args[1]);
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java	Thu May 07 20:50:07 2015 -0700
@@ -227,7 +227,8 @@
      * <span>The default redirects of STDOUT and STDERR are started</span>
      * <p>
      * It is possible to wait for the process to get to a warmed-up state
-     * via {@linkplain Predicate} condition on the STDOUT
+     * via {@linkplain Predicate} condition on the STDOUT. The warm-up will
+     * wait indefinitely.
      * </p>
      * @param name The process name
      * @param processBuilder The process builder
--- a/jdk/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4990825
+ * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @summary test that HostIdentifier objects get created as expected
  */
 
--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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,6 +34,7 @@
  * @bug 6672135
  * @summary setInterval() for local MonitoredHost and local MonitoredVm
  * @author Tomas Hurka
+ * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @run main/othervm -XX:+UsePerfData CR6672135
  */
 public class CR6672135 {
--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -67,6 +67,9 @@
  * @bug 4990825
  * @summary attach to external but local JVM processes
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.jvmstat/sun.jvmstat.monitor
+ *          jdk.jvmstat/sun.jvmstat.monitor.event
  * @build jdk.testlibrary.*
  * @run main/othervm MonitorVmStartTerminate
  */
--- a/jdk/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4990825
+ * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @summary test that VmIdentifier objects get created as expected
  */
 
--- a/jdk/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4990825
+ * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @run main/othervm -XX:+UsePerfData  PrologSizeSanityCheck
  * @summary prolog size and overflow sanity checks
  */
--- a/jdk/test/sun/management/AgentCMETest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/AgentCMETest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -29,6 +29,7 @@
  * @test
  * @bug 7164191
  * @summary properties.putAll API may fail with ConcurrentModifcationException on multi-thread scenario
+ * @modules java.management/sun.management
  * @author Deven You
  */
 
--- a/jdk/test/sun/management/AgentCheckTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/AgentCheckTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, 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
@@ -25,6 +25,7 @@
  *  @test
  *  @bug 5013605
  *  @summary Localize log messages from the management agents
+ *  @modules java.management/sun.management
  *
  *  @author Tim Bell
  */
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotClassLoadingMBean.getClassInitializationTime()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetClassInitializationTime
  */
 
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotClassLoadingMBean.getClassLoadingTime()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @build ClassToLoad0
  * @run main/othervm -XX:+UsePerfData GetClassLoadingTime
  */
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotClassLoadingMBean.getInitializedClassCount()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetInitializedClassCount
  */
 
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotClassLoadingMBean.getLoadedClassSize()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetLoadedClassSize
  */
 
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotClassLoadingMBean.getMethodDataSize()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetMethodDataSize
  */
 
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotClassLoadingMBean.getUnloadedClassSize()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetUnloadedClassSize
  */
 
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotClassLoadingMBean.getSafepointCount()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetSafepointCount
  */
 
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of HotspotRuntimeMBean.getSafepointSyncTime()
  * @author  Steve Bohne
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetSafepointSyncTime
  */
 
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug     4858522
+ * @modules java.management/sun.management
  * @summary Basic unit test of HotspotRuntimeMBean.getTotalSafepointTime()
  * @author  Steve Bohne
  */
--- a/jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotspotThreadMBean.getInternalThreadCount()
  *          and getInternalThreadCpuTime()
  * @author  Mandy Chung
+ * @modules java.management/sun.management
  * @run main/othervm -XX:+UsePerfData GetInternalThreads
  */
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/PlatformMBeanProviderConstructorCheck.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import java.security.AccessControlException;
+import java.security.Permission;
+import java.security.Policy;
+import java.security.ProtectionDomain;
+import java.util.List;
+
+/*
+ * @test
+ * @bug     8042901
+ * @summary Check permission for PlatformMBeanProvider Constructor
+ * @author  Shanliang Jiang
+ */
+public class PlatformMBeanProviderConstructorCheck {
+    public static void main(String[] args) throws Exception {
+        Policy origPolicy = Policy.getPolicy();
+        SecurityManager origSM = System.getSecurityManager();
+        try {
+            System.out.println("---PlatformMBeanProviderConstructorCheck starting...");
+
+            Policy.setPolicy(new MyPolicy());
+            System.setSecurityManager(new SecurityManager());
+
+            System.out.println("---PlatformMBeanProviderConstructorCheck Testing without permission...");
+            try {
+                new MyProvider();
+                throw new RuntimeException("Does not get expected AccessControlException!");
+            } catch (AccessControlException ace) {
+                System.out.println("---PlatformMBeanProviderConstructorCheck got the expected exception: "
+                        + ace);
+            }
+
+            System.out.println("---PlatformMBeanProviderConstructorCheck Testing with permission...");
+            MyPolicy.allowed = true;
+            new MyProvider();
+
+            System.out.println("---PlatformMBeanProviderConstructorCheck PASSED!");
+        } finally {
+            System.setSecurityManager(origSM);
+            Policy.setPolicy(origPolicy);
+        }
+    }
+
+    private static class MyPolicy extends Policy {
+        private static String permName = "sun.management.spi.PlatformMBeanProvider.subclass";
+        private static boolean allowed = false;
+
+        @Override
+        public boolean implies(ProtectionDomain domain, Permission permission) {
+            if (permName.equals(permission.getName())) {
+                System.out.println("---MyPolicy-implies checks permission for "
+                        +permName+" and returns "+allowed);
+
+                return allowed;
+            } else {
+                return true;
+            }
+        }
+    }
+
+    private static class MyProvider extends sun.management.spi.PlatformMBeanProvider {
+        @Override
+        public List<PlatformComponent<?>> getPlatformComponentList() {
+            return null;
+        }
+    }
+}
--- a/jdk/test/sun/management/jdp/JdpDefaultsTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jdp/JdpDefaultsTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -31,6 +31,7 @@
  * @test JdpDefaultsTest
  * @summary Assert that we can read JDP packets from a multicast socket connection, on default IP and port.
  * @library /lib/testlibrary
+ * @modules java.management/sun.management.jdp
  * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
  * @run main JdpDefaultsTest
  */
--- a/jdk/test/sun/management/jdp/JdpOffTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jdp/JdpOffTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -32,6 +32,7 @@
  * @test JdpOffTest.java
  * @summary Assert that no JDP packets are sent to the default address and port.
  * @library /lib/testlibrary
+ * @modules java.management/sun.management.jdp
  * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher
  * @run main JdpOffTest
  */
--- a/jdk/test/sun/management/jdp/JdpSpecificAddressTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jdp/JdpSpecificAddressTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -31,6 +31,7 @@
  * @test JdpSpecificAddressTest
  * @summary Assert that we can read JDP packets from a multicast socket connection, on specific IP and port.
  * @library /lib/testlibrary
+ * @modules java.management/sun.management.jdp
  * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
  * @run main JdpSpecificAddressTest
  */
--- a/jdk/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java	Thu May 07 20:50:07 2015 -0700
@@ -28,6 +28,7 @@
  *
  *  @author Daniel Fuchs
  *
+ *  @modules java.management/sun.management.jmxremote
  *  @run compile -XDignore.symbol.file=true -g LocalRMIServerSocketFactoryTest.java
  *  @run main LocalRMIServerSocketFactoryTest
  */
--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -41,6 +41,8 @@
  * @test
  * @bug 6434402 8004926
  * @library /lib/testlibrary
+ * @modules java.management/sun.management
+ *          java.management
  * @build jdk.testlibrary.*
  * @build TestManager TestApplication CustomLauncherTest
  * @run main/othervm CustomLauncherTest
--- a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -27,6 +27,7 @@
  * @summary Tests that the jvmstat counters published by the out-of-the-box
  *          management agent for the JMX connection details are correct.
  * @author Luis-Miguel Alventosa
+ * @modules java.management/sun.management
  * @run clean JvmstatCountersTest
  * @run build JvmstatCountersTest
  * @run main/othervm/timeout=600 -XX:+UsePerfData JvmstatCountersTest 1
--- a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -37,6 +37,7 @@
  *          without connection or username/password details.
  *          TestManager will attempt a connection to the address obtained from
  *          both agent properties and jvmstat buffer.
+ * @modules java.management/sun.management
  * @build jdk.testlibrary.* TestManager TestApplication
  * @run main/othervm/timeout=300 -XX:+UsePerfData LocalManagementTest
  */
@@ -120,9 +121,7 @@
                         return true;
                     }
                     return false;
-                },
-                5,
-                TimeUnit.SECONDS
+                }
             );
 
             System.out.println("Attaching test manager:");
@@ -142,9 +141,7 @@
             clientPrc = ProcessTools.startProcess(
                 "TestManager",
                 client,
-                (String line) -> line.startsWith("Starting TestManager for PID"),
-                10,
-                TimeUnit.SECONDS
+                (String line) -> line.startsWith("Starting TestManager for PID")
             );
 
             int clientExitCode = clientPrc.waitFor();
--- a/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary
  * @bug 6557093
  * @summary Check SSL config file permission for out-of-the-box management
+ * @modules java.management
  * @build jdk.testlibrary.* AbstractFilePermissionTest Dummy
  * @run main/timeout=300 PasswordFilePermissionTest
  *
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -27,6 +27,9 @@
 # @summary Test RMI Bootstrap
 #
 # @library /lib/testlibrary
+# @modules java.management/sun.management
+#          java.management/sun.management.jmxremote
+#          java.management
 # @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest
 # @run shell/timeout=300  RmiBootstrapTest.sh
 
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -42,6 +42,7 @@
  * @library /lib/testlibrary
  * @bug 6228231
  * @summary Test that RMI registry uses SSL.
+ * @modules java.management
  * @build jdk.testlibrary.* RmiRegistrySslTestApp
  * @run main/timeout=300 RmiRegistrySslTest
  * @author Luis-Miguel Alventosa, Taras Ledkov
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -27,9 +27,11 @@
 # @summary Test RMI Bootstrap with SSL
 #
 # @library /lib/testlibrary
+# @modules java.management/sun.management
+#          java.management/sun.management.jmxremote
+# @ignore 8077924
 # @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest
 # @run shell/timeout=300  RmiSslBootstrapTest.sh
-# @ignore 8077924
 
 # Define the Java class test name
 TESTCLASS="RmiBootstrapTest"
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, 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
@@ -26,6 +26,8 @@
 # @summary Test RMI Bootstrap with SSL and no keystore.
 #
 # @bug 4932854
+# @modules java.management/sun.management
+#          java.management/sun.management.jmxremote
 # @build TestLogger RmiSslNoKeyStoreTest
 # @run shell/timeout=300  RmiSslNoKeyStoreTest.sh
 
--- a/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -27,6 +27,7 @@
  * @test
  * @library /lib/testlibrary
  * @bug 6557093
+ * @modules java.management
  * @build jdk.testlibrary.* Dummy AbstractFilePermissionTest
  * @summary Check SSL config file permission for out-of-the-box management
  * @run main/timeout=300 SSLConfigFilePermissionTest
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopDoSomething.java	Thu May 07 10:19:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012, 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.
- */
-
-import java.io.IOException;
-import jdk.testlibrary.ProcessTools;
-
-public class JMXStartStopDoSomething {
-    public static void doSomething() throws IOException{
-        int r = System.in.read();
-        System.out.println("read: " + r);
-    }
-
-    public static void main(String args[]) throws Exception {
-        System.out.println("main enter");
-        System.out.flush();
-        doSomething();
-        System.out.println("main exit");
-    }
-}
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java	Thu May 07 20:50:07 2015 -0700
@@ -35,20 +35,16 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import javax.management.*;
 import javax.management.remote.*;
 import javax.net.ssl.SSLHandshakeException;
 
 import jdk.testlibrary.ProcessTools;
-import jdk.testlibrary.JDKToolLauncher;
 import sun.management.Agent;
 import sun.management.AgentConfigurationError;
 
@@ -56,46 +52,21 @@
  * @test
  * @bug 7110104
  * @library /lib/testlibrary
- * @build jdk.testlibrary.* JMXStartStopTest JMXStartStopDoSomething
+ * @modules java.management/sun.management
+ * @build jdk.testlibrary.* JMXStartStopTest PortAllocator TestApp ManagementAgentJcmd
  * @run main/othervm/timeout=600 -XX:+UsePerfData JMXStartStopTest
  * @summary Makes sure that enabling/disabling the management agent through JCMD
  *          achieves the desired results
  * @key randomness
  */
 public class JMXStartStopTest {
+    private static final String TEST_APP_NAME = "TestApp";
 
     private static final String TEST_SRC = System.getProperty("test.src");
 
     private static final boolean verbose = false;
 
-    /**
-     * Dynamically allocates distinct ports from the ephemeral range 49152-65535
-     */
-    private static class PortAllocator {
-
-        private final static int LOWER_BOUND = 49152;
-        private final static int UPPER_BOUND = 65535;
-
-        private final static Random RND = new Random(System.currentTimeMillis());
-
-        private static int[] allocatePorts(final int numPorts) {
-            int[] ports = new int[numPorts];
-            for (int i = 0; i < numPorts; i++) {
-                int port = -1;
-                while (port == -1) {
-                    port = RND.nextInt(UPPER_BOUND - LOWER_BOUND + 1) + LOWER_BOUND;
-                    for (int j = 0; j < i; j++) {
-                        if (ports[j] == port) {
-                            port = -1;
-                            break;
-                        }
-                    }
-                }
-                ports[i] = port;
-            }
-            return ports;
-        }
-    }
+    private static ManagementAgentJcmd jcmd = new ManagementAgentJcmd(TEST_APP_NAME, verbose);
 
     private static void dbg_print(String msg) {
         if (verbose) {
@@ -318,14 +289,14 @@
         }
     }
 
-    private static class Something {
+    private static class TestAppRun {
         private Process p;
         private final ProcessBuilder pb;
         private final String name;
         private final AtomicBoolean started = new AtomicBoolean(false);
         private volatile long pid = -1;
 
-        public Something(ProcessBuilder pb, String name) {
+        public TestAppRun(ProcessBuilder pb, String name) {
             this.pb = pb;
             this.name = name;
         }
@@ -335,16 +306,14 @@
                 try {
                     AtomicBoolean error = new AtomicBoolean(false);
                     p = ProcessTools.startProcess(
-                            "JMXStartStopDoSomething{" + name + "}",
+                            TEST_APP_NAME + "{" + name + "}",
                             pb,
                             (line) -> {
                                 boolean ok = line.equals("main enter");
                                 error.set(line.contains("BindException"));
 
                                 return ok || error.get();
-                            },
-                            5,
-                            TimeUnit.SECONDS
+                            }
                     );
                     if (error.get()) {
                         throw new BindException("Starting process failed due to " +
@@ -352,8 +321,10 @@
                     }
                     pid = p.getPid();
                 } catch (TimeoutException e) {
-                    p.destroy();
-                    p.waitFor();
+                    if (p != null) {
+                        p.destroy();
+                        p.waitFor();
+                    }
                     throw e;
                 }
             }
@@ -382,105 +353,32 @@
     }
 
     /**
-     * Runs the test application "JMXStartStopDoSomething"
+     * Runs the test application "TestApp"
      * @param name Test run name
      * @param args Additional arguments
-     * @return Returns a {@linkplain Something} instance representing the run
+     * @return Returns a {@linkplain TestAppRun} instance representing the run
      * @throws IOException
      * @throws InterruptedException
      * @throws TimeoutException
      */
-    private static Something doSomething(String name, String ... args)
+    private static TestAppRun doTest(String name, String ... args)
             throws Exception {
         List<String> pbArgs = new ArrayList<>(Arrays.asList(
                 "-cp",
-                System.getProperty("test.class.path")
+                System.getProperty("test.class.path"),
+                "-XX:+UsePerfData"
         ));
         pbArgs.addAll(Arrays.asList(args));
-        pbArgs.add("JMXStartStopDoSomething");
+        pbArgs.add(TEST_APP_NAME);
 
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
                 pbArgs.toArray(new String[pbArgs.size()])
         );
-        Something s = new Something(pb, name);
+        TestAppRun s = new TestAppRun(pb, name);
         s.start();
         return s;
     }
 
-    /**
-     * Run the "jcmd" command
-     *
-     * @param command Command with parameters; space separated string
-     * @throws IOException
-     * @throws InterruptedException
-     */
-    private static void jcmd(String ... command) throws IOException, InterruptedException {
-        if (command.length == 0) {
-            jcmd(null, c->{});
-        } else {
-            jcmd(null, command);
-        }
-    }
-
-    /**
-     * Run the "jcmd" command
-     *
-     * @param c {@linkplain Consumer} instance
-     * @param command Command with parameters; space separated string
-     * @throws IOException
-     * @throws InterruptedException
-     */
-    private static void jcmd(Consumer<String> c, String ... command) throws IOException, InterruptedException {
-        jcmd("JMXStartStopDoSomething", c, command);
-    }
-
-    /**
-     * Run the "jcmd" command
-     *
-     * @param target The target application name (or PID)
-     * @param c {@linkplain Consumer} instance
-     * @param command Command with parameters; space separated string
-     * @throws IOException
-     * @throws InterruptedException
-     */
-    private static void jcmd(String target, final Consumer<String> c, String ... command) throws IOException, InterruptedException {
-        dbg_print("[jcmd] " + (command.length > 0 ? command[0] : "list"));
-
-        JDKToolLauncher l = JDKToolLauncher.createUsingTestJDK("jcmd");
-        l.addToolArg(target);
-        for (String cmd : command) {
-            l.addToolArg(cmd);
-        }
-
-        AtomicBoolean portUnavailable = new AtomicBoolean(false);
-        Process p = ProcessTools.startProcess(
-            "jcmd",
-            new ProcessBuilder(l.getCommand()),
-            line -> {
-                if (line.contains("BindException") ||
-                    line.contains(Agent.getText(AgentConfigurationError.CONNECTOR_SERVER_IO_ERROR))) {
-                    portUnavailable.set(true);
-                } else {
-                    c.accept(line);
-                }
-            }
-        );
-
-        p.waitFor();
-        dbg_print("[jcmd] --------");
-        if (portUnavailable.get()) {
-            String cmd = Arrays.asList(l.getCommand()).stream()
-                    .collect(
-                            Collectors.joining(" ", "", ": Unable to bind address")
-                    );
-            throw new BindException(cmd);
-        }
-    }
-
-    private static final String CMD_STOP = "ManagementAgent.stop";
-    private static final String CMD_START = "ManagementAgent.start";
-    private static final String CMD_START_LOCAL = "ManagementAgent.start_local";
-
     static void test_01() throws Exception {
         // Run an app with JMX enabled stop it and
         // restart on other port
@@ -488,7 +386,7 @@
         System.out.println("**** Test one ****");
         int ports[] = PortAllocator.allocatePorts(2);
 
-        Something s = doSomething(
+        TestAppRun s = doTest(
                 "test_01",
                 "-Dcom.sun.management.jmxremote.port=" + ports[0],
                 "-Dcom.sun.management.jmxremote.authenticate=false",
@@ -497,10 +395,10 @@
         try {
             testConnect(ports[0]);
 
-            jcmd(CMD_STOP);
+            jcmd.stop();
             testNoConnect(ports[0]);
 
-            jcmd(CMD_START, "jmxremote.port=" + ports[1]);
+            jcmd.start("jmxremote.port=" + ports[1]);
             testConnect(ports[1]);
         } finally {
             s.stop();
@@ -514,12 +412,13 @@
         System.out.println("**** Test two ****");
 
         int[] ports = PortAllocator.allocatePorts(1);
-        Something s = doSomething("test_02");
+        TestAppRun s = doTest("test_02");
         try {
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[0],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                "jmxremote.port=" + ports[0],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             testConnect(ports[0]);
         } finally {
@@ -535,18 +434,20 @@
         System.out.println("**** Test three ****");
 
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething("test_03");
+        TestAppRun s = doTest("test_03");
         try {
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[0],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                "jmxremote.port=" + ports[0],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             // Second agent shouldn't start
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[1],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                "jmxremote.port=" + ports[1],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             // First agent should connect
             testConnect(ports[0]);
@@ -565,13 +466,14 @@
         System.out.println("**** Test four ****");
 
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething("test_04");
+        TestAppRun s = doTest("test_04");
         try {
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[0],
-                    "jmxremote.rmi.port=" + ports[1],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                "jmxremote.port=" + ports[0],
+                "jmxremote.rmi.port=" + ports[1],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             testConnect(ports[0], ports[1]);
         } finally {
@@ -585,9 +487,9 @@
 
         System.out.println("**** Test five ****");
         int[] ports = PortAllocator.allocatePorts(1);
-        Something s = doSomething("test_05");
+        TestAppRun s = doTest("test_05");
         try {
-            jcmd(CMD_START_LOCAL);
+            jcmd.startLocal();
 
             testNoConnect(ports[0]);
             testConnectLocal(s.getPid());
@@ -605,26 +507,27 @@
         System.out.println("**** Test six ****");
 
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething("test_06");
+        TestAppRun s = doTest("test_06");
         try {
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[0],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                "jmxremote.port=" + ports[0],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             testConnect(ports[0], ports[1]);
 
             final AtomicBoolean checks = new AtomicBoolean(false);
-            jcmd(
-                    line -> {
-                        if (line.contains("java.lang.RuntimeException: Invalid agent state")) {
-                            checks.set(true);
-                        }
-                    },
-                    CMD_START,
-                    "jmxremote.port=" + ports[0],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                line -> {
+                    if (line.contains("java.lang.RuntimeException: Invalid agent state")) {
+                        checks.set(true);
+                    }
+                },
+                "jmxremote.port=" + ports[0],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             if (!checks.get()) {
                 throw new Exception("Starting agent on port " + ports[0] + " should "
@@ -644,27 +547,28 @@
         System.out.println("**** Test seven ****");
 
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething("test_07");
+        TestAppRun s = doTest("test_07");
         try {
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[0],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                "jmxremote.port=" + ports[0],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             testConnect(ports[0], ports[1]);
 
             final AtomicBoolean checks = new AtomicBoolean(false);
 
-            jcmd(
-                    line -> {
-                        if (line.contains("java.lang.RuntimeException: Invalid agent state")) {
-                            checks.set(true);
-                        }
-                    },
-                    CMD_START,
-                    "jmxremote.port=" + ports[1],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                line -> {
+                    if (line.contains("java.lang.RuntimeException: Invalid agent state")) {
+                        checks.set(true);
+                    }
+                },
+                "jmxremote.port=" + ports[1],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             if (!checks.get()) {
                 throw new Exception("Starting agent on poprt " + ports[1] + " should "
@@ -684,17 +588,18 @@
         System.out.println("**** Test eight ****");
 
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething("test_08");
+        TestAppRun s = doTest("test_08");
         try {
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[0],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false");
+            jcmd.start(
+                "jmxremote.port=" + ports[0],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
+            );
 
             testConnect(ports[0], ports[1]);
 
-            jcmd(CMD_STOP);
-            jcmd(CMD_STOP);
+            jcmd.stop();
+            jcmd.stop();
         } finally {
             s.stop();
         }
@@ -707,7 +612,7 @@
 
         System.out.println("**** Test nine ****");
 
-        Something s = doSomething("test_09");
+        TestAppRun s = doTest("test_09");
 
         try (ServerSocket ss = new ServerSocket(0)) {
             int localPort = ss.getLocalPort();
@@ -723,13 +628,12 @@
                 final AtomicBoolean retry = new AtomicBoolean(false);
 
                 try {
-                    jcmd(
+                    jcmd.start(
                         line -> {
                             if (line.contains(Agent.getText(AgentConfigurationError.AGENT_EXCEPTION))) {
                                 retry.set(true);
                             }
                         },
-                        CMD_START,
                         "jmxremote.port=" + ports[0],
                         "jmxremote.rmi.port=" + localPort,
                         "jmxremote.authenticate=false",
@@ -764,18 +668,17 @@
         System.out.println("**** Test ten ****");
 
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething(
+        TestAppRun s = doTest(
                 "test_10",
                 "-Dcom.sun.management.jmxremote.authenticate=false",
                 "-Dcom.sun.management.jmxremote.ssl=true");
 
         try {
             testNoConnect(ports[0]);
-            jcmd(
-                    CMD_START,
-                    "jmxremote.port=" + ports[1],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false"
+            jcmd.start(
+                "jmxremote.port=" + ports[1],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
             );
             testConnect(ports[1]);
         } finally {
@@ -791,7 +694,7 @@
 
         System.out.println("**** Test eleven ****");
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething(
+        TestAppRun s = doTest(
                 "test_11",
                 "-Dcom.sun.management.jmxremote.port=" + ports[0],
                 "-Dcom.sun.management.jmxremote.authenticate=false",
@@ -800,15 +703,14 @@
         try {
             testNoConnect(ports[0]);
 
-            jcmd(CMD_STOP);
+            jcmd.stop();
 
             testNoConnect(ports[0]);
 
-            jcmd(
-                    CMD_START,
-                    "jmxremote.port=" + ports[1],
-                    "jmxremote.authenticate=false",
-                    "jmxremote.ssl=false"
+            jcmd.start(
+                "jmxremote.port=" + ports[1],
+                "jmxremote.authenticate=false",
+                "jmxremote.ssl=false"
             );
 
             testConnect(ports[1]);
@@ -828,7 +730,7 @@
         System.out.println("**** Test twelve ****");
 
         int[] ports = PortAllocator.allocatePorts(2);
-        Something s = doSomething("test_12",
+        TestAppRun s = doTest("test_12",
                 "-Dcom.sun.management.config.file="
                 + TEST_SRC + File.separator + "management_cl.properties",
                 "-Dcom.sun.management.jmxremote.authenticate=false"
@@ -837,15 +739,15 @@
         try {
             testNoConnect(ports[0]);
 
-            jcmd(CMD_STOP);
+            jcmd.stop();
 
             testNoConnect(ports[0]);
 
-            jcmd(CMD_START,
-                    "config.file=" + TEST_SRC + File.separator
-                    + "management_jcmd.properties",
-                    "jmxremote.authenticate=false",
-                    "jmxremote.port=" + ports[1]
+            jcmd.start(
+                "config.file=" + TEST_SRC + File.separator
+                + "management_jcmd.properties",
+                "jmxremote.authenticate=false",
+                "jmxremote.port=" + ports[1]
             );
 
             testConnect(ports[1]);
@@ -863,7 +765,7 @@
 
         System.out.println("**** Test thirteen ****");
         int[] ports = PortAllocator.allocatePorts(1);
-        Something s = doSomething(
+        TestAppRun s = doTest(
                 "test_13",
                 "-Dcom.sun.management.jmxremote.port=" + ports[0],
                 "-Dcom.sun.management.jmxremote.authenticate=false",
@@ -872,16 +774,16 @@
         try {
             testNoConnect(ports[0]);
 
-            jcmd(CMD_STOP);
-            jcmd(CMD_START,
-                    "jmxremote.ssl=false",
-                    "jmxremote.port=" + ports[0]
+            jcmd.stop();
+            jcmd.start(
+                "jmxremote.ssl=false",
+                "jmxremote.port=" + ports[0]
             );
             testConnect(ports[0]);
 
-            jcmd(CMD_STOP);
-            jcmd(CMD_START,
-                    "jmxremote.port=" + ports[0]
+            jcmd.stop();
+            jcmd.start(
+                "jmxremote.port=" + ports[0]
             );
 
             testNoConnect(ports[0]);
@@ -897,14 +799,14 @@
 
         System.out.println("**** Test fourteen ****");
         int[] ports = PortAllocator.allocatePorts(1);
-        Something s = doSomething(
+        TestAppRun s = doTest(
                 "test_14",
                 "-Dcom.sun.management.jmxremote.port=" + ports[0],
                 "-Dcom.sun.management.jmxremote.authenticate=false",
                 "-Dcom.sun.management.jmxremote.ssl=false");
         try {
             testConnect(ports[0]);
-            jcmd(CMD_STOP);
+            jcmd.stop();
             testConnectLocal(s.getPid());
         } finally {
             s.stop();
@@ -918,11 +820,11 @@
         System.out.println("**** Test fifteen ****");
 
         int[] ports = PortAllocator.allocatePorts(1);
-        Something s = doSomething("test_15");
+        TestAppRun s = doTest("test_15");
 
         try {
             testNoConnect(ports[0]);
-            jcmd(CMD_START + "_local");
+            jcmd.startLocal();
 
             testConnectLocal(s.getPid());
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import java.net.BindException;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import org.testng.annotations.*;
+import static org.testng.Assert.*;
+
+import jdk.testlibrary.ProcessTools;
+
+/**
+ * @test
+ * @bug 8023093
+ * @summary Performs a sanity test for the ManagementAgent.status diagnostic command.
+ *          Management agent may be disable, started (only local connections) and started.
+ *          The test asserts that the expected text is being printed.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd
+ * @run testng/othervm -XX:+UsePerfData JMXStatusTest
+ */
+public class JMXStatusTest {
+    private final static String TEST_APP_NAME = "TestApp";
+
+    private final static Pattern DISABLE_AGENT_STATUS = Pattern.compile(
+        "Agent\\s*\\: disabled$"
+    );
+
+    private final static Pattern LOCAL_AGENT_STATUS = Pattern.compile(
+        "Agent\\s*\\:\\s*enabled\\n+" +
+        "Connection Type\\s*\\:\\s*local\\n+" +
+        "Protocol\\s*\\:\\s*[a-z]+\\n+" +
+        "Host\\s*\\:\\s*.+\\n+" +
+        "URL\\s*\\:\\s*service\\:jmx\\:.+",
+        Pattern.MULTILINE
+    );
+
+    private final static Pattern REMOTE_AGENT_STATUS = Pattern.compile(
+        "Agent\\s*\\: enabled\\n+" +
+        "Connection Type\\s*\\: remote\\n+" +
+        "Protocol\\s*\\: [a-z]+\\n+" +
+        "Host\\s*\\: .+\\n+" +
+        "URL\\s*\\: service\\:jmx\\:.+\\n+" +
+        "Properties\\s*\\:\\n+(\\s*\\S+\\s*=\\s*\\S+\\n*)+",
+        Pattern.MULTILINE
+    );
+
+    private static ProcessBuilder testAppPb;
+    private Process testApp;
+
+    private ManagementAgentJcmd jcmd;
+
+    @BeforeClass
+    public static void setupClass() throws Exception {
+        testAppPb = ProcessTools.createJavaProcessBuilder(
+            "-cp", System.getProperty("test.class.path"),
+            "-XX:+UsePerfData",
+            TEST_APP_NAME
+        );
+    }
+
+    @BeforeTest
+    public void setup() {
+        jcmd = new ManagementAgentJcmd(TEST_APP_NAME, false);
+    }
+
+    @BeforeMethod
+    public void startTestApp() throws Exception {
+        testApp = ProcessTools.startProcess(
+            TEST_APP_NAME, testAppPb,
+            (Predicate<String>)l->l.trim().equals("main enter")
+        );
+    }
+
+    @AfterMethod
+    public void stopTestApp() throws Exception {
+        testApp.getOutputStream().write(1);
+        testApp.getOutputStream().flush();
+        testApp.waitFor();
+        testApp = null;
+    }
+
+    @Test
+    public void testAgentDisabled() throws Exception {
+        String status = jcmd.status();
+        assertStatusMatches(DISABLE_AGENT_STATUS, status);
+    }
+
+    @Test
+    public void testAgentLocal() throws Exception {
+        jcmd.startLocal();
+        String status = jcmd.status();
+
+        assertStatusMatches(LOCAL_AGENT_STATUS, status);
+    }
+
+    @Test
+    public void testAgentRemote() throws Exception {
+        while (true) {
+            try {
+                int[] ports = PortAllocator.allocatePorts(1);
+                jcmd.start(
+                    "jmxremote.port=" + ports[0],
+                    "jmxremote.authenticate=false",
+                    "jmxremote.ssl=false"
+                );
+                String status = jcmd.status();
+
+                assertStatusMatches(REMOTE_AGENT_STATUS, status);
+                return;
+            } catch (BindException e) {
+                System.out.println("Failed to allocate ports. Retrying ...");
+            }
+        }
+    }
+
+    private void assertStatusMatches(Pattern expected, String value) {
+        assertStatusMatches(expected, value, "");
+    }
+
+    private void assertStatusMatches(Pattern expected, String value, String msg) {
+        int idx = value.indexOf('\n');
+        if (idx > -1) {
+            value = value.substring(idx + 1).trim();
+            assertTrue(expected.matcher(value).find(), msg);
+        } else {
+            fail("The management agent status must contain more then one line of text");
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+import java.io.IOException;
+import java.net.BindException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import sun.management.Agent;
+import sun.management.AgentConfigurationError;
+
+import jdk.testlibrary.JDKToolLauncher;
+import jdk.testlibrary.ProcessTools;
+
+/**
+ * A helper class for issuing ManagementAgent.* diagnostic commands and capturing
+ * their output.
+ */
+final class ManagementAgentJcmd {
+    private static final String CMD_STOP = "ManagementAgent.stop";
+    private static final String CMD_START = "ManagementAgent.start";
+    private static final String CMD_START_LOCAL = "ManagementAgent.start_local";
+    private static final String CMD_STATUS = "ManagementAgent.status";
+
+    private final String id;
+    private final boolean verbose;
+
+    public ManagementAgentJcmd(String targetApp, boolean verbose) {
+        this.id = targetApp;
+        this.verbose = verbose;
+    }
+
+    /**
+     * `jcmd`
+     * @return The JCMD output
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    public String list() throws IOException, InterruptedException {
+        return jcmd();
+    }
+
+    /**
+     * `jcmd <app> ManagementAgent.stop`
+     * @return The JCMD output
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    public String stop() throws IOException, InterruptedException {
+        return jcmd(CMD_STOP);
+    }
+
+    /**
+     * `jcmd <app> ManagementAgent.start_local`
+     * @return The JCMD output
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    public String startLocal() throws IOException, InterruptedException {
+        return jcmd(CMD_START_LOCAL);
+    }
+
+    /**
+     * `jcmd <app> ManagementAgent.start <args>`
+     * @return The JCMD output
+     * @param params The arguments to <b>ManagementAgent.start</b> command
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    public String start(String ... params) throws IOException, InterruptedException {
+        return start(c->{}, params);
+    }
+
+    /**
+     * `jcmd <pp> ManagementAgent.start <args>`
+     * @param c A string consumer used to inspect the jcmd output line-by-line
+     * @param params The arguments to <b>ManagementAgent.start</b> command
+     * @return The JCMD output
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    public String start(Consumer<String> c, String ... params) throws IOException, InterruptedException {
+        List<String> args = new ArrayList<>();
+        args.add(CMD_START);
+        args.addAll(Arrays.asList(params));
+        return jcmd(c, args.toArray(new String[args.size()]));
+    }
+
+    public String status() throws IOException, InterruptedException {
+        return jcmd(CMD_STATUS);
+    }
+
+    /**
+     * Run the "jcmd" command
+     *
+     * @param command Command + arguments
+     * @return The JCMD output
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    private String jcmd(String ... command) throws IOException, InterruptedException {
+        if (command.length == 0) {
+            return jcmd(null, c->{});
+        } else {
+            return jcmd(c->{}, command);
+        }
+    }
+
+    /**
+     * Run the "jcmd" command
+     *
+     * @param c {@linkplain Consumer} instance
+     * @param command Command + arguments
+     * @return The JCMD output
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    private String jcmd(Consumer<String> c, String ... command) throws IOException, InterruptedException {
+        return jcmd(id, c, command);
+    }
+
+    /**
+     * Run the "jcmd" command
+     *
+     * @param target The target application name (or PID)
+     * @param c {@linkplain Consumer} instance
+     * @param command Command + arguments
+     * @return The JCMD output
+     * @throws IOException
+     * @throws InterruptedException
+     */
+    private String jcmd(String target, final Consumer<String> c, String ... command) throws IOException, InterruptedException {
+        dbg_print("[jcmd] " + (command.length > 0 ? command[0] : "list"));
+
+        JDKToolLauncher l = JDKToolLauncher.createUsingTestJDK("jcmd");
+        l.addToolArg(target);
+        for (String cmd : command) {
+            l.addToolArg(cmd);
+        }
+
+        StringBuilder output = new StringBuilder();
+
+        AtomicBoolean portUnavailable = new AtomicBoolean(false);
+        Process p = ProcessTools.startProcess(
+            "jcmd",
+            new ProcessBuilder(l.getCommand()),
+            line -> {
+                if (line.contains("BindException") ||
+                    line.contains(Agent.getText(AgentConfigurationError.CONNECTOR_SERVER_IO_ERROR))) {
+                    portUnavailable.set(true);
+                } else {
+                    output.append(line).append('\n');
+                    c.accept(line);
+                }
+            }
+        );
+
+        p.waitFor();
+        dbg_print("[jcmd] --------");
+        if (portUnavailable.get()) {
+            String cmd = Arrays.asList(l.getCommand()).stream()
+                    .collect(
+                            Collectors.joining(" ", "", ": Unable to bind address")
+                    );
+            throw new BindException(cmd);
+        }
+
+        return output.toString();
+    }
+
+    private void dbg_print(String msg) {
+        if (verbose) {
+            System.out.println("DBG: " + msg);
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jmxremote/startstop/PortAllocator.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import java.util.Random;
+
+/**
+ * Dynamically allocates distinct ports from the ephemeral range 49152-65535
+ */
+class PortAllocator {
+    private final static int LOWER_BOUND = 49152;
+    private final static int UPPER_BOUND = 65535;
+
+    private final static Random RND = new Random(System.currentTimeMillis());
+
+    static int[] allocatePorts(final int numPorts) {
+        int[] ports = new int[numPorts];
+        for (int i = 0; i < numPorts; i++) {
+            int port = -1;
+            while (port == -1) {
+                port = RND.nextInt(UPPER_BOUND - LOWER_BOUND + 1) + LOWER_BOUND;
+                for (int j = 0; j < i; j++) {
+                    if (ports[j] == port) {
+                        port = -1;
+                        break;
+                    }
+                }
+            }
+            ports[i] = port;
+        }
+        return ports;
+    }
+}
--- a/jdk/test/sun/management/jmxremote/startstop/REMOTE_TESTING.txt	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/startstop/REMOTE_TESTING.txt	Thu May 07 20:50:07 2015 -0700
@@ -4,7 +4,7 @@
    on host 1
 4. run 
 
-   ${TESTJAVA}/bin/java -server JMXStartStopDoSomething \
+   ${TESTJAVA}/bin/java -server TestApp \
    -Dcom.sun.management.jmxremote.port=50234 \
    -Dcom.sun.management.jmxremote.rmi.port=50235 \
    -Dcom.sun.management.jmxremote.authenticate=false \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jmxremote/startstop/TestApp.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import java.io.IOException;
+
+public class TestApp {
+    public static void doSomething() throws IOException{
+        int r = System.in.read();
+        System.out.println("read: " + r);
+    }
+
+    public static void main(String args[]) throws Exception {
+        System.out.println("main enter");
+        System.out.flush();
+        doSomething();
+        System.out.println("main exit");
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/jgss/spnego/MSOID.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+/*
+ * @test
+ * @bug 8078439
+ * @summary SPNEGO auth fails if client proposes MS krb5 OID
+ */
+
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.GSSManager;
+
+import java.lang.Exception;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Base64;
+
+public class MSOID {
+    public static void main(String[] args) throws Exception {
+
+        // msoid.txt is a NegTokenInit packet sent from Internet Explorer to
+        // IIS server on a test machine. No sensitive info included.
+        byte[] header = Files.readAllBytes(
+                Paths.get(System.getProperty("test.src"), "msoid.txt"));
+        byte[] token = Base64.getMimeDecoder().decode(
+                Arrays.copyOfRange(header, 10, header.length));
+
+        GSSCredential cred = null;
+        GSSContext ctx = GSSManager.getInstance().createContext(cred);
+
+        try {
+            ctx.acceptSecContext(token, 0, token.length);
+            // Before the fix, GSS_KRB5_MECH_OID_MS is not recognized
+            // and acceptor chooses another mech and goes on
+            throw new Exception("Should fail");
+        } catch (GSSException gsse) {
+            // After the fix, GSS_KRB5_MECH_OID_MS is recognized but the token
+            // cannot be accepted because we don't have any krb5 credential.
+            gsse.printStackTrace();
+            if (gsse.getMajor() != GSSException.NO_CRED) {
+                throw gsse;
+            }
+            for (StackTraceElement st: gsse.getStackTrace()) {
+                if (st.getClassName().startsWith("sun.security.jgss.krb5.")) {
+                    // Good, it is already in krb5 mech's hand.
+                    return;
+                }
+            }
+            throw gsse;
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/jgss/spnego/msoid.txt	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,27 @@
+Negotiate YIIGPAYGKwYBBQUCoIIGMDCCBiygMDAuBgkqhkiC9xIBAgIGCSqGSIb3EgECAgYKKwYBBA
+GCNwICHgYKKwYBBAGCNwICCqKCBfYEggXyYIIF7gYJKoZIhvcSAQICAQBuggXdMIIF2aADAgEFoQMCAQ
+6iBwMFACAAAACjggTIYYIExDCCBMCgAwIBBaEOGwxUV0VMVkUuVEhJTkuiIzAhoAMCAQKhGjAYGwRIVF
+RQGxBrZGMuVFdFTFZFLlRISU5Lo4IEgjCCBH6gAwIBEqEDAgEJooIEcASCBGyoIL0zQevk57pY6D25+1
+SQbAeldYXkpdn8JlKgSyz1cdiTpwqDt8B7pj7AoKMPHCiVss37XCEpBIuZClBK3Jmry+QWXCbQemKvyO
+Caz806RDNB7TA7l1NxUJ6LsCiQncNV1TEq37NM6H8il6PjnbcBoMcHH/+cFGVPNP3eP+Z5Kd+5DZELPV
+qQkYogXybmngmYy2168OsfyANzotUpm/HBwEHKujCPH9Gbhwhmx4tUcBvCetPNoXmHOQZLB4u7uyblKO
+c6R2yGTFCa8DBQNXx38RRHgsvlNGlx+UsSoF4/DixAreNRkZnpKabn1cRK/KZh6vHfbL2QVegr1hrp71
+IJwyVuR+RTGL/7WCSWFClJyWD3Cm4+eK46uVj4MKPUJBc0XVViV/Dsh4N9EomVDkovWU/v+0d+W4pQJk
+BFnJoNYuaG8UnLWrxMKGNwVOfsblcJtB7B5zuZzsWsUIdmMT1n8mtWrv0wYiwvotfT6z/suk+Vhg9MGd
+uDmeneeG9deMDUMwrwB8u5J2VEeWKurBfDB02jv/08qAZS2ovBfV2SiXCuky5z7llvQ8uPsoezVwYdhu
+HmBuPE7PqDIkmkEJRWpq95dqxllCXvlL4uINxFadkhcbzuCDjSGil78p6FJTKc4Dt/kuug1zJuXhJO1L
+2CgkMsYPTogoUvAtplzIDF0nSMwJUIJzQXIHCFasmDNJA1GAvQD+Qh7Mp4dYb2Uid+sSM2qlQn8bgR9S
+dlfL/olQ9GKPOBBGwsVoZKR3Brimc9LOJofPMEEa560KQNgtO1MyjoqEJKzFq+2wVZQahvpcV7VgixCq
+Nom3Wd4NdZ3QM0PHL7e9bl3/qCsWaiNlmRW7gupz8nNCtWNMf4UBqIeo9jPH9Cb96fOUM4c7XXp4iX6w
+ns1MsmPZ4VQDRU7VK+yTC81KGfMlSvrvqCJfGoxy0NaeXtmkN55oAhaj8ebiEBdKCXXF5wk0zqvt1ifE
+9ywYk/AbdFBPThyOT6Tu9x41gi6mCTiMtSdg7cFY+5yXd3UIgUwnbOG3IwAkdLXlepvnHwEXCXkbfbr9
+e1wjs5LMmYRunJ05FOx8iAibB8bWjgiFmYWbeyjyQF3KDs5cpvROXcapT1+KlFU4lEO8lnKM/Ipq81ED
+s+/DygXCvlskeKV57URx+XcMWnURu4hdGHbCPY/X7eOmox0mw5/V0rJMIjSjQNPyi4UM4dDTso6mt0XE
+h+YyCGmV67D8/nihO/NaRFEFxHlaGwh3Lqu/Tero88iuDb9U1uEWz8cF8wr+2azyOTmhi/ID/jfiEC8i
+b/hjYEcBI99x/CNmuuM7uCwTPIsJtBD3AnUdPa/yo41rCtm/K5HZCTzw2W93vaHqyttEC7c70rdAUB49
+CfSAVtH4gwxCDKMSJMlELfHGrIloEppEoUEc7LOdmzinvzcuajj0moBn5WUZHiVmopLjGjW7wunmMPQS
+H9FmCQf2I1N4E6nZfH+cUzBbHkIF5XHY4KXwmJQ3UdbUDp8z3npIH3MIH0oAMCARKigewEgenD23U6gQ
+aORjuWnT1nqadqR+E5fa/viohey4g6mn6uPfVRPz5a7OsDOurQV9wHR/VEwvjpdlZzMcANbt28Ut3YvQ
+SWWwqALoLtSLOTgXmK9Higb+NSSO7hKtqKgDWREfQisn3xE9PGkMUlanu2es34+k43AQmJf2InvFNNcy
+PcKllikoMOldVeoF1BIKvbDI0+vE3SwSrD0UhUdDeeZTN33b0Y8f3I1UYtidwxcRRkvCaNEhphtr8hp8
+hXWQkuxVvF2TiQyHF4PnJkgb1Zr6GXydOmMgMJE1anPFKFKWH6PZWGnp8mw0F5zw==
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/auto/MSOID2.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+/*
+ * @test
+ * @bug 8078439
+ * @summary SPNEGO auth fails if client proposes MS krb5 OID
+ * @compile -XDignore.symbol.file MSOID2.java
+ * @run main/othervm MSOID2
+ */
+
+import sun.security.jgss.GSSUtil;
+
+// The basic krb5 test skeleton you can copy from
+public class MSOID2 {
+
+    public static void main(String[] args) throws Exception {
+
+        new OneKDC(null).writeJAASConf();
+
+        Context c, s;
+        c = Context.fromJAAS("client");
+        s = Context.fromJAAS("server");
+
+        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_SPNEGO_MECH_OID);
+        s.startAsServer(GSSUtil.GSS_SPNEGO_MECH_OID);
+
+        byte[] t = new byte[0];
+        boolean first = true;
+        while (true) {
+            if (t != null || !c.x().isEstablished()) t = c.take(t);
+            if (first) {
+                // Tweak the packet to append an extra OID
+                int len = t.length;
+                byte[] nt = new byte[len + 11];
+                System.arraycopy(t, 0, nt, 0, 0x23);
+                System.arraycopy(t, 0x18, nt, 0x23, 11);    // dup the OID
+                System.arraycopy(t, 0x23, nt, 0x2e, len-0x23);
+                nt[0x1d] = (byte)0x82;  // change the 1st to MS OID
+                // Length bytes to be tweaked
+                for (int pos: new int[] {3, 0xf, 0x13, 0x15, 0x17}) {
+                    nt[pos] = (byte)(nt[pos] + 11);
+                }
+                t = nt;
+                new sun.misc.HexDumpEncoder().encodeBuffer(t, System.out);
+            }
+            if (t != null || !s.x().isEstablished()) t = s.take(t);
+            if (c.x().isEstablished() && s.x().isEstablished()) break;
+            first = false;
+        }
+
+        Context.transmit("i say high --", c, s);
+        Context.transmit("   you say low", s, c);
+
+        s.dispose();
+        c.dispose();
+    }
+}
--- a/jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015 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
@@ -23,12 +23,14 @@
 
 /*
  * @test
- * @bug 8005408
+ * @bug 8005408 8079129
  * @summary KeyStore API enhancements
  */
 
 import java.io.*;
 import java.security.*;
+import java.security.cert.*;
+import java.security.cert.Certificate;
 import java.util.*;
 import javax.crypto.*;
 import javax.crypto.spec.*;
@@ -39,7 +41,9 @@
     private final static String DIR = System.getProperty("test.src", ".");
     private static final char[] PASSWORD = "passphrase".toCharArray();
     private static final String KEYSTORE = "keystore.p12";
-    private static final String ALIAS = "my secret key";
+    private static final String CERT = DIR + "/trusted.pem";
+    private static final String ALIAS = "my trusted cert";
+    private static final String ALIAS2 = "my secret key";
 
     public static void main(String[] args) throws Exception {
 
@@ -56,8 +60,13 @@
         KeyStore keystore = KeyStore.getInstance("PKCS12");
         keystore.load(null, null);
 
-        // Set entry
+        // Set trusted certificate entry
+        Certificate cert = loadCertificate(CERT);
         keystore.setEntry(ALIAS,
+            new KeyStore.TrustedCertificateEntry(cert), null);
+
+        // Set secret key entry
+        keystore.setEntry(ALIAS2,
             new KeyStore.SecretKeyEntry(generateSecretKey("AES", 128)),
                 new KeyStore.PasswordProtection(PASSWORD));
 
@@ -73,7 +82,7 @@
                 " entries");
         }
 
-        KeyStore.Entry entry = keystore.getEntry(ALIAS,
+        KeyStore.Entry entry = keystore.getEntry(ALIAS2,
             new KeyStore.PasswordProtection(PASSWORD));
         System.out.println("Retrieved entry: " + entry);
 
@@ -101,4 +110,14 @@
         generator.init(size);
         return generator.generateKey();
     }
+
+    private static Certificate loadCertificate(String certFile)
+        throws Exception {
+        X509Certificate cert = null;
+        try (FileInputStream certStream = new FileInputStream(certFile)) {
+            CertificateFactory factory =
+                CertificateFactory.getInstance("X.509");
+            return factory.generateCertificate(certStream);
+        }
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/x509/GeneralName/X400Address.java	Thu May 07 20:50:07 2015 -0700
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
+/**
+ * @test
+ * @bug 8058543
+ * @summary Check that a Subject Alternative Name of type X400Address
+ *      can be parsed
+ */
+public class X400Address {
+
+    /*
+     * A cert containing an X400Address SAN:
+     *    ObjectId: 2.5.29.17 Criticality=false
+     *    SubjectAlternativeName [
+     *      RFC822Name: testuser@test.net
+     *      X400Address: <DER-encoded value>
+     *    ]
+     */
+    private static final String certStr =
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIIEXjCCA0agAwIBAgIEAm+MuDANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDEwlU\n" +
+        "ZXN0IFVzZXIwHhcNMTQwOTI2MDgyNTA1WhcNMjQwOTIzMDgyNTA1WjAUMRIwEAYD\n" +
+        "VQQDEwlUZXN0IFVzZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM\n" +
+        "Lj3k7is6bGoZgoONF15PT/GnfGtFJFYF2alnuHYjj/zdlKtU2DAPadz2EAJHczhy\n" +
+        "/p1DVvyrOUgCviB0nzijuLt9YHr6goel7Pe/YtcRavfC5HzEVOjhp92WZX/jIO9X\n" +
+        "xlpC/aQKt0pqCgUkvzVzB2Lm8EB/bcxlRKNh6WpAGfH/23XnJZ/UPRYgu+C+00i2\n" +
+        "vv26kHb2hZ3px1RP4b1FMiKc5mZxd+D9Ep3kGf+SnrBROR9v2u4hOobxzC9avAfq\n" +
+        "vTJ1rauR08eUHD15AUrR6AlOhb4Y6XqzPZ+aPb1Mj1XSuMsXvApWhXmavRA5wK1S\n" +
+        "ZtnvibB/0l57AMSUh24NAgMBAAGjggG2MIIBsjAPBgNVHRMBAf8EBTADAQH/MA8G\n" +
+        "A1UdJQQIMAYGBFUdJQAwDgYDVR0PAQH/BAQDAgbAMEcGA1UdEQRAMD6BEXRlc3R1\n" +
+        "c2VyQHRlc3QubmV0oykwE2EEEwJ0cmIDEwEgogYTBFRFU1QxEjAQgAEBoQsTCVRl\n" +
+        "c3QgVXNlcjCCATMGA1UdDgSCASoEggEmMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A\n" +
+        "MIIBCgKCAQEAjC495O4rOmxqGYKDjRdeT0/xp3xrRSRWBdmpZ7h2I4/83ZSrVNgw\n" +
+        "D2nc9hACR3M4cv6dQ1b8qzlIAr4gdJ84o7i7fWB6+oKHpez3v2LXEWr3wuR8xFTo\n" +
+        "4afdlmV/4yDvV8ZaQv2kCrdKagoFJL81cwdi5vBAf23MZUSjYelqQBnx/9t15yWf\n" +
+        "1D0WILvgvtNItr79upB29oWd6cdUT+G9RTIinOZmcXfg/RKd5Bn/kp6wUTkfb9ru\n" +
+        "ITqG8cwvWrwH6r0yda2rkdPHlBw9eQFK0egJToW+GOl6sz2fmj29TI9V0rjLF7wK\n" +
+        "VoV5mr0QOcCtUmbZ74mwf9JeewDElIduDQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB\n" +
+        "AQCD3p0mhvqDLYqTL9l5cRK9+cGOS5nbDvUmd1NutCIOJHMT96ESob9fqM9zo23l\n" +
+        "Yudajxa3/GooKTCe1TcaWIzFVqvO8wezMLkwuZcoto1ST8+lS36ZwZ1gMipE2Kh1\n" +
+        "XmnBn0wkUNfqypQ+nWH9vsYuJkeDb8402BOEdb/pvGYKC8d6EzQwUukLpXyOMs9r\n" +
+        "aCcsnSYRV8gFYCUxZkm0+tQOBjUsQ1SP/ww7SicPPSHqb08HvH4ALG75MUxIMVF1\n" +
+        "vyTeStZzsFXQaUq026U/rDXf18bV3Vi5EI5jR9p6CDXgundqnMmiEo4BXWCp/KeB\n" +
+        "JxndcaVIF7PbMkUw01elOmj0\n" +
+        "-----END CERTIFICATE-----";
+
+    public static void main(String[] args) throws Exception {
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        ByteArrayInputStream is = new ByteArrayInputStream(certStr.getBytes());
+        X509Certificate cert = (X509Certificate) cf.generateCertificate(is);
+
+        if (cert.getSubjectAlternativeNames() == null) {
+            throw new Exception("Failed to parse Subject Alternative Name");
+        }
+    }
+}
--- a/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -42,6 +42,7 @@
  * @test
  * @bug 7104647
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run main TestJcmdDefaults
  */
--- a/jdk/test/sun/tools/jcmd/TestJcmdSanity.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jcmd/TestJcmdSanity.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -43,6 +43,7 @@
  * @test
  * @bug 7104647 7154822
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run main/othervm -XX:+UsePerfData TestJcmdSanity
  */
--- a/jdk/test/sun/tools/jconsole/ResourceCheckTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jconsole/ResourceCheckTest.java	Thu May 07 20:50:07 2015 -0700
@@ -26,6 +26,7 @@
  *  @test
  *  @bug 5008856 5023573 5024917 5062569 7172176
  *  @summary 'missing resource key' error for key = "Operating system"
+ *  @modules jdk.jconsole/sun.tools.jconsole
  *  @run main ResourceCheckTest
  */
 
--- a/jdk/test/sun/tools/jhat/HatHeapDump1Test.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jhat/HatHeapDump1Test.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -33,6 +33,7 @@
  * @bug 5102009
  * @summary Sanity test of jhat functionality
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibarary.*
  * @compile -g HelloWorld.java
  * @run main HatHeapDump1Test
--- a/jdk/test/sun/tools/jinfo/JInfoLauncherTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jinfo/JInfoLauncherTest.java	Thu May 07 20:50:07 2015 -0700
@@ -36,6 +36,7 @@
 /**
  * @test
  * @bug 8039080
+ * @modules jdk.jcmd/sun.tools.jinfo
  * @run testng JInfoLauncherTest
  * @summary Test JInfo launcher argument parsing
  */
--- a/jdk/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -23,10 +23,8 @@
  * questions.
  */
 
-import sun.management.ManagementFactoryHelper;
-
+import java.lang.management.ManagementFactory;
 import com.sun.management.HotSpotDiagnosticMXBean;
-
 import jdk.testlibrary.OutputAnalyzer;
 import static jdk.testlibrary.Platform.isSolaris;
 import static jdk.testlibrary.Asserts.assertEquals;
@@ -37,6 +35,7 @@
  * @test
  * @summary The test sanity checks 'jinfo -flag' option.
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JInfoHelper
  * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError JInfoRunningProcessFlagTest
  */
@@ -114,13 +113,15 @@
     }
 
     private static void verifyIsEnabled(String flag) {
-        HotSpotDiagnosticMXBean hotspotDiagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
+        HotSpotDiagnosticMXBean hotspotDiagnostic =
+                ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
         String flagValue = hotspotDiagnostic.getVMOption(flag).getValue();
         assertEquals(flagValue, "true", "Expected '" + flag + "' flag be enabled");
     }
 
     private static void verifyIsDisabled(String flag) {
-        HotSpotDiagnosticMXBean hotspotDiagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
+        HotSpotDiagnosticMXBean hotspotDiagnostic =
+                ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
         String flagValue = hotspotDiagnostic.getVMOption(flag).getValue();
         assertEquals(flagValue, "false", "Expected '" + flag + "' flag be disabled");
     }
--- a/jdk/test/sun/tools/jinfo/JInfoRunningProcessTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jinfo/JInfoRunningProcessTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -30,6 +30,7 @@
  * @test
  * @summary The test sanity checks functionality of 'jinfo', 'jinfo -sysprops' and 'jinfo -flags'
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JInfoHelper
  * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError JInfoRunningProcessTest
  */
--- a/jdk/test/sun/tools/jinfo/JInfoSanityTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jinfo/JInfoSanityTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -33,6 +33,7 @@
  * @summary The test sanity checks functionality of 'jinfo -h', 'jinfo -help',
  *          and verifies jinfo exits abnormally if started with invalid options.
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JInfoHelper
  * @run main JInfoSanityTest
  */
--- a/jdk/test/sun/tools/jmap/BasicJMapTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jmap/BasicJMapTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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,6 +34,7 @@
  * @bug 6321286
  * @summary Unit test for jmap utility
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run main BasicJMapTest
  */
--- a/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	Thu May 07 20:50:07 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 8042397
  * @summary Unit test for jmap utility test heap configuration reader
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @build JMapHeapConfigTest LingeredApp TmtoolTestScenario
  * @run main JMapHeapConfigTest
--- a/jdk/test/sun/tools/jps/JpsHelper.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jps/JpsHelper.java	Thu May 07 20:50:07 2015 -0700
@@ -151,6 +151,7 @@
      */
     public static OutputAnalyzer jps(List<String> vmArgs, List<String> toolArgs) throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jps");
+        launcher.addVMArg("-XX:+UsePerfData");
         if (vmArgs != null) {
             for (String vmArg : vmArgs) {
                 launcher.addVMArg(vmArg);
--- a/jdk/test/sun/tools/jps/TestJpsClass.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jps/TestJpsClass.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -35,6 +35,8 @@
  *          will be started from within the test application.
  *          The output should contain proper values.
  * @library /lib/testlibrary
+ * @modules jdk.jartool/sun.tools.jar
+ *          java.management
  * @build jdk.testlibrary.* JpsHelper JpsBase
  * @run driver TestJpsClass
  */
--- a/jdk/test/sun/tools/jps/TestJpsJar.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jps/TestJpsJar.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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,8 +36,10 @@
  *          will be started from within the test application.
  *          The output should contain proper values.
  * @library /lib/testlibrary
+ * @modules jdk.jartool/sun.tools.jar
+ *          java.management
  * @build jdk.testlibrary.* JpsHelper JpsBase
- * @run driver TestJpsJar
+ * @run main/othervm TestJpsJar
  */
 public class TestJpsJar {
 
--- a/jdk/test/sun/tools/jps/TestJpsJarRelative.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jps/TestJpsJarRelative.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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,8 +36,10 @@
  *          will be started from within the test application.
  *          The output should contain proper values.
  * @library /lib/testlibrary
+ * @modules jdk.jartool/sun.tools.jar
+ *          java.management
  * @build jdk.testlibrary.* JpsHelper JpsBase
- * @run driver TestJpsJarRelative
+ * @run main/othervm TestJpsJarRelative
  */
 public class TestJpsJarRelative {
 
--- a/jdk/test/sun/tools/jps/TestJpsSanity.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jps/TestJpsSanity.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -29,6 +29,8 @@
  * @summary This test verifies jps usage and checks that appropriate error message is shown
  *          when running jps with illegal arguments.
  * @library /lib/testlibrary
+ * @modules jdk.jartool/sun.tools.jar
+ *          java.management
  * @build jdk.testlibrary.* JpsHelper
  * @run driver TestJpsSanity
  */
--- a/jdk/test/sun/tools/jstack/BasicJStackTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstack/BasicJStackTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -32,6 +32,7 @@
  * @bug 6260070
  * @summary Unit test for jstack utility
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run main BasicJStackTest
  */
--- a/jdk/test/sun/tools/jstat/JStatInterval.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstat/JStatInterval.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -28,6 +28,7 @@
  * @summary Test checks case when target application finishes execution and jstat didn't complete work.
             jstat is started with interval = 100 (jstat -compiler 100) and monitored application finishes
             after 500ms. This shouldn't cause crash or hang in target application or in jstat.
+ * @modules java.management
  * @build jdk.testlibrary.* JStatInterval
  * @run main JStatInterval
  */
--- a/jdk/test/sun/tools/jstat/snap2.awk	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstat/snap2.awk	Thu May 07 20:50:07 2015 -0700
@@ -3,7 +3,7 @@
 
 	{ totallines++; print $0 }
 
-$0 !~ /[java|sun|com\.sun]\..+=.*$/	{ count++ }
+$0 !~ /[java|jdk|sun|com\.sun]\..+=.*$/	{ count++ }
 
 END	{
 	    if ((count == 0) && (totallines != 0)) {
--- a/jdk/test/sun/tools/jstatd/JstatdTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstatd/JstatdTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -22,7 +22,6 @@
  */
 
 import java.io.File;
-import java.io.IOException;
 import java.net.UnknownHostException;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
@@ -130,38 +129,18 @@
     private OutputAnalyzer runJps() throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jps");
         launcher.addVMArg("-XX:+UsePerfData");
-        // Run jps with -v flag to obtain -Dparent.pid.<pid>
-        launcher.addToolArg("-v");
         launcher.addToolArg(getDestination());
 
         String[] cmd = launcher.getCommand();
         log("Start jps", cmd);
 
         ProcessBuilder processBuilder = new ProcessBuilder(cmd);
-        OutputAnalyzer output = waitForJstatdRMI(processBuilder);
+        OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
         System.out.println(output.getOutput());
 
         return output;
     }
 
-    private OutputAnalyzer waitForJstatdRMI(ProcessBuilder pb) throws Exception {
-        OutputAnalyzer output = ProcessTools.executeProcess(pb);
-
-        String remoteHost = (serverName != null) ? serverName : "JStatRemoteHost";
-        while (output.getExitValue() != 0) {
-            String out = output.getOutput();
-
-            if (out.contains("RMI Registry not available") ||
-                out.contains("RMI Server " + remoteHost + " not available")) {
-                Thread.sleep(100);
-                output = ProcessTools.executeProcess(pb);
-            } else {
-                output.shouldHaveExitValue(0);
-            }
-        }
-        return output;
-    }
-
     /**
      * Verifies output form jps contains pids and programs' name information.
      * The function will discard any lines that come before the first line with pid.
@@ -211,7 +190,7 @@
         log("Start jstat", cmd);
 
         ProcessBuilder processBuilder = new ProcessBuilder(cmd);
-        OutputAnalyzer output = waitForJstatdRMI(processBuilder);
+        OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
         System.out.println(output.getOutput());
 
         return output;
@@ -277,8 +256,6 @@
         assertTrue(policy.exists() && policy.isFile(),
                 "Security policy " + policy.getAbsolutePath() + " does not exist or not a file");
         launcher.addVMArg("-Djava.security.policy=" + policy.getAbsolutePath());
-        // -Dparent.pid.<pid> will help to identify jstad process started by this test
-        launcher.addVMArg("-Dparent.pid." + ProcessTools.getProcessId());
         if (port != null) {
             launcher.addToolArg("-p");
             launcher.addToolArg(port);
@@ -287,6 +264,9 @@
             launcher.addToolArg("-n");
             launcher.addToolArg(serverName);
         }
+        if (withExternalRegistry) {
+            launcher.addToolArg("-nr");
+        }
 
         String[] cmd = launcher.getCommand();
         log("Start jstatd", cmd);
@@ -295,7 +275,7 @@
 
     private ProcessThread tryToSetupJstatdProcess() throws Throwable {
         ProcessThread jstatdThread = new ProcessThread("Jstatd-Thread",
-                getJstatdCmd());
+                JstatdTest::isJstadReady, getJstatdCmd());
         try {
             jstatdThread.start();
             // Make sure jstatd is up and running
@@ -315,18 +295,26 @@
         return jstatdThread;
     }
 
+    private static boolean isJstadReady(String line) {
+        return line.startsWith("jstatd started (bound to ");
+    }
+
     public void doTest() throws Throwable {
+        if (useDefaultPort) {
+            verifyNoRmiRegistryOnDefaultPort();
+        }
+
         ProcessThread jstatdThread = null;
         try {
             while (jstatdThread == null) {
-                if (!useDefaultPort || withExternalRegistry) {
+                if (!useDefaultPort) {
                     port = String.valueOf(Utils.getFreePort());
                 }
 
                 if (withExternalRegistry) {
                     Registry registry = startRegistry();
                     if (registry == null) {
-                        // The port is already in use. Cancel and try with new one.
+                        // The port is already in use. Cancel and try with a new one.
                         continue;
                     }
                 }
@@ -348,4 +336,14 @@
                 "jstatd process exited with unexpected exit code");
     }
 
+    private void verifyNoRmiRegistryOnDefaultPort() throws Exception {
+        try {
+            Registry registry = LocateRegistry.getRegistry();
+            registry.list();
+            throw new Exception("There is already RMI registry on the default port: " + registry);
+        } catch (RemoteException e) {
+            // No RMI registry on default port is detected
+        }
+    }
+
 }
--- a/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 4990825
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdDefaults
  */
--- a/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 4990825 7092186
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdExternalRegistry
  */
@@ -32,6 +33,7 @@
 
     public static void main(String[] args) throws Throwable {
         JstatdTest test = new JstatdTest();
+        test.setUseDefaultPort(false);
         test.setWithExternalRegistry(true);
         test.doTest();
     }
--- a/jdk/test/sun/tools/jstatd/TestJstatdPort.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstatd/TestJstatdPort.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 4990825
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdPort
  */
--- a/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 4990825
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdPortAndServer
  */
--- a/jdk/test/sun/tools/jstatd/TestJstatdServer.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstatd/TestJstatdServer.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 4990825
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdServer
  */
--- a/jdk/test/sun/tools/jstatd/TestJstatdUsage.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/tools/jstatd/TestJstatdUsage.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -29,6 +29,7 @@
  * @test
  * @bug 4990825
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run main TestJstatdUsage
  */
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION	Thu May 07 20:50:07 2015 -0700
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2015b
+tzdata2015d
--- a/jdk/test/sun/util/calendar/zi/tzdata/africa	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/africa	Thu May 07 20:50:07 2015 -0700
@@ -342,35 +342,29 @@
 # above) says DST had no affect on electricity consumption.  There is
 # no information about when DST will end this fall.  See:
 # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
+
+# From Steffen Thorsen (2015-04-08):
+# Egypt will start DST on midnight after Thursday, April 30, 2015.
+# This is based on a law (no 35) from May 15, 2014 saying it starts the last
+# Thursday of April....  Clocks will still be turned back for Ramadan, but
+# dates not yet announced....
+# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
+# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
+
+# From Ahmed Nazmy (2015-04-20):
+# Egypt's ministers cabinet just announced ... that it will cancel DST at
+# least for 2015.
 #
-# For now, guess that later spring and fall transitions will use
-# 2010's rules, and guess that Egypt will switch to standard time at
-# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
-# first Friday after Ramadan.  To implement this,
-# transition dates for 2015 through 2037 were determined by running
-# the following program under GNU Emacs 24.3, with the results integrated
-# by hand into the table below.  Ramadan again intrudes on the guessed
-# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
-# (let ((islamic-year 1436))
-#   (while (< islamic-year 1460)
-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-#           (friday 5))
-#       (while (/= friday (mod a 7))
-#         (setq a (1- a)))
-#       (while (/= friday (mod b 7))
-#         (setq b (1+ b)))
-#       (setq a (1- a))
-#       (setq b (1- b))
-#       (setq a (calendar-gregorian-from-absolute a))
-#       (setq b (calendar-gregorian-from-absolute b))
-#       (insert
-#        (format
-#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
-#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-#     (setq islamic-year (+ 1 islamic-year))))
+# From Tim Parenti (2015-04-20):
+# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx
+# "Egypt's cabinet agreed on Monday not to switch clocks for daylight saving
+# time this summer, and carry out studies on the possibility of canceling the
+# practice altogether in future years."
+#
+# From Paul Eggert (2015-04-20):
+# For now, assume DST will be canceled.  Any resumption would likely
+# use different rules anyway.
+
 Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
 Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
 Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
@@ -379,22 +373,7 @@
 Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
 Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
 Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
-Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
-Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
-Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
-Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
-Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
-Rule	Egypt	2017	only	-	May	25	24:00	0	-
-Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
-Rule	Egypt	2018	only	-	May	10	24:00	0	-
-Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
-Rule	Egypt	2019	only	-	May	 2	24:00	0	-
-Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
-Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
-Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
-Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
-Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
+Rule	Egypt	2014	only	-	Sep	lastThu	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
--- a/jdk/test/sun/util/calendar/zi/tzdata/antarctica	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/antarctica	Thu May 07 20:50:07 2015 -0700
@@ -38,41 +38,6 @@
 # I made up all time zone abbreviations mentioned here; corrections welcome!
 # FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
 
-# These rules are stolen from the 'southamerica' file.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
-Rule	ArgAQ	1964	1966	-	Oct	15	0:00	1:00	S
-Rule	ArgAQ	1967	only	-	Apr	 2	0:00	0	-
-Rule	ArgAQ	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
-Rule	ArgAQ	1968	1969	-	Apr	Sun>=1	0:00	0	-
-Rule	ArgAQ	1974	only	-	Jan	23	0:00	1:00	S
-Rule	ArgAQ	1974	only	-	May	 1	0:00	0	-
-Rule	ChileAQ	1972	1986	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	1987	only	-	Apr	12	3:00u	0	-
-Rule	ChileAQ	1988	1989	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
-Rule	ChileAQ	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	1990	only	-	Mar	18	3:00u	0	-
-Rule	ChileAQ	1990	only	-	Sep	16	4:00u	1:00	S
-Rule	ChileAQ	1991	1996	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	1997	only	-	Mar	30	3:00u	0	-
-Rule	ChileAQ	1998	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	1998	only	-	Sep	27	4:00u	1:00	S
-Rule	ChileAQ	1999	only	-	Apr	 4	3:00u	0	-
-Rule	ChileAQ	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	2000	2007	-	Mar	Sun>=9	3:00u	0	-
-# N.B.: the end of March 29 in Chile is March 30 in Universal time,
-# which is used below in specifying the transition.
-Rule	ChileAQ	2008	only	-	Mar	30	3:00u	0	-
-Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
-Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
-Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	ChileAQ	2012	2015	-	Apr	Sun>=23	3:00u	0	-
-Rule	ChileAQ	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
-
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
 # Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
@@ -367,21 +332,7 @@
 # USA - year-round bases
 #
 # Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
-#
-# From Ethan Dicks (1996-10-06):
-# It keeps the same time as Punta Arenas, Chile, because, just like us
-# and the South Pole, that's the other end of their supply line....
-# I verified with someone who was there that since 1980,
-# Palmer has followed Chile.  Prior to that, before the Falklands War,
-# Palmer used to be supplied from Argentina.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Palmer	0	-	zzz	1965
-			-4:00	ArgAQ	AR%sT	1969 Oct  5
-			-3:00	ArgAQ	AR%sT	1982 May
-			-4:00	ChileAQ	CL%sT	2015 Apr 26 3:00u
-			-3:00	-	CLT
-#
+# See 'southamerica' for Antarctica/Palmer, since it uses South American DST.
 #
 # McMurdo Station, Ross Island, since 1955-12
 # Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
--- a/jdk/test/sun/util/calendar/zi/tzdata/backward	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/backward	Thu May 07 20:50:07 2015 -0700
@@ -43,6 +43,7 @@
 Link	America/Indiana/Knox	America/Knox_IN
 Link	America/Kentucky/Louisville	America/Louisville
 Link	America/Argentina/Mendoza	America/Mendoza
+Link	America/Toronto		America/Montreal
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Argentina/Cordoba	America/Rosario
 Link	America/Denver		America/Shiprock
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe	Thu May 07 20:50:07 2015 -0700
@@ -99,7 +99,7 @@
 #        1:00:14    SET           Swedish (1879-1899)*
 #        2:00       EET EEST      Eastern Europe
 #        3:00       FET           Further-eastern Europe (2011-2014)*
-#        3:00       MSK MSD  MSM* Moscow
+#        3:00       MSK MSD  MSM* Minsk, Moscow
 
 # From Peter Ilieve (1994-12-04),
 # The original six [EU members]: Belgium, France, (West) Germany, Italy,
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica	Thu May 07 20:50:07 2015 -0700
@@ -250,9 +250,14 @@
 # The law doesn't give abbreviations.
 #
 # From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
-# Public law 106-564 (2000-12-23) introduced the abbreviation
-# "Chamorro Standard Time" for time in Guam and the Northern Marianas.
-# See the file "australasia".
+# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
+# for time in Guam and the Northern Marianas.  See the file "australasia".
+#
+# From Paul Eggert (2015-04-17):
+# HST and HDT are standardized abbreviations for Hawaii-Aleutian
+# standard and daylight times.  See section 9.47 (p 234) of the
+# U.S. Government Printing Office Style Manual (2008)
+# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
 
 # From Arthur David Olson, 2005-08-09
 # The following was signed into law on 2005-08-08.
@@ -559,7 +564,7 @@
 			-11:00	-	BST	1969
 			-11:00	US	B%sT	1983 Oct 30  2:00
 			-10:00	US	AH%sT	1983 Nov 30
-			-10:00	US	HA%sT
+			-10:00	US	H%sT
 # The following switches don't quite make our 1970 cutoff.
 #
 # Shanks writes that part of southwest Alaska (e.g. Aniak)
@@ -1354,14 +1359,9 @@
 
 # Quebec
 
-# From Paul Eggert (2013-08-30):
-# Since 1970 most of Quebec has been like Toronto.
-# However, because earlier versions of the tz database mistakenly relied on data
-# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
-# a separate entry was created for most of Quebec.  We're loath to lose
-# its pre-1970 info, even though the tz database is normally limited to
-# zones that differ after 1970, so keep this otherwise out-of-scope entry.
-
+# From Paul Eggert (2015-03-24):
+# See America/Toronto for most of Quebec, including Montreal.
+#
 # Matthews and Vincent (1998) also write that Quebec east of the -63
 # meridian is supposed to observe AST, but residents as far east as
 # Natashquan use EST/EDT, and residents east of Natashquan use AST.
@@ -1375,39 +1375,10 @@
 # For lack of better info, guess this practice began around 1970, contra to
 # Shanks & Pottenger who have this region observing AST/ADT.
 
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
-Rule	Mont	1917	only	-	Apr	24	0:00	0	S
-Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
-Rule	Mont	1919	only	-	Oct	25	2:30	0	S
-Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
-Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
-Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
-Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
-Rule	Mont	1924	only	-	May	17	2:00	1:00	D
-Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
-Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
-Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
-Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
-Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
-Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
-Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
-Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
 			-4:00	Canada	A%sT	1970
 			-4:00	-	AST
-Zone America/Montreal	-4:54:16 -	LMT	1884
-			-5:00	Mont	E%sT	1918
-			-5:00	Canada	E%sT	1919
-			-5:00	Mont	E%sT	1942 Feb  9  2:00s
-			-5:00	Canada	E%sT	1946
-			-5:00	Mont	E%sT	1974
-			-5:00	Canada	E%sT
 
 # Ontario
 
@@ -1898,17 +1869,115 @@
 # Dawson switched to PST in 1973.  Inuvik switched to MST in 1979.
 # Mathew Englander (1996-10-07) gives the following refs:
 #	* 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
-#	c. 7 defines Yukon standard time as UTC-9.  This is still valid;
+#	c. 7 defines Yukon standard time as UTC-9....
 #	see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
+#	[http://canlii.ca/t/7vhg]
 #	* C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
 #	* O.I.C. 1980/02 established DST.
 #	* O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
-# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go
-# with Englander.
-# From Chris Walton (2006-06-26):
-# Here is a link to the old daylight saving portion of the interpretation
-# act which was last updated in 1987:
-# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf
+
+# From Brian Inglis (2015-04-14):
+#
+# I tried to trace the history of Yukon time and found the following
+# regulations, giving the reference title and URL if found, regulation name,
+# and relevant quote if available.  Each regulation specifically revokes its
+# predecessor.  The final reference is to the current Interpretation Act
+# authorizing and resulting from these regulatory changes.
+#
+# Only recent regulations were retrievable via Yukon government site search or
+# index, and only some via Canadian legal sources.  Other sources used include
+# articles titled "Standard Time and Time Zones in Canada" from JRASC via ADS
+# Abstracts, cited by ADO for 1932 ..., and updated versions from 1958 and
+# 1970 quoted below; each article includes current extracts from provincial
+# and territorial ST and DST regulations at the end, summaries and details of
+# standard times and daylight saving time at many locations across Canada,
+# with time zone maps, tables and calculations for Canadian Sunrise, Sunset,
+# and LMST; they also cover many countries and global locations, with a chart
+# and table showing current Universal Time offsets, and may be useful as
+# another source of information for 1970 and earlier.
+#
+# * Standard Time and Time Zones in Canada; Smith, C.C.; JRASC, Vol. 26,
+#   pp.49-77; February 1932; SAO/NASA Astrophysics Data System (ADS)
+#   http://adsabs.harvard.edu/abs/1932JRASC..26...49S from p.75:
+#   Yukon Interpretation Ordinance
+#   Yukon standard time is the local mean time at the one hundred and
+#   thirty-fifth meridian.
+#
+# * Standard Time and Time Zones in Canada; Smith, C.C.; Thomson, Malcolm M.;
+#   JRASC, Vol. 52, pp.193-223; October 1958; SAO/NASA Astrophysics Data System
+#   (ADS) http://adsabs.harvard.edu/abs/1958JRASC..52..193S from pp.220-1:
+#   Yukon Interpretation Ordinance, 1955, Chap. 16.
+#
+#     (1) Subject to this section, standard time shall be reckoned as nine
+#     hours behind Greenwich Time and called Yukon Standard Time.
+#
+#     (2) Notwithstanding subsection (1), the Commissioner may make regulations
+#     varying the manner of reckoning standard time.
+#
+# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance
+#   http://? - no online source found
+#
+# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC,
+#   Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS)
+#   http://adsabs.harvard.edu/abs/1970JRASC..64..129T from p.156: Yukon
+#   Territory Commissioner's Order 1967-59 Interpretation Ordinance ...
+#
+#     1. Commissioner's Order 1966-20 dated at Whitehorse in the Yukon
+#     Territory on 27th January, 1966, is hereby revoked.
+#
+#     2. Yukon (East) Standard Time as defined by section 36 of the
+#     Interpretation Ordinance from and after mid-night on the 28th day of May,
+#     1967 shall be reckoned in the same manner as Pacific Standard Time, that
+#     is to say, eight hours behind Greenwich Time in the area of the Yukon
+#     Territory lying east of the 138th degree longitude west.
+#
+#     3. In the remainder of the Territory, lying west of the 138th degree
+#     longitude west, Yukon (West) Standard Time shall be reckoned as nine
+#     hours behind Greenwich Time.
+#
+# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
+#   http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
+#   C.O. 1973/214 INTERPRETATION ACT ...
+#
+#     1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
+#     revoked.
+#
+#     2. Yukon Standard Time as defined by section 36 of the Interpretation
+#     Act from and after midnight on the twenty-eighth day of October, 1973
+#     shall be reckoned in the same manner as Pacific Standard Time, that is
+#     to say eight hours behind Greenwich Time.
+#
+# * O.I.C. 1980/02 INTERPRETATION ACT
+#   http://? - no online source found
+#
+# * Yukon Daylight Saving Time, YOIC 1987/56
+#   http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
+#   O.I.C. 1987/056 INTERPRETATION ACT ...
+#
+#   In every year between
+#     (a) two o'clock in the morning in the first Sunday in April, and
+#     (b) two o'clock in the morning in the last Sunday in October,
+#   Standard Time shall be reckoned as seven hours behind Greenwich Time and
+#   called Yukon Daylight Saving Time.
+#   ...
+#   Dated ... 9th day of March, A.D., 1987.
+#
+# * Yukon Daylight Saving Time 2006, YOIC 2006/127
+#   http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
+#   O.I.C. 2006/127 INTERPRETATION ACT ...
+#
+#     1. In Yukon each year the time for general purposes shall be 7 hours
+#     behind Greenwich mean time during the period commencing at two o'clock
+#     in the forenoon on the second Sunday of March and ending at two o'clock
+#     in the forenoon on the first Sunday of November and shall be called
+#     Yukon Daylight Saving Time.
+#
+#     2. Order-in-Council 1987/56 is revoked.
+#
+#     3. This order comes into force January 1, 2007.
+#
+# * Interpretation Act, RSY 2002, c 125
+# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
 
 # From Rives McDow (1999-09-04):
 # Nunavut ... moved ... to incorporate the whole territory into one time zone.
@@ -2134,7 +2203,7 @@
 			-7:00	NT_YK	M%sT	1980
 			-7:00	Canada	M%sT
 Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
-			-9:00	NT_YK	Y%sT	1966 Jul  1  2:00
+			-9:00	NT_YK	Y%sT	1967 May 28  0:00
 			-8:00	NT_YK	P%sT	1980
 			-8:00	Canada	P%sT
 Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica	Thu May 07 20:50:07 2015 -0700
@@ -1121,6 +1121,60 @@
 
 # Chile
 
+# From Paul Eggert (2015-04-03):
+# Shanks & Pottenger says America/Santiago introduced standard time in
+# 1890 and rounds its UTC offset to 70W40; guess that in practice this
+# was the same offset as in 1916-1919.  It also says Pacific/Easter
+# standardized on 109W22 in 1890; assume this didn't change the clocks.
+#
+# Dates for America/Santiago from 1910 to 2004 are primarily from
+# the following source, cited by Oscar van Vlijmen (2006-10-08):
+# [1] Chile Law
+# http://www.webexhibits.org/daylightsaving/chile.html
+# This contains a copy of a this official table:
+# Cambios en la hora oficial de Chile desde 1900 (retrieved 2008-03-30)
+# http://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
+# [1] needs several corrections, though.
+#
+# The first set of corrections is from:
+# [2] History of the Official Time of Chile
+# http://www.horaoficial.cl/ing/horaof_ing.html (retrieved 2012-03-06).  See:
+# http://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
+# This is an English translation of:
+# Historia de la hora oficial de Chile (retrieved 2012-10-24).  See:
+# http://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
+# A fancier Spanish version (requiring mouse-clicking) is at:
+# http://www.horaoficial.cl/historia_hora.html
+# Conflicts between [1] and [2] were resolved as follows:
+#
+#  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
+#    Boletín Nº 1, Aviso Nº 1 (1910).  Go with [2].
+#
+#  - [1] says SMT was -4:42:45, [2] says Chile's official time from
+#    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
+#    Astronomical Observatory (OAN), then located in what is now
+#    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
+#
+#  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
+#    Boletín Nº 22, Aviso Nº 129/1918 (1918-08-23).  Go with [2].
+#
+#  - [1] does not give times for transitions; assume they occur
+#    at midnight mainland time, the current common practice.  However,
+#    go with [2]'s specification of 23:00 for the 1947-05-21 transition.
+#
+# Another correction to [1] is from Jesper Nørgaard Welen, who
+# wrote (2006-10-08), "I think that there are some obvious mistakes in
+# the suggested link from Oscar van Vlijmen,... for instance entry 66
+# says that GMT-4 ended 1990-09-12 while entry 67 only begins GMT-3 at
+# 1990-09-15 (they should have been 1990-09-15 and 1990-09-16
+# respectively), but anyhow it clears up some doubts too."
+#
+# Data for Pacific/Easter from 1910 through 1967 come from Shanks &
+# Pottenger.  After that, for lack of better info assume
+# Pacific/Easter is always two hours behind America/Santiago;
+# this is known to work for DST transitions starting in 2008 and
+# may well be true for earlier transitions.
+
 # From Eduardo Krell (1995-10-19):
 # The law says to switch to DST at midnight [24:00] on the second SATURDAY
 # of October....  The law is the same for March and October.
@@ -1133,78 +1187,35 @@
 # Because of the same drought, the government decided to end DST later,
 # on April 3, (one-time change).
 
-# From Oscar van Vlijmen (2006-10-08):
-# http://www.horaoficial.cl/cambio.htm
-
-# From Jesper Nørgaard Welen (2006-10-08):
-# I think that there are some obvious mistakes in the suggested link
-# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
-# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
-# (they should have been 1990-09-15 and 1990-09-16 respectively), but
-# anyhow it clears up some doubts too.
-
-# From Paul Eggert (2014-08-12):
-# The following data entries for Chile and America/Santiago are from
-# <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by
-# Jesper Nørgaard Welen.  The data entries for Pacific/Easter are from Shanks
-# & Pottenger, except with DST transitions after 1932 cloned from
-# America/Santiago.  The pre-1980 Pacific/Easter data entries are dubious,
-# but we have no other source.
-
 # From Germán Poo-Caamaño (2008-03-03):
 # Due to drought, Chile extends Daylight Time in three weeks.  This
 # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
 # and Saturday 3/29 at 22:00 for Pacific/Easter)
 # The Supreme Decree is located at
 # http://www.shoa.cl/servicios/supremo316.pdf
-# and the instructions for 2008 are located in:
-# http://www.horaoficial.cl/cambio.htm
-
+#
 # From José Miguel Garrido (2008-03-05):
-# ...
-# You could see the announces of the change on
 # http://www.shoa.cl/noticias/2008/04hora/hora.htm
 
 # From Angel Chiang (2010-03-04):
 # Subject: DST in Chile exceptionally extended to 3 April due to earthquake
 # http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
-# (in Spanish, last paragraph).
 #
-# This is breaking news. There should be more information available later.
-
 # From Arthur David Olson (2010-03-06):
 # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
 
-# From Glenn Eychaner (2011-03-02):
-# It appears that the Chilean government has decided to postpone the
-# change from summer time to winter time again, by three weeks to April
-# 2nd:
-# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
-#
-# This is not yet reflected in the official "cambio de hora" site, but
-# probably will be soon:
-# http://www.horaoficial.cl/cambio.htm
-
-# From Arthur David Olson (2011-03-02):
-# The emol.com article mentions a water shortage as the cause of the
-# postponement, which may mean that it's not a permanent change.
-
 # From Glenn Eychaner (2011-03-28):
-# The article:
 # http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
-#
 # In English:
 # Chile's clocks will go back an hour this year on the 7th of May instead
 # of this Saturday. They will go forward again the 3rd Saturday in
-# August, not in October as they have since 1968. This is a pilot plan
-# which will be reevaluated in 2012.
+# August, not in October as they have since 1968.
 
 # From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
 # As stated in the website of the Chilean Energy Ministry
 # http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
 # The Chilean Government has decided to postpone the entrance into winter time
-# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
-# been yet formalized but it will within the next days.
+# (to leave DST) from March 11 2012 to April 28th 2012....
 # Quote from the website communication:
 #
 # 6. For the year 2012, the dates of entry into winter time will be as follows:
@@ -1237,17 +1248,9 @@
 # From Paul Eggert (2015-03-03):
 # For now, assume that the extension will persist indefinitely.
 
-# NOTE: ChileAQ rules for Antarctic bases are stored separately in the
-# 'antarctica' file.
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
+Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-Rule	Chile	1942	only	-	Jun	 1	4:00u	0	-
-Rule	Chile	1942	only	-	Aug	 1	5:00u	1:00	S
-Rule	Chile	1946	only	-	Jul	15	4:00u	1:00	S
-Rule	Chile	1946	only	-	Sep	 1	3:00u	0:00	-
-Rule	Chile	1947	only	-	Apr	 1	4:00u	0	-
 Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
 Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
 Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
@@ -1258,10 +1261,8 @@
 Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
 Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
-Rule	Chile	1988	1989	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
-Rule	Chile	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1990	only	-	Mar	18	3:00u	0	-
+Rule	Chile	1988	1990	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
 Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
@@ -1284,15 +1285,21 @@
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santiago	-4:42:46 -	LMT	1890
-			-4:42:46 -	SMT	1910        # Santiago Mean Time
+			-4:42:46 -	SMT	1910 Jan 10 # Santiago Mean Time
 			-5:00	-	CLT	1916 Jul  1 # Chile Time
-			-4:42:46 -	SMT	1918 Sep  1 # Santiago Mean Time
-			-4:00	-	CLT	1919 Jul  1 # Chile Time
-			-4:42:46 -	SMT	1927 Sep  1 # Santiago Mean Time
-			-5:00	Chile	CL%sT	1947 May 22 # Chile Time
+			-4:42:46 -	SMT	1918 Sep 10
+			-4:00	-	CLT	1919 Jul  1
+			-4:42:46 -	SMT	1927 Sep  1
+			-5:00	Chile	CL%sT	1932 Sep  1
+			-4:00	-	CLT	1942 Jun  1
+			-5:00	-	CLT	1942 Aug  1
+			-4:00	-	CLT	1946 Jul 15
+			-4:00	1:00	CLST	1946 Sep  1 # central Chile
+			-4:00	-	CLT	1947 Apr  1
+			-5:00	-	CLT	1947 May 21 23:00
 			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
 			-3:00	-	CLT
-Zone Pacific/Easter	-7:17:44 -	LMT	1890
+Zone Pacific/Easter	-7:17:28 -	LMT	1890
 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
 			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
 			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
@@ -1302,6 +1309,25 @@
 # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
 # and Antarctic bases, are like America/Santiago.
 
+# Antarctic base using South American rules
+# (See the file 'antarctica' for more.)
+#
+# Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
+#
+# From Ethan Dicks (1996-10-06):
+# It keeps the same time as Punta Arenas, Chile, because, just like us
+# and the South Pole, that's the other end of their supply line....
+# I verified with someone who was there that since 1980,
+# Palmer has followed Chile.  Prior to that, before the Falklands War,
+# Palmer used to be supplied from Argentina.
+#
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Antarctica/Palmer	0	-	zzz	1965
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1982 May
+			-4:00	Chile	CL%sT	2015 Apr 26 3:00u
+			-3:00	-	CLT
+
 # Colombia
 
 # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest.  He writes,
--- a/jdk/test/tools/launcher/FXLauncherTest.java	Thu May 07 10:19:34 2015 -0700
+++ b/jdk/test/tools/launcher/FXLauncherTest.java	Thu May 07 20:50:07 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -28,7 +28,7 @@
  * Test uses main method and blank main method, a jfx app class and an incorrest
  * jfx app class, a main-class for the manifest, a bogus one and none.
  * All should execute except the incorrect fx app class entries.
- * @run main FXLauncherTest
+ * @run main/othervm FXLauncherTest
  */
 import java.io.File;
 import java.io.IOException;