--- a/.hgtags Fri May 13 13:20:16 2011 +0200
+++ b/.hgtags Sat May 14 11:24:26 2011 -0700
@@ -115,3 +115,4 @@
62b8e328f8c8c66c14b0713222116f2add473f3f jdk7-b138
955488f34ca418f6cdab843d61c20d2c615637d9 jdk7-b139
f4298bc3f4b6baa315643be06966f09684290068 jdk7-b140
+5d86d0c7692e8f4a58d430d68c03594e2d3403b3 jdk7-b141
--- a/.hgtags-top-repo Fri May 13 13:20:16 2011 +0200
+++ b/.hgtags-top-repo Sat May 14 11:24:26 2011 -0700
@@ -115,3 +115,4 @@
fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
+c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
--- a/corba/.hgtags Fri May 13 13:20:16 2011 +0200
+++ b/corba/.hgtags Sat May 14 11:24:26 2011 -0700
@@ -115,3 +115,4 @@
78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138
60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139
cdf5d19ec142424489549025e9c42e51f32cf688 jdk7-b140
+a58635cdd921bafef353f4864184a0481353197b jdk7-b141
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Fri May 13 13:20:16 2011 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Sat May 14 11:24:26 2011 -0700
@@ -23,9 +23,9 @@
# questions.
#
-orbd.usage=Uso: {0} <options> \n\nem que <options> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, default 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, default "./orb.db" (opcional)\n -serverid id do servidor para ORBD, default 1 (opcional)\n -ORBInitialPort porta inicial (necess\u00E1rio)\n -ORBInitialHost nome de host inicial (necess\u00E1rio)\n
+orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, default 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, default "./orb.db" (opcional)\n -serverid id do servidor para ORBD, default 1 (opcional)\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
-servertool.usage=Uso: {0} <options> \n\nem que <options> inclui:\n -ORBInitialPort porta inicial (necess\u00E1rio)\n -ORBInitialHost nome de host inicial (necess\u00E1rio)\n
+servertool.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n
servertool.shorthelp=\n\n\tComandos Dispon\u00EDveis: \n\t------------------- \n
servertool.baddef=Defini\u00E7\u00E3o do servidor inv\u00E1lida: {0}
@@ -40,23 +40,23 @@
servertool.vmargs=\tvmargs - {0}
servertool.serverid=\tserver id - {0}
servertool.servernotrunning=\to servidor n\u00E3o est\u00E1 em execu\u00E7\u00E3o.
-servertool.register=\n\n\tregister -server <server class name> \n\t -applicationName <alternate server name> \n\t -classpath <classpath to server> \n\t -args <args to server> \n\t -vmargs <args to server Java VM>\n
+servertool.register=\n\n\tregister -server <nome da classe do servidor> \n\t -applicationName <nome do servidor alternativo> \n\t -classpath <classpath para o servidor> \n\t -args <args para o servidor> \n\t -vmargs <args para a VM Java do servidor>\n
servertool.register1=registra um servidor ativ\u00E1vel
servertool.register2=\tservidor registrado (serverid = {0}).
servertool.register3=\tservidor registrado, mas em espera (serverid = {0}).
servertool.register4=\tservidor j\u00E1 registrado (serverid = {0}).
-servertool.unregister=\n\tunregister [ -serverid <server id> | -applicationName <name> ] \n
+servertool.unregister=\n\tunregister [ -serverid <id do servidor> | -applicationName <nome> ] \n
servertool.unregister1=cancela o registro de um servidor registrado
servertool.unregister2=\tservidor n\u00E3o registrado.
-servertool.locate=\n\tlocate [ -serverid <server id> | -applicationName <name> ] [ <-endpointType <endpointType> ] \n
+servertool.locate=\n\tlocate [ -serverid <id do servidor> | -applicationName <nome> ] [ <-endpointType <endpointType> ] \n
servertool.locate1=localiza portas de tipo espec\u00EDfico para um servidor registrado
servertool.locate2=\n\n\tNome do Host {0} \n\n\t\tPorta\t\tTipo de Porta\t\tId do ORB\n\t\t----\t\t---------\t\t------\n
-servertool.locateorb=\n\tlocateperorb [ -serverid <server id> | -applicationName <name> ] [ -orbid <ORB name> ]\n
+servertool.locateorb=\n\tlocateperorb [ -serverid <id do servidor> | -applicationName <nome> ] [ -orbid <nome ORB> ]\n
servertool.locateorb1=localiza portas para um orb espec\u00EDfico de servidor registrado
servertool.locateorb2=\n\n\tNome do Host {0} \n\n\t\tPorta\t\tTipo de Porta\t\tId do ORB\n\t\t----\t\t--------\t\t------\n
-servertool.getserverid=\n\tgetserverid [ -applicationName <name> ] \n
+servertool.getserverid=\n\tgetserverid [ -applicationName <nome> ] \n
servertool.getserverid1=retorna o id do servidor de um applicationName
servertool.getserverid2=\tID do Servidor de applicationName {0} \u00E9 {1}
@@ -69,33 +69,33 @@
servertool.listappnames1=lista os applicationNames atualmente definidos
servertool.listappnames2=applicationNames do servidor definidos atualmente:
-servertool.shutdown=\n\tshutdown [ -serverid <server id> | -applicationName <name> ]\n
+servertool.shutdown=\n\tshutdown [ -serverid <id do servidor> | -applicationName <nome> ]\n
servertool.shutdown1=faz shutdown de um servidor registrado
servertool.shutdown2=\tshutdown do servidor bem-sucedido.
-servertool.startserver=\n\tstartup [ -serverid <server id> | -applicationName <name> ]\n
+servertool.startserver=\n\tstartup [ -serverid <id do servidor> | -applicationName <nome> ]\n
servertool.startserver1=inicia um servidor registrado
servertool.startserver2=\tservidor iniciado com \u00EAxito.
servertool.quit=\n\tquit\n
servertool.quit1=sai desta ferramenta
-servertool.help=\thelp\n\tOR\n\thelp <command name>\n
+servertool.help=\thelp\n\tOR\n\thelp <nome do comando>\n
servertool.help1=obt\u00E9m ajuda
-servertool.orbidmap=\tUso: orblist [ -serverid <server id> | -applicationName <name> ]\n
+servertool.orbidmap=\tUso: orblist [ -serverid <id do servidor> | -applicationName <nome> ]\n
servertool.orbidmap1=lista de nomes de orb e seus mapeamentos
servertool.orbidmap2=\n\tId de ORB\t\tNome de ORB\n\t------\t\t--------\n
pnameserv.success=NameServer Persistente Iniciado com \u00CAxito
-bootstrap.usage=Uso: {0} <options> \n\nem que <options> inclui:\n -ORBInitialPort porta inicial (necess\u00E1rio)\n -InitialServicesFile arquivo que cont\u00E9m a lista de servi\u00E7os iniciais (necess\u00E1rio)\n
+bootstrap.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -InitialServicesFile arquivo que cont\u00E9m a lista de servi\u00E7os iniciais (obrigat\u00F3rio)\n
bootstrap.success=definindo porta para {0} e lendo servi\u00E7os de {1}
bootstrap.filenotreadable=o arquivo {0} n\u00E3o \u00E9 leg\u00EDvel
bootstrap.filenotfound=arquivo {0} n\u00E3o encontrado
bootstrap.exception=exce\u00E7\u00E3o capturada ao salvar as propriedades no Arquivo {0}: exce\u00E7\u00E3o {1}
tnameserv.exception=uma exce\u00E7\u00E3o capturada ao iniciar o servi\u00E7o de inicializa\u00E7\u00E3o na porta {0}
-tnameserv.usage=tente usar outra porta com os argumentos de linha de comandos -ORBInitialPort <portno>
+tnameserv.usage=tente usar outra porta com os argumentos de linha de comandos -ORBInitialPort <n\u00BA da porta>
tnameserv.invalidhostoption=ORBInitialHost n\u00E3o \u00E9 uma op\u00E7\u00E3o v\u00E1lida para NameService
tnameserv.orbinitialport0=ORBInitialPort 0 n\u00E3o \u00E9 uma op\u00E7\u00E3o v\u00E1lida para NameService
tnameserv.hs1=Contexto de Nomea\u00E7\u00E3o Inicial:\n{0}
--- a/hotspot/.hgtags Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/.hgtags Sat May 14 11:24:26 2011 -0700
@@ -168,3 +168,5 @@
611e19a16519d6fb5deea9ab565336e6e6ee475d hs21-b09
d283b82966712b353fa307845a1316da42a355f4 jdk7-b140
d283b82966712b353fa307845a1316da42a355f4 hs21-b10
+5d07913abd59261c77f24cc04a759cb75d804099 jdk7-b141
+3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11
--- a/hotspot/agent/make/Makefile Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/agent/make/Makefile Sat May 14 11:24:26 2011 -0700
@@ -257,7 +257,7 @@
all: filelist
@mkdir -p $(OUTPUT_DIR)
@echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(JAVAC) -source 1.4 -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
+ $(JAVAC) -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
$(RMIC) -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql/sa.js
cp $(SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql
@@ -269,7 +269,7 @@
allprof: filelist
@mkdir -p $(OUTPUT_DIR)
@echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(JAVAC) -source 1.4 -J-Xprof -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
+ $(JAVAC) -J-Xprof -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
$(RMIC) -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql/sa.js
cp $(SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql
--- a/hotspot/agent/src/os/solaris/proc/libproc.h Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/agent/src/os/solaris/proc/libproc.h Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -420,7 +420,22 @@
/*
* Stack frame iteration interface.
*/
+#ifdef SOLARIS_11_B159_OR_LATER
+/* building on Nevada-B159 or later so define the new callback */
+typedef int proc_stack_f(
+ void *, /* the cookie given to Pstack_iter() */
+ const prgregset_t, /* the frame's registers */
+ uint_t, /* argc for the frame's function */
+ const long *, /* argv for the frame's function */
+ int, /* bitwise flags describing the frame (see below) */
+ int); /* a signal number */
+
+#define PR_SIGNAL_FRAME 1 /* called by a signal handler */
+#define PR_FOUND_SIGNAL 2 /* we found the corresponding signal number */
+#else
+/* building on Nevada-B158 or earlier so define the old callback */
typedef int proc_stack_f(void *, const prgregset_t, uint_t, const long *);
+#endif
extern int Pstack_iter(struct ps_prochandle *,
const prgregset_t, proc_stack_f *, void *);
--- a/hotspot/agent/src/os/solaris/proc/salibproc.h Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/agent/src/os/solaris/proc/salibproc.h Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,23 @@
/*
* Stack frame iteration interface.
*/
+#ifdef SOLARIS_11_B159_OR_LATER
+/* building on Nevada-B159 or later so define the new callback */
+typedef int proc_stack_f(
+ void *, /* the cookie given to Pstack_iter() */
+ const prgregset_t, /* the frame's registers */
+ uint_t, /* argc for the frame's function */
+ const long *, /* argv for the frame's function */
+ int, /* bitwise flags describing the frame (see below) */
+ int); /* a signal number */
+
+#define PR_SIGNAL_FRAME 1 /* called by a signal handler */
+#define PR_FOUND_SIGNAL 2 /* we found the corresponding signal number */
+#else
+/* building on Nevada-B158 or earlier so define the old callback */
typedef int proc_stack_f(void *, const prgregset_t, uint_t, const long *);
+#endif
+
extern int Pstack_iter(struct ps_prochandle *,
const prgregset_t, proc_stack_f *, void *);
--- a/hotspot/agent/src/os/solaris/proc/saproc.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/agent/src/os/solaris/proc/saproc.cpp Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,9 @@
#include "salibproc.h"
#include "sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal.h"
+#ifndef SOLARIS_11_B159_OR_LATER
+#include <sys/utsname.h>
+#endif
#include <thread_db.h>
#include <strings.h>
#include <limits.h>
@@ -40,8 +43,22 @@
#define SYMBOL_BUF_SIZE 256
#define ERR_MSG_SIZE (PATH_MAX + 256)
-// debug mode
+// debug modes
static int _libsaproc_debug = 0;
+#ifndef SOLARIS_11_B159_OR_LATER
+static bool _Pstack_iter_debug = false;
+
+static void dprintf_2(const char* format,...) {
+ if (_Pstack_iter_debug) {
+ va_list alist;
+
+ va_start(alist, format);
+ fputs("Pstack_iter DEBUG: ", stderr);
+ vfprintf(stderr, format, alist);
+ va_end(alist);
+ }
+}
+#endif // !SOLARIS_11_B159_OR_LATER
static void print_debug(const char* format,...) {
if (_libsaproc_debug) {
@@ -450,6 +467,7 @@
return 0;
}
+// Pstack_iter() proc_stack_f callback prior to Nevada-B159
static int
fill_cframe_list(void *cd, const prgregset_t regs, uint_t argc, const long *argv) {
DebuggerWith2Objects* dbgo2 = (DebuggerWith2Objects*) cd;
@@ -472,6 +490,14 @@
return 0;
}
+// Pstack_iter() proc_stack_f callback in Nevada-B159 or later
+/*ARGSUSED*/
+static int
+wrapper_fill_cframe_list(void *cd, const prgregset_t regs, uint_t argc,
+ const long *argv, int frame_flags, int sig) {
+ return(fill_cframe_list(cd, regs, argc, argv));
+}
+
// part of the class sharing workaround
// FIXME: !!HACK ALERT!!
@@ -970,6 +996,11 @@
TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS);
}
+#ifndef SOLARIS_11_B159_OR_LATER
+// building on Nevada-B158 or earlier so more hoops to jump through
+static bool has_newer_Pstack_iter = false; // older version by default
+#endif
+
/*
* Class: sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal
* Method: fillCFrameList0
@@ -997,7 +1028,24 @@
env->ReleaseLongArrayElements(regsArray, ptr, JNI_ABORT);
CHECK_EXCEPTION_(0);
- Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs, fill_cframe_list, &dbgo2);
+
+#ifdef SOLARIS_11_B159_OR_LATER
+ // building on Nevada-B159 or later so use the new callback
+ Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs,
+ wrapper_fill_cframe_list, &dbgo2);
+#else
+ // building on Nevada-B158 or earlier so figure out which callback to use
+
+ if (has_newer_Pstack_iter) {
+ // Since we're building on Nevada-B158 or earlier, we have to
+ // cast wrapper_fill_cframe_list to make the compiler happy.
+ Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs,
+ (proc_stack_f *)wrapper_fill_cframe_list, &dbgo2);
+ } else {
+ Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs,
+ fill_cframe_list, &dbgo2);
+ }
+#endif // SOLARIS_11_B159_OR_LATER
return dbgo2.obj;
}
@@ -1218,6 +1266,102 @@
return res;
}
+#ifndef SOLARIS_11_B159_OR_LATER
+// Determine if the OS we're running on has the newer version
+// of libproc's Pstack_iter.
+//
+// Set env var PSTACK_ITER_DEBUG=true to debug this logic.
+// Set env var PSTACK_ITER_DEBUG_RELEASE to simulate a 'release' value.
+// Set env var PSTACK_ITER_DEBUG_VERSION to simulate a 'version' value.
+//
+// frankenputer 'uname -r -v': 5.10 Generic_141445-09
+// jurassic 'uname -r -v': 5.11 snv_164
+// lonepeak 'uname -r -v': 5.11 snv_127
+//
+static void set_has_newer_Pstack_iter(JNIEnv *env) {
+ static bool done_set = false;
+
+ if (done_set) {
+ // already set has_newer_Pstack_iter
+ return;
+ }
+
+ struct utsname name;
+ if (uname(&name) == -1) {
+ THROW_NEW_DEBUGGER_EXCEPTION("uname() failed!");
+ }
+ dprintf_2("release='%s' version='%s'\n", name.release, name.version);
+
+ if (_Pstack_iter_debug) {
+ char *override = getenv("PSTACK_ITER_DEBUG_RELEASE");
+ if (override != NULL) {
+ strncpy(name.release, override, SYS_NMLN - 1);
+ name.release[SYS_NMLN - 2] = '\0';
+ dprintf_2("overriding with release='%s'\n", name.release);
+ }
+ override = getenv("PSTACK_ITER_DEBUG_VERSION");
+ if (override != NULL) {
+ strncpy(name.version, override, SYS_NMLN - 1);
+ name.version[SYS_NMLN - 2] = '\0';
+ dprintf_2("overriding with version='%s'\n", name.version);
+ }
+ }
+
+ // the major number corresponds to the old SunOS major number
+ int major = atoi(name.release);
+ if (major >= 6) {
+ dprintf_2("release is SunOS 6 or later\n");
+ has_newer_Pstack_iter = true;
+ done_set = true;
+ return;
+ }
+ if (major < 5) {
+ dprintf_2("release is SunOS 4 or earlier\n");
+ done_set = true;
+ return;
+ }
+
+ // some SunOS 5.* build so now check for Solaris versions
+ char *dot = strchr(name.release, '.');
+ int minor = 0;
+ if (dot != NULL) {
+ // release is major.minor format
+ *dot = NULL;
+ minor = atoi(dot + 1);
+ }
+
+ if (minor <= 10) {
+ dprintf_2("release is Solaris 10 or earlier\n");
+ done_set = true;
+ return;
+ } else if (minor >= 12) {
+ dprintf_2("release is Solaris 12 or later\n");
+ has_newer_Pstack_iter = true;
+ done_set = true;
+ return;
+ }
+
+ // some Solaris 11 build so now check for internal build numbers
+ if (strncmp(name.version, "snv_", 4) != 0) {
+ dprintf_2("release is Solaris 11 post-GA or later\n");
+ has_newer_Pstack_iter = true;
+ done_set = true;
+ return;
+ }
+
+ // version begins with "snv_" so a pre-GA build of Solaris 11
+ int build = atoi(&name.version[4]);
+ if (build >= 159) {
+ dprintf_2("release is Nevada-B159 or later\n");
+ has_newer_Pstack_iter = true;
+ } else {
+ dprintf_2("release is Nevada-B158 or earlier\n");
+ }
+
+ done_set = true;
+}
+#endif // !SOLARIS_11_B159_OR_LATER
+
/*
* Class: sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal
* Method: initIDs
@@ -1237,6 +1381,14 @@
if (libproc_handle == 0)
THROW_NEW_DEBUGGER_EXCEPTION("can't load libproc.so, if you are using Solaris 5.7 or below, copy libproc.so from 5.8!");
+#ifndef SOLARIS_11_B159_OR_LATER
+ _Pstack_iter_debug = getenv("PSTACK_ITER_DEBUG") != NULL;
+
+ set_has_newer_Pstack_iter(env);
+ CHECK_EXCEPTION;
+ dprintf_2("has_newer_Pstack_iter=%d\n", has_newer_Pstack_iter);
+#endif
+
p_ps_prochandle_ID = env->GetFieldID(clazz, "p_ps_prochandle", "J");
CHECK_EXCEPTION;
--- a/hotspot/make/altsrc.make Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/make/altsrc.make Sat May 14 11:24:26 2011 -0700
@@ -24,7 +24,8 @@
# This file defines variables and macros which are used in the makefiles to
# allow distributions to augment or replace common hotspot code with
-# distribution-specific source files.
+# distribution-specific source files. This capability is disabled when
+# an OPENJDK build is requested, unless HS_ALT_SRC_REL has been set externally.
# Requires: GAMMADIR
# Provides:
@@ -33,14 +34,17 @@
HS_COMMON_SRC_REL=src
-# This needs to be changed to a more generic location, but we keep it as this
-# for now for compatibility
-HS_ALT_SRC_REL=src/closed
+ifneq ($(OPENJDK),true)
+ # This needs to be changed to a more generic location, but we keep it
+ # as this for now for compatibility
+ HS_ALT_SRC_REL=src/closed
+else
+ HS_ALT_SRC_REL=NO_SUCH_PATH
+endif
HS_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL)
HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL)
-
## altsrc-equiv
#
# Convert a common source path to an alternative source path
--- a/hotspot/make/hotspot_version Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/make/hotspot_version Sat May 14 11:24:26 2011 -0700
@@ -35,7 +35,7 @@
HS_MAJOR_VER=21
HS_MINOR_VER=0
-HS_BUILD_NUMBER=11
+HS_BUILD_NUMBER=12
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/make/jdk6_hotspot_distro Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# 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.
+#
+
+#
+# This file format must remain compatible with both
+# GNU Makefile and Microsoft nmake formats.
+#
+
+# Don't put quotes (fail windows build).
+HOTSPOT_VM_DISTRO=Java HotSpot(TM)
+COMPANY_NAME=Sun Microsystems, Inc.
+PRODUCT_NAME=Java(TM) Platform SE
--- a/hotspot/make/linux/makefiles/gcc.make Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/make/linux/makefiles/gcc.make Sat May 14 11:24:26 2011 -0700
@@ -205,7 +205,7 @@
SHARED_FLAG = -shared
# Keep symbols even they are not used
-AOUT_FLAGS += -export-dynamic
+AOUT_FLAGS += -Xlinker -export-dynamic
#------------------------------------------------------------------------
# Debug flags
--- a/hotspot/make/linux/makefiles/vm.make Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/make/linux/makefiles/vm.make Sat May 14 11:24:26 2011 -0700
@@ -102,6 +102,10 @@
CFLAGS += $(EXTRA_CFLAGS)
LFLAGS += $(EXTRA_CFLAGS)
+# Don't set excutable bit on stack segment
+# the same could be done by separate execstack command
+LFLAGS += -Xlinker -z -Xlinker noexecstack
+
LIBS += -lm -ldl -lpthread
# By default, link the *.o into the library, not the executable.
--- a/hotspot/make/solaris/makefiles/saproc.make Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/make/solaris/makefiles/saproc.make Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,30 @@
SA_LFLAGS += -mt -xnolib -norunpath
endif
+# The libproc Pstack_iter() interface changed in Nevada-B159.
+# This logic needs to match
+# agent/src/os/solaris/proc/saproc.cpp: set_has_newer_Pstack_iter():
+# - skip SunOS 4 or older
+# - skip Solaris 10 or older
+# - skip two digit Nevada builds
+# - skip three digit Nevada builds thru 149
+# - skip Nevada builds 150-158
+SOLARIS_11_B159_OR_LATER := \
+$(shell uname -r -v \
+ | sed -n ' \
+ /^[0-3]\. /b \
+ /^5\.[0-9] /b \
+ /^5\.10 /b \
+ / snv_[0-9][0-9]$/b \
+ / snv_[01][0-4][0-9]$/b \
+ / snv_15[0-8]$/b \
+ s/.*/-DSOLARIS_11_B159_OR_LATER/p \
+ ')
+
+# Uncomment the following to simulate building on Nevada-B159 or later
+# when actually building on Nevada-B158 or earlier:
+#SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER
+
$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -68,6 +92,7 @@
-I$(GENERATED) \
-I$(BOOT_JAVA_HOME)/include \
-I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
+ $(SOLARIS_11_B159_OR_LATER) \
$(SASRCFILES) \
$(SA_LFLAGS) \
-o $@ \
--- a/hotspot/make/solaris/makefiles/sparcWorks.make Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make Sat May 14 11:24:26 2011 -0700
@@ -100,11 +100,6 @@
LINK_LIB.CC/PRE_HOOK += $(JVM_CHECK_SYMBOLS) || exit 1;
-# Some interfaces (_lwp_create) changed with LP64 and Solaris 7
-SOLARIS_7_OR_LATER := \
-$(shell uname -r | awk -F. '{ if ($$2 >= 7) print "-DSOLARIS_7_OR_LATER"; }')
-CFLAGS += ${SOLARIS_7_OR_LATER}
-
# New architecture options started in SS12 (5.9), we need both styles to build.
# The older arch options for SS11 (5.8) or older and also for /usr/ccs/bin/as.
# Note: default for 32bit sparc is now the same as v8plus, so the
--- a/hotspot/make/windows/build.make Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/make/windows/build.make Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -125,7 +125,25 @@
# or make/hotspot_distro.
!ifndef HOTSPOT_VM_DISTRO
!if exists($(WorkSpace)\src\closed)
+
+# if the build is for JDK6 or earlier version, it should include jdk6_hotspot_distro,
+# instead of hotspot_distro.
+JDK6_OR_EARLIER=0
+!if "$(JDK_MAJOR_VERSION)" != "" && "$(JDK_MINOR_VERSION)" != "" && "$(JDK_MICRO_VERSION)" != ""
+!if $(JDK_MAJOR_VERSION) == 1 && $(JDK_MINOR_VERSION) < 7
+JDK6_OR_EARLIER=1
+!endif
+!else
+!if $(JDK_MAJOR_VER) == 1 && $(JDK_MINOR_VER) < 7
+JDK6_OR_EARLIER=1
+!endif
+!endif
+
+!if $(JDK6_OR_EARLIER) == 1
+!include $(WorkSpace)\make\jdk6_hotspot_distro
+!else
!include $(WorkSpace)\make\hotspot_distro
+!endif
!else
!include $(WorkSpace)\make\openjdk_distro
!endif
@@ -260,7 +278,7 @@
@ echo Variant=$(realVariant) >> $@
@ echo WorkSpace=$(WorkSpace) >> $@
@ echo BootStrapDir=$(BootStrapDir) >> $@
- @ if "$(USERNAME)" NEQ "" echo BuildUser=$(USERNAME) >> $@
+ @ if "$(USERNAME)" NEQ "" echo BuildUser=$(USERNAME) >> $@
@ echo HS_VER=$(HS_VER) >> $@
@ echo HS_DOTVER=$(HS_DOTVER) >> $@
@ echo HS_COMPANY=$(COMPANY_NAME) >> $@
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -806,3 +806,34 @@
int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize) - 1;
return &interpreter_frame_tos_address()[index];
}
+
+
+#ifdef ASSERT
+
+#define DESCRIBE_FP_OFFSET(name) \
+ values.describe(-1, fp() + frame::name##_offset, #name)
+
+void frame::describe_pd(FrameValues& values, int frame_no) {
+ for (int w = 0; w < frame::register_save_words; w++) {
+ values.describe(frame_no, sp() + w, err_msg("register save area word %d", w), 1);
+ }
+
+ if (is_interpreted_frame()) {
+ DESCRIBE_FP_OFFSET(interpreter_frame_d_scratch_fp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_l_scratch_fp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_padding);
+ DESCRIBE_FP_OFFSET(interpreter_frame_oop_temp);
+ }
+
+ if (!is_compiled_frame()) {
+ if (frame::callee_aggregate_return_pointer_words != 0) {
+ values.describe(frame_no, sp() + frame::callee_aggregate_return_pointer_sp_offset, "callee_aggregate_return_pointer_word");
+ }
+ for (int w = 0; w < frame::callee_register_argument_save_area_words; w++) {
+ values.describe(frame_no, sp() + frame::callee_register_argument_save_area_sp_offset + w,
+ err_msg("callee_register_argument_save_area_words %d", w));
+ }
+ }
+}
+
+#endif
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Sat May 14 11:24:26 2011 -0700
@@ -350,8 +350,9 @@
#ifndef PRODUCT
extern "C" void print_method_handle(oop mh);
void trace_method_handle_stub(const char* adaptername,
- oopDesc* mh) {
- printf("MH %s mh="INTPTR_FORMAT"\n", adaptername, (intptr_t) mh);
+ oopDesc* mh,
+ intptr_t* saved_sp) {
+ tty->print_cr("MH %s mh="INTPTR_FORMAT " saved_sp=" INTPTR_FORMAT, adaptername, (intptr_t) mh, saved_sp);
print_method_handle(mh);
}
void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) {
@@ -361,6 +362,7 @@
__ save_frame(16);
__ set((intptr_t) adaptername, O0);
__ mov(G3_method_handle, O1);
+ __ mov(I5_savedSP, O2);
__ mov(G3_method_handle, L3);
__ mov(Gargs, L4);
__ mov(G5_method_type, L5);
@@ -643,9 +645,10 @@
// Live at this point:
// - G5_klass : klass required by the target method
+ // - O0_argslot : argslot index in vmarg; may be required in the failing path
// - O1_scratch : argument klass to test
// - G3_method_handle: adapter method handle
- __ check_klass_subtype(O1_scratch, G5_klass, O0_argslot, O2_scratch, done);
+ __ check_klass_subtype(O1_scratch, G5_klass, O2_scratch, O3_scratch, done);
// If we get here, the type check failed!
__ load_heap_oop(G3_amh_argument, O2_required); // required class
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Sat May 14 11:24:26 2011 -0700
@@ -1698,35 +1698,21 @@
popframe_extra_args;
int local_words = method->max_locals() * Interpreter::stackElementWords;
- int parm_words = method->size_of_parameters() * Interpreter::stackElementWords;
- NEEDS_CLEANUP;
intptr_t* locals;
- if (caller->is_interpreted_frame()) {
- // Can force the locals area to end up properly overlapping the top of the expression stack.
- intptr_t* Lesp_ptr = caller->interpreter_frame_tos_address() - 1;
- // Note that this computation means we replace size_of_parameters() values from the caller
- // interpreter frame's expression stack with our argument locals
- locals = Lesp_ptr + parm_words;
- int delta = local_words - parm_words;
- int computed_sp_adjustment = (delta > 0) ? round_to(delta, WordsPerLong) : 0;
- *interpreter_frame->register_addr(I5_savedSP) = (intptr_t) (fp + computed_sp_adjustment) - STACK_BIAS;
+ if (caller->is_compiled_frame()) {
+ // Compiled frames do not allocate a varargs area so place them
+ // next to the register save area.
+ locals = fp + frame::register_save_words + local_words - 1;
+ // Caller wants his own SP back
+ int caller_frame_size = caller->cb()->frame_size();
+ *interpreter_frame->register_addr(I5_savedSP) = (intptr_t)(caller->fp() - caller_frame_size) - STACK_BIAS;
} else {
- assert(caller->is_compiled_frame() || caller->is_entry_frame(), "only possible cases");
- // Don't have Lesp available; lay out locals block in the caller
- // adjacent to the register window save area.
- //
- // Compiled frames do not allocate a varargs area which is why this if
- // statement is needed.
- //
- if (caller->is_compiled_frame()) {
- locals = fp + frame::register_save_words + local_words - 1;
- } else {
- locals = fp + frame::memory_parameter_word_sp_offset + local_words - 1;
- }
- if (!caller->is_entry_frame()) {
- // Caller wants his own SP back
- int caller_frame_size = caller->cb()->frame_size();
- *interpreter_frame->register_addr(I5_savedSP) = (intptr_t)(caller->fp() - caller_frame_size) - STACK_BIAS;
+ assert(caller->is_interpreted_frame() || caller->is_entry_frame(), "only possible cases");
+ // The entry and interpreter frames are laid out like normal C
+ // frames so place the locals adjacent to the varargs area.
+ locals = fp + frame::memory_parameter_word_sp_offset + local_words - 1;
+ if (caller->is_interpreted_frame()) {
+ *interpreter_frame->register_addr(I5_savedSP) = (intptr_t) (fp + rounded_cls) - STACK_BIAS;
}
}
if (TraceDeoptimization) {
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp Sat May 14 11:24:26 2011 -0700
@@ -6039,6 +6039,43 @@
call_VM_leaf(entry_point, 3);
}
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0) {
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 1);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1) {
+
+ LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+ pass_arg1(this, arg_1);
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 2);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2) {
+ LP64_ONLY(assert(arg_0 != c_rarg2, "smashed arg"));
+ LP64_ONLY(assert(arg_1 != c_rarg2, "smashed arg"));
+ pass_arg2(this, arg_2);
+ LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+ pass_arg1(this, arg_1);
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 3);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2, Register arg_3) {
+ LP64_ONLY(assert(arg_0 != c_rarg3, "smashed arg"));
+ LP64_ONLY(assert(arg_1 != c_rarg3, "smashed arg"));
+ LP64_ONLY(assert(arg_2 != c_rarg3, "smashed arg"));
+ pass_arg3(this, arg_3);
+ LP64_ONLY(assert(arg_0 != c_rarg2, "smashed arg"));
+ LP64_ONLY(assert(arg_1 != c_rarg2, "smashed arg"));
+ pass_arg2(this, arg_2);
+ LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+ pass_arg1(this, arg_1);
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 4);
+}
+
void MacroAssembler::check_and_handle_earlyret(Register java_thread) {
}
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp Sat May 14 11:24:26 2011 -0700
@@ -1655,6 +1655,14 @@
void call_VM_leaf(address entry_point,
Register arg_1, Register arg_2, Register arg_3);
+ // These always tightly bind to MacroAssembler::call_VM_leaf_base
+ // bypassing the virtual implementation
+ void super_call_VM_leaf(address entry_point);
+ void super_call_VM_leaf(address entry_point, Register arg_1);
+ void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2);
+ void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3);
+ void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3, Register arg_4);
+
// last Java Frame (fills frame anchor)
void set_last_Java_frame(Register thread,
Register last_java_sp,
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -669,3 +669,23 @@
int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize);
return &interpreter_frame_tos_address()[index];
}
+
+#ifdef ASSERT
+
+#define DESCRIBE_FP_OFFSET(name) \
+ values.describe(-1, fp() + frame::name##_offset, #name)
+
+void frame::describe_pd(FrameValues& values, int frame_no) {
+ if (is_interpreted_frame()) {
+ DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_last_sp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_method);
+ DESCRIBE_FP_OFFSET(interpreter_frame_mdx);
+ DESCRIBE_FP_OFFSET(interpreter_frame_cache);
+ DESCRIBE_FP_OFFSET(interpreter_frame_locals);
+ DESCRIBE_FP_OFFSET(interpreter_frame_bcx);
+ DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp);
+ }
+
+}
+#endif
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Sat May 14 11:24:26 2011 -0700
@@ -383,32 +383,6 @@
movptr(Address(rsp, Interpreter::expr_offset_in_bytes(n)), val);
}
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point) {
- MacroAssembler::call_VM_leaf_base(entry_point, 0);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point, Register arg_1) {
- push(arg_1);
- MacroAssembler::call_VM_leaf_base(entry_point, 1);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2) {
- push(arg_2);
- push(arg_1);
- MacroAssembler::call_VM_leaf_base(entry_point, 2);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3) {
- push(arg_3);
- push(arg_2);
- push(arg_1);
- MacroAssembler::call_VM_leaf_base(entry_point, 3);
-}
-
-
void InterpreterMacroAssembler::prepare_to_jump_from_interpreted() {
// set sender sp
lea(rsi, Address(rsp, wordSize));
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -124,12 +124,6 @@
void load_ptr(int n, Register val);
void store_ptr(int n, Register val);
- // Super call_VM calls - correspond to MacroAssembler::call_VM(_leaf) calls
- void super_call_VM_leaf(address entry_point);
- void super_call_VM_leaf(address entry_point, Register arg_1);
- void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2);
- void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3);
-
// Generate a subtype check: branch to ok_is_subtype if sub_klass is
// a subtype of super_klass. EAX holds the super_klass. Blows ECX
// and EDI. Register sub_klass cannot be any of the above.
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Sat May 14 11:24:26 2011 -0700
@@ -381,56 +381,6 @@
}
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point) {
- MacroAssembler::call_VM_leaf_base(entry_point, 0);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point,
- Register arg_1) {
- if (c_rarg0 != arg_1) {
- mov(c_rarg0, arg_1);
- }
- MacroAssembler::call_VM_leaf_base(entry_point, 1);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point,
- Register arg_1,
- Register arg_2) {
- assert(c_rarg0 != arg_2, "smashed argument");
- assert(c_rarg1 != arg_1, "smashed argument");
- if (c_rarg0 != arg_1) {
- mov(c_rarg0, arg_1);
- }
- if (c_rarg1 != arg_2) {
- mov(c_rarg1, arg_2);
- }
- MacroAssembler::call_VM_leaf_base(entry_point, 2);
-}
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point,
- Register arg_1,
- Register arg_2,
- Register arg_3) {
- assert(c_rarg0 != arg_2, "smashed argument");
- assert(c_rarg0 != arg_3, "smashed argument");
- assert(c_rarg1 != arg_1, "smashed argument");
- assert(c_rarg1 != arg_3, "smashed argument");
- assert(c_rarg2 != arg_1, "smashed argument");
- assert(c_rarg2 != arg_2, "smashed argument");
- if (c_rarg0 != arg_1) {
- mov(c_rarg0, arg_1);
- }
- if (c_rarg1 != arg_2) {
- mov(c_rarg1, arg_2);
- }
- if (c_rarg2 != arg_3) {
- mov(c_rarg2, arg_3);
- }
- MacroAssembler::call_VM_leaf_base(entry_point, 3);
-}
-
void InterpreterMacroAssembler::prepare_to_jump_from_interpreted() {
// set sender sp
lea(r13, Address(rsp, wordSize));
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -136,13 +136,6 @@
void load_ptr(int n, Register val);
void store_ptr(int n, Register val);
- // Super call_VM calls - correspond to MacroAssembler::call_VM(_leaf) calls
- void super_call_VM_leaf(address entry_point);
- void super_call_VM_leaf(address entry_point, Register arg_1);
- void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2);
- void super_call_VM_leaf(address entry_point,
- Register arg_1, Register arg_2, Register arg_3);
-
// Generate a subtype check: branch to ok_is_subtype if sub_klass is
// a subtype of super_klass.
void gen_subtype_check( Register sub_klass, Label &ok_is_subtype );
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp Sat May 14 11:24:26 2011 -0700
@@ -315,56 +315,38 @@
#ifndef PRODUCT
extern "C" void print_method_handle(oop mh);
void trace_method_handle_stub(const char* adaptername,
+ intptr_t* saved_sp,
oop mh,
- intptr_t* saved_regs,
- intptr_t* entry_sp,
- intptr_t* saved_sp,
- intptr_t* saved_bp) {
+ intptr_t* sp) {
// called as a leaf from native code: do not block the JVM!
- intptr_t* last_sp = (intptr_t*) saved_bp[frame::interpreter_frame_last_sp_offset];
- intptr_t* base_sp = (intptr_t*) saved_bp[frame::interpreter_frame_monitor_block_top_offset];
- printf("MH %s mh="INTPTR_FORMAT" sp=("INTPTR_FORMAT"+"INTX_FORMAT") stack_size="INTX_FORMAT" bp="INTPTR_FORMAT"\n",
- adaptername, (intptr_t)mh, (intptr_t)entry_sp, (intptr_t)(saved_sp - entry_sp), (intptr_t)(base_sp - last_sp), (intptr_t)saved_bp);
- if (last_sp != saved_sp && last_sp != NULL)
- printf("*** last_sp="INTPTR_FORMAT"\n", (intptr_t)last_sp);
+ intptr_t* entry_sp = sp + LP64_ONLY(16) NOT_LP64(8);
+ tty->print_cr("MH %s mh="INTPTR_FORMAT" sp="INTPTR_FORMAT" saved_sp="INTPTR_FORMAT")",
+ adaptername, (intptr_t)mh, (intptr_t)entry_sp, saved_sp);
if (Verbose) {
- printf(" reg dump: ");
- int saved_regs_count = (entry_sp-1) - saved_regs;
- // 32 bit: rdi rsi rbp rsp; rbx rdx rcx (*) rax
- int i;
- for (i = 0; i <= saved_regs_count; i++) {
- if (i > 0 && i % 4 == 0 && i != saved_regs_count)
- printf("\n + dump: ");
- printf(" %d: "INTPTR_FORMAT, i, saved_regs[i]);
- }
- printf("\n");
- int stack_dump_count = 16;
- if (stack_dump_count < (int)(saved_bp + 2 - saved_sp))
- stack_dump_count = (int)(saved_bp + 2 - saved_sp);
- if (stack_dump_count > 64) stack_dump_count = 48;
- for (i = 0; i < stack_dump_count; i += 4) {
- printf(" dump at SP[%d] "INTPTR_FORMAT": "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT"\n",
- i, (intptr_t) &entry_sp[i+0], entry_sp[i+0], entry_sp[i+1], entry_sp[i+2], entry_sp[i+3]);
- }
print_method_handle(mh);
}
}
void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) {
if (!TraceMethodHandles) return;
BLOCK_COMMENT("trace_method_handle {");
- __ push(rax);
- __ lea(rax, Address(rsp, wordSize*6)); // entry_sp
__ pusha();
+#ifdef _LP64
+ // Pass arguments carefully since the registers overlap with the calling convention.
+ // rcx: method handle
+ // r13: saved sp
+ __ mov(c_rarg2, rcx); // mh
+ __ mov(c_rarg1, r13); // saved sp
+ __ mov(c_rarg3, rsp); // sp
+ __ movptr(c_rarg0, (intptr_t) adaptername);
+ __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), c_rarg0, c_rarg1, c_rarg2, c_rarg3);
+#else
// arguments:
- __ push(rbp); // interpreter frame pointer
- __ push(rsi); // saved_sp
- __ push(rax); // entry_sp
- __ push(rcx); // mh
- __ push(rcx);
- __ movptr(Address(rsp, 0), (intptr_t) adaptername);
- __ call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), 5);
+ // rcx: method handle
+ // rsi: saved sp
+ __ movptr(rbx, (intptr_t) adaptername);
+ __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), rbx, rsi, rcx, rsp);
+#endif
__ popa();
- __ pop(rax);
BLOCK_COMMENT("} trace_method_handle");
}
#endif //PRODUCT
--- a/hotspot/src/cpu/x86/vm/x86_32.ad Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad Sat May 14 11:24:26 2011 -0700
@@ -12989,6 +12989,53 @@
%}
// ============================================================================
+// Counted Loop limit node which represents exact final iterator value.
+// Note: the resulting value should fit into integer range since
+// counted loops have limit check on overflow.
+instruct loopLimit_eReg(eAXRegI limit, nadxRegI init, immI stride, eDXRegI limit_hi, nadxRegI tmp, eFlagsReg flags) %{
+ match(Set limit (LoopLimit (Binary init limit) stride));
+ effect(TEMP limit_hi, TEMP tmp, KILL flags);
+ ins_cost(300);
+
+ format %{ "loopLimit $init,$limit,$stride # $limit = $init + $stride *( $limit - $init + $stride -1)/ $stride, kills $limit_hi" %}
+ ins_encode %{
+ int strd = (int)$stride$$constant;
+ assert(strd != 1 && strd != -1, "sanity");
+ int m1 = (strd > 0) ? 1 : -1;
+ // Convert limit to long (EAX:EDX)
+ __ cdql();
+ // Convert init to long (init:tmp)
+ __ movl($tmp$$Register, $init$$Register);
+ __ sarl($tmp$$Register, 31);
+ // $limit - $init
+ __ subl($limit$$Register, $init$$Register);
+ __ sbbl($limit_hi$$Register, $tmp$$Register);
+ // + ($stride - 1)
+ if (strd > 0) {
+ __ addl($limit$$Register, (strd - 1));
+ __ adcl($limit_hi$$Register, 0);
+ __ movl($tmp$$Register, strd);
+ } else {
+ __ addl($limit$$Register, (strd + 1));
+ __ adcl($limit_hi$$Register, -1);
+ __ lneg($limit_hi$$Register, $limit$$Register);
+ __ movl($tmp$$Register, -strd);
+ }
+ // signed devision: (EAX:EDX) / pos_stride
+ __ idivl($tmp$$Register);
+ if (strd < 0) {
+ // restore sign
+ __ negl($tmp$$Register);
+ }
+ // (EAX) * stride
+ __ mull($tmp$$Register);
+ // + init (ignore upper bits)
+ __ addl($limit$$Register, $init$$Register);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+// ============================================================================
// Branch Instructions
// Jump Table
instruct jumpXtnd(eRegI switch_val) %{
--- a/hotspot/src/os/linux/vm/globals_linux.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/os/linux/vm/globals_linux.hpp Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
// Defines Linux-specific default values. The flags are available on all
// platforms, but they may have different default values on other platforms.
//
-define_pd_global(bool, UseLargePages, false);
+define_pd_global(bool, UseLargePages, true);
define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;
--- a/hotspot/src/os/linux/vm/os_linux.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Sat May 14 11:24:26 2011 -0700
@@ -2914,16 +2914,21 @@
static size_t _large_page_size = 0;
-bool os::large_page_init() {
+void os::large_page_init() {
if (!UseLargePages) {
UseHugeTLBFS = false;
UseSHM = false;
- return false;
+ return;
}
if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) {
- // Our user has not expressed a preference, so we'll try both.
- UseHugeTLBFS = UseSHM = true;
+ // If UseLargePages is specified on the command line try both methods,
+ // if it's default, then try only HugeTLBFS.
+ if (FLAG_IS_DEFAULT(UseLargePages)) {
+ UseHugeTLBFS = true;
+ } else {
+ UseHugeTLBFS = UseSHM = true;
+ }
}
if (LargePageSizeInBytes) {
@@ -2978,7 +2983,6 @@
_page_sizes[1] = default_page_size;
_page_sizes[2] = 0;
}
-
UseHugeTLBFS = UseHugeTLBFS &&
Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size);
@@ -2988,12 +2992,6 @@
UseLargePages = UseHugeTLBFS || UseSHM;
set_coredump_filter();
-
- // Large page support is available on 2.6 or newer kernel, some vendors
- // (e.g. Redhat) have backported it to their 2.4 based distributions.
- // We optimistically assume the support is available. If later it turns out
- // not true, VM will automatically switch to use regular page size.
- return true;
}
#ifndef SHM_HUGETLB
@@ -4118,7 +4116,7 @@
#endif
}
- FLAG_SET_DEFAULT(UseLargePages, os::large_page_init());
+ os::large_page_init();
// initialize suspend/resume support - must do this before signal_sets_init()
if (SR_initialize() != 0) {
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Sat May 14 11:24:26 2011 -0700
@@ -3336,11 +3336,11 @@
return true;
}
-bool os::large_page_init() {
+void os::large_page_init() {
if (!UseLargePages) {
UseISM = false;
UseMPSS = false;
- return false;
+ return;
}
// print a warning if any large page related flag is specified on command line
@@ -3361,7 +3361,6 @@
Solaris::mpss_sanity_check(warn_on_failure, &_large_page_size);
UseLargePages = UseISM || UseMPSS;
- return UseLargePages;
}
bool os::Solaris::set_mpss_range(caddr_t start, size_t bytes, size_t align) {
@@ -4992,7 +4991,7 @@
#endif
}
- FLAG_SET_DEFAULT(UseLargePages, os::large_page_init());
+ os::large_page_init();
// Check minimum allowable stack size for thread creation and to initialize
// the java system classes, including StackOverflowError - depends on page
--- a/hotspot/src/os/windows/vm/os_windows.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Sat May 14 11:24:26 2011 -0700
@@ -2762,8 +2762,8 @@
_hToken = NULL;
}
-bool os::large_page_init() {
- if (!UseLargePages) return false;
+void os::large_page_init() {
+ if (!UseLargePages) return;
// print a warning if any large page related flag is specified on command line
bool warn_on_failure = !FLAG_IS_DEFAULT(UseLargePages) ||
@@ -2808,7 +2808,7 @@
}
cleanup_after_large_page_init();
- return success;
+ UseLargePages = success;
}
// On win32, one cannot release just a part of reserved memory, it's an
@@ -3561,7 +3561,7 @@
#endif
}
- FLAG_SET_DEFAULT(UseLargePages, os::large_page_init());
+ os::large_page_init();
// Setup Windows Exceptions
--- a/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Sat May 14 11:24:26 2011 -0700
@@ -93,7 +93,7 @@
inline void OrderAccess::store_fence(jbyte* p, jbyte v) {
__asm__ volatile ( "xchgb (%2),%0"
- : "=r" (v)
+ : "=q" (v)
: "0" (v), "r" (p)
: "memory");
}
@@ -155,7 +155,7 @@
// Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) {
__asm__ volatile ( "xchgb (%2),%0"
- : "=r" (v)
+ : "=q" (v)
: "0" (v), "r" (p)
: "memory");
}
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Sat May 14 11:24:26 2011 -0700
@@ -826,6 +826,14 @@
void ConcurrentMark::checkpointRootsInitialPost() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
+ // If we force an overflow during remark, the remark operation will
+ // actually abort and we'll restart concurrent marking. If we always
+ // force an oveflow during remark we'll never actually complete the
+ // marking phase. So, we initilize this here, at the start of the
+ // cycle, so that at the remaining overflow number will decrease at
+ // every remark and we'll eventually not need to cause one.
+ force_overflow_stw()->init();
+
// For each region note start of marking.
NoteStartOfMarkHRClosure startcl;
g1h->heap_region_iterate(&startcl);
@@ -893,27 +901,37 @@
}
/*
- Notice that in the next two methods, we actually leave the STS
- during the barrier sync and join it immediately afterwards. If we
- do not do this, this then the following deadlock can occur: one
- thread could be in the barrier sync code, waiting for the other
- thread to also sync up, whereas another one could be trying to
- yield, while also waiting for the other threads to sync up too.
-
- Because the thread that does the sync barrier has left the STS, it
- is possible to be suspended for a Full GC or an evacuation pause
- could occur. This is actually safe, since the entering the sync
- barrier is one of the last things do_marking_step() does, and it
- doesn't manipulate any data structures afterwards.
-*/
+ * Notice that in the next two methods, we actually leave the STS
+ * during the barrier sync and join it immediately afterwards. If we
+ * do not do this, the following deadlock can occur: one thread could
+ * be in the barrier sync code, waiting for the other thread to also
+ * sync up, whereas another one could be trying to yield, while also
+ * waiting for the other threads to sync up too.
+ *
+ * Note, however, that this code is also used during remark and in
+ * this case we should not attempt to leave / enter the STS, otherwise
+ * we'll either hit an asseert (debug / fastdebug) or deadlock
+ * (product). So we should only leave / enter the STS if we are
+ * operating concurrently.
+ *
+ * Because the thread that does the sync barrier has left the STS, it
+ * is possible to be suspended for a Full GC or an evacuation pause
+ * could occur. This is actually safe, since the entering the sync
+ * barrier is one of the last things do_marking_step() does, and it
+ * doesn't manipulate any data structures afterwards.
+ */
void ConcurrentMark::enter_first_sync_barrier(int task_num) {
if (verbose_low())
gclog_or_tty->print_cr("[%d] entering first barrier", task_num);
- ConcurrentGCThread::stsLeave();
+ if (concurrent()) {
+ ConcurrentGCThread::stsLeave();
+ }
_first_overflow_barrier_sync.enter();
- ConcurrentGCThread::stsJoin();
+ if (concurrent()) {
+ ConcurrentGCThread::stsJoin();
+ }
// at this point everyone should have synced up and not be doing any
// more work
@@ -923,7 +941,12 @@
// let task 0 do this
if (task_num == 0) {
// task 0 is responsible for clearing the global data structures
- clear_marking_state();
+ // We should be here because of an overflow. During STW we should
+ // not clear the overflow flag since we rely on it being true when
+ // we exit this method to abort the pause and restart concurent
+ // marking.
+ clear_marking_state(concurrent() /* clear_overflow */);
+ force_overflow()->update();
if (PrintGC) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
@@ -940,15 +963,45 @@
if (verbose_low())
gclog_or_tty->print_cr("[%d] entering second barrier", task_num);
- ConcurrentGCThread::stsLeave();
+ if (concurrent()) {
+ ConcurrentGCThread::stsLeave();
+ }
_second_overflow_barrier_sync.enter();
- ConcurrentGCThread::stsJoin();
+ if (concurrent()) {
+ ConcurrentGCThread::stsJoin();
+ }
// at this point everything should be re-initialised and ready to go
if (verbose_low())
gclog_or_tty->print_cr("[%d] leaving second barrier", task_num);
}
+#ifndef PRODUCT
+void ForceOverflowSettings::init() {
+ _num_remaining = G1ConcMarkForceOverflow;
+ _force = false;
+ update();
+}
+
+void ForceOverflowSettings::update() {
+ if (_num_remaining > 0) {
+ _num_remaining -= 1;
+ _force = true;
+ } else {
+ _force = false;
+ }
+}
+
+bool ForceOverflowSettings::should_force() {
+ if (_force) {
+ _force = false;
+ return true;
+ } else {
+ return false;
+ }
+}
+#endif // !PRODUCT
+
void ConcurrentMark::grayRoot(oop p) {
HeapWord* addr = (HeapWord*) p;
// We can't really check against _heap_start and _heap_end, since it
@@ -1117,6 +1170,7 @@
_restart_for_overflow = false;
size_t active_workers = MAX2((size_t) 1, parallel_marking_threads());
+ force_overflow_conc()->init();
set_phase(active_workers, true /* concurrent */);
CMConcurrentMarkingTask markingTask(this, cmThread());
@@ -1845,7 +1899,7 @@
while (!_cleanup_list.is_empty()) {
HeapRegion* hr = _cleanup_list.remove_head();
assert(hr != NULL, "the list was not empty");
- hr->rem_set()->clear();
+ hr->par_clear();
tmp_free_list.add_as_tail(hr);
// Instead of adding one region at a time to the secondary_free_list,
@@ -2703,12 +2757,16 @@
}
-void ConcurrentMark::clear_marking_state() {
+void ConcurrentMark::clear_marking_state(bool clear_overflow) {
_markStack.setEmpty();
_markStack.clear_overflow();
_regionStack.setEmpty();
_regionStack.clear_overflow();
- clear_has_overflown();
+ if (clear_overflow) {
+ clear_has_overflown();
+ } else {
+ assert(has_overflown(), "pre-condition");
+ }
_finger = _heap_start;
for (int i = 0; i < (int)_max_task_num; ++i) {
@@ -4279,6 +4337,15 @@
}
}
+ // If we are about to wrap up and go into termination, check if we
+ // should raise the overflow flag.
+ if (do_termination && !has_aborted()) {
+ if (_cm->force_overflow()->should_force()) {
+ _cm->set_has_overflown();
+ regular_clock_call();
+ }
+ }
+
// We still haven't aborted. Now, let's try to get into the
// termination protocol.
if (do_termination && !has_aborted()) {
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Sat May 14 11:24:26 2011 -0700
@@ -316,6 +316,19 @@
void setEmpty() { _index = 0; clear_overflow(); }
};
+class ForceOverflowSettings VALUE_OBJ_CLASS_SPEC {
+private:
+#ifndef PRODUCT
+ uintx _num_remaining;
+ bool _force;
+#endif // !defined(PRODUCT)
+
+public:
+ void init() PRODUCT_RETURN;
+ void update() PRODUCT_RETURN;
+ bool should_force() PRODUCT_RETURN_( return false; );
+};
+
// this will enable a variety of different statistics per GC task
#define _MARKING_STATS_ 0
// this will enable the higher verbose levels
@@ -462,6 +475,9 @@
WorkGang* _parallel_workers;
+ ForceOverflowSettings _force_overflow_conc;
+ ForceOverflowSettings _force_overflow_stw;
+
void weakRefsWork(bool clear_all_soft_refs);
void swapMarkBitMaps();
@@ -470,7 +486,7 @@
// task local ones; should be called during initial mark.
void reset();
// It resets all the marking data structures.
- void clear_marking_state();
+ void clear_marking_state(bool clear_overflow = true);
// It should be called to indicate which phase we're in (concurrent
// mark or remark) and how many threads are currently active.
@@ -547,6 +563,22 @@
void enter_first_sync_barrier(int task_num);
void enter_second_sync_barrier(int task_num);
+ ForceOverflowSettings* force_overflow_conc() {
+ return &_force_overflow_conc;
+ }
+
+ ForceOverflowSettings* force_overflow_stw() {
+ return &_force_overflow_stw;
+ }
+
+ ForceOverflowSettings* force_overflow() {
+ if (concurrent()) {
+ return force_overflow_conc();
+ } else {
+ return force_overflow_stw();
+ }
+ }
+
public:
// Manipulation of the global mark stack.
// Notice that the first mark_stack_push is CAS-based, whereas the
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Sat May 14 11:24:26 2011 -0700
@@ -3975,6 +3975,9 @@
oop
G1CollectedHeap::handle_evacuation_failure_par(OopsInHeapRegionClosure* cl,
oop old) {
+ assert(obj_in_cs(old),
+ err_msg("obj: "PTR_FORMAT" should still be in the CSet",
+ (HeapWord*) old));
markOop m = old->mark();
oop forward_ptr = old->forward_to_atomic(old);
if (forward_ptr == NULL) {
@@ -3997,7 +4000,13 @@
}
return old;
} else {
- // Someone else had a place to copy it.
+ // Forward-to-self failed. Either someone else managed to allocate
+ // space for this object (old != forward_ptr) or they beat us in
+ // self-forwarding it (old == forward_ptr).
+ assert(old == forward_ptr || !obj_in_cs(forward_ptr),
+ err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" "
+ "should not be in the CSet",
+ (HeapWord*) old, (HeapWord*) forward_ptr));
return forward_ptr;
}
}
@@ -4308,11 +4317,10 @@
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop(heap_oop);
- assert((_g1->evacuation_failed()) || (!_g1->obj_in_cs(obj)),
- "shouldn't still be in the CSet if evacuation didn't fail.");
HeapWord* addr = (HeapWord*)obj;
- if (_g1->is_in_g1_reserved(addr))
+ if (_g1->is_in_g1_reserved(addr)) {
_cm->grayRoot(oop(addr));
+ }
}
}
@@ -4961,36 +4969,45 @@
#ifndef PRODUCT
class G1VerifyCardTableCleanup: public HeapRegionClosure {
+ G1CollectedHeap* _g1h;
CardTableModRefBS* _ct_bs;
public:
- G1VerifyCardTableCleanup(CardTableModRefBS* ct_bs)
- : _ct_bs(ct_bs) { }
+ G1VerifyCardTableCleanup(G1CollectedHeap* g1h, CardTableModRefBS* ct_bs)
+ : _g1h(g1h), _ct_bs(ct_bs) { }
virtual bool doHeapRegion(HeapRegion* r) {
- MemRegion mr(r->bottom(), r->end());
if (r->is_survivor()) {
- _ct_bs->verify_dirty_region(mr);
+ _g1h->verify_dirty_region(r);
} else {
- _ct_bs->verify_clean_region(mr);
+ _g1h->verify_not_dirty_region(r);
}
return false;
}
};
+void G1CollectedHeap::verify_not_dirty_region(HeapRegion* hr) {
+ // All of the region should be clean.
+ CardTableModRefBS* ct_bs = (CardTableModRefBS*)barrier_set();
+ MemRegion mr(hr->bottom(), hr->end());
+ ct_bs->verify_not_dirty_region(mr);
+}
+
+void G1CollectedHeap::verify_dirty_region(HeapRegion* hr) {
+ // We cannot guarantee that [bottom(),end()] is dirty. Threads
+ // dirty allocated blocks as they allocate them. The thread that
+ // retires each region and replaces it with a new one will do a
+ // maximal allocation to fill in [pre_dummy_top(),end()] but will
+ // not dirty that area (one less thing to have to do while holding
+ // a lock). So we can only verify that [bottom(),pre_dummy_top()]
+ // is dirty.
+ CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
+ MemRegion mr(hr->bottom(), hr->pre_dummy_top());
+ ct_bs->verify_dirty_region(mr);
+}
+
void G1CollectedHeap::verify_dirty_young_list(HeapRegion* head) {
- CardTableModRefBS* ct_bs = (CardTableModRefBS*) (barrier_set());
+ CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
for (HeapRegion* hr = head; hr != NULL; hr = hr->get_next_young_region()) {
- // We cannot guarantee that [bottom(),end()] is dirty. Threads
- // dirty allocated blocks as they allocate them. The thread that
- // retires each region and replaces it with a new one will do a
- // maximal allocation to fill in [pre_dummy_top(),end()] but will
- // not dirty that area (one less thing to have to do while holding
- // a lock). So we can only verify that [bottom(),pre_dummy_top()]
- // is dirty. Also note that verify_dirty_region() requires
- // mr.start() and mr.end() to be card aligned and pre_dummy_top()
- // is not guaranteed to be.
- MemRegion mr(hr->bottom(),
- ct_bs->align_to_card_boundary(hr->pre_dummy_top()));
- ct_bs->verify_dirty_region(mr);
+ verify_dirty_region(hr);
}
}
@@ -5033,7 +5050,7 @@
g1_policy()->record_clear_ct_time( elapsed * 1000.0);
#ifndef PRODUCT
if (G1VerifyCTCleanup || VerifyAfterGC) {
- G1VerifyCardTableCleanup cleanup_verifier(ct_bs);
+ G1VerifyCardTableCleanup cleanup_verifier(this, ct_bs);
heap_region_iterate(&cleanup_verifier);
}
#endif
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Sat May 14 11:24:26 2011 -0700
@@ -970,6 +970,8 @@
// The number of regions available for "regular" expansion.
size_t expansion_regions() { return _expansion_regions; }
+ void verify_not_dirty_region(HeapRegion* hr) PRODUCT_RETURN;
+ void verify_dirty_region(HeapRegion* hr) PRODUCT_RETURN;
void verify_dirty_young_list(HeapRegion* head) PRODUCT_RETURN;
void verify_dirty_young_regions() PRODUCT_RETURN;
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Sat May 14 11:24:26 2011 -0700
@@ -157,7 +157,6 @@
void set_try_claimed() { _try_claimed = true; }
void scanCard(size_t index, HeapRegion *r) {
- _cards_done++;
DirtyCardToOopClosure* cl =
r->new_dcto_closure(_oc,
CardTableModRefBS::Precise,
@@ -168,17 +167,14 @@
HeapWord* card_start = _bot_shared->address_for_index(index);
HeapWord* card_end = card_start + G1BlockOffsetSharedArray::N_words;
Space *sp = SharedHeap::heap()->space_containing(card_start);
- MemRegion sm_region;
- if (ParallelGCThreads > 0) {
- // first find the used area
- sm_region = sp->used_region_at_save_marks();
- } else {
- // The closure is not idempotent. We shouldn't look at objects
- // allocated during the GC.
- sm_region = sp->used_region_at_save_marks();
- }
+ MemRegion sm_region = sp->used_region_at_save_marks();
MemRegion mr = sm_region.intersection(MemRegion(card_start,card_end));
- if (!mr.is_empty()) {
+ if (!mr.is_empty() && !_ct_bs->is_card_claimed(index)) {
+ // We make the card as "claimed" lazily (so races are possible
+ // but they're benign), which reduces the number of duplicate
+ // scans (the rsets of the regions in the cset can intersect).
+ _ct_bs->set_card_claimed(index);
+ _cards_done++;
cl->do_MemRegion(mr);
}
}
@@ -199,6 +195,9 @@
HeapRegionRemSet* hrrs = r->rem_set();
if (hrrs->iter_is_complete()) return false; // All done.
if (!_try_claimed && !hrrs->claim_iter()) return false;
+ // If we ever free the collection set concurrently, we should also
+ // clear the card table concurrently therefore we won't need to
+ // add regions of the collection set to the dirty cards region.
_g1h->push_dirty_cards_region(r);
// If we didn't return above, then
// _try_claimed || r->claim_iter()
@@ -230,15 +229,10 @@
_g1h->push_dirty_cards_region(card_region);
}
- // If the card is dirty, then we will scan it during updateRS.
- if (!card_region->in_collection_set() && !_ct_bs->is_card_dirty(card_index)) {
- // We make the card as "claimed" lazily (so races are possible but they're benign),
- // which reduces the number of duplicate scans (the rsets of the regions in the cset
- // can intersect).
- if (!_ct_bs->is_card_claimed(card_index)) {
- _ct_bs->set_card_claimed(card_index);
- scanCard(card_index, card_region);
- }
+ // If the card is dirty, then we will scan it during updateRS.
+ if (!card_region->in_collection_set() &&
+ !_ct_bs->is_card_dirty(card_index)) {
+ scanCard(card_index, card_region);
}
}
if (!_try_claimed) {
@@ -246,8 +240,6 @@
}
return false;
}
- // Set all cards back to clean.
- void cleanup() {_g1h->cleanUpCardTable();}
size_t cards_done() { return _cards_done;}
size_t cards_looked_up() { return _cards;}
};
@@ -566,8 +558,9 @@
update_rs_cl.set_region(r);
HeapWord* stop_point =
r->oops_on_card_seq_iterate_careful(scanRegion,
- &filter_then_update_rs_cset_oop_cl,
- false /* filter_young */);
+ &filter_then_update_rs_cset_oop_cl,
+ false /* filter_young */,
+ NULL /* card_ptr */);
// Since this is performed in the event of an evacuation failure, we
// we shouldn't see a non-null stop point
@@ -735,12 +728,6 @@
(OopClosure*)&mux :
(OopClosure*)&update_rs_oop_cl));
- // Undirty the card.
- *card_ptr = CardTableModRefBS::clean_card_val();
- // We must complete this write before we do any of the reads below.
- OrderAccess::storeload();
- // And process it, being careful of unallocated portions of TLAB's.
-
// The region for the current card may be a young region. The
// current card may have been a card that was evicted from the
// card cache. When the card was inserted into the cache, we had
@@ -749,7 +736,7 @@
// and tagged as young.
//
// We wish to filter out cards for such a region but the current
- // thread, if we're running conucrrently, may "see" the young type
+ // thread, if we're running concurrently, may "see" the young type
// change at any time (so an earlier "is_young" check may pass or
// fail arbitrarily). We tell the iteration code to perform this
// filtering when it has been determined that there has been an actual
@@ -759,7 +746,8 @@
HeapWord* stop_point =
r->oops_on_card_seq_iterate_careful(dirtyRegion,
&filter_then_update_rs_oop_cl,
- filter_young);
+ filter_young,
+ card_ptr);
// If stop_point is non-null, then we encountered an unallocated region
// (perhaps the unfilled portion of a TLAB.) For now, we'll dirty the
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Sat May 14 11:24:26 2011 -0700
@@ -311,7 +311,11 @@
\
develop(bool, G1ExitOnExpansionFailure, false, \
"Raise a fatal VM exit out of memory failure in the event " \
- " that heap expansion fails due to running out of swap.")
+ " that heap expansion fails due to running out of swap.") \
+ \
+ develop(uintx, G1ConcMarkForceOverflow, 0, \
+ "The number of times we'll force an overflow during " \
+ "concurrent marking")
G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Sat May 14 11:24:26 2011 -0700
@@ -376,6 +376,17 @@
if (clear_space) clear(SpaceDecorator::Mangle);
}
+void HeapRegion::par_clear() {
+ assert(used() == 0, "the region should have been already cleared");
+ assert(capacity() == (size_t) HeapRegion::GrainBytes,
+ "should be back to normal");
+ HeapRegionRemSet* hrrs = rem_set();
+ hrrs->clear();
+ CardTableModRefBS* ct_bs =
+ (CardTableModRefBS*)G1CollectedHeap::heap()->barrier_set();
+ ct_bs->clear(MemRegion(bottom(), end()));
+}
+
// <PREDICTION>
void HeapRegion::calc_gc_efficiency() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
@@ -600,7 +611,15 @@
HeapRegion::
oops_on_card_seq_iterate_careful(MemRegion mr,
FilterOutOfRegionClosure* cl,
- bool filter_young) {
+ bool filter_young,
+ jbyte* card_ptr) {
+ // Currently, we should only have to clean the card if filter_young
+ // is true and vice versa.
+ if (filter_young) {
+ assert(card_ptr != NULL, "pre-condition");
+ } else {
+ assert(card_ptr == NULL, "pre-condition");
+ }
G1CollectedHeap* g1h = G1CollectedHeap::heap();
// If we're within a stop-world GC, then we might look at a card in a
@@ -626,6 +645,15 @@
assert(!is_young(), "check value of filter_young");
+ // We can only clean the card here, after we make the decision that
+ // the card is not young. And we only clean the card if we have been
+ // asked to (i.e., card_ptr != NULL).
+ if (card_ptr != NULL) {
+ *card_ptr = CardTableModRefBS::clean_card_val();
+ // We must complete this write before we do any of the reads below.
+ OrderAccess::storeload();
+ }
+
// We used to use "block_start_careful" here. But we're actually happy
// to update the BOT while we do this...
HeapWord* cur = block_start(mr.start());
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Sat May 14 11:24:26 2011 -0700
@@ -584,6 +584,7 @@
// Reset HR stuff to default values.
void hr_clear(bool par, bool clear_space);
+ void par_clear();
void initialize(MemRegion mr, bool clear_space, bool mangle_space);
@@ -802,12 +803,16 @@
HeapWord*
object_iterate_mem_careful(MemRegion mr, ObjectClosure* cl);
- // In this version - if filter_young is true and the region
- // is a young region then we skip the iteration.
+ // filter_young: if true and the region is a young region then we
+ // skip the iteration.
+ // card_ptr: if not NULL, and we decide that the card is not young
+ // and we iterate over it, we'll clean the card before we start the
+ // iteration.
HeapWord*
oops_on_card_seq_iterate_careful(MemRegion mr,
FilterOutOfRegionClosure* cl,
- bool filter_young);
+ bool filter_young,
+ jbyte* card_ptr);
// A version of block start that is guaranteed to find *some* block
// boundary at or before "p", but does not object iteration, and may
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp Sat May 14 11:24:26 2011 -0700
@@ -224,6 +224,12 @@
const size_t alignment = virtual_space()->alignment();
size_t aligned_bytes = align_size_up(bytes, alignment);
size_t aligned_expand_bytes = align_size_up(MinHeapDeltaBytes, alignment);
+
+ if (UseNUMA) {
+ // With NUMA we use round-robin page allocation for the old gen. Expand by at least
+ // providing a page per lgroup. Alignment is larger or equal to the page size.
+ aligned_expand_bytes = MAX2(aligned_expand_bytes, alignment * os::numa_get_groups_num());
+ }
if (aligned_bytes == 0){
// The alignment caused the number of bytes to wrap. An expand_by(0) will
// return true with the implication that and expansion was done when it
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp Sat May 14 11:24:26 2011 -0700
@@ -327,6 +327,7 @@
// 1. check if klass is not interface
if (resolved_klass->is_interface()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Found interface %s, but class was expected", Klass::cast(resolved_klass())->external_name());
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
@@ -413,6 +414,7 @@
// check if klass is interface
if (!resolved_klass->is_interface()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Found class %s, but interface was expected", Klass::cast(resolved_klass())->external_name());
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
@@ -534,6 +536,7 @@
// check for errors
if (is_static != fd.is_static()) {
+ ResourceMark rm(THREAD);
char msg[200];
jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", Klass::cast(resolved_klass())->external_name(), fd.name()->as_C_string());
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg);
@@ -631,6 +634,7 @@
// check if static
if (!resolved_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Expected static method %s", methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
resolved_method->name(),
@@ -671,6 +675,7 @@
// check if not static
if (resolved_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf),
"Expecting non-static method %s",
@@ -717,6 +722,7 @@
// check if not static
if (sel_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
resolved_method->name(),
@@ -757,6 +763,7 @@
// check if not static
if (resolved_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
resolved_method->name(),
@@ -873,6 +880,7 @@
// check if receiver klass implements the resolved interface
if (!recv_klass->is_subtype_of(resolved_klass())) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Class %s does not implement the requested interface %s",
(Klass::cast(recv_klass()))->external_name(),
--- a/hotspot/src/share/vm/memory/allocation.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/memory/allocation.cpp Sat May 14 11:24:26 2011 -0700
@@ -44,6 +44,14 @@
return (void *) AllocateHeap(size, "CHeapObj-new");
}
+void* CHeapObj::operator new (size_t size, const std::nothrow_t& nothrow_constant) {
+ char* p = (char*) os::malloc(size);
+#ifdef ASSERT
+ if (PrintMallocFree) trace_heap_malloc(size, "CHeapObj-new", p);
+#endif
+ return p;
+}
+
void CHeapObj::operator delete(void* p){
FreeHeap(p);
}
--- a/hotspot/src/share/vm/memory/allocation.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/memory/allocation.hpp Sat May 14 11:24:26 2011 -0700
@@ -34,6 +34,8 @@
#include "opto/c2_globals.hpp"
#endif
+#include <new>
+
#define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1)
#define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1))
#define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK)
@@ -99,6 +101,7 @@
class CHeapObj ALLOCATION_SUPER_CLASS_SPEC {
public:
void* operator new(size_t size);
+ void* operator new (size_t size, const std::nothrow_t& nothrow_constant);
void operator delete(void* p);
void* new_array(size_t size);
};
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Sat May 14 11:24:26 2011 -0700
@@ -652,43 +652,37 @@
}
#ifndef PRODUCT
-class GuaranteeNotModClosure: public MemRegionClosure {
- CardTableModRefBS* _ct;
-public:
- GuaranteeNotModClosure(CardTableModRefBS* ct) : _ct(ct) {}
- void do_MemRegion(MemRegion mr) {
- jbyte* entry = _ct->byte_for(mr.start());
- guarantee(*entry != CardTableModRefBS::clean_card,
- "Dirty card in region that should be clean");
+void CardTableModRefBS::verify_region(MemRegion mr,
+ jbyte val, bool val_equals) {
+ jbyte* start = byte_for(mr.start());
+ jbyte* end = byte_for(mr.last());
+ bool failures = false;
+ for (jbyte* curr = start; curr <= end; ++curr) {
+ jbyte curr_val = *curr;
+ bool failed = (val_equals) ? (curr_val != val) : (curr_val == val);
+ if (failed) {
+ if (!failures) {
+ tty->cr();
+ tty->print_cr("== CT verification failed: ["PTR_FORMAT","PTR_FORMAT"]");
+ tty->print_cr("== %sexpecting value: %d",
+ (val_equals) ? "" : "not ", val);
+ failures = true;
+ }
+ tty->print_cr("== card "PTR_FORMAT" ["PTR_FORMAT","PTR_FORMAT"], "
+ "val: %d", curr, addr_for(curr),
+ (HeapWord*) (((size_t) addr_for(curr)) + card_size),
+ (int) curr_val);
+ }
}
-};
-
-void CardTableModRefBS::verify_clean_region(MemRegion mr) {
- GuaranteeNotModClosure blk(this);
- non_clean_card_iterate_serial(mr, &blk);
+ guarantee(!failures, "there should not have been any failures");
}
-// To verify a MemRegion is entirely dirty this closure is passed to
-// dirty_card_iterate. If the region is dirty do_MemRegion will be
-// invoked only once with a MemRegion equal to the one being
-// verified.
-class GuaranteeDirtyClosure: public MemRegionClosure {
- CardTableModRefBS* _ct;
- MemRegion _mr;
- bool _result;
-public:
- GuaranteeDirtyClosure(CardTableModRefBS* ct, MemRegion mr)
- : _ct(ct), _mr(mr), _result(false) {}
- void do_MemRegion(MemRegion mr) {
- _result = _mr.equals(mr);
- }
- bool result() const { return _result; }
-};
+void CardTableModRefBS::verify_not_dirty_region(MemRegion mr) {
+ verify_region(mr, dirty_card, false /* val_equals */);
+}
void CardTableModRefBS::verify_dirty_region(MemRegion mr) {
- GuaranteeDirtyClosure blk(this, mr);
- dirty_card_iterate(mr, &blk);
- guarantee(blk.result(), "Non-dirty cards in region that should be dirty");
+ verify_region(mr, dirty_card, true /* val_equals */);
}
#endif
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp Sat May 14 11:24:26 2011 -0700
@@ -475,7 +475,10 @@
void verify();
void verify_guard();
- void verify_clean_region(MemRegion mr) PRODUCT_RETURN;
+ // val_equals -> it will check that all cards covered by mr equal val
+ // !val_equals -> it will check that all cards covered by mr do not equal val
+ void verify_region(MemRegion mr, jbyte val, bool val_equals) PRODUCT_RETURN;
+ void verify_not_dirty_region(MemRegion mr) PRODUCT_RETURN;
void verify_dirty_region(MemRegion mr) PRODUCT_RETURN;
static size_t par_chunk_heapword_alignment() {
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp Sat May 14 11:24:26 2011 -0700
@@ -265,8 +265,6 @@
MaxHeapSize = align_size_up(MaxHeapSize, max_alignment());
always_do_update_barrier = UseConcMarkSweepGC;
- BlockOffsetArrayUseUnallocatedBlock =
- BlockOffsetArrayUseUnallocatedBlock || ParallelGCThreads > 0;
// Check validity of heap flags
assert(OldSize % min_alignment() == 0, "old space alignment");
--- a/hotspot/src/share/vm/memory/genOopClosures.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/memory/genOopClosures.hpp Sat May 14 11:24:26 2011 -0700
@@ -175,7 +175,7 @@
protected:
template <class T> inline void do_oop_work(T* p) {
oop obj = oopDesc::load_decode_heap_oop(p);
- guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, obj));
+ guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, (oopDesc*) obj));
}
public:
virtual void do_oop(oop* p);
--- a/hotspot/src/share/vm/memory/modRefBarrierSet.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/memory/modRefBarrierSet.hpp Sat May 14 11:24:26 2011 -0700
@@ -100,12 +100,6 @@
// Pass along the argument to the superclass.
ModRefBarrierSet(int max_covered_regions) :
BarrierSet(max_covered_regions) {}
-
-#ifndef PRODUCT
- // Verifies that the given region contains no modified references.
- virtual void verify_clean_region(MemRegion mr) = 0;
-#endif
-
};
#endif // SHARE_VM_MEMORY_MODREFBARRIERSET_HPP
--- a/hotspot/src/share/vm/oops/methodDataOop.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/oops/methodDataOop.hpp Sat May 14 11:24:26 2011 -0700
@@ -1194,7 +1194,7 @@
// Whole-method sticky bits and flags
public:
enum {
- _trap_hist_limit = 16, // decoupled from Deoptimization::Reason_LIMIT
+ _trap_hist_limit = 17, // decoupled from Deoptimization::Reason_LIMIT
_trap_hist_mask = max_jubyte,
_extra_data_count = 4 // extra DataLayout headers, for trap history
}; // Public flag values
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Sat May 14 11:24:26 2011 -0700
@@ -310,13 +310,14 @@
return "inlining too deep";
}
- // We need to detect recursive inlining of method handle targets: if
- // the current method is a method handle adapter and one of the
- // callers is the same method as the callee, we bail out if
- // MaxRecursiveInlineLevel is hit.
- if (method()->is_method_handle_adapter()) {
+ // detect direct and indirect recursive inlining
+ {
+ // count the current method and the callee
+ int inline_level = (method() == callee_method) ? 1 : 0;
+ if (inline_level > MaxRecursiveInlineLevel)
+ return "recursively inlining too deep";
+ // count callers of current method and callee
JVMState* jvms = caller_jvms();
- int inline_level = 0;
while (jvms != NULL && jvms->has_method()) {
if (jvms->method() == callee_method) {
inline_level++;
@@ -327,10 +328,6 @@
}
}
- if (method() == callee_method && inline_depth() > MaxRecursiveInlineLevel) {
- return "recursively inlining too deep";
- }
-
int size = callee_method->code_size();
if (UseOldInlining && ClipInlining
@@ -376,7 +373,6 @@
return true;
}
-#ifndef PRODUCT
//------------------------------print_inlining---------------------------------
// Really, the failure_msg can be a success message also.
void InlineTree::print_inlining(ciMethod* callee_method, int caller_bci, const char* failure_msg) const {
@@ -388,7 +384,6 @@
tty->print(" bcs: %d+%d invoked: %d", top->count_inline_bcs(), callee_method->code_size(), callee_method->interpreter_invocation_count());
}
}
-#endif
//------------------------------ok_to_inline-----------------------------------
WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci) {
--- a/hotspot/src/share/vm/opto/c2_globals.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp Sat May 14 11:24:26 2011 -0700
@@ -183,6 +183,21 @@
develop(bool, TraceLoopOpts, false, \
"Trace executed loop optimizations") \
\
+ diagnostic(bool, LoopLimitCheck, true, \
+ "Generate a loop limits check for overflow") \
+ \
+ develop(bool, TraceLoopLimitCheck, false, \
+ "Trace generation of loop limits checks") \
+ \
+ diagnostic(bool, RangeLimitCheck, true, \
+ "Additional overflow checks during range check elimination") \
+ \
+ develop(bool, TraceRangeLimitCheck, false, \
+ "Trace additional overflow checks in RCE") \
+ \
+ diagnostic(bool, UnrollLimitCheck, true, \
+ "Additional overflow checks during loop unroll") \
+ \
product(bool, OptimizeFill, false, \
"convert fill/copy loops into intrinsic") \
\
--- a/hotspot/src/share/vm/opto/cfgnode.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp Sat May 14 11:24:26 2011 -0700
@@ -1373,7 +1373,7 @@
// Clone loop predicates
if (predicate_proj != NULL) {
- newn = igvn->clone_loop_predicates(predicate_proj, newn);
+ newn = igvn->clone_loop_predicates(predicate_proj, newn, !n->is_CountedLoop());
}
// Now I can point to the new node.
--- a/hotspot/src/share/vm/opto/classes.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/classes.hpp Sat May 14 11:24:26 2011 -0700
@@ -156,6 +156,7 @@
macro(LogD)
macro(Log10D)
macro(Loop)
+macro(LoopLimit)
macro(Mach)
macro(MachProj)
macro(MaxI)
--- a/hotspot/src/share/vm/opto/graphKit.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/graphKit.cpp Sat May 14 11:24:26 2011 -0700
@@ -3378,6 +3378,10 @@
if (UseLoopPredicate) {
add_predicate_impl(Deoptimization::Reason_predicate, nargs);
}
+ // loop's limit check predicate should be near the loop.
+ if (LoopLimitCheck) {
+ add_predicate_impl(Deoptimization::Reason_loop_limit_check, nargs);
+ }
}
//----------------------------- store barriers ----------------------------
--- a/hotspot/src/share/vm/opto/ifnode.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/ifnode.cpp Sat May 14 11:24:26 2011 -0700
@@ -236,6 +236,7 @@
}
Node* predicate_c = NULL;
Node* predicate_x = NULL;
+ bool counted_loop = r->is_CountedLoop();
Node *region_c = new (igvn->C, req_c + 1) RegionNode(req_c + 1);
Node *phi_c = con1;
@@ -294,16 +295,16 @@
if (predicate_c != NULL) {
assert(predicate_x == NULL, "only one predicate entry expected");
// Clone loop predicates to each path
- iff_c_t = igvn->clone_loop_predicates(predicate_c, iff_c_t);
- iff_c_f = igvn->clone_loop_predicates(predicate_c, iff_c_f);
+ iff_c_t = igvn->clone_loop_predicates(predicate_c, iff_c_t, !counted_loop);
+ iff_c_f = igvn->clone_loop_predicates(predicate_c, iff_c_f, !counted_loop);
}
Node *iff_x_t = phase->transform(new (igvn->C, 1) IfTrueNode (iff_x));
Node *iff_x_f = phase->transform(new (igvn->C, 1) IfFalseNode(iff_x));
if (predicate_x != NULL) {
assert(predicate_c == NULL, "only one predicate entry expected");
// Clone loop predicates to each path
- iff_x_t = igvn->clone_loop_predicates(predicate_x, iff_x_t);
- iff_x_f = igvn->clone_loop_predicates(predicate_x, iff_x_f);
+ iff_x_t = igvn->clone_loop_predicates(predicate_x, iff_x_t, !counted_loop);
+ iff_x_f = igvn->clone_loop_predicates(predicate_x, iff_x_f, !counted_loop);
}
// Merge the TRUE paths
@@ -545,6 +546,7 @@
Node *new_bol = gvn->transform( new (gvn->C, 2) BoolNode( new_cmp, bol->as_Bool()->_test._test ) );
igvn->hash_delete( iff );
iff->set_req_X( 1, new_bol, igvn );
+ igvn->_worklist.push( iff );
}
//------------------------------up_one_dom-------------------------------------
--- a/hotspot/src/share/vm/opto/library_call.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/library_call.cpp Sat May 14 11:24:26 2011 -0700
@@ -867,12 +867,10 @@
Node* str1_offset = make_load(no_ctrl, str1_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
Node* str1_start = array_element_address(str1_value, str1_offset, T_CHAR);
- // Pin loads from String::equals() argument since it could be NULL.
- Node* str2_ctrl = (opcode == Op_StrEquals) ? control() : no_ctrl;
Node* str2_valuea = basic_plus_adr(str2, str2, value_offset);
- Node* str2_value = make_load(str2_ctrl, str2_valuea, value_type, T_OBJECT, string_type->add_offset(value_offset));
+ Node* str2_value = make_load(no_ctrl, str2_valuea, value_type, T_OBJECT, string_type->add_offset(value_offset));
Node* str2_offseta = basic_plus_adr(str2, str2, offset_offset);
- Node* str2_offset = make_load(str2_ctrl, str2_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
+ Node* str2_offset = make_load(no_ctrl, str2_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
Node* str2_start = array_element_address(str2_value, str2_offset, T_CHAR);
Node* result = NULL;
@@ -1012,14 +1010,15 @@
if (!stopped()) {
// Properly cast the argument to String
argument = _gvn.transform(new (C, 2) CheckCastPPNode(control(), argument, string_type));
+ // This path is taken only when argument's type is String:NotNull.
+ argument = cast_not_null(argument, false);
// Get counts for string and argument
Node* receiver_cnta = basic_plus_adr(receiver, receiver, count_offset);
receiver_cnt = make_load(no_ctrl, receiver_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
- // Pin load from argument string since it could be NULL.
Node* argument_cnta = basic_plus_adr(argument, argument, count_offset);
- argument_cnt = make_load(control(), argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+ argument_cnt = make_load(no_ctrl, argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
// Check for receiver count != argument count
Node* cmp = _gvn.transform( new(C, 3) CmpINode(receiver_cnt, argument_cnt) );
--- a/hotspot/src/share/vm/opto/loopPredicate.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/loopPredicate.cpp Sat May 14 11:24:26 2011 -0700
@@ -341,7 +341,7 @@
// Cut predicate from old place.
Node* old = predicate_proj;
igvn->_worklist.push(old);
- for (DUIterator_Last imin, i = old->last_outs(imin); i >= imin; ) {
+ for (DUIterator_Last imin, i = old->last_outs(imin); i >= imin;) {
Node* use = old->last_out(i); // for each use...
igvn->hash_delete(use);
igvn->_worklist.push(use);
@@ -384,24 +384,25 @@
//--------------------------clone_loop_predicates-----------------------
// Interface from IGVN
-Node* PhaseIterGVN::clone_loop_predicates(Node* old_entry, Node* new_entry) {
- return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, false, NULL, this);
+Node* PhaseIterGVN::clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, false, clone_limit_check, NULL, this);
}
-Node* PhaseIterGVN::move_loop_predicates(Node* old_entry, Node* new_entry) {
- return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, true, NULL, this);
+Node* PhaseIterGVN::move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, true, clone_limit_check, NULL, this);
}
// Interface from PhaseIdealLoop
-Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry) {
- return clone_loop_predicates(old_entry, new_entry, false, this, &this->_igvn);
+Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return clone_loop_predicates(old_entry, new_entry, false, clone_limit_check, this, &this->_igvn);
}
-Node* PhaseIdealLoop::move_loop_predicates(Node* old_entry, Node* new_entry) {
- return clone_loop_predicates(old_entry, new_entry, true, this, &this->_igvn);
+Node* PhaseIdealLoop::move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return clone_loop_predicates(old_entry, new_entry, true, clone_limit_check, this, &this->_igvn);
}
// Clone loop predicates to cloned loops (peeled, unswitched, split_if).
Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry,
bool move_predicates,
+ bool clone_limit_check,
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn) {
#ifdef ASSERT
@@ -413,10 +414,16 @@
#endif
// Search original predicates
Node* entry = old_entry;
+ ProjNode* limit_check_proj = NULL;
+ if (LoopLimitCheck) {
+ limit_check_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (limit_check_proj != NULL) {
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
ProjNode* predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate_proj != NULL) { // right pattern that can be used by loop predication
- assert(entry->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
if (move_predicates) {
new_entry = move_predicate(predicate_proj, new_entry,
Deoptimization::Reason_predicate,
@@ -435,11 +442,37 @@
}
}
}
+ if (limit_check_proj != NULL && clone_limit_check) {
+ // Clone loop limit check last to insert it before loop.
+ // Don't clone a limit check which was already finalized
+ // for this counted loop (only one limit check is needed).
+ if (move_predicates) {
+ new_entry = move_predicate(limit_check_proj, new_entry,
+ Deoptimization::Reason_loop_limit_check,
+ loop_phase, igvn);
+ assert(new_entry == limit_check_proj, "old limit check fall through projection");
+ } else {
+ new_entry = clone_predicate(limit_check_proj, new_entry,
+ Deoptimization::Reason_loop_limit_check,
+ loop_phase, igvn);
+ assert(new_entry != NULL && new_entry->is_Proj(), "IfTrue or IfFalse after clone limit check");
+ }
+ if (TraceLoopLimitCheck) {
+ tty->print_cr("Loop Limit Check %s: ", move_predicates ? "moved" : "cloned");
+ debug_only( new_entry->in(0)->dump(); )
+ }
+ }
return new_entry;
}
//--------------------------eliminate_loop_predicates-----------------------
void PhaseIdealLoop::eliminate_loop_predicates(Node* entry) {
+ if (LoopLimitCheck) {
+ Node* predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL) {
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
ProjNode* predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate_proj != NULL) { // right pattern that can be used by loop predication
@@ -456,10 +489,15 @@
// Skip related predicates.
Node* PhaseIdealLoop::skip_loop_predicates(Node* entry) {
Node* predicate = NULL;
+ if (LoopLimitCheck) {
+ predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL) {
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate != NULL) { // right pattern that can be used by loop predication
- assert(entry->is_Proj() && entry->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
IfNode* iff = entry->in(0)->as_If();
ProjNode* uncommon_proj = iff->proj_out(1 - entry->as_Proj()->_con);
Node* rgn = uncommon_proj->unique_ctrl_out();
@@ -491,10 +529,15 @@
// Find a predicate
Node* PhaseIdealLoop::find_predicate(Node* entry) {
Node* predicate = NULL;
+ if (LoopLimitCheck) {
+ predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL) { // right pattern that can be used by loop predication
+ return entry;
+ }
+ }
if (UseLoopPredicate) {
predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate != NULL) { // right pattern that can be used by loop predication
- assert(entry->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
return entry;
}
}
@@ -658,7 +701,7 @@
Node* range = cmp->in(2);
if (range->Opcode() != Op_LoadRange) {
const TypeInt* tint = phase->_igvn.type(range)->isa_int();
- if (!OptimizeFill || tint == NULL || tint->empty() || tint->_lo < 0) {
+ if (tint == NULL || tint->empty() || tint->_lo < 0) {
// Allow predication on positive values that aren't LoadRanges.
// This allows optimization of loops where the length of the
// array is a known value and doesn't need to be loaded back
@@ -696,36 +739,49 @@
// max(scale*i + offset) = scale*(limit-stride) + offset
// (2) stride*scale < 0
// max(scale*i + offset) = scale*init + offset
-BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl,
+BoolNode* PhaseIdealLoop::rc_predicate(IdealLoopTree *loop, Node* ctrl,
int scale, Node* offset,
Node* init, Node* limit, Node* stride,
Node* range, bool upper) {
- DEBUG_ONLY(ttyLocker ttyl);
- if (TraceLoopPredicate) tty->print("rc_predicate ");
+ stringStream* predString = NULL;
+ if (TraceLoopPredicate) {
+ predString = new stringStream();
+ predString->print("rc_predicate ");
+ }
Node* max_idx_expr = init;
int stride_con = stride->get_int();
if ((stride_con > 0) == (scale > 0) == upper) {
- max_idx_expr = new (C, 3) SubINode(limit, stride);
- register_new_node(max_idx_expr, ctrl);
- if (TraceLoopPredicate) tty->print("(limit - stride) ");
+ if (LoopLimitCheck) {
+ // With LoopLimitCheck limit is not exact.
+ // Calculate exact limit here.
+ // Note, counted loop's test is '<' or '>'.
+ limit = exact_limit(loop);
+ max_idx_expr = new (C, 3) SubINode(limit, stride);
+ register_new_node(max_idx_expr, ctrl);
+ if (TraceLoopPredicate) predString->print("(limit - stride) ");
+ } else {
+ max_idx_expr = new (C, 3) SubINode(limit, stride);
+ register_new_node(max_idx_expr, ctrl);
+ if (TraceLoopPredicate) predString->print("(limit - stride) ");
+ }
} else {
- if (TraceLoopPredicate) tty->print("init ");
+ if (TraceLoopPredicate) predString->print("init ");
}
if (scale != 1) {
ConNode* con_scale = _igvn.intcon(scale);
max_idx_expr = new (C, 3) MulINode(max_idx_expr, con_scale);
register_new_node(max_idx_expr, ctrl);
- if (TraceLoopPredicate) tty->print("* %d ", scale);
+ if (TraceLoopPredicate) predString->print("* %d ", scale);
}
if (offset && (!offset->is_Con() || offset->get_int() != 0)){
max_idx_expr = new (C, 3) AddINode(max_idx_expr, offset);
register_new_node(max_idx_expr, ctrl);
if (TraceLoopPredicate)
- if (offset->is_Con()) tty->print("+ %d ", offset->get_int());
- else tty->print("+ offset ");
+ if (offset->is_Con()) predString->print("+ %d ", offset->get_int());
+ else predString->print("+ offset ");
}
CmpUNode* cmp = new (C, 3) CmpUNode(max_idx_expr, range);
@@ -733,7 +789,10 @@
BoolNode* bol = new (C, 2) BoolNode(cmp, BoolTest::lt);
register_new_node(bol, ctrl);
- if (TraceLoopPredicate) tty->print_cr("<u range");
+ if (TraceLoopPredicate) {
+ predString->print_cr("<u range");
+ tty->print(predString->as_string());
+ }
return bol;
}
@@ -746,29 +805,36 @@
// Could be a simple region when irreducible loops are present.
return false;
}
+ LoopNode* head = loop->_head->as_Loop();
- if (loop->_head->unique_ctrl_out()->Opcode() == Op_NeverBranch) {
+ if (head->unique_ctrl_out()->Opcode() == Op_NeverBranch) {
// do nothing for infinite loops
return false;
}
CountedLoopNode *cl = NULL;
- if (loop->_head->is_CountedLoop()) {
- cl = loop->_head->as_CountedLoop();
+ if (head->is_CountedLoop()) {
+ cl = head->as_CountedLoop();
// do nothing for iteration-splitted loops
if (!cl->is_normal_loop()) return false;
}
- LoopNode *lpn = loop->_head->as_Loop();
- Node* entry = lpn->in(LoopNode::EntryControl);
+ Node* entry = head->in(LoopNode::EntryControl);
+ ProjNode *predicate_proj = NULL;
+ // Loop limit check predicate should be near the loop.
+ if (LoopLimitCheck) {
+ predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate_proj != NULL)
+ entry = predicate_proj->in(0)->in(0);
+ }
- ProjNode *predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
+ predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (!predicate_proj) {
#ifndef PRODUCT
if (TraceLoopPredicate) {
tty->print("missing predicate:");
loop->dump_head();
- lpn->dump(1);
+ head->dump(1);
}
#endif
return false;
@@ -782,7 +848,6 @@
// Create list of if-projs such that a newer proj dominates all older
// projs in the list, and they all dominate loop->tail()
Node_List if_proj_list(area);
- LoopNode *head = loop->_head->as_Loop();
Node *current_proj = loop->tail(); //start from tail
while (current_proj != head) {
if (loop == get_loop(current_proj) && // still in the loop ?
@@ -856,8 +921,8 @@
const Node* cmp = bol->in(1)->as_Cmp();
Node* idx = cmp->in(1);
assert(!invar.is_invariant(idx), "index is variant");
- assert(cmp->in(2)->Opcode() == Op_LoadRange || OptimizeFill, "must be");
Node* rng = cmp->in(2);
+ assert(rng->Opcode() == Op_LoadRange || _igvn.type(rng)->is_int() >= 0, "must be");
assert(invar.is_invariant(rng), "range must be invariant");
int scale = 1;
Node* offset = zero;
@@ -886,14 +951,14 @@
}
// Test the lower bound
- Node* lower_bound_bol = rc_predicate(ctrl, scale, offset, init, limit, stride, rng, false);
+ Node* lower_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, false);
IfNode* lower_bound_iff = lower_bound_proj->in(0)->as_If();
_igvn.hash_delete(lower_bound_iff);
lower_bound_iff->set_req(1, lower_bound_bol);
if (TraceLoopPredicate) tty->print_cr("lower bound check if: %d", lower_bound_iff->_idx);
// Test the upper bound
- Node* upper_bound_bol = rc_predicate(ctrl, scale, offset, init, limit, stride, rng, true);
+ Node* upper_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, true);
IfNode* upper_bound_iff = upper_bound_proj->in(0)->as_If();
_igvn.hash_delete(upper_bound_iff);
upper_bound_iff->set_req(1, upper_bound_bol);
@@ -957,4 +1022,3 @@
return hoisted;
}
-
--- a/hotspot/src/share/vm/opto/loopTransform.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp Sat May 14 11:24:26 2011 -0700
@@ -83,7 +83,7 @@
#ifdef ASSERT
BoolTest::mask bt = cl->loopexit()->test_trip();
assert(bt == BoolTest::lt || bt == BoolTest::gt ||
- bt == BoolTest::ne, "canonical test is expected");
+ (bt == BoolTest::ne && !LoopLimitCheck), "canonical test is expected");
#endif
Node* init_n = cl->init_trip();
@@ -510,7 +510,7 @@
// the pre-loop with only 1 user (the new peeled iteration), but the
// peeled-loop backedge has 2 users.
Node* new_exit_value = old_new[head->in(LoopNode::LoopBackControl)->_idx];
- new_exit_value = move_loop_predicates(entry, new_exit_value);
+ new_exit_value = move_loop_predicates(entry, new_exit_value, !counted_loop);
_igvn.hash_delete(head);
head->set_req(LoopNode::EntryControl, new_exit_value);
for (DUIterator_Fast jmax, j = head->fast_outs(jmax); j < jmax; j++) {
@@ -593,6 +593,12 @@
return false;
}
+ // Fully unroll a loop with few iterations regardless next
+ // conditions since following loop optimizations will split
+ // such loop anyway (pre-main-post).
+ if (trip_count <= 3)
+ return true;
+
// Take into account that after unroll conjoined heads and tails will fold,
// otherwise policy_unroll() may allow more unrolling than max unrolling.
uint new_body_size = EMPTY_LOOP_SIZE + (body_size - EMPTY_LOOP_SIZE) * trip_count;
@@ -605,15 +611,6 @@
return false;
}
- // Currently we don't have policy to optimize one iteration loops.
- // Maximally unrolling transformation is used for that:
- // it is peeled and the original loop become non reachable (dead).
- // Also fully unroll a loop with few iterations regardless next
- // conditions since following loop optimizations will split
- // such loop anyway (pre-main-post).
- if (trip_count <= 3)
- return true;
-
// Do not unroll a loop with String intrinsics code.
// String intrinsics are large and have loops.
for (uint k = 0; k < _body.size(); k++) {
@@ -632,6 +629,8 @@
}
+#define MAX_UNROLL 16 // maximum number of unrolls for main loop
+
//------------------------------policy_unroll----------------------------------
// Return TRUE or FALSE if the loop should be unrolled or not. Unroll if
// the loop is a CountedLoop and the body is small enough.
@@ -643,13 +642,15 @@
if (!cl->is_valid_counted_loop())
return false; // Malformed counted loop
- // protect against over-unrolling
- if (cl->trip_count() <= 1) return false;
-
- // Check for stride being a small enough constant
- if (abs(cl->stride_con()) > (1<<3)) return false;
+ // Protect against over-unrolling.
+ // After split at least one iteration will be executed in pre-loop.
+ if (cl->trip_count() <= (uint)(cl->is_normal_loop() ? 2 : 1)) return false;
int future_unroll_ct = cl->unrolled_count() * 2;
+ if (future_unroll_ct > MAX_UNROLL) return false;
+
+ // Check for initial stride being a small enough constant
+ if (abs(cl->stride_con()) > (1<<2)*future_unroll_ct) return false;
// Don't unroll if the next round of unrolling would push us
// over the expected trip count of the loop. One is subtracted
@@ -675,6 +676,7 @@
Node *init_n = cl->init_trip();
Node *limit_n = cl->limit();
+ int stride_con = cl->stride_con();
// Non-constant bounds.
// Protect against over-unrolling when init or/and limit are not constant
// (so that trip_count's init value is maxint) but iv range is known.
@@ -684,7 +686,7 @@
if (phi != NULL) {
assert(phi->is_Phi() && phi->in(0) == _head, "Counted loop should have iv phi.");
const TypeInt* iv_type = phase->_igvn.type(phi)->is_int();
- int next_stride = cl->stride_con() * 2; // stride after this unroll
+ int next_stride = stride_con * 2; // stride after this unroll
if (next_stride > 0) {
if (iv_type->_lo + next_stride <= iv_type->_lo || // overflow
iv_type->_lo + next_stride > iv_type->_hi) {
@@ -699,15 +701,19 @@
}
}
+ // After unroll limit will be adjusted: new_limit = limit-stride.
+ // Bailout if adjustment overflow.
+ const TypeInt* limit_type = phase->_igvn.type(limit_n)->is_int();
+ if (stride_con > 0 && ((limit_type->_hi - stride_con) >= limit_type->_hi) ||
+ stride_con < 0 && ((limit_type->_lo - stride_con) <= limit_type->_lo))
+ return false; // overflow
+
// Adjust body_size to determine if we unroll or not
uint body_size = _body.size();
- // Key test to unroll CaffeineMark's Logic test
- int xors_in_loop = 0;
// Also count ModL, DivL and MulL which expand mightly
for (uint k = 0; k < _body.size(); k++) {
Node* n = _body.at(k);
switch (n->Opcode()) {
- case Op_XorI: xors_in_loop++; break; // CaffeineMark's Logic test
case Op_ModL: body_size += 30; break;
case Op_DivL: body_size += 30; break;
case Op_MulL: body_size += 10; break;
@@ -724,8 +730,7 @@
// Check for being too big
if (body_size > (uint)LoopUnrollLimit) {
- if (xors_in_loop >= 4 && body_size < (uint)LoopUnrollLimit*4) return true;
- // Normal case: loop too big
+ // Normal case: loop too big
return false;
}
@@ -747,28 +752,31 @@
// Return TRUE or FALSE if the loop should be range-check-eliminated.
// Actually we do iteration-splitting, a more powerful form of RCE.
bool IdealLoopTree::policy_range_check( PhaseIdealLoop *phase ) const {
- if( !RangeCheckElimination ) return false;
+ if (!RangeCheckElimination) return false;
CountedLoopNode *cl = _head->as_CountedLoop();
// If we unrolled with no intention of doing RCE and we later
// changed our minds, we got no pre-loop. Either we need to
// make a new pre-loop, or we gotta disallow RCE.
- if( cl->is_main_no_pre_loop() ) return false; // Disallowed for now.
+ if (cl->is_main_no_pre_loop()) return false; // Disallowed for now.
Node *trip_counter = cl->phi();
// Check loop body for tests of trip-counter plus loop-invariant vs
// loop-invariant.
- for( uint i = 0; i < _body.size(); i++ ) {
+ for (uint i = 0; i < _body.size(); i++) {
Node *iff = _body[i];
- if( iff->Opcode() == Op_If ) { // Test?
+ if (iff->Opcode() == Op_If) { // Test?
// Comparing trip+off vs limit
Node *bol = iff->in(1);
- if( bol->req() != 2 ) continue; // dead constant test
+ if (bol->req() != 2) continue; // dead constant test
if (!bol->is_Bool()) {
assert(UseLoopPredicate && bol->Opcode() == Op_Conv2B, "predicate check only");
continue;
}
+ if (bol->as_Bool()->_test._test == BoolTest::ne)
+ continue; // not RC
+
Node *cmp = bol->in(1);
Node *rc_exp = cmp->in(1);
@@ -1064,6 +1072,7 @@
// negative stride use >
if (pre_end->in(CountedLoopEndNode::TestValue)->as_Bool()->_test._test == BoolTest::ne) {
+ assert(!LoopLimitCheck, "only canonical tests (lt or gt) are expected");
BoolTest::mask new_test = (main_end->stride_con() > 0) ? BoolTest::lt : BoolTest::gt;
// Modify pre loop end condition
@@ -1090,6 +1099,9 @@
main_head->set_main_loop();
if( peel_only ) main_head->set_main_no_pre_loop();
+ // Subtract a trip count for the pre-loop.
+ main_head->set_trip_count(main_head->trip_count() - 1);
+
// It's difficult to be precise about the trip-counts
// for the pre/post loops. They are usually very short,
// so guess that 4 trips is a reasonable value.
@@ -1123,9 +1135,9 @@
loop->dump_head();
} else if (TraceLoopOpts) {
if (loop_head->trip_count() < (uint)LoopUnrollLimit) {
- tty->print("Unroll %d(%2d) ", loop_head->unrolled_count()*2, loop_head->trip_count());
+ tty->print("Unroll %d(%2d) ", loop_head->unrolled_count()*2, loop_head->trip_count());
} else {
- tty->print("Unroll %d ", loop_head->unrolled_count()*2);
+ tty->print("Unroll %d ", loop_head->unrolled_count()*2);
}
loop->dump_head();
}
@@ -1141,7 +1153,8 @@
Node *stride = loop_head->stride();
Node *opaq = NULL;
- if( adjust_min_trip ) { // If not maximally unrolling, need adjustment
+ if (adjust_min_trip) { // If not maximally unrolling, need adjustment
+ // Search for zero-trip guard.
assert( loop_head->is_main_loop(), "" );
assert( ctrl->Opcode() == Op_IfTrue || ctrl->Opcode() == Op_IfFalse, "" );
Node *iff = ctrl->in(0);
@@ -1151,63 +1164,210 @@
Node *cmp = bol->in(1);
assert( cmp->Opcode() == Op_CmpI, "" );
opaq = cmp->in(2);
- // Occasionally it's possible for a pre-loop Opaque1 node to be
+ // Occasionally it's possible for a zero-trip guard Opaque1 node to be
// optimized away and then another round of loop opts attempted.
// We can not optimize this particular loop in that case.
- if( opaq->Opcode() != Op_Opaque1 )
- return; // Cannot find pre-loop! Bail out!
+ if (opaq->Opcode() != Op_Opaque1)
+ return; // Cannot find zero-trip guard! Bail out!
+ // Zero-trip test uses an 'opaque' node which is not shared.
+ assert(opaq->outcnt() == 1 && opaq->in(1) == limit, "");
}
C->set_major_progress();
- // Adjust max trip count. The trip count is intentionally rounded
- // down here (e.g. 15-> 7-> 3-> 1) because if we unwittingly over-unroll,
- // the main, unrolled, part of the loop will never execute as it is protected
- // by the min-trip test. See bug 4834191 for a case where we over-unrolled
- // and later determined that part of the unrolled loop was dead.
- loop_head->set_trip_count(loop_head->trip_count() / 2);
+ Node* new_limit = NULL;
+ if (UnrollLimitCheck) {
+ int stride_con = stride->get_int();
+ int stride_p = (stride_con > 0) ? stride_con : -stride_con;
+ uint old_trip_count = loop_head->trip_count();
+ // Verify that unroll policy result is still valid.
+ assert(old_trip_count > 1 &&
+ (!adjust_min_trip || stride_p <= (1<<3)*loop_head->unrolled_count()), "sanity");
- // Double the count of original iterations in the unrolled loop body.
- loop_head->double_unrolled_count();
+ // Adjust loop limit to keep valid iterations number after unroll.
+ // Use (limit - stride) instead of (((limit - init)/stride) & (-2))*stride
+ // which may overflow.
+ if (!adjust_min_trip) {
+ assert(old_trip_count > 1 && (old_trip_count & 1) == 0,
+ "odd trip count for maximally unroll");
+ // Don't need to adjust limit for maximally unroll since trip count is even.
+ } else if (loop_head->has_exact_trip_count() && init->is_Con()) {
+ // Loop's limit is constant. Loop's init could be constant when pre-loop
+ // become peeled iteration.
+ long init_con = init->get_int();
+ // We can keep old loop limit if iterations count stays the same:
+ // old_trip_count == new_trip_count * 2
+ // Note: since old_trip_count >= 2 then new_trip_count >= 1
+ // so we also don't need to adjust zero trip test.
+ long limit_con = limit->get_int();
+ // (stride_con*2) not overflow since stride_con <= 8.
+ int new_stride_con = stride_con * 2;
+ int stride_m = new_stride_con - (stride_con > 0 ? 1 : -1);
+ long trip_count = (limit_con - init_con + stride_m)/new_stride_con;
+ // New trip count should satisfy next conditions.
+ assert(trip_count > 0 && (julong)trip_count < (julong)max_juint/2, "sanity");
+ uint new_trip_count = (uint)trip_count;
+ adjust_min_trip = (old_trip_count != new_trip_count*2);
+ }
+
+ if (adjust_min_trip) {
+ // Step 2: Adjust the trip limit if it is called for.
+ // The adjustment amount is -stride. Need to make sure if the
+ // adjustment underflows or overflows, then the main loop is skipped.
+ Node* cmp = loop_end->cmp_node();
+ assert(cmp->in(2) == limit, "sanity");
+ assert(opaq != NULL && opaq->in(1) == limit, "sanity");
+
+ // Verify that policy_unroll result is still valid.
+ const TypeInt* limit_type = _igvn.type(limit)->is_int();
+ assert(stride_con > 0 && ((limit_type->_hi - stride_con) < limit_type->_hi) ||
+ stride_con < 0 && ((limit_type->_lo - stride_con) > limit_type->_lo), "sanity");
- // -----------
- // Step 2: Cut back the trip counter for an unroll amount of 2.
- // Loop will normally trip (limit - init)/stride_con. Since it's a
- // CountedLoop this is exact (stride divides limit-init exactly).
- // We are going to double the loop body, so we want to knock off any
- // odd iteration: (trip_cnt & ~1). Then back compute a new limit.
- Node *span = new (C, 3) SubINode( limit, init );
- register_new_node( span, ctrl );
- Node *trip = new (C, 3) DivINode( 0, span, stride );
- register_new_node( trip, ctrl );
- Node *mtwo = _igvn.intcon(-2);
- set_ctrl(mtwo, C->root());
- Node *rond = new (C, 3) AndINode( trip, mtwo );
- register_new_node( rond, ctrl );
- Node *spn2 = new (C, 3) MulINode( rond, stride );
- register_new_node( spn2, ctrl );
- Node *lim2 = new (C, 3) AddINode( spn2, init );
- register_new_node( lim2, ctrl );
+ if (limit->is_Con()) {
+ // The check in policy_unroll and the assert above guarantee
+ // no underflow if limit is constant.
+ new_limit = _igvn.intcon(limit->get_int() - stride_con);
+ set_ctrl(new_limit, C->root());
+ } else {
+ // Limit is not constant.
+ {
+ // Separate limit by Opaque node in case it is an incremented
+ // variable from previous loop to avoid using pre-incremented
+ // value which could increase register pressure.
+ // Otherwise reorg_offsets() optimization will create a separate
+ // Opaque node for each use of trip-counter and as result
+ // zero trip guard limit will be different from loop limit.
+ assert(has_ctrl(opaq), "should have it");
+ Node* opaq_ctrl = get_ctrl(opaq);
+ limit = new (C, 2) Opaque2Node( C, limit );
+ register_new_node( limit, opaq_ctrl );
+ }
+ if (stride_con > 0 && ((limit_type->_lo - stride_con) < limit_type->_lo) ||
+ stride_con < 0 && ((limit_type->_hi - stride_con) > limit_type->_hi)) {
+ // No underflow.
+ new_limit = new (C, 3) SubINode(limit, stride);
+ } else {
+ // (limit - stride) may underflow.
+ // Clamp the adjustment value with MININT or MAXINT:
+ //
+ // new_limit = limit-stride
+ // if (stride > 0)
+ // new_limit = (limit < new_limit) ? MININT : new_limit;
+ // else
+ // new_limit = (limit > new_limit) ? MAXINT : new_limit;
+ //
+ BoolTest::mask bt = loop_end->test_trip();
+ assert(bt == BoolTest::lt || bt == BoolTest::gt, "canonical test is expected");
+ Node* adj_max = _igvn.intcon((stride_con > 0) ? min_jint : max_jint);
+ set_ctrl(adj_max, C->root());
+ Node* old_limit = NULL;
+ Node* adj_limit = NULL;
+ Node* bol = limit->is_CMove() ? limit->in(CMoveNode::Condition) : NULL;
+ if (loop_head->unrolled_count() > 1 &&
+ limit->is_CMove() && limit->Opcode() == Op_CMoveI &&
+ limit->in(CMoveNode::IfTrue) == adj_max &&
+ bol->as_Bool()->_test._test == bt &&
+ bol->in(1)->Opcode() == Op_CmpI &&
+ bol->in(1)->in(2) == limit->in(CMoveNode::IfFalse)) {
+ // Loop was unrolled before.
+ // Optimize the limit to avoid nested CMove:
+ // use original limit as old limit.
+ old_limit = bol->in(1)->in(1);
+ // Adjust previous adjusted limit.
+ adj_limit = limit->in(CMoveNode::IfFalse);
+ adj_limit = new (C, 3) SubINode(adj_limit, stride);
+ } else {
+ old_limit = limit;
+ adj_limit = new (C, 3) SubINode(limit, stride);
+ }
+ assert(old_limit != NULL && adj_limit != NULL, "");
+ register_new_node( adj_limit, ctrl ); // adjust amount
+ Node* adj_cmp = new (C, 3) CmpINode(old_limit, adj_limit);
+ register_new_node( adj_cmp, ctrl );
+ Node* adj_bool = new (C, 2) BoolNode(adj_cmp, bt);
+ register_new_node( adj_bool, ctrl );
+ new_limit = new (C, 4) CMoveINode(adj_bool, adj_limit, adj_max, TypeInt::INT);
+ }
+ register_new_node(new_limit, ctrl);
+ }
+ assert(new_limit != NULL, "");
+ // Replace in loop test.
+ _igvn.hash_delete(cmp);
+ cmp->set_req(2, new_limit);
- // Hammer in the new limit
- Node *ctrl2 = loop_end->in(0);
- Node *cmp2 = new (C, 3) CmpINode( loop_head->incr(), lim2 );
- register_new_node( cmp2, ctrl2 );
- Node *bol2 = new (C, 2) BoolNode( cmp2, loop_end->test_trip() );
- register_new_node( bol2, ctrl2 );
- _igvn.hash_delete(loop_end);
- loop_end->set_req(CountedLoopEndNode::TestValue, bol2);
+ // Step 3: Find the min-trip test guaranteed before a 'main' loop.
+ // Make it a 1-trip test (means at least 2 trips).
+
+ // Guard test uses an 'opaque' node which is not shared. Hence I
+ // can edit it's inputs directly. Hammer in the new limit for the
+ // minimum-trip guard.
+ assert(opaq->outcnt() == 1, "");
+ _igvn.hash_delete(opaq);
+ opaq->set_req(1, new_limit);
+ }
+
+ // Adjust max trip count. The trip count is intentionally rounded
+ // down here (e.g. 15-> 7-> 3-> 1) because if we unwittingly over-unroll,
+ // the main, unrolled, part of the loop will never execute as it is protected
+ // by the min-trip test. See bug 4834191 for a case where we over-unrolled
+ // and later determined that part of the unrolled loop was dead.
+ loop_head->set_trip_count(old_trip_count / 2);
+
+ // Double the count of original iterations in the unrolled loop body.
+ loop_head->double_unrolled_count();
+
+ } else { // LoopLimitCheck
+
+ // Adjust max trip count. The trip count is intentionally rounded
+ // down here (e.g. 15-> 7-> 3-> 1) because if we unwittingly over-unroll,
+ // the main, unrolled, part of the loop will never execute as it is protected
+ // by the min-trip test. See bug 4834191 for a case where we over-unrolled
+ // and later determined that part of the unrolled loop was dead.
+ loop_head->set_trip_count(loop_head->trip_count() / 2);
+
+ // Double the count of original iterations in the unrolled loop body.
+ loop_head->double_unrolled_count();
- // Step 3: Find the min-trip test guaranteed before a 'main' loop.
- // Make it a 1-trip test (means at least 2 trips).
- if( adjust_min_trip ) {
- // Guard test uses an 'opaque' node which is not shared. Hence I
- // can edit it's inputs directly. Hammer in the new limit for the
- // minimum-trip guard.
- assert( opaq->outcnt() == 1, "" );
- _igvn.hash_delete(opaq);
- opaq->set_req(1, lim2);
- }
+ // -----------
+ // Step 2: Cut back the trip counter for an unroll amount of 2.
+ // Loop will normally trip (limit - init)/stride_con. Since it's a
+ // CountedLoop this is exact (stride divides limit-init exactly).
+ // We are going to double the loop body, so we want to knock off any
+ // odd iteration: (trip_cnt & ~1). Then back compute a new limit.
+ Node *span = new (C, 3) SubINode( limit, init );
+ register_new_node( span, ctrl );
+ Node *trip = new (C, 3) DivINode( 0, span, stride );
+ register_new_node( trip, ctrl );
+ Node *mtwo = _igvn.intcon(-2);
+ set_ctrl(mtwo, C->root());
+ Node *rond = new (C, 3) AndINode( trip, mtwo );
+ register_new_node( rond, ctrl );
+ Node *spn2 = new (C, 3) MulINode( rond, stride );
+ register_new_node( spn2, ctrl );
+ new_limit = new (C, 3) AddINode( spn2, init );
+ register_new_node( new_limit, ctrl );
+
+ // Hammer in the new limit
+ Node *ctrl2 = loop_end->in(0);
+ Node *cmp2 = new (C, 3) CmpINode( loop_head->incr(), new_limit );
+ register_new_node( cmp2, ctrl2 );
+ Node *bol2 = new (C, 2) BoolNode( cmp2, loop_end->test_trip() );
+ register_new_node( bol2, ctrl2 );
+ _igvn.hash_delete(loop_end);
+ loop_end->set_req(CountedLoopEndNode::TestValue, bol2);
+
+ // Step 3: Find the min-trip test guaranteed before a 'main' loop.
+ // Make it a 1-trip test (means at least 2 trips).
+ if( adjust_min_trip ) {
+ assert( new_limit != NULL, "" );
+ // Guard test uses an 'opaque' node which is not shared. Hence I
+ // can edit it's inputs directly. Hammer in the new limit for the
+ // minimum-trip guard.
+ assert( opaq->outcnt() == 1, "" );
+ _igvn.hash_delete(opaq);
+ opaq->set_req(1, new_limit);
+ }
+ } // LoopLimitCheck
// ---------
// Step 4: Clone the loop body. Move it inside the loop. This loop body
@@ -1263,6 +1423,7 @@
void PhaseIdealLoop::do_maximally_unroll( IdealLoopTree *loop, Node_List &old_new ) {
CountedLoopNode *cl = loop->_head->as_CountedLoop();
+ assert(cl->has_exact_trip_count(), "trip count is not exact");
assert(cl->trip_count() > 0, "");
#ifndef PRODUCT
if (TraceLoopOpts) {
@@ -1279,6 +1440,7 @@
// Now its tripping an even number of times remaining. Double loop body.
// Do not adjust pre-guards; they are not needed and do not exist.
if (cl->trip_count() > 0) {
+ assert((cl->trip_count() & 1) == 0, "missed peeling");
do_unroll(loop, old_new, false);
}
}
@@ -1292,22 +1454,13 @@
}
//------------------------------add_constraint---------------------------------
-// Constrain the main loop iterations so the condition:
-// scale_con * I + offset < limit
+// Constrain the main loop iterations so the conditions:
+// low_limit <= scale_con * I + offset < upper_limit
// always holds true. That is, either increase the number of iterations in
// the pre-loop or the post-loop until the condition holds true in the main
// loop. Stride, scale, offset and limit are all loop invariant. Further,
// stride and scale are constants (offset and limit often are).
-void PhaseIdealLoop::add_constraint( int stride_con, int scale_con, Node *offset, Node *limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit ) {
-
- // Compute "I :: (limit-offset)/scale_con"
- Node *con = new (C, 3) SubINode( limit, offset );
- register_new_node( con, pre_ctrl );
- Node *scale = _igvn.intcon(scale_con);
- set_ctrl(scale, C->root());
- Node *X = new (C, 3) DivINode( 0, con, scale );
- register_new_node( X, pre_ctrl );
-
+void PhaseIdealLoop::add_constraint( int stride_con, int scale_con, Node *offset, Node *low_limit, Node *upper_limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit ) {
// For positive stride, the pre-loop limit always uses a MAX function
// and the main loop a MIN function. For negative stride these are
// reversed.
@@ -1316,48 +1469,143 @@
// pre-loop must check for underflow and the post-loop for overflow.
// Negative stride*scale reverses this; pre-loop checks for overflow and
// post-loop for underflow.
- if( stride_con*scale_con > 0 ) {
- // Compute I < (limit-offset)/scale_con
- // Adjust main-loop last iteration to be MIN/MAX(main_loop,X)
- *main_limit = (stride_con > 0)
- ? (Node*)(new (C, 3) MinINode( *main_limit, X ))
- : (Node*)(new (C, 3) MaxINode( *main_limit, X ));
- register_new_node( *main_limit, pre_ctrl );
+ if (stride_con*scale_con > 0) {
+ // The overflow limit: scale*I+offset < upper_limit
+ // For main-loop compute
+ // ( if (scale > 0) /* and stride > 0 */
+ // I < (upper_limit-offset)/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (upper_limit-offset)/scale
+ // )
+ //
+ // (upper_limit-offset) may overflow when offset < 0.
+ // But it is fine since main loop will either have
+ // less iterations or will be skipped in such case.
+ Node *con = new (C, 3) SubINode(upper_limit, offset);
+ register_new_node(con, pre_ctrl);
+ Node *scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ Node *X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
+
+ // Adjust main-loop last iteration
+ Node *loop_limit = *main_limit;
+ loop_limit = (stride_con > 0) // scale > 0
+ ? (Node*)(new (C, 3) MinINode(loop_limit, X))
+ : (Node*)(new (C, 3) MaxINode(loop_limit, X));
+ register_new_node(loop_limit, pre_ctrl);
+ *main_limit = loop_limit;
- } else {
- // Compute (limit-offset)/scale_con + SGN(-scale_con) <= I
- // Add the negation of the main-loop constraint to the pre-loop.
- // See footnote [++] below for a derivation of the limit expression.
- Node *incr = _igvn.intcon(scale_con > 0 ? -1 : 1);
- set_ctrl(incr, C->root());
- Node *adj = new (C, 3) AddINode( X, incr );
- register_new_node( adj, pre_ctrl );
- *pre_limit = (scale_con > 0)
- ? (Node*)new (C, 3) MinINode( *pre_limit, adj )
- : (Node*)new (C, 3) MaxINode( *pre_limit, adj );
- register_new_node( *pre_limit, pre_ctrl );
+ // The underflow limit: low_limit <= scale*I+offset.
+ // For pre-loop compute
+ // NOT(scale*I+offset >= low_limit)
+ // scale*I+offset < low_limit
+ // ( if (scale > 0) /* and stride > 0 */
+ // I < (low_limit-offset)/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (low_limit-offset)/scale
+ // )
+
+ if (low_limit->get_int() == -max_jint) {
+ if (!RangeLimitCheck) return;
+ // We need this guard when scale*pre_limit+offset >= limit
+ // due to underflow so we need execute pre-loop until
+ // scale*I+offset >= min_int. But (low_limit-offset) will
+ // underflow when offset > 0 and X will be > original_limit.
+ // To avoid it we replace offset = offset > 0 ? 0 : offset
+ // and add min(pre_limit, original_limit).
+ Node* shift = _igvn.intcon(31);
+ set_ctrl(shift, C->root());
+ Node *neg_off = new (C, 3) RShiftINode(offset, shift);
+ register_new_node(neg_off, pre_ctrl);
+ offset = new (C, 3) AndINode(offset, neg_off);
+ register_new_node(offset, pre_ctrl);
+ } else {
+ assert(low_limit->get_int() == 0, "wrong low limit for range check");
+ // The only problem we have here when offset == min_int
+ // since (0-min_int) == min_int. It may be fine for scale > 0
+ // but for scale < 0 X will be < original_limit.
+ }
+ con = new (C, 3) SubINode(low_limit, offset);
+ register_new_node(con, pre_ctrl);
+ scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
-// [++] Here's the algebra that justifies the pre-loop limit expression:
-//
-// NOT( scale_con * I + offset < limit )
-// ==
-// scale_con * I + offset >= limit
-// ==
-// SGN(scale_con) * I >= (limit-offset)/|scale_con|
-// ==
-// (limit-offset)/|scale_con| <= I * SGN(scale_con)
-// ==
-// (limit-offset)/|scale_con|-1 < I * SGN(scale_con)
-// ==
-// ( if (scale_con > 0) /*common case*/
-// (limit-offset)/scale_con - 1 < I
-// else
-// (limit-offset)/scale_con + 1 > I
-// )
-// ( if (scale_con > 0) /*common case*/
-// (limit-offset)/scale_con + SGN(-scale_con) < I
-// else
-// (limit-offset)/scale_con + SGN(-scale_con) > I
+ // Adjust pre-loop last iteration
+ loop_limit = *pre_limit;
+ loop_limit = (stride_con > 0) // scale > 0
+ ? (Node*)(new (C, 3) MaxINode(loop_limit, X))
+ : (Node*)(new (C, 3) MinINode(loop_limit, X));
+ register_new_node( loop_limit, pre_ctrl );
+ *pre_limit = loop_limit;
+
+ } else { // stride_con*scale_con < 0
+ // For negative stride*scale pre-loop checks for overflow and
+ // post-loop for underflow.
+ //
+ // The underflow limit: low_limit <= scale*I+offset.
+ // For main-loop compute
+ // scale*I+offset+1 > low_limit
+ // ( if (scale < 0) /* and stride > 0 */
+ // I < (low_limit-(offset+1))/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (low_limit-(offset+1))/scale
+ // )
+
+ if (low_limit->get_int() == -max_jint) {
+ if (!RangeLimitCheck) return;
+ } else {
+ assert(low_limit->get_int() == 0, "wrong low limit for range check");
+ }
+
+ Node *one = _igvn.intcon(1);
+ set_ctrl(one, C->root());
+ Node *plus_one = new (C, 3) AddINode(offset, one);
+ register_new_node( plus_one, pre_ctrl );
+ Node *con = new (C, 3) SubINode(low_limit, plus_one);
+ register_new_node(con, pre_ctrl);
+ Node *scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ Node *X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
+
+ // Adjust main-loop last iteration
+ Node *loop_limit = *main_limit;
+ loop_limit = (stride_con > 0) // scale < 0
+ ? (Node*)(new (C, 3) MinINode(loop_limit, X))
+ : (Node*)(new (C, 3) MaxINode(loop_limit, X));
+ register_new_node(loop_limit, pre_ctrl);
+ *main_limit = loop_limit;
+
+ // The overflow limit: scale*I+offset < upper_limit
+ // For pre-loop compute
+ // NOT(scale*I+offset < upper_limit)
+ // scale*I+offset >= upper_limit
+ // scale*I+offset+1 > upper_limit
+ // ( if (scale < 0) /* and stride > 0 */
+ // I < (upper_limit-(offset+1))/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (upper_limit-(offset+1))/scale
+ // )
+ plus_one = new (C, 3) AddINode(offset, one);
+ register_new_node( plus_one, pre_ctrl );
+ con = new (C, 3) SubINode(upper_limit, plus_one);
+ register_new_node(con, pre_ctrl);
+ scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
+
+ // Adjust pre-loop last iteration
+ loop_limit = *pre_limit;
+ loop_limit = (stride_con > 0) // scale < 0
+ ? (Node*)(new (C, 3) MaxINode(loop_limit, X))
+ : (Node*)(new (C, 3) MinINode(loop_limit, X));
+ register_new_node( loop_limit, pre_ctrl );
+ *pre_limit = loop_limit;
+
}
}
@@ -1488,7 +1736,7 @@
Node *cmpzm = bolzm->in(1);
assert(cmpzm->is_Cmp(), "");
Node *opqzm = cmpzm->in(2);
- // Can not optimize a loop if pre-loop Opaque1 node is optimized
+ // Can not optimize a loop if zero-trip Opaque1 node is optimized
// away and then another round of loop opts attempted.
if (opqzm->Opcode() != Op_Opaque1)
return;
@@ -1523,8 +1771,11 @@
int stride_con = cl->stride_con();
Node *zero = _igvn.intcon(0);
Node *one = _igvn.intcon(1);
+ // Use symmetrical int range [-max_jint,max_jint]
+ Node *mini = _igvn.intcon(-max_jint);
set_ctrl(zero, C->root());
set_ctrl(one, C->root());
+ set_ctrl(mini, C->root());
// Range checks that do not dominate the loop backedge (ie.
// conditionally executed) can lengthen the pre loop limit beyond
@@ -1599,7 +1850,12 @@
if( offset_c == ctrl ) {
continue; // Don't rce this check but continue looking for other candidates.
}
-
+#ifdef ASSERT
+ if (TraceRangeLimitCheck) {
+ tty->print_cr("RC bool node%s", flip ? " flipped:" : ":");
+ bol->dump(2);
+ }
+#endif
// At this point we have the expression as:
// scale_con * trip_counter + offset :: limit
// where scale_con, offset and limit are loop invariant. Trip_counter
@@ -1610,17 +1866,16 @@
// Adjust pre and main loop limits to guard the correct iteration set
if( cmp->Opcode() == Op_CmpU ) {// Unsigned compare is really 2 tests
if( b_test._test == BoolTest::lt ) { // Range checks always use lt
- // The overflow limit: scale*I+offset < limit
- add_constraint( stride_con, scale_con, offset, limit, pre_ctrl, &pre_limit, &main_limit );
- // The underflow limit: 0 <= scale*I+offset.
- // Some math yields: -scale*I-(offset+1) < 0
- Node *plus_one = new (C, 3) AddINode( offset, one );
- register_new_node( plus_one, pre_ctrl );
- Node *neg_offset = new (C, 3) SubINode( zero, plus_one );
- register_new_node( neg_offset, pre_ctrl );
- add_constraint( stride_con, -scale_con, neg_offset, zero, pre_ctrl, &pre_limit, &main_limit );
+ // The underflow and overflow limits: 0 <= scale*I+offset < limit
+ add_constraint( stride_con, scale_con, offset, zero, limit, pre_ctrl, &pre_limit, &main_limit );
if (!conditional_rc) {
conditional_rc = !loop->dominates_backedge(iff);
+ // It is also needed if offset->_lo == min_int since
+ // (0-min_int) == min_int. It may be fine for stride > 0
+ // but for stride < 0 pre_limit will be < original_limit.
+ const TypeInt* offset_t = _igvn.type(offset)->is_int();
+ conditional_rc |= RangeLimitCheck && (offset_t->_lo == min_jint) &&
+ (scale_con<0) && (stride_con<0);
}
} else {
#ifndef PRODUCT
@@ -1631,21 +1886,35 @@
}
} else { // Otherwise work on normal compares
switch( b_test._test ) {
- case BoolTest::ge: // Convert X >= Y to -X <= -Y
+ case BoolTest::gt:
+ // Fall into GE case
+ case BoolTest::ge:
+ // Convert (I*scale+offset) >= Limit to (I*(-scale)+(-offset)) <= -Limit
scale_con = -scale_con;
offset = new (C, 3) SubINode( zero, offset );
register_new_node( offset, pre_ctrl );
limit = new (C, 3) SubINode( zero, limit );
register_new_node( limit, pre_ctrl );
// Fall into LE case
- case BoolTest::le: // Convert X <= Y to X < Y+1
- limit = new (C, 3) AddINode( limit, one );
- register_new_node( limit, pre_ctrl );
+ case BoolTest::le:
+ if (b_test._test != BoolTest::gt) {
+ // Convert X <= Y to X < Y+1
+ limit = new (C, 3) AddINode( limit, one );
+ register_new_node( limit, pre_ctrl );
+ }
// Fall into LT case
case BoolTest::lt:
- add_constraint( stride_con, scale_con, offset, limit, pre_ctrl, &pre_limit, &main_limit );
+ // The underflow and overflow limits: MIN_INT <= scale*I+offset < limit
+ add_constraint( stride_con, scale_con, offset, mini, limit, pre_ctrl, &pre_limit, &main_limit );
if (!conditional_rc) {
conditional_rc = !loop->dominates_backedge(iff);
+ // It is also needed if scale*pre_limit+offset >= limit
+ // due to underflow so we need execute pre-loop until
+ // scale*I+offset >= min_int. But (low_limit-offset) will
+ // underflow when offset > 0 and X will be > original_limit.
+ const TypeInt* offset_t = _igvn.type(offset)->is_int();
+ conditional_rc |= RangeLimitCheck && (offset_t->_hi > 0) &&
+ (scale_con>0) && (stride_con>0);
}
break;
default:
@@ -1696,7 +1965,8 @@
// Note:: we are making the main loop limit no longer precise;
// need to round up based on stride.
- if( stride_con != 1 && stride_con != -1 ) { // Cutout for common case
+ cl->set_nonexact_trip_count();
+ if (!LoopLimitCheck && stride_con != 1 && stride_con != -1) { // Cutout for common case
// "Standard" round-up logic: ([main_limit-init+(y-1)]/y)*y+init
// Hopefully, compiler will optimize for powers of 2.
Node *ctrl = get_ctrl(main_limit);
@@ -1876,7 +2146,19 @@
// iteration. Then the CountedLoopEnd will collapse (backedge never
// taken) and all loop-invariant uses of the exit values will be correct.
Node *phi = cl->phi();
- Node *final = new (phase->C, 3) SubINode( cl->limit(), cl->stride() );
+ Node *exact_limit = phase->exact_limit(this);
+ if (exact_limit != cl->limit()) {
+ // We also need to replace the original limit to collapse loop exit.
+ Node* cmp = cl->loopexit()->cmp_node();
+ assert(cl->limit() == cmp->in(2), "sanity");
+ phase->_igvn._worklist.push(cmp->in(2)); // put limit on worklist
+ phase->_igvn.hash_delete(cmp);
+ cmp->set_req(2, exact_limit);
+ phase->_igvn._worklist.push(cmp); // put cmp on worklist
+ }
+ // Note: the final value after increment should not overflow since
+ // counted loop has limit check predicate.
+ Node *final = new (phase->C, 3) SubINode( exact_limit, cl->stride() );
phase->register_new_node(final,cl->in(LoopNode::EntryControl));
phase->_igvn.replace_node(phi,final);
phase->C->set_major_progress();
--- a/hotspot/src/share/vm/opto/loopUnswitch.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/loopUnswitch.cpp Sat May 14 11:24:26 2011 -0700
@@ -130,6 +130,11 @@
Node* uniqc = proj_true->unique_ctrl_out();
Node* entry = head->in(LoopNode::EntryControl);
Node* predicate = find_predicate(entry);
+ if (predicate != NULL && LoopLimitCheck && UseLoopPredicate) {
+ // We may have two predicates, find first.
+ entry = find_predicate(entry->in(0)->in(0));
+ if (entry != NULL) predicate = entry;
+ }
if (predicate != NULL) predicate = predicate->in(0);
assert(proj_true->is_IfTrue() &&
(predicate == NULL && uniqc == head ||
@@ -217,6 +222,7 @@
ProjNode* PhaseIdealLoop::create_slow_version_of_loop(IdealLoopTree *loop,
Node_List &old_new) {
LoopNode* head = loop->_head->as_Loop();
+ bool counted_loop = head->is_CountedLoop();
Node* entry = head->in(LoopNode::EntryControl);
_igvn.hash_delete(entry);
_igvn._worklist.push(entry);
@@ -242,14 +248,14 @@
assert(old_new[head->_idx]->is_Loop(), "" );
// Fast (true) control
- Node* iffast_pred = clone_loop_predicates(entry, iffast);
+ Node* iffast_pred = clone_loop_predicates(entry, iffast, !counted_loop);
_igvn.hash_delete(head);
head->set_req(LoopNode::EntryControl, iffast_pred);
set_idom(head, iffast_pred, dom_depth(head));
_igvn._worklist.push(head);
// Slow (false) control
- Node* ifslow_pred = move_loop_predicates(entry, ifslow);
+ Node* ifslow_pred = move_loop_predicates(entry, ifslow, !counted_loop);
LoopNode* slow_head = old_new[head->_idx]->as_Loop();
_igvn.hash_delete(slow_head);
slow_head->set_req(LoopNode::EntryControl, ifslow_pred);
--- a/hotspot/src/share/vm/opto/loopnode.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/loopnode.cpp Sat May 14 11:24:26 2011 -0700
@@ -206,7 +206,7 @@
// Get backedge compare
Node *cmp = test->in(1);
int cmp_op = cmp->Opcode();
- if( cmp_op != Op_CmpI )
+ if (cmp_op != Op_CmpI)
return false; // Avoid pointer & float compares
// Find the trip-counter increment & limit. Limit must be loop invariant.
@@ -259,7 +259,8 @@
}
// Stride must be constant
int stride_con = stride->get_int();
- assert(stride_con != 0, "missed some peephole opt");
+ if (stride_con == 0)
+ return false; // missed some peephole opt
if (!xphi->is_Phi())
return false; // Too much math on the trip counter
@@ -319,7 +320,7 @@
// Count down loop rolls through MAXINT
(bt == BoolTest::le || bt == BoolTest::lt) && stride_con < 0 ||
// Count up loop rolls through MININT
- (bt == BoolTest::ge || bt == BoolTest::gt) && stride_con > 0 ) {
+ (bt == BoolTest::ge || bt == BoolTest::gt) && stride_con > 0) {
return false; // Bail out
}
@@ -341,12 +342,137 @@
//
assert(x->Opcode() == Op_Loop, "regular loops only");
C->print_method("Before CountedLoop", 3);
+
+ Node *hook = new (C, 6) Node(6);
+
+ if (LoopLimitCheck) {
+
+ // ===================================================
+ // Generate loop limit check to avoid integer overflow
+ // in cases like next (cyclic loops):
+ //
+ // for (i=0; i <= max_jint; i++) {}
+ // for (i=0; i < max_jint; i+=2) {}
+ //
+ //
+ // Limit check predicate depends on the loop test:
+ //
+ // for(;i != limit; i++) --> limit <= (max_jint)
+ // for(;i < limit; i+=stride) --> limit <= (max_jint - stride + 1)
+ // for(;i <= limit; i+=stride) --> limit <= (max_jint - stride )
+ //
+
+ // Check if limit is excluded to do more precise int overflow check.
+ bool incl_limit = (bt == BoolTest::le || bt == BoolTest::ge);
+ int stride_m = stride_con - (incl_limit ? 0 : (stride_con > 0 ? 1 : -1));
+
+ // If compare points directly to the phi we need to adjust
+ // the compare so that it points to the incr. Limit have
+ // to be adjusted to keep trip count the same and the
+ // adjusted limit should be checked for int overflow.
+ if (phi_incr != NULL) {
+ stride_m += stride_con;
+ }
+
+ if (limit->is_Con()) {
+ int limit_con = limit->get_int();
+ if ((stride_con > 0 && limit_con > (max_jint - stride_m)) ||
+ (stride_con < 0 && limit_con < (min_jint - stride_m))) {
+ // Bailout: it could be integer overflow.
+ return false;
+ }
+ } else if ((stride_con > 0 && limit_t->_hi <= (max_jint - stride_m)) ||
+ (stride_con < 0 && limit_t->_lo >= (min_jint - stride_m))) {
+ // Limit's type may satisfy the condition, for example,
+ // when it is an array length.
+ } else {
+ // Generate loop's limit check.
+ // Loop limit check predicate should be near the loop.
+ ProjNode *limit_check_proj = find_predicate_insertion_point(init_control, Deoptimization::Reason_loop_limit_check);
+ if (!limit_check_proj) {
+ // The limit check predicate is not generated if this method trapped here before.
+#ifdef ASSERT
+ if (TraceLoopLimitCheck) {
+ tty->print("missing loop limit check:");
+ loop->dump_head();
+ x->dump(1);
+ }
+#endif
+ return false;
+ }
+
+ IfNode* check_iff = limit_check_proj->in(0)->as_If();
+ Node* cmp_limit;
+ Node* bol;
+
+ if (stride_con > 0) {
+ cmp_limit = new (C, 3) CmpINode(limit, _igvn.intcon(max_jint - stride_m));
+ bol = new (C, 2) BoolNode(cmp_limit, BoolTest::le);
+ } else {
+ cmp_limit = new (C, 3) CmpINode(limit, _igvn.intcon(min_jint - stride_m));
+ bol = new (C, 2) BoolNode(cmp_limit, BoolTest::ge);
+ }
+ cmp_limit = _igvn.register_new_node_with_optimizer(cmp_limit);
+ bol = _igvn.register_new_node_with_optimizer(bol);
+ set_subtree_ctrl(bol);
+
+ // Replace condition in original predicate but preserve Opaque node
+ // so that previous predicates could be found.
+ assert(check_iff->in(1)->Opcode() == Op_Conv2B &&
+ check_iff->in(1)->in(1)->Opcode() == Op_Opaque1, "");
+ Node* opq = check_iff->in(1)->in(1);
+ _igvn.hash_delete(opq);
+ opq->set_req(1, bol);
+ // Update ctrl.
+ set_ctrl(opq, check_iff->in(0));
+ set_ctrl(check_iff->in(1), check_iff->in(0));
+
#ifndef PRODUCT
- if (TraceLoopOpts) {
- tty->print("Counted ");
- loop->dump_head();
+ // report that the loop predication has been actually performed
+ // for this loop
+ if (TraceLoopLimitCheck) {
+ tty->print_cr("Counted Loop Limit Check generated:");
+ debug_only( bol->dump(2); )
+ }
+#endif
+ }
+
+ if (phi_incr != NULL) {
+ // If compare points directly to the phi we need to adjust
+ // the compare so that it points to the incr. Limit have
+ // to be adjusted to keep trip count the same and we
+ // should avoid int overflow.
+ //
+ // i = init; do {} while(i++ < limit);
+ // is converted to
+ // i = init; do {} while(++i < limit+1);
+ //
+ limit = gvn->transform(new (C, 3) AddINode(limit, stride));
}
-#endif
+
+ // Now we need to canonicalize loop condition.
+ if (bt == BoolTest::ne) {
+ assert(stride_con == 1 || stride_con == -1, "simple increment only");
+ bt = (stride_con > 0) ? BoolTest::lt : BoolTest::gt;
+ }
+
+ if (incl_limit) {
+ // The limit check guaranties that 'limit <= (max_jint - stride)' so
+ // we can convert 'i <= limit' to 'i < limit+1' since stride != 0.
+ //
+ Node* one = (stride_con > 0) ? gvn->intcon( 1) : gvn->intcon(-1);
+ limit = gvn->transform(new (C, 3) AddINode(limit, one));
+ if (bt == BoolTest::le)
+ bt = BoolTest::lt;
+ else if (bt == BoolTest::ge)
+ bt = BoolTest::gt;
+ else
+ ShouldNotReachHere();
+ }
+ set_subtree_ctrl( limit );
+
+ } else { // LoopLimitCheck
+
// If compare points to incr, we are ok. Otherwise the compare
// can directly point to the phi; in this case adjust the compare so that
// it points to the incr by adjusting the limit.
@@ -359,7 +485,6 @@
Node *one_m = gvn->intcon(-1);
Node *trip_count = NULL;
- Node *hook = new (C, 6) Node(6);
switch( bt ) {
case BoolTest::eq:
ShouldNotReachHere();
@@ -441,6 +566,8 @@
limit = gvn->transform(new (C, 3) AddINode(span,init_trip));
set_subtree_ctrl( limit );
+ } // LoopLimitCheck
+
// Check for SafePoint on backedge and remove
Node *sfpt = x->in(LoopNode::LoopBackControl);
if (sfpt->Opcode() == Op_SafePoint && is_deleteable_safept(sfpt)) {
@@ -531,7 +658,7 @@
// Check for immediately preceding SafePoint and remove
Node *sfpt2 = le->in(0);
- if( sfpt2->Opcode() == Op_SafePoint && is_deleteable_safept(sfpt2))
+ if (sfpt2->Opcode() == Op_SafePoint && is_deleteable_safept(sfpt2))
lazy_replace( sfpt2, sfpt2->in(TypeFunc::Control));
// Free up intermediate goo
@@ -541,12 +668,56 @@
assert(l->is_valid_counted_loop(), "counted loop shape is messed up");
assert(l == loop->_head && l->phi() == phi && l->loopexit() == lex, "" );
#endif
+#ifndef PRODUCT
+ if (TraceLoopOpts) {
+ tty->print("Counted ");
+ loop->dump_head();
+ }
+#endif
C->print_method("After CountedLoop", 3);
return true;
}
+//----------------------exact_limit-------------------------------------------
+Node* PhaseIdealLoop::exact_limit( IdealLoopTree *loop ) {
+ assert(loop->_head->is_CountedLoop(), "");
+ CountedLoopNode *cl = loop->_head->as_CountedLoop();
+
+ if (!LoopLimitCheck || ABS(cl->stride_con()) == 1 ||
+ cl->limit()->Opcode() == Op_LoopLimit) {
+ // Old code has exact limit (it could be incorrect in case of int overflow).
+ // Loop limit is exact with stride == 1. And loop may already have exact limit.
+ return cl->limit();
+ }
+ Node *limit = NULL;
+#ifdef ASSERT
+ BoolTest::mask bt = cl->loopexit()->test_trip();
+ assert(bt == BoolTest::lt || bt == BoolTest::gt, "canonical test is expected");
+#endif
+ if (cl->has_exact_trip_count()) {
+ // Simple case: loop has constant boundaries.
+ // Use longs to avoid integer overflow.
+ int stride_con = cl->stride_con();
+ long init_con = cl->init_trip()->get_int();
+ long limit_con = cl->limit()->get_int();
+ julong trip_cnt = cl->trip_count();
+ long final_con = init_con + trip_cnt*stride_con;
+ final_con -= stride_con;
+ int final_int = (int)final_con;
+ // The final value should be in integer range since the loop
+ // is counted and the limit was checked for overflow.
+ assert(final_con == (long)final_int, "final value should be integer");
+ limit = _igvn.intcon(final_int);
+ } else {
+ // Create new LoopLimit node to get exact limit (final iv value).
+ limit = new (C, 4) LoopLimitNode(C, cl->init_trip(), cl->limit(), cl->stride());
+ register_new_node(limit, cl->in(LoopNode::EntryControl));
+ }
+ assert(limit != NULL, "sanity");
+ return limit;
+}
//------------------------------Ideal------------------------------------------
// Return a node which is more "ideal" than the current node.
@@ -572,14 +743,12 @@
#ifndef PRODUCT
void CountedLoopNode::dump_spec(outputStream *st) const {
LoopNode::dump_spec(st);
- if( stride_is_con() ) {
+ if (stride_is_con()) {
st->print("stride: %d ",stride_con());
- } else {
- st->print("stride: not constant ");
}
- if( is_pre_loop () ) st->print("pre of N%d" , _main_idx );
- if( is_main_loop() ) st->print("main of N%d", _idx );
- if( is_post_loop() ) st->print("post of N%d", _main_idx );
+ if (is_pre_loop ()) st->print("pre of N%d" , _main_idx);
+ if (is_main_loop()) st->print("main of N%d", _idx);
+ if (is_post_loop()) st->print("post of N%d", _main_idx);
}
#endif
@@ -588,7 +757,130 @@
return stride()->bottom_type()->is_int()->get_con();
}
-
+//=============================================================================
+//------------------------------Value-----------------------------------------
+const Type *LoopLimitNode::Value( PhaseTransform *phase ) const {
+ const Type* init_t = phase->type(in(Init));
+ const Type* limit_t = phase->type(in(Limit));
+ const Type* stride_t = phase->type(in(Stride));
+ // Either input is TOP ==> the result is TOP
+ if (init_t == Type::TOP) return Type::TOP;
+ if (limit_t == Type::TOP) return Type::TOP;
+ if (stride_t == Type::TOP) return Type::TOP;
+
+ int stride_con = stride_t->is_int()->get_con();
+ if (stride_con == 1)
+ return NULL; // Identity
+
+ if (init_t->is_int()->is_con() && limit_t->is_int()->is_con()) {
+ // Use longs to avoid integer overflow.
+ long init_con = init_t->is_int()->get_con();
+ long limit_con = limit_t->is_int()->get_con();
+ int stride_m = stride_con - (stride_con > 0 ? 1 : -1);
+ long trip_count = (limit_con - init_con + stride_m)/stride_con;
+ long final_con = init_con + stride_con*trip_count;
+ int final_int = (int)final_con;
+ // The final value should be in integer range since the loop
+ // is counted and the limit was checked for overflow.
+ assert(final_con == (long)final_int, "final value should be integer");
+ return TypeInt::make(final_int);
+ }
+
+ return bottom_type(); // TypeInt::INT
+}
+
+//------------------------------Ideal------------------------------------------
+// Return a node which is more "ideal" than the current node.
+Node *LoopLimitNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+ if (phase->type(in(Init)) == Type::TOP ||
+ phase->type(in(Limit)) == Type::TOP ||
+ phase->type(in(Stride)) == Type::TOP)
+ return NULL; // Dead
+
+ int stride_con = phase->type(in(Stride))->is_int()->get_con();
+ if (stride_con == 1)
+ return NULL; // Identity
+
+ if (in(Init)->is_Con() && in(Limit)->is_Con())
+ return NULL; // Value
+
+ // Delay following optimizations until all loop optimizations
+ // done to keep Ideal graph simple.
+ if (!can_reshape || phase->C->major_progress())
+ return NULL;
+
+ const TypeInt* init_t = phase->type(in(Init) )->is_int();
+ const TypeInt* limit_t = phase->type(in(Limit))->is_int();
+ int stride_p;
+ long lim, ini;
+ julong max;
+ if (stride_con > 0) {
+ stride_p = stride_con;
+ lim = limit_t->_hi;
+ ini = init_t->_lo;
+ max = (julong)max_jint;
+ } else {
+ stride_p = -stride_con;
+ lim = init_t->_hi;
+ ini = limit_t->_lo;
+ max = (julong)min_jint;
+ }
+ julong range = lim - ini + stride_p;
+ if (range <= max) {
+ // Convert to integer expression if it is not overflow.
+ Node* stride_m = phase->intcon(stride_con - (stride_con > 0 ? 1 : -1));
+ Node *range = phase->transform(new (phase->C, 3) SubINode(in(Limit), in(Init)));
+ Node *bias = phase->transform(new (phase->C, 3) AddINode(range, stride_m));
+ Node *trip = phase->transform(new (phase->C, 3) DivINode(0, bias, in(Stride)));
+ Node *span = phase->transform(new (phase->C, 3) MulINode(trip, in(Stride)));
+ return new (phase->C, 3) AddINode(span, in(Init)); // exact limit
+ }
+
+ if (is_power_of_2(stride_p) || // divisor is 2^n
+ !Matcher::has_match_rule(Op_LoopLimit)) { // or no specialized Mach node?
+ // Convert to long expression to avoid integer overflow
+ // and let igvn optimizer convert this division.
+ //
+ Node* init = phase->transform( new (phase->C, 2) ConvI2LNode(in(Init)));
+ Node* limit = phase->transform( new (phase->C, 2) ConvI2LNode(in(Limit)));
+ Node* stride = phase->longcon(stride_con);
+ Node* stride_m = phase->longcon(stride_con - (stride_con > 0 ? 1 : -1));
+
+ Node *range = phase->transform(new (phase->C, 3) SubLNode(limit, init));
+ Node *bias = phase->transform(new (phase->C, 3) AddLNode(range, stride_m));
+ Node *span;
+ if (stride_con > 0 && is_power_of_2(stride_p)) {
+ // bias >= 0 if stride >0, so if stride is 2^n we can use &(-stride)
+ // and avoid generating rounding for division. Zero trip guard should
+ // guarantee that init < limit but sometimes the guard is missing and
+ // we can get situation when init > limit. Note, for the empty loop
+ // optimization zero trip guard is generated explicitly which leaves
+ // only RCE predicate where exact limit is used and the predicate
+ // will simply fail forcing recompilation.
+ Node* neg_stride = phase->longcon(-stride_con);
+ span = phase->transform(new (phase->C, 3) AndLNode(bias, neg_stride));
+ } else {
+ Node *trip = phase->transform(new (phase->C, 3) DivLNode(0, bias, stride));
+ span = phase->transform(new (phase->C, 3) MulLNode(trip, stride));
+ }
+ // Convert back to int
+ Node *span_int = phase->transform(new (phase->C, 2) ConvL2INode(span));
+ return new (phase->C, 3) AddINode(span_int, in(Init)); // exact limit
+ }
+
+ return NULL; // No progress
+}
+
+//------------------------------Identity---------------------------------------
+// If stride == 1 return limit node.
+Node *LoopLimitNode::Identity( PhaseTransform *phase ) {
+ int stride_con = phase->type(in(Stride))->is_int()->get_con();
+ if (stride_con == 1 || stride_con == -1)
+ return in(Limit);
+ return this;
+}
+
+//=============================================================================
//----------------------match_incr_with_optional_truncation--------------------
// Match increment with optional truncation:
// CHAR: (i+1)&0x7fff, BYTE: ((i+1)<<8)>>8, or SHORT: ((i+1)<<16)>>16
@@ -870,7 +1162,7 @@
outer = igvn.register_new_node_with_optimizer(outer, _head);
phase->set_created_loop_node();
- Node* pred = phase->clone_loop_predicates(ctl, outer);
+ Node* pred = phase->clone_loop_predicates(ctl, outer, true);
// Outermost loop falls into '_head' loop
_head->set_req(LoopNode::EntryControl, pred);
_head->del_req(outer_idx);
@@ -1440,9 +1732,16 @@
tty->print(" ");
tty->print("Loop: N%d/N%d ",_head->_idx,_tail->_idx);
if (_irreducible) tty->print(" IRREDUCIBLE");
+ Node* entry = _head->in(LoopNode::EntryControl);
+ if (LoopLimitCheck) {
+ Node* predicate = PhaseIdealLoop::find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL ) {
+ tty->print(" limit_check");
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
- Node* entry = PhaseIdealLoop::find_predicate_insertion_point(_head->in(LoopNode::EntryControl),
- Deoptimization::Reason_predicate);
+ entry = PhaseIdealLoop::find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (entry != NULL) {
tty->print(" predicated");
}
@@ -1528,10 +1827,15 @@
!loop->tail()->is_top()) {
LoopNode* lpn = loop->_head->as_Loop();
Node* entry = lpn->in(LoopNode::EntryControl);
- Node* predicate_proj = find_predicate(entry);
+ Node* predicate_proj = find_predicate(entry); // loop_limit_check first
if (predicate_proj != NULL ) { // right pattern that can be used by loop predication
assert(entry->in(0)->in(1)->in(1)->Opcode() == Op_Opaque1, "must be");
useful_predicates.push(entry->in(0)->in(1)->in(1)); // good one
+ entry = entry->in(0)->in(0);
+ }
+ predicate_proj = find_predicate(entry); // Predicate
+ if (predicate_proj != NULL ) {
+ useful_predicates.push(entry->in(0)->in(1)->in(1)); // good one
}
}
@@ -1542,6 +1846,8 @@
//------------------------eliminate_useless_predicates-----------------------------
// Eliminate all inserted predicates if they could not be used by loop predication.
+// Note: it will also eliminates loop limits check predicate since it also uses
+// Opaque1 node (see Parse::add_predicate()).
void PhaseIdealLoop::eliminate_useless_predicates() {
if (C->predicate_count() == 0)
return; // no predicate left
@@ -1731,7 +2037,7 @@
// Some parser-inserted loop predicates could never be used by loop
// predication or they were moved away from loop during some optimizations.
// For example, peeling. Eliminate them before next loop optimizations.
- if (UseLoopPredicate) {
+ if (UseLoopPredicate || LoopLimitCheck) {
eliminate_useless_predicates();
}
--- a/hotspot/src/share/vm/opto/loopnode.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/loopnode.hpp Sat May 14 11:24:26 2011 -0700
@@ -289,6 +289,28 @@
inline Node *CountedLoopNode::incr() const { return loopexit() ? loopexit()->incr() : NULL; }
inline Node *CountedLoopNode::phi() const { return loopexit() ? loopexit()->phi() : NULL; }
+//------------------------------LoopLimitNode-----------------------------
+// Counted Loop limit node which represents exact final iterator value:
+// trip_count = (limit - init_trip + stride - 1)/stride
+// final_value= trip_count * stride + init_trip.
+// Use HW instructions to calculate it when it can overflow in integer.
+// Note, final_value should fit into integer since counted loop has
+// limit check: limit <= max_int-stride.
+class LoopLimitNode : public Node {
+ enum { Init=1, Limit=2, Stride=3 };
+ public:
+ LoopLimitNode( Compile* C, Node *init, Node *limit, Node *stride ) : Node(0,init,limit,stride) {
+ // Put it on the Macro nodes list to optimize during macro nodes expansion.
+ init_flags(Flag_is_macro);
+ C->add_macro_node(this);
+ }
+ virtual int Opcode() const;
+ virtual const Type *bottom_type() const { return TypeInt::INT; }
+ virtual uint ideal_reg() const { return Op_RegI; }
+ virtual const Type *Value( PhaseTransform *phase ) const;
+ virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual Node *Identity( PhaseTransform *phase );
+};
// -----------------------------IdealLoopTree----------------------------------
class IdealLoopTree : public ResourceObj {
@@ -775,6 +797,8 @@
bool is_counted_loop( Node *x, IdealLoopTree *loop );
+ Node* exact_limit( IdealLoopTree *loop );
+
// Return a post-walked LoopNode
IdealLoopTree *get_loop( Node *n ) const {
// Dead nodes have no loop, so return the top level loop instead
@@ -837,7 +861,6 @@
bool is_scaled_iv_plus_offset(Node* exp, Node* iv, int* p_scale, Node** p_offset, int depth = 0);
// Return true if proj is for "proj->[region->..]call_uct"
- // Return true if proj is for "proj->[region->..]call_uct"
static bool is_uncommon_trap_proj(ProjNode* proj, Deoptimization::DeoptReason reason);
// Return true for "if(test)-> proj -> ...
// |
@@ -860,10 +883,11 @@
PhaseIterGVN* igvn);
static Node* clone_loop_predicates(Node* old_entry, Node* new_entry,
bool move_predicates,
+ bool clone_limit_check,
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn);
- Node* clone_loop_predicates(Node* old_entry, Node* new_entry);
- Node* move_loop_predicates(Node* old_entry, Node* new_entry);
+ Node* clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
+ Node* move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
void eliminate_loop_predicates(Node* entry);
static Node* skip_loop_predicates(Node* entry);
@@ -873,7 +897,7 @@
// Find a predicate
static Node* find_predicate(Node* entry);
// Construct a range check for a predicate if
- BoolNode* rc_predicate(Node* ctrl,
+ BoolNode* rc_predicate(IdealLoopTree *loop, Node* ctrl,
int scale, Node* offset,
Node* init, Node* limit, Node* stride,
Node* range, bool upper);
@@ -903,11 +927,11 @@
// Range Check Elimination uses this function!
// Constrain the main loop iterations so the affine function:
- // scale_con * I + offset < limit
+ // low_limit <= scale_con * I + offset < upper_limit
// always holds true. That is, either increase the number of iterations in
// the pre-loop or the post-loop until the condition holds true in the main
// loop. Scale_con, offset and limit are all loop invariant.
- void add_constraint( int stride_con, int scale_con, Node *offset, Node *limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit );
+ void add_constraint( int stride_con, int scale_con, Node *offset, Node *low_limit, Node *upper_limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit );
// Partially peel loop up through last_peel node.
bool partial_peel( IdealLoopTree *loop, Node_List &old_new );
--- a/hotspot/src/share/vm/opto/macro.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/macro.cpp Sat May 14 11:24:26 2011 -0700
@@ -2154,6 +2154,11 @@
debug_only(int old_macro_count = C->macro_count(););
if (n->is_AbstractLock()) {
success = eliminate_locking_node(n->as_AbstractLock());
+ } else if (n->Opcode() == Op_LoopLimit) {
+ // Remove it from macro list and put on IGVN worklist to optimize.
+ C->remove_macro_node(n);
+ _igvn._worklist.push(n);
+ success = true;
} else if (n->Opcode() == Op_Opaque1 || n->Opcode() == Op_Opaque2) {
_igvn.replace_node(n, n->in(1));
success = true;
--- a/hotspot/src/share/vm/opto/matcher.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/matcher.cpp Sat May 14 11:24:26 2011 -0700
@@ -2086,6 +2086,13 @@
n->del_req(3);
break;
}
+ case Op_LoopLimit: {
+ Node *pair1 = new (C, 3) BinaryNode(n->in(1),n->in(2));
+ n->set_req(1,pair1);
+ n->set_req(2,n->in(3));
+ n->del_req(3);
+ break;
+ }
case Op_StrEquals: {
Node *pair1 = new (C, 3) BinaryNode(n->in(2),n->in(3));
n->set_req(2,pair1);
--- a/hotspot/src/share/vm/opto/parse.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/parse.hpp Sat May 14 11:24:26 2011 -0700
@@ -70,7 +70,7 @@
const char* try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result);
const char* shouldInline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) const;
const char* shouldNotInline(ciMethod* callee_method, ciMethod* caller_method, WarmCallInfo* wci_result) const;
- void print_inlining(ciMethod *callee_method, int caller_bci, const char *failure_msg) const PRODUCT_RETURN;
+ void print_inlining(ciMethod *callee_method, int caller_bci, const char *failure_msg) const;
InlineTree *caller_tree() const { return _caller_tree; }
InlineTree* callee_at(int bci, ciMethod* m) const;
--- a/hotspot/src/share/vm/opto/parse1.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/parse1.cpp Sat May 14 11:24:26 2011 -0700
@@ -638,7 +638,7 @@
ensure_phis_everywhere();
if (block->is_SEL_head() &&
- UseLoopPredicate) {
+ (UseLoopPredicate || LoopLimitCheck)) {
// Add predicate to single entry (not irreducible) loop head.
assert(!block->has_merged_backedge(), "only entry paths should be merged for now");
// Need correct bci for predicate.
--- a/hotspot/src/share/vm/opto/phaseX.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/phaseX.hpp Sat May 14 11:24:26 2011 -0700
@@ -472,8 +472,8 @@
}
// Clone loop predicates. Defined in loopTransform.cpp.
- Node* clone_loop_predicates(Node* old_entry, Node* new_entry);
- Node* move_loop_predicates(Node* old_entry, Node* new_entry);
+ Node* clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
+ Node* move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
// Create a new if below new_entry for the predicate to be cloned
ProjNode* create_new_if_for_predicate(ProjNode* cont_proj, Node* new_entry,
Deoptimization::DeoptReason reason);
--- a/hotspot/src/share/vm/opto/subnode.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/subnode.cpp Sat May 14 11:24:26 2011 -0700
@@ -1223,21 +1223,6 @@
}
//=============================================================================
-//------------------------------NegNode----------------------------------------
-Node *NegFNode::Ideal(PhaseGVN *phase, bool can_reshape) {
- if( in(1)->Opcode() == Op_SubF )
- return new (phase->C, 3) SubFNode( in(1)->in(2), in(1)->in(1) );
- return NULL;
-}
-
-Node *NegDNode::Ideal(PhaseGVN *phase, bool can_reshape) {
- if( in(1)->Opcode() == Op_SubD )
- return new (phase->C, 3) SubDNode( in(1)->in(2), in(1)->in(1) );
- return NULL;
-}
-
-
-//=============================================================================
//------------------------------Value------------------------------------------
// Compute sqrt
const Type *SqrtDNode::Value( PhaseTransform *phase ) const {
--- a/hotspot/src/share/vm/opto/subnode.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/opto/subnode.hpp Sat May 14 11:24:26 2011 -0700
@@ -377,7 +377,6 @@
public:
NegFNode( Node *in1 ) : NegNode(in1) {}
virtual int Opcode() const;
- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
const Type *bottom_type() const { return Type::FLOAT; }
virtual uint ideal_reg() const { return Op_RegF; }
};
@@ -391,7 +390,6 @@
public:
NegDNode( Node *in1 ) : NegNode(in1) {}
virtual int Opcode() const;
- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
};
--- a/hotspot/src/share/vm/prims/jvmti.xml Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/prims/jvmti.xml Sat May 14 11:24:26 2011 -0700
@@ -280,10 +280,8 @@
<!ELEMENT externallink (#PCDATA|jvmti|code|i|b|tm)*>
<!ATTLIST externallink id CDATA #REQUIRED>
- <!ELEMENT vmspeclink EMPTY>
- <!ATTLIST vmspeclink id CDATA #IMPLIED>
- <!ATTLIST vmspeclink name CDATA #IMPLIED>
- <!ATTLIST vmspeclink preposition CDATA #IMPLIED>
+ <!ELEMENT vmspec EMPTY>
+ <!ATTLIST vmspec chapter CDATA #IMPLIED>
<!ELEMENT internallink (#PCDATA|jvmti|code|i|b)*>
<!ATTLIST internallink id CDATA #REQUIRED>
@@ -2285,9 +2283,8 @@
Stack frames are referenced by depth.
The frame at depth zero is the current frame.
<p/>
- Stack frames are as described in the
- <vmspeclink id="Overview.doc.html#17257"
- name="Frames section"/>.
+ Stack frames are as described in
+ <vmspec chapter="3.6"/>,
That is, they correspond to method
invocations (including native methods) but do not correspond to platform native or
VM internal frames.
@@ -2627,7 +2624,7 @@
<param id="use_java_stack">
<jboolean/>
<description>
- Return the stack showing the <vmspeclink/>
+ Return the stack showing <vmspec/>
model of the stack;
otherwise, show the internal representation of the stack with
inlined and optimized methods missing. If the virtual machine
@@ -2707,7 +2704,7 @@
When the thread is resumed, the execution
state of the thread is reset to the state
immediately before the called method was invoked.
- That is (using the <vmspeclink/> terminology):
+ That is (using <vmspec/> terminology):
<ul>
<li>the current frame is discarded as the previous frame becomes the current one</li>
<li>the operand stack is restored--the argument values are added back
@@ -2868,9 +2865,8 @@
to return at any point during its execution.
The method which will return early is referred to as the <i>called method</i>.
The called method is the current method
- (as defined by the
- <vmspeclink id="Overview.doc.html#17257"
- name="Frames section"/>)
+ (as defined by
+ <vmspec chapter="3.6"/>)
for the specified thread at
the time the function is called.
<p/>
@@ -3576,10 +3572,8 @@
<field id="index">
<jint/>
<description>
- The index into the constant pool of the class. See the
- <vmspeclink id="ClassFile.doc.html#20080"
- name="Constant Pool section"/>
- description.
+ The index into the constant pool of the class. See the description in
+ <vmspec chapter="4.4"/>.
</description>
</field>
</typedef>
@@ -5006,9 +5000,8 @@
For references of this kind the <code>referrer_index</code>
parameter to the <internallink id="jvmtiObjectReferenceCallback">
jvmtiObjectReferenceCallback</internallink> is the index into
- constant pool table of the class, starting at 1. See the
- <vmspeclink id="ClassFile.doc.html#20080"
- name="Constant Pool section"/>
+ constant pool table of the class, starting at 1. See
+ <vmspec chapter="4.4"/>.
</constant>
</constants>
@@ -6441,9 +6434,7 @@
been recorded as an initiating loader. Each
class in the returned array was created by this class loader,
either by defining it directly or by delegation to another class loader.
- See the
- <vmspeclink id="ConstantPool.doc.html#72007"
- name="Creation and Loading section"/>.
+ See <vmspec chapter="5.3"/>.
<p/>
For JDK version 1.1 implementations that don't
recognize the distinction between initiating and defining class loaders,
@@ -6626,9 +6617,7 @@
For the class indicated by <code>klass</code>, return the access
flags
via <code>modifiers_ptr</code>.
- Access flags are defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ Access flags are defined in <vmspec chapter="4"/>.
<p/>
If the class is an array class, then its public, private, and protected
modifiers are the same as those of its component type. For arrays of
@@ -6794,9 +6783,8 @@
<description>
For the class indicated by <code>klass</code>,
return the minor and major version numbers,
- as defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ as defined in
+ <vmspec chapter="4"/>.
</description>
<origin>new</origin>
<capabilities>
@@ -6839,10 +6827,8 @@
<description>
For the class indicated by <code>klass</code>,
return the raw bytes of the constant pool in the format of the
- <code>constant_pool</code> item of the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format"
- preposition="in"/>.
+ <code>constant_pool</code> item of
+ <vmspec chapter="4"/>.
The format of the constant pool may differ between versions
of the Class File Format, so, the
<functionlink id="GetClassVersionNumbers">minor and major
@@ -7286,9 +7272,7 @@
<field id="class_bytes">
<inbuf incount="class_byte_count"><uchar/></inbuf>
<description>
- Bytes defining class (in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format"/>)
+ Bytes defining class (in <vmspec chapter="4"/>)
</description>
</field>
</typedef>
@@ -7611,10 +7595,8 @@
<paramlink id="signature_ptr"/>.
<p/>
Field signatures are defined in the JNI Specification and
- are referred to as
- <vmspeclink id="ClassFile.doc.html#14152"
- name="field descriptors"
- preposition="in"/>.
+ are referred to as <code>field descriptors</code> in
+ <vmspec chapter="4.3.2"/>.
</description>
<origin>jvmdiClone</origin>
<capabilities>
@@ -7709,9 +7691,7 @@
<description>
For the field indicated by <code>klass</code> and <code>field</code>
return the access flags via <code>modifiers_ptr</code>.
- Access flags are defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ Access flags are defined in <vmspec chapter="4"/>.
</description>
<origin>jvmdi</origin>
<capabilities>
@@ -7810,10 +7790,9 @@
return the method name via <code>name_ptr</code> and method signature via
<code>signature_ptr</code>.
<p/>
- Method signatures are defined in the JNI Specification and are referred to as
- <vmspeclink id="ClassFile.doc.html#7035"
- name="method descriptors"
- preposition="in"/>.
+ Method signatures are defined in the JNI Specification and are
+ referred to as <code>method descriptors</code> in
+ <vmspec chapter="4.3.3"/>.
Note this is different
than method signatures as defined in the <i>Java Language Specification</i>.
</description>
@@ -7902,9 +7881,7 @@
<description>
For the method indicated by <code>method</code>,
return the access flags via <code>modifiers_ptr</code>.
- Access flags are defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ Access flags are defined in <vmspec chapter="4"/>.
</description>
<origin>jvmdi</origin>
<capabilities>
@@ -7941,9 +7918,7 @@
including the local variables used to pass parameters to the
method on its invocation.
<p/>
- See <code>max_locals</code> in the
- <vmspeclink id="ClassFile.doc.html#1546"
- name="Code Attribute section"/>.
+ See <code>max_locals</code> in <vmspec chapter="4.7.3"/>.
</description>
<origin>jvmdi</origin>
<capabilities>
@@ -8150,8 +8125,7 @@
The local variable's type signature, encoded as a
<internallink id="mUTF">modified UTF-8</internallink> string.
The signature format is the same as that defined in
- <vmspeclink id="ClassFile.doc.html#14152"
- name="Field Descriptors section"/>
+ <vmspec chapter="4.3.2"/>.
</description>
</field>
<field id="generic_signature">
@@ -10460,10 +10434,7 @@
<synopsis>Add To Bootstrap Class Loader Search</synopsis>
<description>
This function can be used to cause instrumentation classes to be defined by the
- bootstrap class loader. See
- <vmspeclink id="ConstantPool.doc.html#79383"
- name="Loading Using the Bootstrap Class Loader"
- preposition="in"/>.
+ bootstrap class loader. See <vmspec chapter="5.3.1"/>.
After the bootstrap
class loader unsuccessfully searches for a class, the specified platform-dependent
search path <paramlink id="segment"/> will be searched as well. Only one segment may be specified in
@@ -10480,7 +10451,7 @@
contain any classes or resources other than those to be defined by the bootstrap
class loader for the purposes of instrumentation.
<p/>
- The <vmspeclink/> specifies that a subsequent attempt to resolve a symbolic
+ <vmspec/> specifies that a subsequent attempt to resolve a symbolic
reference that the Java virtual machine has previously unsuccessfully attempted
to resolve always fails with the same error that was thrown as a result of the
initial resolution attempt. Consequently, if the JAR file contains an entry
@@ -10512,10 +10483,7 @@
<synopsis>Add To System Class Loader Search</synopsis>
<description>
This function can be used to cause instrumentation classes to be
- defined by the system class loader. See
- <vmspeclink id="ConstantPool.doc.html#79441"
- name="Loading Using a User-defined Class Loader"
- preposition="in"/>.
+ defined by the system class loader. See <vmspec chapter="5.3.2"/>.
After the class loader unsuccessfully searches for a class, the specified platform-dependent search
path <paramlink id="segment"/> will be searched as well. Only one segment may be specified in the
<paramlink id="segment"/>. This function may be called multiple times to add multiple segments, the
@@ -10536,7 +10504,7 @@
which takes a single parameter of type <code>java.lang.String</code>. The method is not required
to have <code>public</code> access.
<p/>
- The <vmspeclink/> specifies that a subsequent attempt to resolve a symbolic
+ <vmspec/> specifies that a subsequent attempt to resolve a symbolic
reference that the Java virtual machine has previously unsuccessfully attempted
to resolve always fails with the same error that was thrown as a result of the
initial resolution attempt. Consequently, if the JAR file contains an entry
@@ -11438,7 +11406,7 @@
at the finest granularity allowed by the VM. A single step event is
generated whenever a thread reaches a new location.
Typically, single step events represent the completion of one VM
- instruction as defined in the <vmspeclink/>. However, some implementations
+ instruction as defined in <vmspec/>. However, some implementations
may define locations differently. In any case the
<code>method</code> and <code>location</code>
parameters uniquely identify the current location and allow
@@ -13841,7 +13809,7 @@
and can_get_source_debug_extension.
PopFrame cannot have a native calling method.
Removed incorrect statement in GetClassloaderClasses
- (see http://java.sun.com/docs/books/vmspec/2nd-edition/html/ConstantPool.doc.html#79383).
+ (see <vmspec chapter="4.4"/>).
</change>
<change date="24 July 2003" version="v79">
XML and text fixes.
--- a/hotspot/src/share/vm/prims/jvmti.xsl Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/prims/jvmti.xsl Sat May 14 11:24:26 2011 -0700
@@ -1039,34 +1039,14 @@
</a>
</xsl:template>
-<xsl:template match="vmspeclink">
- <xsl:if test="count(@id)=1">
- <a>
- <xsl:attribute name="href">
- <xsl:text>http://java.sun.com/docs/books/vmspec/2nd-edition/html/</xsl:text>
- <xsl:value-of select="@id"/>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- <xsl:text> </xsl:text>
- <xsl:choose>
- <xsl:when test="count(@preposition)=1">
- <xsl:value-of select="@preposition"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>of</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text> the </xsl:text>
- </xsl:if>
- <a>
- <xsl:attribute name="href">
- <xsl:text>http://java.sun.com/docs/books/vmspec/</xsl:text>
- </xsl:attribute>
- <i>
- <xsl:text>Java Virtual Machine Specification</xsl:text>
- </i>
- </a>
+<xsl:template match="vmspec">
+ <cite>
+ <xsl:text>The Java™ Virtual Machine Specification</xsl:text>
+ <xsl:if test="count(@chapter)=1">
+ <xsl:text>, Chapter </xsl:text>
+ <xsl:value-of select="@chapter"/>
+ </xsl:if>
+ </cite>
</xsl:template>
<xsl:template match="internallink">
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp Sat May 14 11:24:26 2011 -0700
@@ -1804,6 +1804,8 @@
}
void JvmtiExport::post_dynamic_code_generated_internal(const char *name, const void *code_begin, const void *code_end) {
+ assert(name != NULL && name[0] != '\0', "sanity check");
+
JavaThread* thread = JavaThread::current();
// In theory everyone coming thru here is in_vm but we need to be certain
// because a callee will do a vm->native transition
--- a/hotspot/src/share/vm/prims/jvmtiImpl.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.cpp Sat May 14 11:24:26 2011 -0700
@@ -38,6 +38,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/javaCalls.hpp"
+#include "runtime/os.hpp"
#include "runtime/serviceThread.hpp"
#include "runtime/signature.hpp"
#include "runtime/vframe.hpp"
@@ -939,10 +940,15 @@
nmethodLocker::lock_nmethod(nm, true /* zombie_ok */);
return event;
}
+
JvmtiDeferredEvent JvmtiDeferredEvent::dynamic_code_generated_event(
const char* name, const void* code_begin, const void* code_end) {
JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_DYNAMIC_CODE_GENERATED);
- event._event_data.dynamic_code_generated.name = name;
+ // Need to make a copy of the name since we don't know how long
+ // the event poster will keep it around after we enqueue the
+ // deferred event and return. strdup() failure is handled in
+ // the post() routine below.
+ event._event_data.dynamic_code_generated.name = os::strdup(name);
event._event_data.dynamic_code_generated.code_begin = code_begin;
event._event_data.dynamic_code_generated.code_end = code_end;
return event;
@@ -968,12 +974,19 @@
nmethodLocker::unlock_nmethod(nm);
break;
}
- case TYPE_DYNAMIC_CODE_GENERATED:
+ case TYPE_DYNAMIC_CODE_GENERATED: {
JvmtiExport::post_dynamic_code_generated_internal(
- _event_data.dynamic_code_generated.name,
+ // if strdup failed give the event a default name
+ (_event_data.dynamic_code_generated.name == NULL)
+ ? "unknown_code" : _event_data.dynamic_code_generated.name,
_event_data.dynamic_code_generated.code_begin,
_event_data.dynamic_code_generated.code_end);
+ if (_event_data.dynamic_code_generated.name != NULL) {
+ // release our copy
+ os::free((void *)_event_data.dynamic_code_generated.name);
+ }
break;
+ }
default:
ShouldNotReachHere();
}
--- a/hotspot/src/share/vm/runtime/arguments.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Sat May 14 11:24:26 2011 -0700
@@ -960,7 +960,7 @@
// Ensure Agent_OnLoad has the correct initial values.
// This may not be the final mode; mode may change later in onload phase.
PropertyList_unique_add(&_system_properties, "java.vm.info",
- (char*)Abstract_VM_Version::vm_info_string(), false);
+ (char*)VM_Version::vm_info_string(), false);
UseInterpreter = true;
UseCompiler = true;
@@ -969,10 +969,10 @@
#ifndef ZERO
// Turn these off for mixed and comp. Leave them on for Zero.
if (FLAG_IS_DEFAULT(UseFastAccessorMethods)) {
- UseFastAccessorMethods = mode == _int;
+ UseFastAccessorMethods = (mode == _int);
}
if (FLAG_IS_DEFAULT(UseFastEmptyMethods)) {
- UseFastEmptyMethods = mode == _int;
+ UseFastEmptyMethods = (mode == _int);
}
#endif
@@ -1423,6 +1423,11 @@
}
}
}
+ if (UseNUMA) {
+ if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
+ FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
+ }
+ }
}
void Arguments::set_g1_gc_flags() {
@@ -1987,6 +1992,9 @@
Arguments::_ClipInlining = ClipInlining;
Arguments::_BackgroundCompilation = BackgroundCompilation;
+ // Setup flags for mixed which is the default
+ set_mode_flags(_mixed);
+
// Parse JAVA_TOOL_OPTIONS environment variable (if present)
jint result = parse_java_tool_options_environment_variable(&scp, &scp_assembly_required);
if (result != JNI_OK) {
@@ -2376,7 +2384,6 @@
_gc_log_filename = strdup(tail);
FLAG_SET_CMDLINE(bool, PrintGC, true);
FLAG_SET_CMDLINE(bool, PrintGCTimeStamps, true);
- FLAG_SET_CMDLINE(bool, TraceClassUnloading, true);
// JNI hooks
} else if (match_option(option, "-Xcheck", &tail)) {
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp Sat May 14 11:24:26 2011 -0700
@@ -189,6 +189,10 @@
assert(thread->deopt_nmethod() == NULL, "Pending deopt!");
thread->set_deopt_nmethod(deoptee.cb()->as_nmethod_or_null());
+ if (VerifyStack) {
+ thread->validate_frame_layout();
+ }
+
// Create a growable array of VFrames where each VFrame represents an inlined
// Java frame. This storage is allocated with the usual system arena.
assert(deoptee.is_compiled_frame(), "Wrong frame type");
@@ -421,6 +425,21 @@
frame deopt_sender = stub_frame.sender(&dummy_map); // First is the deoptee frame
deopt_sender = deopt_sender.sender(&dummy_map); // Now deoptee caller
+ // It's possible that the number of paramters at the call site is
+ // different than number of arguments in the callee when method
+ // handles are used. If the caller is interpreted get the real
+ // value so that the proper amount of space can be added to it's
+ // frame.
+ int sender_callee_parameters = callee_parameters;
+ if (deopt_sender.is_interpreted_frame()) {
+ methodHandle method = deopt_sender.interpreter_frame_method();
+ Bytecode_invoke cur = Bytecode_invoke_check(method,
+ deopt_sender.interpreter_frame_bci());
+ Symbol* signature = method->constants()->signature_ref_at(cur.index());
+ ArgumentSizeComputer asc(signature);
+ sender_callee_parameters = asc.size() + (cur.has_receiver() ? 1 : 0);
+ }
+
// Compute the amount the oldest interpreter frame will have to adjust
// its caller's stack by. If the caller is a compiled frame then
// we pretend that the callee has no parameters so that the
@@ -435,14 +454,13 @@
if (deopt_sender.is_compiled_frame()) {
caller_adjustment = last_frame_adjust(0, callee_locals);
- } else if (callee_locals > callee_parameters) {
+ } else if (callee_locals > sender_callee_parameters) {
// The caller frame may need extending to accommodate
// non-parameter locals of the first unpacked interpreted frame.
// Compute that adjustment.
- caller_adjustment = last_frame_adjust(callee_parameters, callee_locals);
+ caller_adjustment = last_frame_adjust(sender_callee_parameters, callee_locals);
}
-
// If the sender is deoptimized the we must retrieve the address of the handler
// since the frame will "magically" show the original pc before the deopt
// and we'd undo the deopt.
@@ -569,6 +587,8 @@
if (VerifyStack) {
ResourceMark res_mark;
+ thread->validate_frame_layout();
+
// Verify that the just-unpacked frames match the interpreter's
// notions of expression stack and locals
vframeArray* cur_array = thread->vframe_array_last();
@@ -1753,7 +1773,8 @@
"constraint",
"div0_check",
"age",
- "predicate"
+ "predicate",
+ "loop_limit_check"
};
const char* Deoptimization::_trap_action_name[Action_LIMIT] = {
// Note: Keep this in sync. with enum DeoptAction.
--- a/hotspot/src/share/vm/runtime/deoptimization.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/deoptimization.hpp Sat May 14 11:24:26 2011 -0700
@@ -56,6 +56,7 @@
Reason_div0_check, // a null_check due to division by zero
Reason_age, // nmethod too old; tier threshold reached
Reason_predicate, // compiler generated predicate failed
+ Reason_loop_limit_check, // compiler generated loop limits check failed
Reason_LIMIT,
// Note: Keep this enum in sync. with _trap_reason_name.
Reason_RECORDED_LIMIT = Reason_bimorphic // some are not recorded per bc
@@ -78,7 +79,7 @@
enum {
_action_bits = 3,
- _reason_bits = 4,
+ _reason_bits = 5,
_action_shift = 0,
_reason_shift = _action_shift+_action_bits,
BC_CASE_LIMIT = PRODUCT_ONLY(1) NOT_PRODUCT(4) // for _deoptimization_hist
--- a/hotspot/src/share/vm/runtime/frame.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/frame.cpp Sat May 14 11:24:26 2011 -0700
@@ -1308,6 +1308,72 @@
guarantee((current - low_mark) % monitor_size == 0 , "Misaligned bottom of BasicObjectLock*");
guarantee( current >= low_mark , "Current BasicObjectLock* below than low_mark");
}
+
+
+void frame::describe(FrameValues& values, int frame_no) {
+ if (is_entry_frame() || is_compiled_frame() || is_interpreted_frame() || is_native_frame()) {
+ // Label values common to most frames
+ values.describe(-1, unextended_sp(), err_msg("unextended_sp for #%d", frame_no));
+ values.describe(-1, sp(), err_msg("sp for #%d", frame_no));
+ values.describe(-1, fp(), err_msg("fp for #%d", frame_no));
+ }
+ if (is_interpreted_frame()) {
+ methodOop m = interpreter_frame_method();
+ int bci = interpreter_frame_bci();
+
+ // Label the method and current bci
+ values.describe(-1, MAX2(sp(), fp()),
+ FormatBuffer<1024>("#%d method %s @ %d", frame_no, m->name_and_sig_as_C_string(), bci), 2);
+ values.describe(-1, MAX2(sp(), fp()),
+ err_msg("- %d locals %d max stack", m->max_locals(), m->max_stack()), 1);
+ if (m->max_locals() > 0) {
+ intptr_t* l0 = interpreter_frame_local_at(0);
+ intptr_t* ln = interpreter_frame_local_at(m->max_locals() - 1);
+ values.describe(-1, MAX2(l0, ln), err_msg("locals for #%d", frame_no), 1);
+ // Report each local and mark as owned by this frame
+ for (int l = 0; l < m->max_locals(); l++) {
+ intptr_t* l0 = interpreter_frame_local_at(l);
+ values.describe(frame_no, l0, err_msg("local %d", l));
+ }
+ }
+
+ // Compute the actual expression stack size
+ InterpreterOopMap mask;
+ OopMapCache::compute_one_oop_map(m, bci, &mask);
+ intptr_t* tos = NULL;
+ // Report each stack element and mark as owned by this frame
+ for (int e = 0; e < mask.expression_stack_size(); e++) {
+ tos = MAX2(tos, interpreter_frame_expression_stack_at(e));
+ values.describe(frame_no, interpreter_frame_expression_stack_at(e),
+ err_msg("stack %d", e));
+ }
+ if (tos != NULL) {
+ values.describe(-1, tos, err_msg("expression stack for #%d", frame_no), 1);
+ }
+ if (interpreter_frame_monitor_begin() != interpreter_frame_monitor_end()) {
+ values.describe(frame_no, (intptr_t*)interpreter_frame_monitor_begin(), "monitors begin");
+ values.describe(frame_no, (intptr_t*)interpreter_frame_monitor_end(), "monitors end");
+ }
+ } else if (is_entry_frame()) {
+ // For now just label the frame
+ values.describe(-1, MAX2(sp(), fp()), err_msg("#%d entry frame", frame_no), 2);
+ } else if (is_compiled_frame()) {
+ // For now just label the frame
+ nmethod* nm = cb()->as_nmethod_or_null();
+ values.describe(-1, MAX2(sp(), fp()),
+ FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for method %s%s", frame_no,
+ nm, nm->method()->name_and_sig_as_C_string(),
+ is_deoptimized_frame() ? " (deoptimized" : ""), 2);
+ } else if (is_native_frame()) {
+ // For now just label the frame
+ nmethod* nm = cb()->as_nmethod_or_null();
+ values.describe(-1, MAX2(sp(), fp()),
+ FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for native method %s", frame_no,
+ nm, nm->method()->name_and_sig_as_C_string()), 2);
+ }
+ describe_pd(values, frame_no);
+}
+
#endif
@@ -1319,3 +1385,71 @@
_fr = thread->last_frame();
_is_done = false;
}
+
+
+#ifdef ASSERT
+
+void FrameValues::describe(int owner, intptr_t* location, const char* description, int priority) {
+ FrameValue fv;
+ fv.location = location;
+ fv.owner = owner;
+ fv.priority = priority;
+ fv.description = NEW_RESOURCE_ARRAY(char, strlen(description) + 1);
+ strcpy(fv.description, description);
+ _values.append(fv);
+}
+
+
+bool FrameValues::validate() {
+ _values.sort(compare);
+ bool error = false;
+ FrameValue prev;
+ prev.owner = -1;
+ for (int i = _values.length() - 1; i >= 0; i--) {
+ FrameValue fv = _values.at(i);
+ if (fv.owner == -1) continue;
+ if (prev.owner == -1) {
+ prev = fv;
+ continue;
+ }
+ if (prev.location == fv.location) {
+ if (fv.owner != prev.owner) {
+ tty->print_cr("overlapping storage");
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT " %s", prev.location, *prev.location, prev.description);
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT " %s", fv.location, *fv.location, fv.description);
+ error = true;
+ }
+ } else {
+ prev = fv;
+ }
+ }
+ return error;
+}
+
+
+void FrameValues::print() {
+ _values.sort(compare);
+ intptr_t* v0 = _values.at(0).location;
+ intptr_t* v1 = _values.at(_values.length() - 1).location;
+ intptr_t* min = MIN2(v0, v1);
+ intptr_t* max = MAX2(v0, v1);
+ intptr_t* cur = max;
+ intptr_t* last = NULL;
+ for (int i = _values.length() - 1; i >= 0; i--) {
+ FrameValue fv = _values.at(i);
+ while (cur > fv.location) {
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT, cur, *cur);
+ cur--;
+ }
+ if (last == fv.location) {
+ const char* spacer = " " LP64_ONLY(" ");
+ tty->print_cr(" %s %s %s", spacer, spacer, fv.description);
+ } else {
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT " %s", fv.location, *fv.location, fv.description);
+ last = fv.location;
+ cur--;
+ }
+ }
+}
+
+#endif
--- a/hotspot/src/share/vm/runtime/frame.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/frame.hpp Sat May 14 11:24:26 2011 -0700
@@ -60,6 +60,7 @@
typedef class BytecodeInterpreter* interpreterState;
class CodeBlob;
+class FrameValues;
class vframeArray;
@@ -381,6 +382,8 @@
private:
const char* print_name() const;
+ void describe_pd(FrameValues& values, int frame_no);
+
public:
void print_value() const { print_value_on(tty,NULL); }
void print_value_on(outputStream* st, JavaThread *thread) const;
@@ -388,6 +391,9 @@
void interpreter_frame_print_on(outputStream* st) const;
void print_on_error(outputStream* st, char* buf, int buflen, bool verbose = false) const;
+ // Add annotated descriptions of memory locations belonging to this frame to values
+ void describe(FrameValues& values, int frame_no);
+
// Conversion from an VMReg to physical stack location
oop* oopmapreg_to_location(VMReg reg, const RegisterMap* regmap) const;
@@ -472,6 +478,41 @@
};
+#ifdef ASSERT
+// A simple class to describe a location on the stack
+class FrameValue VALUE_OBJ_CLASS_SPEC {
+ public:
+ intptr_t* location;
+ char* description;
+ int owner;
+ int priority;
+};
+
+
+// A collection of described stack values that can print a symbolic
+// description of the stack memory. Interpreter frame values can be
+// in the caller frames so all the values are collected first and then
+// sorted before being printed.
+class FrameValues {
+ private:
+ GrowableArray<FrameValue> _values;
+
+ static int compare(FrameValue* a, FrameValue* b) {
+ if (a->location == b->location) {
+ return a->priority - b->priority;
+ }
+ return a->location - b->location;
+ }
+
+ public:
+ // Used by frame functions to describe locations.
+ void describe(int owner, intptr_t* location, const char* description, int priority = 0);
+
+ bool validate();
+ void print();
+};
+
+#endif
//
// StackFrameStream iterates through the frames of a thread starting from
--- a/hotspot/src/share/vm/runtime/globals.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/globals.hpp Sat May 14 11:24:26 2011 -0700
@@ -1827,7 +1827,7 @@
develop(bool, VerifyBlockOffsetArray, false, \
"Do (expensive!) block offset array verification") \
\
- product(bool, BlockOffsetArrayUseUnallocatedBlock, false, \
+ diagnostic(bool, BlockOffsetArrayUseUnallocatedBlock, false, \
"Maintain _unallocated_block in BlockOffsetArray" \
" (currently applicable only to CMS collector)") \
\
@@ -2882,7 +2882,7 @@
"Max. no. of lines in the stack trace for Java exceptions " \
"(0 means all)") \
\
- NOT_EMBEDDED(develop(intx, GuaranteedSafepointInterval, 1000, \
+ NOT_EMBEDDED(diagnostic(intx, GuaranteedSafepointInterval, 1000, \
"Guarantee a safepoint (at least) every so many milliseconds " \
"(0 means none)")) \
\
--- a/hotspot/src/share/vm/runtime/os.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/os.hpp Sat May 14 11:24:26 2011 -0700
@@ -274,7 +274,7 @@
static char* reserve_memory_special(size_t size, char* addr = NULL,
bool executable = false);
static bool release_memory_special(char* addr, size_t bytes);
- static bool large_page_init();
+ static void large_page_init();
static size_t large_page_size();
static bool can_commit_large_page_memory();
static bool can_execute_large_page_memory();
--- a/hotspot/src/share/vm/runtime/thread.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/thread.cpp Sat May 14 11:24:26 2011 -0700
@@ -31,6 +31,7 @@
#include "compiler/compileBroker.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/linkResolver.hpp"
+#include "interpreter/oopMapCache.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
@@ -2860,6 +2861,25 @@
}
+// Print or validate the layout of stack frames
+void JavaThread::print_frame_layout(int depth, bool validate_only) {
+ ResourceMark rm;
+ PRESERVE_EXCEPTION_MARK;
+ FrameValues values;
+ int frame_no = 0;
+ for(StackFrameStream fst(this, false); !fst.is_done(); fst.next()) {
+ fst.current()->describe(values, ++frame_no);
+ if (depth == frame_no) break;
+ }
+ if (validate_only) {
+ values.validate();
+ } else {
+ tty->print_cr("[Describe stack layout]");
+ values.print();
+ }
+}
+
+
void JavaThread::trace_stack_from(vframe* start_vf) {
ResourceMark rm;
int vframe_no = 1;
--- a/hotspot/src/share/vm/runtime/thread.hpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/runtime/thread.hpp Sat May 14 11:24:26 2011 -0700
@@ -1380,6 +1380,12 @@
void trace_stack_from(vframe* start_vf) PRODUCT_RETURN;
void trace_frames() PRODUCT_RETURN;
+ // Print an annotated view of the stack frames
+ void print_frame_layout(int depth = 0, bool validate_only = false) PRODUCT_RETURN;
+ void validate_frame_layout() {
+ print_frame_layout(0, true);
+ }
+
// Returns the number of stack frames on the stack
int depth() const;
--- a/hotspot/src/share/vm/utilities/debug.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/utilities/debug.cpp Sat May 14 11:24:26 2011 -0700
@@ -469,6 +469,7 @@
extern "C" void pp(void* p) {
Command c("pp");
FlagSetting fl(PrintVMMessages, true);
+ FlagSetting f2(DisplayVMOutput, true);
if (Universe::heap()->is_in(p)) {
oop obj = oop(p);
obj->print();
@@ -507,6 +508,17 @@
}
+extern "C" void pfl() {
+ // print frame layout
+ Command c("pfl");
+ JavaThread* p = JavaThread::active();
+ tty->print(" for thread: ");
+ p->print();
+ tty->cr();
+ if (p->has_last_Java_frame()) {
+ p->print_frame_layout();
+ }
+}
extern "C" void psf() { // print stack frames
{
--- a/hotspot/src/share/vm/utilities/elfFile.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/utilities/elfFile.cpp Sat May 14 11:24:26 2011 -0700
@@ -29,6 +29,7 @@
#include <string.h>
#include <stdio.h>
#include <limits.h>
+#include <new>
#include "memory/allocation.inline.hpp"
#include "utilities/decoder.hpp"
@@ -46,7 +47,7 @@
m_status = Decoder::no_error;
int len = strlen(filepath) + 1;
- m_filepath = NEW_C_HEAP_ARRAY(char, len);
+ m_filepath = (const char*)os::malloc(len * sizeof(char));
if (m_filepath != NULL) {
strcpy((char*)m_filepath, filepath);
m_file = fopen(filepath, "r");
@@ -74,7 +75,7 @@
}
if (m_filepath != NULL) {
- FREE_C_HEAP_ARRAY(char, m_filepath);
+ os::free((void*)m_filepath);
}
if (m_next != NULL) {
@@ -120,14 +121,14 @@
}
// string table
if (shdr.sh_type == SHT_STRTAB) {
- ElfStringTable* table = new ElfStringTable(m_file, shdr, index);
+ ElfStringTable* table = new (std::nothrow) ElfStringTable(m_file, shdr, index);
if (table == NULL) {
m_status = Decoder::out_of_memory;
return false;
}
add_string_table(table);
} else if (shdr.sh_type == SHT_SYMTAB || shdr.sh_type == SHT_DYNSYM) {
- ElfSymbolTable* table = new ElfSymbolTable(m_file, shdr);
+ ElfSymbolTable* table = new (std::nothrow) ElfSymbolTable(m_file, shdr);
if (table == NULL) {
m_status = Decoder::out_of_memory;
return false;
--- a/hotspot/src/share/vm/utilities/elfStringTable.cpp Fri May 13 13:20:16 2011 +0200
+++ b/hotspot/src/share/vm/utilities/elfStringTable.cpp Sat May 14 11:24:26 2011 -0700
@@ -27,6 +27,7 @@
#ifndef _WINDOWS
#include "memory/allocation.inline.hpp"
+#include "runtime/os.hpp"
#include "utilities/elfStringTable.hpp"
// We will try to load whole string table into memory if we can.
@@ -41,14 +42,14 @@
// try to load the string table
long cur_offset = ftell(file);
- m_table = (char*)NEW_C_HEAP_ARRAY(char, shdr.sh_size);
+ m_table = (char*)os::malloc(sizeof(char) * shdr.sh_size);
if (m_table != NULL) {
// if there is an error, mark the error
if (fseek(file, shdr.sh_offset, SEEK_SET) ||
fread((void*)m_table, shdr.sh_size, 1, file) != 1 ||
fseek(file, cur_offset, SEEK_SET)) {
m_status = Decoder::file_invalid;
- FREE_C_HEAP_ARRAY(char, m_table);
+ os::free((void*)m_table);
m_table = NULL;
}
} else {
@@ -58,7 +59,7 @@
ElfStringTable::~ElfStringTable() {
if (m_table != NULL) {
- FREE_C_HEAP_ARRAY(char, m_table);
+ os::free((void*)m_table);
}
if (m_next != NULL) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test5091921.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2011 Hewlett-Packard Company. All rights reserved.
+ * 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 5091921
+ * @summary Sign flip issues in loop optimizer
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test5091921 -XX:MaxInlineSize=1 Test5091921
+ */
+
+public class Test5091921 {
+ private static int result = 0;
+
+
+ /* Test for the bug of transforming indx >= MININT to indx > MININT-1 */
+ public static int test_ge1(int limit) {
+ int indx;
+ int sum = 0;
+ for (indx = 500; indx >= limit; indx -= 2) {
+ sum += 2000 / indx;
+ result = sum;
+ }
+ return sum;
+ }
+
+ /* Test for the bug of transforming indx <= MAXINT to indx < MAXINT+1 */
+ public static int test_le1(int limit) {
+ int indx;
+ int sum = 0;
+ for (indx = -500; indx <= limit; indx += 2)
+ {
+ sum += 3000 / indx;
+ result = sum;
+ }
+ return sum;
+ }
+
+ /* Run with -Xcomp -XX:CompileOnly=wrap1.test1 -XX:MaxInlineSize=1 */
+ /* limit reset to ((limit-init+stride-1)/stride)*stride+init */
+ /* Calculation may overflow */
+ public static volatile int c = 1;
+ public static int test_wrap1(int limit)
+ {
+ int indx;
+ int sum = 0;
+ for (indx = 0xffffffff; indx < limit; indx += 0x20000000)
+ {
+ sum += c;
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with bit flip issue for
+ scale*i+offset<limit where offset is not 0 */
+ static int[] box5 = {1,2,3,4,5,6,7,8,9};
+ public static int test_rce5(int[] b, int limit)
+ {
+ int indx;
+ int sum = b[1];
+ result = sum;
+ for (indx = 0x80000000; indx < limit; ++indx)
+ {
+ if (indx > 0x80000000)
+ {
+ // this test is not issued in pre-loop but issued in main loop
+ // trick rce into thinking expression is false when indx >= 0
+ // in fact it is false when indx==0x80000001
+ if (indx - 9 < -9)
+ {
+ sum += indx;
+ result = sum;
+ sum ^= b[indx & 7];
+ result = sum;
+ }
+ else
+ break;
+ }
+ else
+ {
+ sum += b[indx & 3];
+ result = sum;
+ }
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with bit flip issue for
+ scale*i<limit where scale > 1 */
+ static int[] box6 = {1,2,3,4,5,6,7,8,9};
+ public static int test_rce6(int[] b, int limit)
+ {
+ int indx;
+ int sum = b[1];
+ result = sum;
+ for (indx = 0x80000000; indx < limit; ++indx)
+ {
+ if (indx > 0x80000000)
+ {
+ // harmless rce target
+ if (indx < 0)
+ {
+ sum += result;
+ result = sum;
+ }
+ else
+ break;
+ // this test is not issued in pre-loop but issued in main loop
+ // trick rce into thinking expression is false when indx >= 0
+ // in fact it is false when indx==0x80000001
+ // In compilers that transform mulI to shiftI may mask this issue.
+ if (indx * 28 + 1 < 0)
+ {
+ sum += indx;
+ result = sum;
+ sum ^= b[indx & 7];
+ result = sum;
+ }
+ else
+ break;
+ }
+ else
+ {
+ sum += b[indx & 3];
+ result = sum;
+ }
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with i <= limit */
+ static int[] box7 = {1,2,3,4,5,6,7,8,9,0x7fffffff};
+ public static int test_rce7(int[] b)
+ {
+ int indx;
+ int max = b[9];
+ int sum = b[7];
+ result = sum;
+ for (indx = 0; indx < b.length; ++indx)
+ {
+ if (indx <= max)
+ {
+ sum += (indx ^ 15) + ((result != 0) ? 0 : sum);
+ result = sum;
+ }
+ else
+ throw new RuntimeException();
+ }
+ for (indx = -7; indx < b.length; ++indx)
+ {
+ if (indx <= 9)
+ {
+ sum += (sum ^ 15) + ((result != 0) ? 0 : sum);
+ result = sum;
+ }
+ else
+ throw new RuntimeException();
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with i >= limit */
+ static int[] box8 = {-1,0,1,2,3,4,5,6,7,8,0x80000000};
+ public static int test_rce8(int[] b)
+ {
+ int indx;
+ int sum = b[5];
+ int min = b[10];
+ result = sum;
+ for (indx = b.length-1; indx >= 0; --indx)
+ {
+ if (indx >= min)
+ {
+ sum += (sum ^ 9) + ((result != 0) ? 0 :sum);
+ result = sum;
+ }
+ else
+ throw new RuntimeException();
+ }
+ return sum;
+ }
+
+ public static void main(String[] args)
+ {
+ result=1;
+ int r = 0;
+ try {
+ r = test_ge1(0x80000000);
+ System.out.println(result);
+ System.out.println("test_ge1 FAILED");
+ System.exit(1);
+ }
+ catch (ArithmeticException e1) {
+ System.out.println("test_ge1: Expected exception caught");
+ if (result != 5986) {
+ System.out.println(result);
+ System.out.println("test_ge1 FAILED");
+ System.exit(97);
+ }
+ }
+ System.out.println("test_ge1 WORKED");
+
+ result=0;
+ try
+ {
+ r = test_le1(0x7fffffff);
+ System.out.println(result);
+ System.out.println("test_le1 FAILED");
+ System.exit(1);
+ }
+ catch (ArithmeticException e1)
+ {
+ System.out.println("test_le1: Expected exception caught");
+ if (result != -9039)
+ {
+ System.out.println(result);
+ System.out.println("test_le1 FAILED");
+ System.exit(97);
+ }
+ }
+ System.out.println("test_le1 WORKED");
+
+ result=0;
+ r = test_wrap1(0x7fffffff);
+ if (r != 4)
+ {
+ System.out.println(result);
+ System.out.println("test_wrap1 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_wrap1 WORKED");
+ }
+
+ result=0;
+ r = test_rce5(box5,0x80000100);
+ if (result != 3)
+ {
+ System.out.println(result);
+ System.out.println("test_rce5 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce5 WORKED");
+ }
+
+ result=0;
+ r = test_rce6(box6,0x80000100);
+ if (result != 6)
+ {
+ System.out.println(result);
+ System.out.println("test_rce6 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce6 WORKED");
+ }
+
+ result=0;
+ r = test_rce7(box7);
+ if (result != 14680079)
+ {
+ System.out.println(result);
+ System.out.println("test_rce7 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce7 WORKED");
+ }
+
+ result=0;
+ r = test_rce8(box8);
+ if (result != 16393)
+ {
+ System.out.println(result);
+ System.out.println("test_rce8 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce8 WORKED");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6186134.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6186134
+ * @summary Server virtual machine produces/exeutes incorrect code.
+ *
+ * @run main Test6186134 100000
+ */
+import java.util.ArrayList;
+
+public class Test6186134 {
+
+ int num = 0;
+
+ public Test6186134(int n) {
+ num = n;
+ }
+
+ public boolean more() {
+ return num-- > 0;
+ }
+
+ public ArrayList test1() {
+ ArrayList res = new ArrayList();
+ int maxResults = Integer.MAX_VALUE;
+ int n = 0;
+ boolean more = more();
+ while ((n++ < maxResults) && more) {
+ res.add(new Object());
+ more = more();
+ }
+ return res;
+ }
+
+ public static void main(String[] pars) {
+ int n = Integer.parseInt(pars[0]);
+ for (int i=0; i<n; i++) {
+ Test6186134 t = new Test6186134(10);
+ int size = t.test1().size();
+ if (size != 10) {
+ System.out.println("wrong size: " + size +", should be 10");
+ System.exit(97);
+ }
+ }
+ System.out.println("Passed");
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6196102.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6196102
+ * @summary Integer seems to be greater than Integer.MAX_VALUE
+ *
+ * @run main Test6196102
+ */
+
+public class Test6196102 {
+ static public void main(String[] args) {
+ int i1 = 0;
+ int i2 = Integer.MAX_VALUE;
+
+ while (i1 >= 0) {
+ i1++;
+ if (i1 > i2) {
+ System.out.println("E R R O R: " + i1);
+ System.exit(97);
+ }
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6357214.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6357214
+ * @summary Hotspot server compiler gets integer comparison wrong
+ *
+ * @run main/othervm/timeout=60 -DshowAll=ffo -DeventID=444 Test6357214
+ */
+
+// The test hangs after few iterations before the fix. So it fails if timeout.
+class MyResult {
+ public boolean next() {
+ return true;
+ }
+
+ public String getString(String in) {
+ if (in.equals("id"))
+ return "idFoo";
+ if (in.equals("contentKey"))
+ return "ckFoo";
+ return "Foo";
+ }
+
+ public int getInt(String in) {
+ if (in.equals("processingComplete"))
+ return 0;
+ return 1;
+ }
+
+ public byte[] getBytes(String in) {
+ byte[] arr = null;
+ if (in.equals("content")) {
+ arr = new byte[65536];
+ byte j = 32;
+ for (int i=0; i<65536; i++) {
+ arr[i] = j;
+ if (++j == 127)
+ j=32;
+ }
+ }
+ return arr;
+ }
+}
+
+public class Test6357214 {
+ public static volatile boolean bollocks = true;
+ public String create(String context) throws Exception {
+
+ //
+ // Extract HTTP parameters
+ //
+
+ boolean showAll = System.getProperty("showAll") != null;
+ String eventID = System.getProperty("eventID");
+ String eventContentKey = System.getProperty("cKey");
+ //
+ // Build ContentStaging query based on eventID or eventContentKey
+ //
+
+ String sql = "select id, processingComplete, contentKey, content "
+ + "from ContentStaging cs, ContentStagingKey csk "
+ + "where cs.eventContentKey = csk.eventContentKey ";
+
+ if (eventID != null) {
+ sql += "and id = " + eventID;
+ }
+ else if (eventContentKey != null) {
+ sql += "and cs.eventContentKey = '"
+ + eventContentKey
+ + "' having id = max(id)";
+ }
+ else {
+ throw new Exception("Need eventID or eventContentKey");
+ }
+
+ //
+ // This factory builds a static panel, there is no JSP
+ //
+
+ StringBuffer html = new StringBuffer();
+
+ try {
+
+ MyResult result = new MyResult();
+ if (result.next()) {
+
+ eventID = result.getString("id");
+ int processingComplete = result.getInt("processingComplete");
+ String contentKey = result.getString("contentKey");
+ byte[] bytes = result.getBytes("content");
+
+ //
+ // Print content status and associated controls
+ //
+
+ html.append("<br/><font class=\"small\">");
+ html.append("Status: ");
+ switch (processingComplete) {
+ case 0 :
+ case 1 : html.append("PENDING"); break;
+ case 2 : html.append(contentKey); break;
+ case 3 : html.append(eventID); break;
+ default : html.append("UNKNONW");
+ }
+ html.append("</font><br/>");
+
+ //
+ // Print at most 20Kb of content unless "showAll" is set
+ //
+
+ int limit = showAll ? Integer.MAX_VALUE : 1024 * 20;
+ System.out.println(limit);
+ html.append("<pre>");
+ for (int i = 0; bytes != null && i < bytes.length; i++) {
+ char c = (char) bytes[i];
+ switch (c) {
+ case '<' : html.append("<"); break;
+ case '>' : html.append(">"); break;
+ case '&' : html.append("&"); break;
+ default : html.append(c);
+ }
+
+ if (i > limit) {
+ while (bollocks);
+ // System.out.println("i is " + i);
+ // System.out.println("limit is " + limit);
+ html.append("...\n</pre>");
+ html.append(eventID);
+ html.append("<pre>");
+ break;
+ }
+ }
+ html.append("</pre>");
+ }
+ }
+ catch (Exception exception) {
+ throw exception;
+ }
+ finally {
+ html.append("Oof!!");
+ }
+ String ret = html.toString();
+ System.out.println("Returning string length = "+ ret.length());
+ return ret;
+ }
+
+ public static void main(String[] args) throws Exception {
+ int length=0;
+
+ for (int i = 0; i < 100; i++) {
+ length = new Test6357214().create("boo").length();
+ System.out.println(length);
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6559156.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6559156
+ * @summary Server compiler generates bad code for "<= Integer.MAX_VALUE" expression
+ *
+ * @run main Test6559156
+ */
+
+public class Test6559156 {
+
+ static final int N_TESTS = 1000000;
+
+ public static void main(String[] args) throws Exception {
+
+ /*
+ * If MAX_VALUE is changed to MAX_VALUE - 1 below, the test passes
+ * because (apparently) bad code is only generated when comparing
+ * <= MAX_VALUE in the doTest method.
+ */
+ Test6559156 test = new Test6559156();
+ for (int i = 0; i < N_TESTS; i += 1) {
+ test.doTest1(10, Integer.MAX_VALUE, i);
+ test.doTest2(10, Integer.MAX_VALUE, i);
+ }
+ System.out.println("No failure");
+ }
+
+ void doTest1(int expected, int max, int i) {
+ int counted;
+ for (counted = 0;
+ (counted <= max) && (counted < expected);
+ counted += 1) {
+ }
+ if (counted != expected) {
+ throw new RuntimeException("Failed test1 iteration=" + i +
+ " max=" + max +
+ " counted=" + counted +
+ " expected=" + expected);
+ }
+ }
+
+ void doTest2(int expected, int max, int i) {
+ int counted;
+ for (counted = 0;
+ // change test sequence.
+ (counted < expected) && (counted <= max);
+ counted += 1) {
+ }
+ if (counted != expected) {
+ throw new RuntimeException("Failed test1 iteration=" + i +
+ " max=" + max +
+ " counted=" + counted +
+ " expected=" + expected);
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6753639.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6753639
+ * @summary Strange optimisation in for loop with cyclic integer condition
+ *
+ * @run main/othervm -Xbatch Test6753639
+ */
+
+public class Test6753639 {
+ public static void main(String[] args) throws InterruptedException {
+ int END = Integer.MAX_VALUE;
+ int count = 0;
+ for(int i = Integer.MAX_VALUE - 5; i <= END; i++) {
+ count++;
+ if (count > 100000) {
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ }
+ System.out.println("broken " + count);
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6850611.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6850611
+ * @summary int / long arithmetic seems to be broken in 1.6.0_14 HotSpot Server VM (Win XP)
+ *
+ * @run main Test6850611
+ */
+
+public class Test6850611 {
+
+ public static void main(String[] args) {
+ test();
+ }
+
+ private static void test() {
+ for (int j = 0; j < 5; ++j) {
+ long x = 0;
+ for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; ++i) {
+ x += i;
+ }
+ System.out.println("sum: " + x);
+ if (x != -4294967295l) {
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6890943.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6890943
+ * @summary JVM mysteriously gives wrong result on 64-bit 1.6 VMs in hotspot mode.
+ *
+ * @run shell Test6890943.sh
+ */
+import java.util.*;
+import java.io.*;
+import java.util.regex.*;
+
+public class Test6890943 {
+ public static final boolean AIR = true, ROCK = false;
+ public static void main(String[] args) {
+ new Test6890943().go();
+ }
+
+ int r, c, f, t;
+ boolean[][] grid;
+
+ public void go() {
+ Scanner s = new Scanner(System.in);
+ s.useDelimiter("\\s+");
+ int T = s.nextInt();
+ for (t = 0 ; t < T ; t++) {
+ r = s.nextInt(); c = s.nextInt(); f = s.nextInt();
+ grid = new boolean[r][c];
+ for (int x = 0 ; x < r ; x++) {
+ String line = s.next();
+ for (int y = 0 ; y < c ; y++) grid[x][y] = line.charAt(y) == '.';
+ }
+ int digs = solve();
+ String res = digs == -1 ? "No" : "Yes " + digs;
+ System.out.printf("Case #%d: %s\n", t+1, res);
+ }
+ }
+
+ Map<Integer, Integer> M = new HashMap<Integer, Integer>();
+
+ private int solve() {
+ M = new HashMap<Integer, Integer>();
+ M.put(calcWalkingRange(0, 0), 0);
+ for (int digDown = 0 ; digDown < r ; digDown++) {
+ Map<Integer, Integer> tries = new HashMap<Integer, Integer>();
+ for (Map.Entry<Integer, Integer> m : M.entrySet()) {
+ int q = m.getKey();
+ if (depth(q) != (digDown)) continue;
+ if (stuck(q)) continue;
+ tries.put(q, m.getValue());
+ }
+
+ for (Map.Entry<Integer, Integer> m : tries.entrySet()) {
+ int q = m.getKey();
+ int fallLeftDelta = 0, fallRightDelta = 0;
+ //fall left
+ int fallLeft = fall(digDown, start(q));
+ if (fallLeft > 0) {
+ fallLeftDelta = 1;
+ if (fallLeft <= f) addToM(calcWalkingRange(digDown+fallLeft, start(q)), m.getValue());
+ }
+
+ //fall right
+ int fallRight = fall(digDown, end(q));
+ if (fallRight > 0) {
+ fallRightDelta = 1;
+
+ if (fallRight <= f) addToM(calcWalkingRange(digDown+fallRight, end(q)), m.getValue());
+ }
+
+ for (int p = start(q) + fallLeftDelta ; p <= end(q) - fallRightDelta ; p++) {
+ //goLeft
+ for (int digSpot = p ; digSpot > start(q) +fallLeftDelta ; digSpot--) {
+ int fallDown = 1+fall(digDown+1, digSpot);
+ if (fallDown <= f) {
+ if (fallDown == 1) {
+ addToM(calcWalkingRange(digDown + 1, digSpot, digSpot, p), m.getValue() + Math.abs(digSpot-p)+1);
+ } else {
+ addToM(calcWalkingRange(digDown + fallDown, digSpot), m.getValue() + Math.abs(digSpot-p)+1);
+ }
+ }
+ }
+
+ //goRight
+ for (int digSpot = p ; digSpot < end(q)-fallRightDelta ;digSpot++) {
+ int fallDown = 1+fall(digDown+1, digSpot);
+ if (fallDown <= f) {
+ if (fallDown == 1) {
+ addToM(calcWalkingRange(digDown + 1, digSpot, p, digSpot), m.getValue() + Math.abs(digSpot-p)+1);
+ } else {
+ addToM(calcWalkingRange(digDown + fallDown, digSpot), m.getValue() + Math.abs(digSpot-p)+1);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ int result = Integer.MAX_VALUE;
+ for (Map.Entry<Integer, Integer> m : M.entrySet()) {
+ if (depth(m.getKey()) == r-1) result = Math.min(m.getValue(), result);
+ }
+
+ if (result == Integer.MAX_VALUE) return -1;
+ return result;
+ }
+
+ private void addToM(int q, int i) {
+ Integer original = M.get(q);
+ if ( original == null ) M.put(q, i);
+ else M.put(q, Math.min(original, i));
+ }
+
+ private int fall(int row, int column) {
+ int res = 0;
+ for ( int p = row+1 ; p < r ; p++) {
+ if (grid[p][column] == AIR) res++;
+ else break;
+ }
+ return res;
+ }
+
+ private boolean stuck(int q) {
+ return start(q) == end(q);
+ }
+
+ private int depth(int q) {
+ return q % 50;
+ }
+
+ private int start(int q) {
+ return q / (50*50);
+ }
+
+ private int end(int q) {
+ return (q / 50) % 50;
+ }
+
+ private int calcWalkingRange(int depth, int pos) {
+ return calcWalkingRange(depth, pos, Integer.MAX_VALUE, Integer.MIN_VALUE);
+ }
+
+ private int calcWalkingRange(int depth, int pos, int airOverrideStart, int airOverrideEnd) {
+ int left = pos, right = pos;
+ if (depth >= r) return (c-1)*50 + depth;
+
+ while (left > 0) {
+ if (grid[depth][left-1] == ROCK && (left-1 < airOverrideStart || left-1 > airOverrideEnd)) break;
+ if (depth < r-1 && grid[depth+1][left-1] == AIR) {
+ left--;
+ break;
+ }
+ left--;
+ }
+ while (right < c-1) {
+ if (grid[depth][right+1] == ROCK && (right+1 < airOverrideStart || right+1 > airOverrideEnd)) break;
+ if (depth < r-1 && grid[depth+1][right+1] == AIR) {
+ right++;
+ break;
+ }
+ right++;
+ }
+
+ return left *50*50 + right*50 + depth;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6890943.sh Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# 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.
+#
+#
+
+if [ "${TESTSRC}" = "" ]
+then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTSRC=${TESTSRC}"
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTJAVA=${TESTJAVA}"
+if [ "${TESTCLASSES}" = "" ]
+then
+ echo "TESTCLASSES not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTCLASSES=${TESTCLASSES}"
+echo "CLASSPATH=${CLASSPATH}"
+
+set -x
+
+cp ${TESTSRC}/Test6890943.java .
+cp ${TESTSRC}/input6890943.txt .
+cp ${TESTSRC}/output6890943.txt .
+cp ${TESTSRC}/Test6890943.sh .
+
+${TESTJAVA}/bin/javac -d . Test6890943.java
+
+${TESTJAVA}/bin/java ${TESTVMOPTS} Test6890943 < input6890943.txt > test.out 2>&1
+
+diff output6890943.txt test.out
+
+result=$?
+if [ $result -eq 0 ]
+then
+ echo "Passed"
+ exit 0
+else
+ echo "Failed"
+ exit 1
+fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6897150.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6897150
+ * @summary Hotspot optimises away a valid loop
+ *
+ * @run main Test6897150
+ */
+
+// Should be compiled with javac from JDK1.3 to get bytecode which shows the problem.
+public class Test6897150 {
+ public static void main(String[] args) {
+ // This works
+ loopAndPrint(Integer.MAX_VALUE -1);
+ // This doesn't
+ loopAndPrint(Integer.MAX_VALUE);
+ }
+
+ static void verify(int max, int a) {
+ if ( a != (max - 1)) {
+ System.out.println("Expected: " + (max - 1));
+ System.out.println("Actual : " + a);
+ System.exit(97);
+ }
+ }
+ static void loopAndPrint(int max) {
+ int a = -1;
+ int i = 1;
+ for (; i < max; i++) {
+ a = i;
+ }
+ verify(max, a);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6905845.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6905845
+ * @summary Server VM improperly optimizing away loop.
+ *
+ * @run main Test6905845
+ */
+
+public class Test6905845 {
+
+ public static void main(String[] args){
+ for (int asdf = 0; asdf < 5; asdf++){
+ //test block
+ {
+ StringBuilder strBuf1 = new StringBuilder(65);
+ long start = System.currentTimeMillis();
+ int count = 0;
+
+ for (int i = Integer.MIN_VALUE; i < (Integer.MAX_VALUE - 80); i += 79){
+ strBuf1.append(i);
+ count++;
+ strBuf1.delete(0, 65);
+ }
+
+ System.out.println(count);
+ if (count != 54366674) {
+ System.out.println("wrong count: " + count +", should be 54366674");
+ System.exit(97);
+ }
+ }
+ //test block
+ {
+ StringBuilder strBuf1 = new StringBuilder(65);
+ long start = System.currentTimeMillis();
+ int count = 0;
+
+ for (int i = Integer.MIN_VALUE; i < (Integer.MAX_VALUE - 80); i += 79){
+ strBuf1.append(i);
+ count++;
+ strBuf1.delete(0, 65);
+ }
+
+ System.out.println(count);
+ if (count != 54366674) {
+ System.out.println("wrong count: " + count +", should be 54366674");
+ System.exit(97);
+ }
+ }
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6931567.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6931567
+ * @summary JIT Error (on class file compiled with eclipse) on JVM x64 (but not on x32!).
+ *
+ * @run main Test6931567
+ */
+
+// Should be compiled with javac from JDK1.3 to get bytecode which shows the problem.
+public class Test6931567 {
+
+ public static void main(final String[] args) {
+ booleanInvert(Integer.MAX_VALUE);
+ booleanInvert(Integer.MAX_VALUE - 1);
+ }
+
+ private static void booleanInvert(final int max) {
+ boolean test1 = false;
+ boolean test2 = false;
+
+ for (int i = 0; i < max; i++) {
+ test1 = !test1;
+ }
+
+ for (int i = 0; i < max; i++) {
+ test2 ^= true;
+ }
+
+ if (test1 != test2) {
+ System.out.println("ERROR: Boolean invert\n\ttest1=" + test1
+ + "\n\ttest2=" + test2);
+ System.exit(97);
+ } else {
+ System.out.println("Passed!");
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6935022.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6935022
+ * @summary Server VM incorrectly breaks out of while loop
+ *
+ * @run main Test6935022
+ */
+
+public class Test6935022 {
+ public static final void main(String[] args) throws Exception {
+ Test6935022 test = new Test6935022();
+
+ int cnt = 0;
+
+ while (cnt < 10000) {
+ try {
+ ++cnt;
+ if ((cnt&1023) == 0)
+ System.out.println("Thread="+Thread.currentThread().getName() + " iteration: " + cnt);
+ test.loop(2147483647, (cnt&1023));
+ }
+
+ catch (Exception e) {
+ System.out.println("Caught on iteration " + cnt);
+ e.printStackTrace();
+ System.exit(97);
+ }
+ }
+ }
+
+ private void loop(int endingRow, int mask) throws Exception {
+ int rows = 1;
+ boolean next = true;
+
+ while(rows <= endingRow && next) {
+ rows++;
+ if (rows == mask)
+ System.out.println("Rows="+rows+", end="+endingRow+", next="+next);
+ next = next(rows);
+ }
+
+ if (next)
+ throw new Exception("Ended on rows(no rs): " + rows);
+ }
+
+ private boolean next(int rows) {
+ return rows < 12;
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6959129.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6959129
+ * @summary COMPARISON WITH INTEGER.MAX_INT DOES NOT WORK CORRECTLY IN THE CLIENT VM.
+ *
+ * @run main/othervm -ea Test6959129
+ */
+
+public class Test6959129 {
+
+ public static void main(String[] args) {
+ long start = System.currentTimeMillis();
+ int min = Integer.MAX_VALUE-30000;
+ int max = Integer.MAX_VALUE;
+ long maxmoves = 0;
+ try {
+ maxmoves = maxMoves(min, max);
+ } catch (AssertionError e) {
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ System.out.println("maxMove:" + maxmoves);
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+ /**
+ * Imperative implementation that returns the length hailstone moves
+ * for a given number.
+ */
+ public static long hailstoneLengthImp(long n) {
+ long moves = 0;
+ while (n != 1) {
+ assert n > 1;
+ if (isEven(n)) {
+ n = n / 2;
+ } else {
+ n = 3 * n + 1;
+ }
+ ++moves;
+ }
+ return moves;
+ }
+
+ private static boolean isEven(long n) {
+ return n % 2 == 0;
+ }
+
+ /**
+ * Returns the maximum length of the hailstone sequence for numbers
+ * between min to max.
+ *
+ * For rec1 - Assume that min is bigger than max.
+ */
+ public static long maxMoves(int min, int max) {
+ long maxmoves = 0;
+ for (int n = min; n <= max; n++) {
+ if ((n & 1023) == 0) System.out.println(n);
+ long moves = hailstoneLengthImp(n);
+ if (moves > maxmoves) {
+ maxmoves = moves;
+ }
+ }
+ return maxmoves;
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6985295.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6985295
+ * @summary JVM fails to evaluate condition randomly
+ *
+ * @run main/othervm -Xbatch Test6985295
+ */
+
+public class Test6985295 {
+
+ public static void main(String[] args) {
+ int min = Integer.MAX_VALUE-50000;
+ int max = Integer.MAX_VALUE;
+ System.out.println("max = " + max);
+ long counter = 0;
+ int i;
+ for(i = min; i <= max; i++) {
+ counter++;
+ if (counter > 1000000) {
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ }
+ System.out.println("iteration went " + counter + " times (" + i + ")");
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6992759.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6992759
+ * @summary Bad code generated for integer <= comparison, fails for Integer.MAX_VALUE
+ *
+ * @run main Test6992759
+ */
+
+public class Test6992759 {
+
+ static final int N_TESTS = 1000000000;
+
+ public static void main(String[] args) throws Exception {
+
+ /*
+ * If MAX_VALUE is changed to MAX_VALUE - 1 below, the test passes
+ * because (apparently) bad code is only generated when comparing
+ * <= MAX_VALUE in the doTest method.
+ */
+ Test6992759 test = new Test6992759();
+ for (int i = 0; i < N_TESTS; i += 1) {
+ test.doTest(10, Integer.MAX_VALUE, i);
+ //test.doTest(10, Integer.MAX_VALUE - 1, i);
+ }
+ System.out.println("No failure");
+ }
+
+ void doTest(int expected, int max, int i) {
+ int counted;
+ for (counted = 0;
+ (counted <= max) && (counted < expected);
+ counted += 1) {
+ }
+ if (counted != expected) {
+ throw new RuntimeException("Failed test iteration=" + i +
+ " max=" + max +
+ " counted=" + counted +
+ " expected=" + expected);
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test7005594.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7005594
+ * @summary Array overflow not handled correctly with loop optimzations
+ *
+ * @run main/othervm -Xms2048m -Xcomp -XX:CompileOnly=Test7005594.test Test7005594
+ */
+
+public class Test7005594 {
+
+ static int test(byte a[]){
+ int result=0;
+ for( int i=0; i<a.length; i+=((0x7fffffff>>1)+1) ){
+ result += a[i];
+ }
+ return result;
+ }
+
+ public static void main(String [] args){
+ byte a[]=new byte[(0x7fffffff>>1)+2];
+ int result = 0;
+ try {
+ result = test(a);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ e.printStackTrace(System.out);
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ System.out.println(result);
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test7020614.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7020614
+ * @summary "-server" mode optimizer makes code hang
+ *
+ * @run main/othervm/timeout=30 -Xbatch Test7020614
+ */
+
+public class Test7020614 {
+
+ private static final int ITERATIONS = 1000;
+ private static int doNotOptimizeOut = 0;
+
+ public static long bitCountShort() {
+ long t0 = System.currentTimeMillis();
+ int sum = 0;
+ for (int it = 0; it < ITERATIONS; ++it) {
+ short value = 0;
+ do {
+ sum += Integer.bitCount(value);
+ } while (++value != 0);
+ }
+ doNotOptimizeOut += sum;
+ return System.currentTimeMillis() - t0;
+ }
+
+ public static void main(String[] args) {
+ for (int i = 0; i < 4; ++i) {
+ System.out.println((i + 1) + ": " + bitCountShort());
+ }
+ System.out.println("doNotOptimizeOut value: " + doNotOptimizeOut);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/input6890943.txt Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,1543 @@
+50
+4 5 1
+.....
+#####
+..###
+.#...
+4 5 1
+.....
+#####
+###..
+...#.
+5 4 2
+....
+####
+..##
+.###
+.#.#
+6 10 5
+..........
+####.#####
+####.#####
+####.#####
+####.#####
+####.#####
+6 10 4
+..........
+#....#####
+#....#####
+#....#####
+#....#####
+#....#####
+6 10 1
+..........
+####.#####
+####.#####
+####.#####
+####.#####
+####.#####
+6 10 2
+..........
+####.#####
+####.#####
+####.#####
+####.#####
+####.#####
+6 11 2
+.....######
+###########
+###.......#
+###.#.#...#
+###.#.##..#
+###.#.###.#
+6 11 1
+.....######
+###########
+###.......#
+###.#.#...#
+###.#.##..#
+###.#.###.#
+6 11 2
+.......####
+###########
+###.......#
+###.#.#...#
+###.#.##..#
+###.#.###.#
+7 11 1
+..#........
+##.#.......
+###.#......
+####.#.....
+#####.#....
+######.#...
+#########..
+13 16 2
+................
+#.#.#.#.#.#.#.#.
+................
+.#.#.#.#.#.#.#.#
+................
+#.#.#.#.#.#.#.#.
+................
+.#.#.#.#.#.#.#.#
+................
+#.#.#.#.#.#.#.#.
+................
+.#.#.#.#.#.#.#.#
+................
+4 16 3
+................
+#.#.#.#.#.#.#.#.
+.#.#.#.#.#.#.#.#
+................
+50 50 1
+..................................................
+################################################.#
+.#............#....#.......................#....##
+..#.....#......#....#.....................#....#..
+...#.......#....#....#...................#....#...
+#...#....#.......#....#.................#....#....
+##...#.......#....#....#...............#....#.....
+###...#....#.......#....#.............#....#......
+####...#.......#....#....#...........#....#.......
+.####...#....#.......#....#.........#....#........
+..####...#.......#....#....#.......#....#.........
+...####...#....#.......#....#.....#....#..........
+....####...#.......#....#....#...#....#...###.....
+.....####...#....#.......#....#.#....#..##..###...
+......####...#.......#....#....#.............##...
+.......####...#....#.......#...............##.....
+........####...#.......#....#............##.......
+.........####...#....#.......#.........#######....
+..###.....####...#.......#....#...................
+.#..###....####...#....#.......#.........####.....
+##...###....####...#.......#....#.......##..##....
+##...........####...#....#.......#......##..##....
+##..####......####...#.......#....##....##..##....
+##....##.......####...#....#......##....##..##....
+.###.##.........####.............##.....##..##....
+..###............#######........##.......####.....
+.........###......######.......##.................
+.......##..##..........#......##.........####.....
+......##....##........#......##.........##..##....
+......##.............#......##..........##..##....
+......##............#......##...........##..##....
+......##....#......#......##............##..##....
+.......##..##.....#....########.........##..##....
+........####.....#.....###.#...#.........####.....
+.#####..........#.....#..##.#...#.................
+...##..........#.....#....##.#...#.........####...
+...##.........#.....#..#...##.#...#.......##..##..
+...##........#.....#..##....##.#...#......##..##..
+...##.......#.....#....##....##.#...#.....##..##..
+##.##......#.....#...###......##.#...#.....#####..
+.###......#.....#..##..........##.#...#.......##..
+.........#.....#...##..####.....##.#...#.....##...
+........#.....#...###..#.##......##.#...#...##....
+.......#.....#....##.....###......##.#...#........
+......#.....#..#.##...###..........##.#...#.......
+.....#.....#...##..#..#..##.##.#....##.#...#......
+....#.....#........###.....##........##.#...#.....
+...#.....#.......##...####..###.......##.#...#....
+..#.....#......##.#.#..#.#..##.........##.#...#...
+.#..............#.#.#.#.#.#.#...........##.#...#..
+50 50 13
+..................................................
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+20 49 5
+.................................................
+#################################################
+#################################################
+##################################.##############
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+############################.####################
+#################################################
+######.##########################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+49 49 48
+.................................................
+#################################################
+################################################.
+#################################################
+####################################.############
+#################################################
+##########.######################################
+#######.#########################################
+#################################################
+#################################################
+#################################################
+#######################################.#########
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+###########################################.#####
+#################################################
+#################################################
+###.#############################################
+###############.#################################
+#################################################
+##.##############################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#####################################.###########
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#####.###########################################
+#####################.###########################
+#################################################
+###.#############################################
+#################################################
+#################################################
+#################################################
+#############.###########.#######################
+###.##############.####.#########################
+#########################################.#######
+#################################################
+########################################.########
+40 49 10
+.................................................
+#################################################
+..#..............#...............................
+.......................#.......................#.
+..#....#...................#.................#...
+..........#...............................#......
+............#..................#.......#.........
+........#............#............#..............
+...................#.....#.......................
+....#..........#........................#........
+....#.................................#......#...
+...........#.....................................
+....................#............................
+.##........#................#....................
+..............#..................................
+........#......................................#.
+.................................#....#........#.
+.................................................
+.............................#..##...............
+...........................................#.#...
+........#..........#........#.............#.....#
+..........#.#....................................
+.............................#............#......
+.......#.......................#.........#.......
+..............................#..................
+......#..........................................
+.............#................#..................
+......#.............................#............
+#.................#..................#......#....
+..............#..................................
+...........#...........................#.....#...
+............#............#...#...................
+.......................#.......................#.
+............................#....................
+..........................#......................
+...........................#.............#...#...
+.#...............................................
+..................#..............................
+...#..............................#..............
+.....#..................#........................
+49 49 20
+.........................................##..#..#
+########################################.##...#.#
+#.##..#....#####..####...#..#.##.###.#..#..#.....
+..#...#.##...##.#....#...##..#.#..###...###......
+..#..##.#.###......#.....##.....#.......##.#.#.#.
+..##......###.#.##.....##.#..#.##.###..##.#.#####
+#.#.##....#..#..#.....#.#.##.#.#.##.#.....###.#.#
+..###.#..#..###...###..#.#.....#..######.#.#....#
+..#...#...##.#..##.#.#.#..###.#..#..#...#....##..
+.#..#.#..##.#...##........##.##..#..........#.#..
+#.#.###.####...#.#...#..###..#.##....#...........
+#..#.#######.#....#.#.##...#.#.............##....
+###..###....#..#....#.#.###...#..##.#.#..##.#####
+....####...#.#...........##.#.#.#..#.#.#.##.#.#..
+##.#...##..#..#...#..##..####.##.#...#.....#...#.
+...###.##.#..##.....#.#.##..#..###.#.###.#.#..#.#
+###....##...#.#.##.##..#.#...#...##....#.###.....
+##..#....###..#.....#..#....#.#.#.##.......##.###
+.#.#....#.....####..##....##...##...#.##..##.#...
+##....#....#.#.###.##...#..##.##...##....#.######
+..#....#..##.....##.##.#.........##..##...#.#....
+#..#..#.#....##.#.#...#.###..#...#..#.##.#.#....#
+.....#..#...###.....##...###....###.##.....#...#.
+#..#.#...###..#....#..####....#.#......#..##....#
+.....#.#...###...###.#..#.#.#.........#.#.#..#.##
+.#..##..##..#..#.#....##.........#..#.##.#..##...
+##.#.#.....##.##..###...#.#.#..#.#.####.#.###.#..
+..#.#.......#.#.#...#####..#.##.#....#...#.#.....
+..########.####.....#..#.........#..#####.##.#...
+.#......##.####..###..#.####........#....#....#.#
+#.....#....#...#...#..###......#.##..#..#...#.###
+...#..###.....#....#..#..#......#.....#.#.#.#..##
+....#.##..####.#..###...#...#...#######..#..#....
+.#..#...##...#...#......##...#####.##...#..##....
+..#.#.#######.#....#.#.###....#.##...#..#.##..#..
+#..#.##.#.#.##..###....#.##.#..#..#...##....##..#
+.###.#.#..##.###...#..##.#.#...#.#.####....#..###
+#.#......#...##.##...#.#.....##..#..##....#.##...
+#.#...#.#.##...##.###.#..##..##..####..##.#.#...#
+....#....#..####.##.....#.#....#..##..##....#..#.
+....#...###.....##..#..###....#........###..##..#
+.###....##...........#....#........####.#.####..#
+.#........##...#.###..###.#...##.##..###..###..##
+#.#######.#....###...#..##..#...#....##....#....#
+#....#..#......#..#...##.....##.#.#.#..#......##.
+#.##.##.#.#.##..#..##..######.##.###.#.#..#....#.
+.###.##.....#.##.#..###....###..##....#.#..#.....
+#####..#.#....#.#......##..##.#...........####.#.
+..#..#.#..#...##....###.##.#.#...#..#..#....#..##
+49 49 5
+.........................................#....###
+#########################################..#.....
+.....#.###...#...#...........##...#...#....#...#.
+....#.....#..#....#....##...#..###.#...#..##.#.##
+....#...###.##...........#.#.##.......#.#.#.#..#.
+...........#..###..#..##.....#.........#.....#...
+.....#......#.##.#..##.###.....#...###.#....#...#
+.#......##.#.......##...##.....###..#......#.##..
+#.....#.#..#.#...#####...#.###.##.....#..#.......
+........##....#....#....#.#.#....####....#.##.###
+....#.#......#.##.....#..........##.............#
+#..##....#.#....#..#.....#.#.#....#.#.#....##...#
+...#..##..#...#....#.#....#..#....#..#..#.......#
+......#...##.#.####.....####.###.#..#........####
+##..........#...........#..#.##......##......#.##
+....###....##...#.####.....#............#..#.....
+...#....#....##.....##.....#.#.....#..#.#..#..#..
+...........#...#.##..##..##.#......#..#.#..##....
+.#........##......#.........##..#..........#.#...
+#....##.#.##..#.....#.....##.....##....#.........
+.#.......###.......#..#.....#.....#..##.##...#..#
+###......##.....##...##..#.#....#...####.##......
+....#..#....##...#.##.##.#.#...#...#.#..#.##.#..#
+..........#.#..#####..####....##..#.#.#.........#
+........##.#.###..###....#...#........##.#......#
+...........##.##..#.....#.#.#..#....#.###..#.###.
+#.#....#.#...##............#.#.....#....#...#.#..
+..###.#.##...#....#..##.##...#........#..........
+...........#...##...#..#..##.....#..#.......#..#.
+#.#.#......##.#.....#...#.#.#.#...#..#######.#.##
+...##..#.......###..#..#.##....#......####.#.....
+....##......#.#......#....##..#...##.......#..#..
+#..###.##....##..##.#..#.###.##.....#...#........
+#......#....####....#.........#.........#.##.##..
+.#.#..###......#...##.#.##..#.#.....#...#.#......
+......#.#...##.#....#..#.#.......#.#.....#.#.###.
+###..#.....#....#.#...##..#.#.....#.#.....#.#.#..
+..........#........#....#...#..#...#...#.#.#.#...
+#..##..#...###....#.#..#....##....#...#..##....#.
+.#.#.#....#..##.#...#.....#.##..#....##........#.
+..#.##....###...#...#..#..#.....#..#..###..#...#.
+##....#........#..#..#..#......#...#.##....#.#.##
+....#.............#..#...#...#.#.#...##....#..#.#
+...#.........#....###.....#.#..#..#...#..#...#...
+.#.#.###..###..##.#.##...#...#..#................
+.#......#..#..#.#.#...#.....................#..#.
+..#.....#.......#..##.......#...#...##.#.....#.#.
+#..####.#....#......#.........#.#...###...#....#.
+#.#.#.#....#......#..#.#........###..#....##.....
+31 47 7
+.........................#.#..##.#..#...#.#...#
+#########################.#.#...#...#.#........
+...#...........#...#...#...##...#..#.#.#...#.##
+.#........#.......#.#.....#......#........#....
+#.#....###...#...#....#....#......##...#.......
+#.#......##..##...#.....#.##.#.........#.......
+.......#.....##........#..#.......#.##...#.....
+..#.......##.#...#.#..#.#..#....#......#......#
+#.##.........#####..###.......#........#......#
+.#..#.#.#...#....####...#...........#....#.....
+##..##..#..###..###....##......#....#..##...#.#
+#......#........##...#.#.#..#..#....#..#...##.#
+.#.#.##..........#.#..#...##.##................
+##.##.#...#....#.............#.#.....###...#.#.
+..#..#.#..#..#.#....#....#............#.##..#..
+......###......#..##..#.#...##.........#.#.###.
+..#.##.#..#......##....#.#........#....##..#..#
+.........#.#.#.....##...#.#...#.##.....##.##...
+.#........#...#.###.........#.#.#..............
+....##........#.....#....###....###.#..#....##.
+..#..#....#....#.#.......#.#.#..........###....
+.#..###.#...#.###...##...#....#...#............
+##.....#..##.#.##.##.......#.##.....###...##.#.
+.###.......#...#.....#.....###.........#...#...
+#.....#..####.....##...#........####..........#
+#..#...........##.#.#.#..............#....##...
+..#.#..........#..##.#.##...##..##.#.#..##..#..
+#..........................###......#....##....
+.....#..........#..#......#...#.#..#....#...#..
+#......#....##.........#..#.......#..#.......#.
+.#......#...###...##....##.#..........#...#..#.
+44 35 13
+...........................##..####
+############################.....##
+..###.#.##.#...#.##.####.###.###.##
+#.##.#.#.#.#..###.#..#...###.##..##
+.#.##.#.##..#.###.###.##.#.#...#.#.
+##....##.#..#####.#.####..##.##...#
+####.##..##.###.##.#.#...#.##.###.#
+#.#######.#.#.#..#.#..#..#...###.#.
+##.###.#..#.####.##.#.#########.##.
+#.##.#######..#.#.####.#..#..######
+.#.##..########...##.###..#..##.##.
+#.#######.###...##.#...#.####.#..#.
+.###..###....#.#.##.###..##.##.##.#
+...#.###.#.##.#.####.##.####.#.#...
+#..#......##....#.##.#.#.###.#..#..
+...##.###.###.#.####..#.#.#..###.#.
+.#####.#..#..##.#.#...##.#.#.##...#
+..##..#.#....##.#.#.###.##.##...#..
+###.#..###....#######..#.#.###.##.#
+##.##.#.#.##..#.#.#.#.#..##.####...
+##.###...#.###.#.#.#..#####.###.#..
+...#.#...##......#.##..##.##.#.#.##
+##..#..####..###...###.#........###
+##..#....#..#.#..##.#####..###.#...
+##...#.#####.###.##....###...####..
+#.####.#..#.##.#.#...#.###.#...##..
+####.#####.###.#.##...##...#...#.##
+#..##.##....###..#..####.##..#.#.##
+..#.###.##....####.##.#..###.#....#
+#.#.###.#..#.##.##...###.##..######
+##.#.##.###.#..#...###.####..##.###
+.########.#....#..#........#..##..#
+####..#.##.#.##.####..#.###...#####
+#..##..#..##.###....####.#.#...#.#.
+.#...##.##.###.###...##..##..###...
+###.##...#.##...####.#.#.##..#.####
+##.###..##.#....#.###..##.#...###.#
+##..##.###..#..#.####.#.....##.####
+.#....##...#####.....####...#.##.#.
+##.#.#.....##...#..#...#....#....##
+#..#.#..#####.##..###.#.###########
+.#.###.#..###.##.###.#.###.##.#.###
+.###..####.#..##......#..##.######.
+...##..###.#.....##.#.#..##......#.
+6 10 2
+.......#..
+##########
+##.#...#..
+.#..###...
+#.##.#####
+.####..#.#
+7 9 4
+......##.
+#########
+.#.###.##
+..#...#..
+.....##.#
+####...##
+.#..#.#.#
+10 9 2
+.........
+#########
+..###.###
+#..###.##
+.....#.#.
+..##.....
+###.#....
+.##..#...
+##...#..#
+#..##..##
+10 7 1
+....#..
+####..#
+####..#
+..#.#..
+...##.#
+#....##
+..#..##
+#.#....
+.##.#..
+###...#
+6 10 2
+.......#..
+#######.#.
+..##.#.##.
+..#..#....
+.#.#....##
+..#....#..
+40 40 5
+........................................
+###############################..#######
+#..##############.....##################
+........................................
+...........................##########...
+#####...################..##############
+##################.#####################
+.............................#####......
+#.............................##########
+...............................####.....
+.........#################..............
+..........................###...........
+........................................
+....................#####...............
+##########....................##########
+.......##################...............
+########........###############..#######
+........................................
+..........#########################.....
+#####...................................
+.........................####...........
+......................#####...######....
+######..................################
+........#########.......................
+############.........................###
+........####################............
+......................##################
+....................######......#.......
+............################............
+........................................
+......................#########.........
+#######............#####################
+........###############.................
+........................................
+.........###################............
+.............................#..........
+######................................##
+........................#############...
+......##................................
+........................................
+30 20 11
+....................
+####################
+......##.##.........
+#.....####....######
+...##...............
+........#######.###.
+.......##...........
+....#####..##.......
+........##.#........
+.....###...........#
+..##########.....##.
+..#........#.#......
+......##...##.......
+....##...###..###...
+.####...#####...####
+###.................
+.......##...........
+..........###..####.
+..####..#####.#####.
+..###....#.......##.
+......##....##......
+....##.###..........
+.##.....#####..#....
+....................
+......###...........
+####..###.#########.
+.......#######......
+....###.............
+.........###.#####..
+................####
+50 20 17
+....................
+###################.
+#..##...............
+....................
+............####....
+........#####.......
+..............#..#..
+.........####...####
+.............####...
+.....#....###.......
+####...............#
+....................
+.....######.........
+......#.............
+.####......#####....
+.............##.....
+#####....#####......
+..#####.............
+##..####....###..###
+....................
+....................
+........######.###..
+....####....#####...
+....########........
+...#####............
+.###................
+...............###..
+.......#########....
+..................##
+.......####.........
+..#####.............
+...####.............
+.##..........#####..
+....................
+...#.##.......###...
+######.....##......#
+......####..........
+......#.............
+....................
+....................
+....................
+.....#..............
+.....####....###....
+......#.........####
+.......######...###.
+....................
+....................
+##...........###...#
+.###................
+......#######.......
+45 25 10
+.........................
+#########################
+#...................#..##
+....................#....
+.........................
+.........................
+...................#####.
+##.....................##
+.#.....................#.
+##.....................##
+.........................
+.....####................
+.....##.#................
+.....##.#................
+.....##.#............####
+.....##.#.......###..####
+.....##.#.......#.#......
+.....##.######..#.#......
+.....####....#..#.#..###.
+........#....#..#.#..###.
+...##...#....#..#.#......
+...##...#....#..#.#......
+...##...#....#..#.#......
+...##...#....#..#.#......
+...########..#..###......
+##.##...#....#........###
+.#.##...######..#####.#..
+.#.##...........#...#.#..
+.#.##...........#...#.#..
+.#..............#...#.#..
+.#..............#...#.#..
+.#.####.........#...#.#..
+.#.#..#.........#...#.#..
+.#.#..#.........#####.#..
+##.#.##########.......###
+...#.####.....#..........
+..#####.#.....#..####....
+..#####.#.....#..#..#....
+..#..#..#.....#..#..#....
+..#..#..#.....#..#..#....
+#.#..#..#.....#..#..#..##
+#.#..#..#######..#..#..#.
+#.####.......#####..#..#.
+#............#..##..#..#.
+#............########..#.
+25 45 5
+.............................................
+#############################################
+..........#...###################.#...#......
+#########.#....##############################
+#########.#.............##################...
+####################....#####################
+#########..........#........#################
+####################........#################
+..................####################.....#.
+####..............#...........###############
+######################################.######
+#########################.....#...###########
+###.###################.......#.....#########
+#####.#.........#.....#.....#################
+#############################################
+###.#############...####............#########
+......############################...#....#..
+....#########....................#...######..
+##########.##..............##################
+#####################......##################
+#############################################
+#############################################
+#######################################...###
+#############################################
+##########....###############################
+40 40 5
+...............................#########
+########################################
+########################################
+########################################
+#########....###########################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+..#######.######################........
+########################################
+########################################
+########################################
+...........#####################........
+####.................###################
+########################################
+########################################
+########################################
+########################################
+#####................###################
+###################...........##########
+########################################
+########################################
+.......##############################...
+########################################
+########################################
+########################################
+##############..............############
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+30 20 2
+....................
+####################
+#############.....##
+##...###############
+####################
+####################
+####################
+....##.....#...#....
+####################
+##########.#########
+###....#############
+#########....#######
+###....#############
+####################
+....#######.....###.
+####################
+########.###########
+####################
+#############.....##
+....#####..#########
+####################
+##..########.##.####
+########.###########
+#########..#########
+#........###########
+#########..######.##
+###.################
+####################
+####################
+##############...###
+50 20 7
+...................#
+####################
+#####...############
+####################
+####################
+####################
+####################
+####################
+####################
+.....##############.
+####################
+####################
+.........########...
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+#########.##########
+####################
+####################
+####################
+....###########.....
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+##........##########
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+....##########......
+####################
+49 49 3
+.................................................
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+.................................................
+.................................................
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+........##########...............................
+#################################################
+###########..................####################
+#################################################
+#################################################
+#################################################
+#################################################
+.................................................
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+.......#####.....................................
+.................................................
+#################################################
+................................################.
+..................................###########....
+#################################################
+#################################################
+#################################################
+#################################################
+45 25 4
+.........................
+#########################
+########............#####
+#########################
+.........................
+###############.#######.#
+###############.#######.#
+############....#######.#
+.........................
+############.#.##########
+############...##########
+#########################
+.................######..
+################.######.#
+.........................
+....................##...
+.........................
+#########################
+#########################
+#########################
+#########################
+#########################
+#########################
+..........####...........
+##.......................
+##.......................
+#########.####.##########
+..........####...........
+#########################
+#########################
+#########################
+#########################
+#########################
+#########################
+.........................
+##################.######
+##################.######
+##################.######
+.........................
+#########################
+#########################
+#########################
+.........................
+.........................
+.........................
+25 45 5
+.............................................
+#############################################
+####################################.########
+###########.#################################
+###########.#################################
+###########.#################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################...#############
+#############################.#.#############
+#############################...#############
+#############################################
+#############################################
+#############################################
+###..########################################
+###..########################################
+#########################################....
+####################################.####.##.
+50 50 18
+..................................................
+##################################################
+..##..##..##..##..##..##..##..##..##..##..##..##..
+.###.###.###.###.###.###.###.###.###.###.###.###.#
+....####....####....####....####....####....####..
+.#.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+..######..######..######..######..######..######..
+.#######.#######.#######.#######.#######.#######.#
+........########........########........########..
+.#.#.#.#########.#.#.#.#########.#.#.#.#########.#
+..##..##########..##..##########..##..##########..
+.###.###########.###.###########.###.###########.#
+....############....############....############..
+.#.#############.#.#############.#.#############.#
+..##############..##############..##############..
+.###############.###############.###############.#
+................################................##
+.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#.###
+..##..##..##..##################..##..##..##..####
+.###.###.###.###################.###.###.###.#####
+....####....####################....####....######
+.#.#####.#.#####################.#.#####.#.#######
+..######..######################..######..########
+.#######.#######################.#######.#########
+........########################........##########
+.#.#.#.#########################.#.#.#.###########
+..##..##########################..##..############
+.###.###########################.###.#############
+....############################....##############
+.#.#############################.#.###############
+..##############################..################
+.###############################.#################
+................................##################
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.###################
+..##..##..##..##..##..##..##..####################
+.###.###.###.###.###.###.###.#####################
+....####....####....####....######################
+.#.#####.#.#####.#.#####.#.#######################
+..######..######..######..########################
+.#######.#######.#######.#########################
+........########........##########################
+.#.#.#.#########.#.#.#.###########################
+..##..##########..##..############################
+.###.###########.###.#############################
+....############....##############################
+.#.#############.#.###############################
+..##############..################################
+.###############.#################################
+................##################################
+.#.#.#.#.#.#.#.###################################
+50 50 19
+..................................................
+##################################################
+..##..##..##..##..##..##..##..##..##..##..##..##..
+.###.###.###.###.###.###.###.###.###.###.###.###.#
+....####....####....####....####....####....####..
+.#.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+..######..######..######..######..######..######..
+.#######.#######.#######.#######.#######.#######.#
+........########........########........########..
+.#.#.#.#########.#.#.#.#########.#.#.#.#########.#
+..##..##########..##..##########..##..##########..
+.###.###########.###.###########.###.###########.#
+....############....############....############..
+.#.#############.#.#############.#.#############.#
+..##############..##############..##############..
+.###############.###############.###############.#
+................################................##
+.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#.###
+..##..##..##..##################..##..##..##..####
+.###.###.###.###################.###.###.###.#####
+....####....####################....####....######
+.#.#####.#.#####################.#.#####.#.#######
+..######..######################..######..########
+.#######.#######################.#######.#########
+........########################........##########
+.#.#.#.#########################.#.#.#.###########
+..##..##########################..##..############
+.###.###########################.###.#############
+....############################....##############
+.#.#############################.#.###############
+..##############################..################
+.###############################.#################
+................................##################
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.###################
+..##..##..##..##..##..##..##..####################
+.###.###.###.###.###.###.###.#####################
+....####....####....####....######################
+.#.#####.#.#####.#.#####.#.#######################
+..######..######..######..########################
+.#######.#######.#######.#########################
+........########........##########################
+.#.#.#.#########.#.#.#.###########################
+..##..##########..##..############################
+.###.###########.###.#############################
+....############....##############################
+.#.#############.#.###############################
+..##############..################################
+.###############.#################################
+................##################################
+.#.#.#.#.#.#.#.###################################
+50 50 20
+..................................................
+##################################################
+..##..##..##..##..##..##..##..##..##..##..##..##..
+.###.###.###.###.###.###.###.###.###.###.###.###.#
+....####....####....####....####....####....####..
+.#.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+..######..######..######..######..######..######..
+.#######.#######.#######.#######.#######.#######.#
+........########........########........########..
+.#.#.#.#########.#.#.#.#########.#.#.#.#########.#
+..##..##########..##..##########..##..##########..
+.###.###########.###.###########.###.###########.#
+....############....############....############..
+.#.#############.#.#############.#.#############.#
+..##############..##############..##############..
+.###############.###############.###############.#
+................################................##
+.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#.###
+..##..##..##..##################..##..##..##..####
+.###.###.###.###################.###.###.###.#####
+....####....####################....####....######
+.#.#####.#.#####################.#.#####.#.#######
+..######..######################..######..########
+.#######.#######################.#######.#########
+........########################........##########
+.#.#.#.#########################.#.#.#.###########
+..##..##########################..##..############
+.###.###########################.###.#############
+....############################....##############
+.#.#############################.#.###############
+..##############################..################
+.###############################.#################
+................................##################
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.###################
+..##..##..##..##..##..##..##..####################
+.###.###.###.###.###.###.###.#####################
+....####....####....####....######################
+.#.#####.#.#####.#.#####.#.#######################
+..######..######..######..########################
+.#######.#######.#######.#########################
+........########........##########################
+.#.#.#.#########.#.#.#.###########################
+..##..##########..##..############################
+.###.###########.###.#############################
+....############....##############################
+.#.#############.#.###############################
+..##############..################################
+.###############.#################################
+................##################################
+.#.#.#.#.#.#.#.###################################
+49 48 5
+................................................
+################################################
+################################.###############
+###############################..##############.
+##############################.#.#############.#
+#############################....############...
+############################.###.###########.###
+###########################..##..##########..##.
+##########################.#.#.#.#########.#.#.#
+#########################........########.......
+########################.#######.#######.#######
+#######################..######..######..######.
+######################.#.#####.#.#####.#.#####.#
+#####################....####....####....####...
+####################.###.###.###.###.###.###.###
+###################..##..##..##..##..##..##..##.
+##################.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+#################...............................
+################.###############################
+###############..##############################.
+##############.#.#############################.#
+#############....############################...
+############.###.###########################.###
+###########..##..##########################..##.
+##########.#.#.#.#########################.#.#.#
+#########........########################.......
+########.#######.#######################.#######
+#######..######..######################..######.
+######.#.#####.#.#####################.#.#####.#
+#####....####....####################....####...
+####.###.###.###.###################.###.###.###
+###..##..##..##..##################..##..##..##.
+##.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#
+#................################...............
+.###############.###############.###############
+.##############..##############..##############.
+.#############.#.#############.#.#############.#
+.############....############....############...
+.###########.###.###########.###.###########.###
+.##########..##..##########..##..##########..##.
+.#########.#.#.#.#########.#.#.#.#########.#.#.#
+.########........########........########.......
+.#######.#######.#######.#######.#######.#######
+.######..######..######..######..######..######.
+.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+.####....####....####....####....####....####...
+.###.###.###.###.###.###.###.###.###.###.###.###
+.##..##..##..##..##..##..##..##..##..##..##..##.
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+49 48 11
+................................................
+################################################
+################################.###############
+###############################..##############.
+##############################.#.#############.#
+#############################....############...
+############################.###.###########.###
+###########################..##..##########..##.
+##########################.#.#.#.#########.#.#.#
+#########################........########.......
+########################.#######.#######.#######
+#######################..######..######..######.
+######################.#.#####.#.#####.#.#####.#
+#####################....####....####....####...
+####################.###.###.###.###.###.###.###
+###################..##..##..##..##..##..##..##.
+##################.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+#################...............................
+################.###############################
+###############..##############################.
+##############.#.#############################.#
+#############....############################...
+############.###.###########################.###
+###########..##..##########################..##.
+##########.#.#.#.#########################.#.#.#
+#########........########################.......
+########.#######.#######################.#######
+#######..######..######################..######.
+######.#.#####.#.#####################.#.#####.#
+#####....####....####################....####...
+####.###.###.###.###################.###.###.###
+###..##..##..##..##################..##..##..##.
+##.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#
+#................################...............
+.###############.###############.###############
+.##############..##############..##############.
+.#############.#.#############.#.#############.#
+.############....############....############...
+.###########.###.###########.###.###########.###
+.##########..##..##########..##..##########..##.
+.#########.#.#.#.#########.#.#.#.#########.#.#.#
+.########........########........########.......
+.#######.#######.#######.#######.#######.#######
+.######..######..######..######..######..######.
+.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+.####....####....####....####....####....####...
+.###.###.###.###.###.###.###.###.###.###.###.###
+.##..##..##..##..##..##..##..##..##..##..##..##.
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+49 48 30
+................................................
+################################################
+################################.###############
+###############################..##############.
+##############################.#.#############.#
+#############################....############...
+############################.###.###########.###
+###########################..##..##########..##.
+##########################.#.#.#.#########.#.#.#
+#########################........########.......
+########################.#######.#######.#######
+#######################..######..######..######.
+######################.#.#####.#.#####.#.#####.#
+#####################....####....####....####...
+####################.###.###.###.###.###.###.###
+###################..##..##..##..##..##..##..##.
+##################.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+#################...............................
+################.###############################
+###############..##############################.
+##############.#.#############################.#
+#############....############################...
+############.###.###########################.###
+###########..##..##########################..##.
+##########.#.#.#.#########################.#.#.#
+#########........########################.......
+########.#######.#######################.#######
+#######..######..######################..######.
+######.#.#####.#.#####################.#.#####.#
+#####....####....####################....####...
+####.###.###.###.###################.###.###.###
+###..##..##..##..##################..##..##..##.
+##.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#
+#................################...............
+.###############.###############.###############
+.##############..##############..##############.
+.#############.#.#############.#.#############.#
+.############....############....############...
+.###########.###.###########.###.###########.###
+.##########..##..##########..##..##########..##.
+.#########.#.#.#.#########.#.#.#.#########.#.#.#
+.########........########........########.......
+.#######.#######.#######.#######.#######.#######
+.######..######..######..######..######..######.
+.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+.####....####....####....####....####....####...
+.###.###.###.###.###.###.###.###.###.###.###.###
+.##..##..##..##..##..##..##..##..##..##..##..##.
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+50 10 4
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+#####.....
+50 10 5
+..........
+#####.....
+...##.....
+..........
+..........
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+50 10 4
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+50 10 5
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+...##.....
+..........
+..........
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#.........
+.#........
+..#.......
+35 41 11
+........................................#
+#########################################
+##.......####.#..######.##.###...#####.##
+.##.#.#...#.###...##...#..#.#..##..######
+.#...##....#.###...##.#.##.#.###...####..
+.###...##.##..####..##.#.#####.#...#.#...
+..#...#.##..#...##..###..##...###...#.#..
+.#.####.##.##.###.....#..#..##.###..#.##.
+##..##..#...##.###.#...####...#..##....#.
+#....#..##.#.#.#......####.#.....#...#.#.
+#.##.#####......####......###.###..###.#.
+##..######...######.##.#.##.......#...#..
+.#.....###......#####...#..#.#.###...##.#
+...##.##.##..##...####.#.###...#..#.##..#
+....###.#.#..#...###..###.###..#####...##
+....##.##..#.#.#.#.#####...##..######....
+#.#.##.##.#...#####....##.#.#...#.##.#..#
+#.##.##.##.#...#.#.####...#..#.......##.#
+.##.#..###..####.#..###...#...###.##.##..
+.####.#.#######.#......##....#######..##.
+.#..#...#.#.####..#.######.#.#..##.#.####
+...#.###..#.##.#.###.#.#....#.###.#.#...#
+..#.#.####....###...#..##..#####.#.######
+#......####.#..##.....#####.##...###.....
+##..##..####......#.#.##..##...###.#.....
+#.#.####.####.......##......####.###..###
+##...###.#...#.####.##.#........##..#.###
+....#..#####.#....#.##...###..#####.#.###
+####.#.###.........####..###.#..######.##
+.#..########..###..#####.######.###.#...#
+.##..#.##..#....####...#.###.....##.#...#
+##.#..##.##..##.##...##.##.##.#.##.######
+..#..#..####..##...###.#...#.....###..#..
+####.#..####.###...##..#.#.###.#..#..####
+#...#..#..#.#...#...#.#.##.##.#...###.#.#
+31 41 12
+.........................................
+#################################.....#..
+.#..........#.......#....##....#...#.....
+.........#......#.#...#...#..#........#..
+#......#.#......#...#.........#.........#
+.................#....#...#...##.........
+.......#.#..#.....#..#.....##........#..#
+.....#..#..#......................#..#...
+..............#....##....#...#..#..#....#
+...#.#.#........##.#..#..........#......#
+...#......#..#......#....#....#....#.....
+......##.#...#.##..........#.............
+.......##.#.#..#...#.....#.#..#..........
+.........#..........#.................#..
+.#....#..#......#.......#.#..#..####.##..
+#...#................##...#..........#...
+..........#...#.#..#..###..#...#.........
+........##.......#.....##.#......#...#.#.
+.#.....#.#..#.....#.#..##.#.#...........#
+.......####...#.#.........#...#.#........
+.##.................#.#.#................
+.....###.#...#..#.#..............#.......
+.....#...#.....#........#....##.......#..
+.........#...........##.#..#.....##......
+...#....#.........#...#...#.#............
+.....#..............#..............#....#
+#.##...#.............#....#.#..#......#..
+........#...#...##.............#.#.......
+.......#.......#..............#..........
+.....#.........#.........#..#...#..#....#
+####..#...#.#.....##...........#.#.#.#.#.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/output6890943.txt Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,50 @@
+Case #1: Yes 2
+Case #2: Yes 2
+Case #3: Yes 1
+Case #4: Yes 0
+Case #5: No
+Case #6: No
+Case #7: Yes 6
+Case #8: Yes 6
+Case #9: No
+Case #10: Yes 1
+Case #11: Yes 6
+Case #12: Yes 0
+Case #13: No
+Case #14: Yes 22
+Case #15: Yes 1225
+Case #16: Yes 178
+Case #17: No
+Case #18: Yes 1
+Case #19: Yes 7
+Case #20: Yes 2
+Case #21: Yes 1
+Case #22: No
+Case #23: Yes 3
+Case #24: Yes 1
+Case #25: Yes 7
+Case #26: No
+Case #27: Yes 2
+Case #28: Yes 4
+Case #29: Yes 2
+Case #30: Yes 1
+Case #31: Yes 2
+Case #32: Yes 20
+Case #33: Yes 161
+Case #34: Yes 48
+Case #35: No
+Case #36: Yes 218
+Case #37: Yes 51
+Case #38: Yes 247
+Case #39: Yes 32
+Case #40: Yes 31
+Case #41: Yes 31
+Case #42: Yes 25
+Case #43: Yes 17
+Case #44: Yes 2
+Case #45: Yes 61
+Case #46: Yes 25
+Case #47: No
+Case #48: No
+Case #49: Yes 8
+Case #50: Yes 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6796786/Test6796786.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6796786
+ * @summary invalid FP identity transform - (a - b) -> b - a
+ *
+ * @run main/othervm -Xbatch Test6796786
+ */
+
+public class Test6796786 {
+ static volatile float d1;
+ static volatile float d2;
+
+ public static void main(String[] args) {
+ int total = 0;
+ for (int i = 0; i < 100000; i++) {
+ if (Float.floatToRawIntBits(- (d1 - d2)) == Float.floatToRawIntBits(-0.0f)) {
+ total++;
+ }
+ }
+ if (total != 100000) {
+ throw new InternalError();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/7041100/Test7041100.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7041100
+ * @summary The load in String.equals intrinsic executed before null check
+ *
+ * @run main/othervm -Xbatch Test7041100 abc def
+ */
+
+public class Test7041100 {
+
+ static String n = null;
+ public static void main(String[] args) throws Exception {
+ for (int i = 0; i < 10000; i++) {
+ stringEQ(args[0], args[1]);
+ stringEQ(args[0], args[0]);
+ stringEQ(args[0], n);
+ stringEQ(n, args[0]);
+ }
+ }
+
+ public static boolean stringEQ(String a, String b) {
+ if (a == b)
+ return true;
+ if (a == null || b == null)
+ return false;
+ else
+ return a.equals(b);
+ }
+}
--- a/jaxp/.hgtags Fri May 13 13:20:16 2011 +0200
+++ b/jaxp/.hgtags Sat May 14 11:24:26 2011 -0700
@@ -115,3 +115,4 @@
be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
c8136fd161c83917f87e93b14fa2ba3483f9be83 jdk7-b140
+e1b5ef243445bf836d095fd44866e1771ef99374 jdk7-b141
--- a/jaxp/jaxp.properties Fri May 13 13:20:16 2011 +0200
+++ b/jaxp/jaxp.properties Sat May 14 11:24:26 2011 -0700
@@ -25,13 +25,13 @@
drops.master.copy.base=${drops.dir}
-jaxp_src.bundle.name=jaxp-1_4_5-dev1.zip
-jaxp_src.bundle.md5.checksum=53c95613c29852a12b93e7249f1aa227
+jaxp_src.bundle.name=jaxp-1_4_5.zip
+jaxp_src.bundle.md5.checksum=485e731f26f35d4efe05a63c57104374
jaxp_src.master.bundle.dir=${drops.master.copy.base}
-jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
+jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
-jaxp_tests.bundle.name=jaxp-1_4_5-dev1-unittests.zip
-jaxp_tests.bundle.md5.checksum=754aaba2f4944f69bfea91dec11daf4c
+jaxp_tests.bundle.name=jaxp-1_4_5-unittests.zip
+jaxp_tests.bundle.md5.checksum=fda9b9ad17c459880c077df6ecc7df80
jaxp_tests.master.bundle.dir=${drops.master.copy.base}
-jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
+jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
--- a/jaxws/.hgtags Fri May 13 13:20:16 2011 +0200
+++ b/jaxws/.hgtags Sat May 14 11:24:26 2011 -0700
@@ -115,3 +115,4 @@
cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138
c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139
82a9022c4f21b1313023c8303b557a17c4106701 jdk7-b140
+66826b0aec5a1834da3821c35cf85ac154e9b04d jdk7-b141
--- a/jdk/.hgtags Fri May 13 13:20:16 2011 +0200
+++ b/jdk/.hgtags Sat May 14 11:24:26 2011 -0700
@@ -116,3 +116,4 @@
d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
9315c733fb17ddfb9fb44be7e0ffea37bf3c727d jdk7-b140
63eeefe118da18c75ba3d36266768cd1ccaaca6b jdk7-b141
+312612e89ece62633f4809706dec00bcd5fe7c2d jdk7-b142
--- a/jdk/make/common/Release.gmk Fri May 13 13:20:16 2011 +0200
+++ b/jdk/make/common/Release.gmk Sat May 14 11:24:26 2011 -0700
@@ -85,8 +85,8 @@
else
# make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC
- IMAGE_DOCLIST_JDK = COPYRIGHT README.html THIRDPARTYLICENSEREADME.txt
- IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt
+ IMAGE_DOCLIST_JDK = COPYRIGHT README.html LICENSE THIRDPARTYLICENSEREADME.txt
+ IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
ifeq ($(PLATFORM), windows)
IMAGE_DOCLIST_JRE += README.txt
else
--- a/jdk/make/java/management/Makefile Fri May 13 13:20:16 2011 +0200
+++ b/jdk/make/java/management/Makefile Sat May 14 11:24:26 2011 -0700
@@ -63,6 +63,20 @@
FILES_c += UnixOperatingSystem_md.c
FILES_export += com/sun/management/UnixOperatingSystem.java
+
+ifeq ($(PLATFORM),solaris)
+
+FILES_c += SolarisOperatingSystem.c
+OTHER_LDLIBS += -lkstat
+
+endif # PLATFORM solaris
+
+ifeq ($(PLATFORM),linux)
+
+FILES_c += LinuxOperatingSystem.c
+
+endif # PLATFORM linux
+
endif # PLATFORM
#
--- a/jdk/make/java/management/mapfile-vers Fri May 13 13:20:16 2011 +0200
+++ b/jdk/make/java/management/mapfile-vers Sat May 14 11:24:26 2011 -0700
@@ -32,7 +32,9 @@
Java_com_sun_management_UnixOperatingSystem_getFreeSwapSpaceSize;
Java_com_sun_management_UnixOperatingSystem_getMaxFileDescriptorCount;
Java_com_sun_management_UnixOperatingSystem_getOpenFileDescriptorCount;
+ Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad;
Java_com_sun_management_UnixOperatingSystem_getProcessCpuTime;
+ Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad;
Java_com_sun_management_UnixOperatingSystem_getTotalPhysicalMemorySize;
Java_com_sun_management_UnixOperatingSystem_getTotalSwapSpaceSize;
Java_com_sun_management_UnixOperatingSystem_initialize;
--- a/jdk/src/linux/doc/man/appletviewer.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/appletviewer.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,44 +19,34 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH appletviewer 1 "02 Jun 2010"
+.TH appletviewer 1 "10 May 2011"
.LP
.SH "Name"
appletviewer \- The Java Applet Viewer.
.LP
-.RS 3
-
-.LP
.LP
The \f3appletviewer\fP command allows you to run applets outside of a web browser.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.LP
\f4appletviewer\fP \f2[\fP \f2options\fP \f2] \fP\f2urls\fP ...
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3appletviewer\fP command connects to the documents or resources designated by \f2urls\fP and displays each applet referenced by the documents in its own window. Note: if the documents referred to by \f2urls\fP do not reference any applets with the \f2OBJECT\fP, \f2EMBED\fP, or \f2APPLET\fP tag, then \f3appletviewer\fP does nothing. For details on the HTML tags that \f3appletviewer\fP supports, see
.na
\f2AppletViewer Tags\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/appletviewertags.html.
+http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
.LP
.LP
\f3Note:\fP The \f3appletviewer\fP requires encoded URLs according to the escaping mechanism defined in RFC2396. Only encoded URLs are supported. However, file names must be unencoded, as specified in RFC2396.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-debug
--- a/jdk/src/linux/doc/man/apt.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/apt.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH apt 1 "02 Jun 2010"
+.TH apt 1 "10 May 2011"
.LP
.SH "NAME"
@@ -50,21 +50,17 @@
.SH "DESCRIPTION"
.LP
.LP
-The tool \f2apt\fP, annotation processing tool, includes a set of new reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP.
+\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
+.LP
+.LP
+The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP.
.LP
.LP
A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in
.na
\f4Getting Started with \fP\f4apt\fP. @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html
-.LP
-.RS 3
-.TP 3
-Note:
-\f2The functionality of \fP\f2apt\fP has been subsumed by the annotation\-processing infrastructure that is now part of the \f2javac(1)\fP tool and standardized for use by all Java compilers. This new infrastructure relies on the language model and annotation\-processing APIs that are now part of the Java Platform. It is recommended that new annotation processor development be based on the new APIs and the \f2javac\fP tool.
-.RE
-
+http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
.LP
.SH "OPTIONS"
.LP
@@ -90,6 +86,12 @@
.TP 3
\-factory classname
Name of annotation processor factory to use; bypasses default discovery process
+.TP 3
+\-version
+Print version information.
+.TP 3
+\-X
+Display information about non\-standard options.
.RE
.LP
@@ -109,10 +111,35 @@
.LP
Consult the javac(1) man page for information on \f2javac\fP options.
.LP
+.SS
+Non\-Standard Options
+.LP
+.RS 3
+.TP 3
+\-XListAnnotationTypes
+List found annotation types.
+.TP 3
+\-XListDeclarations
+List specified and included declarations.
+.TP 3
+\-XPrintAptRounds
+Print information about initial and recursive \f2apt\fP rounds.
+.TP 3
+\-XPrintFactoryInfo
+Print information about which annotations a factory is asked to process.
+.TP 3
+\-XclassesAsDecls
+Treat both class and source files as declarations to process.
+.RE
+
+.LP
+.LP
+\f3Note\fP: Because these options are non\-standard, they are subject to change without notice.
+.LP
.SH "NOTES"
.LP
.LP
-The functionality of \f2apt\fP has been subsumed by the standard annotation\-processing infrastructure now offered by \f2javac\fP. Support for \f2apt\fP and its associated APIs may be discontinued in some future JDK release.
+The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
.LP
.SH "SEE ALSO"
.LP
--- a/jdk/src/linux/doc/man/extcheck.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/extcheck.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH extcheck 1 "02 Jun 2010"
+.TH extcheck 1 "10 May 2011"
.LP
.SH "Name"
extcheck \- A utility to detect jar conflicts
.LP
-.RS 3
-
-.LP
.LP
\f3extcheck\fP detects version conflicts between a target jar file and currently installed extension jar files.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +41,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3extcheck\fP utility checks a specified Jar file for title and version conflicts with any extensions installed in the Java(TM) SDK. Before installing an extension, you can use this utility to see if the same or a more recent version of the extension is already installed.
.LP
@@ -63,8 +55,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-verbose
@@ -77,8 +67,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
jar(1)
.LP
--- a/jdk/src/linux/doc/man/idlj.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/idlj.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH idlj 1 "02 Jun 2010"
+.TH idlj 1 "10 May 2011"
.LP
.SH "Name"
idlj \- The IDL\-to\-Java Compiler
.LP
-.RS 3
-
-.LP
-\f3idlj\fP generates Java bindings from a given IDL file.
-.RE
+\f3idlj\fP generates Java bindings from a given IDL file.
.SH "Synopsis"
.LP
-
-.LP
.nf
\f3
.fl
@@ -48,28 +42,62 @@
.LP
.SH "Description"
.LP
-
.LP
The IDL\-to\-Java Compiler generates the Java bindings for a given IDL file.\ For binding details, see the
.na
\f2OMG IDL to Java Language Language Mapping Specification\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
+.LP
.SS
Emitting Client and Server Bindings
.LP
-.RS 3
+.LP
+To generate Java bindings for an IDL file named My.idl:
+.LP
+.nf
+\f3
+.fl
+idlj My.idl
+.fl
+\fP
+.fi
+
+.LP
+.LP
+This generates the client\-side bindings and is equivalent to:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fclient\fP My.idl
+.fl
+.fi
.LP
-To generate Java bindings for an IDL file named My.idl: \f2idlj My.idl\fP
+.LP
+The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces:
.LP
-This generates the client\-side bindings and is equivalent to: \f2idlj \fP\f4\-fclient\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fserver\fP My.idl
+.fl
+.fi
+
+.LP
.LP
-The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: \f2idlj \fP\f4\-fserver\fP\f2 My.idl\fP
+Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands:
.LP
-Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: \f2idlj \fP\f4\-fclient \-fserver\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fclient \-fserver\fP My.idl
+.fl
+idlj \f3\-fall\fP My.idl
+.fl
+.fi
+
.LP
.LP
There are two possible server\-side models: the Inheritance Model and the Tie Delegation Model.
@@ -82,31 +110,47 @@
.na
\f2org.omg.PortableServer.Servant\fP @
.fi
-http://java.sun.com/javase/6/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
+http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
.LP
.LP
The \f2PortableServer\fP module for the
.na
\f2Portable Object Adapter (POA)\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
.LP
.LP
Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible:
.LP
-\f2idlj \fP\f4\-fclient \-fserver\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-fall\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fclient \-fserver\fP \f3\-oldImplBase\fP My.idl
+.fl
+idlj \f3\-fall\fP \f3\-oldImplBase\fP My.idl
+.fl
+.fi
+
.LP
-Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP.
+.LP
+Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP.
+.LP
.LP
The other server\-side model is called the Tie Model. This is a delegation model. Because it is not possible to generate ties and skeletons at the same time, they must be generated separately. The following commands generate the bindings for the Tie Model:
.LP
-\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-fallTIE\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fall\fP My.idl
+.fl
+idlj \f3\-fallTIE\fP My.idl
+.fl
+.fi
+
.LP
-For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance:
+.LP
+For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance:
+.LP
.nf
\f3
.fl
@@ -144,13 +188,21 @@
.fi
.LP
-You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method.
+.LP
+You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method.
+.LP
.LP
To generate server\-side, Tie model bindings that are compatible with versions of the IDL to Java language mapping in versions prior to J2SE 1.4.
.LP
-\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fall\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fallTIE\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-oldImplBase\fP \f3\-fall\fP My.idl
+.fl
+idlj \f3\-oldImplBase\fP \f3\-fallTIE\fP My.idl
+.fl
+.fi
+
.LP
.LP
For the interface \f2My\fP, this will generate \f2My_Tie.java\fP. The constructor to \f2My_Tie\fP takes a \f2impl\fP. You must provide the implementation for \f2impl\fP, but it does not have to inherit from any other class, only the interface \f2HelloOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2My_Tie\fP. For instance:
@@ -184,201 +236,383 @@
.fi
.LP
-.RE
.SS
Specifying Alternate Locations for Emitted Files
.LP
-.RS 3
+.LP
+If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-td /altdir\fP My.idl
+.fl
+.fi
.LP
-If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as:
-.RS 3
-
.LP
-\f2idlj \fP\f4\-td /altdir\fP\f2 My.idl\fP
-.RE
For the interface \f2My\fP, the bindings will be emitted to \f2/altdir/My.java\fP, etc., instead of \f2./My.java\fP.
-.RE
+.LP
.SS
Specifying Alternate Locations for Include Files
.LP
-.RS 3
+.LP
+If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-i /includes\fP My.idl
+.fl
+.fi
.LP
-If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes\fP\f2 My.idl\fP
+.LP
+If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-i /includes \-i /moreIncludes\fP My.idl
+.fl
+.fi
+
+.LP
.LP
-If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes \-i /moreIncludes\fP\f2 My.idl\fP
+Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form:
.LP
-Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: \f2includes=/includes;/moreIncludes\fP
+.nf
+\f3
+.fl
+includes=/includes;/moreIncludes
+.fl
+\fP
+.fi
+
+.LP
.LP
The compiler will find this file and read in the includes list. Note that in this example the separator character between the two directories is a semicolon (;). This separator character is platform dependent. On the Windows platform, use a semicolon, on the Unix platform, use a colon, etc. For more information on \f2includes\fP, see the
.na
\f2Setting the Classpath\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#general.
-.RE
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general.
+.LP
.SS
Emitting Bindings for Include Files
.LP
-.RS 3
+.LP
+By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files:
+.LP
+
+.LP
+.LP
+\f4My.idl\fP
+.LP
+.nf
+\f3
+.fl
+#include <MyOther.idl>
+.fl
+interface My
+.fl
+{
+.fl
+};
+.fl
+\fP
+.fi
+
+.LP
+
+.LP
+.LP
+\f4MyOther.idl\fP
+.LP
+.nf
+\f3
+.fl
+interface MyOther
+.fl
+{
+.fl
+};
+.fl
+\fP
+.fi
+
+.LP
+
+.LP
+.LP
+The following command will only generate the java bindings for \f2My\fP:
+.LP
+.nf
+\f3
+.fl
+idlj My.idl
+.fl
+\fP
+.fi
+
+.LP
+.LP
+To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-emitAll\fP My.idl
+.fl
+.fi
+
+.LP
+.LP
+There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example:
+.LP
.LP
-By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: \f4My.idl\fP
+.LP
+\f4My.idl\fP
.LP
-\f2#include <MyOther.idl>\fP
-.br
-\f2interface My\fP
-.br
-\f2{\fP
-.br
-\f2};\fP
-.br
-\f4MyOther.idl\fP
+.nf
+\f3
+.fl
+#include <MyOther.idl>
+.fl
+interface My
+.fl
+{
+.fl
+ #include <Embedded.idl>
+.fl
+};
+.fl
+\fP
+.fi
+
.LP
-\f2interface MyOther\fP
-.br
-\f2{\fP
-.br
-\f2};\fP\
+
+.LP
+.LP
+\f4MyOther.idl\fP
.LP
-The following command will only generate the java bindings for \f2My\fP: \f2idlj My.idl\fP
+.nf
+\f3
+.fl
+interface MyOther
+.fl
+{
+.fl
+};
+.fl
+\fP
+.fi
+
.LP
-To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: \f2idlj \fP\f4\-emitAll\fP\f2 My.idl\fP
+
.LP
-There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: \f4My.idl\fP
+.LP
+\f4Embedded.idl\fP
.LP
-\f2#include <MyOther.idl>\fP
-.br
-\f2interface My\fP
-.br
-\f2{\fP
-.br
-\f2\ #include <Embedded.idl>\fP
-.br
-\f2};\ \fP \f4MyOther.idl\fP
+.nf
+\f3
+.fl
+enum E {one, two, three};
+.fl
+\fP
+.fi
+
+.LP
+
+.LP
.LP
-\f2interface MyOther\fP
-.br
-\f2{\fP
-.br
-\f2};\ \fP \f4Embedded.idl\fP
+Running the following command:
.LP
-\f2enum E {one, two, three};\fP\
+.nf
+\f3
+.fl
+idlj My.idl
+.fl
+\fP
+.fi
+
+.LP
+.LP
+will generate the following list of Java files:
.LP
-Running the following command: \f2idlj My.idl\fP
+.nf
+\f3
+.fl
+./MyHolder.java
+.fl
+./MyHelper.java
+.fl
+./_MyStub.java
+.fl
+./MyPackage
+.fl
+./MyPackage/EHolder.java
+.fl
+./MyPackage/EHelper.java
+.fl
+./MyPackage/E.java
+.fl
+./My.java
+.fl
+\fP
+.fi
+
.LP
-will generate the following list of Java files: \f2./MyHolder.java\fP
-.br
-\f2./MyHelper.java\fP
-.br
-\f2./_MyStub.java\fP
-.br
-\f2./MyPackage\fP
-.br
-\f2./MyPackage/EHolder.java\fP
-.br
-\f2./MyPackage/EHelper.java\fP
-.br
-\f2./MyPackage/E.java\fP
-.br
-\f2./My.java\fP
.LP
-Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP).
+Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP).
+.LP
.LP
If the \f2\-emitAll\fP flag had been used in the previous example, then all types in all included files would be emitted.
.LP
-.RE
.SS
Inserting Package Prefixes
.LP
-.RS 3
+.LP
+Suppose that you work for a company named ABC that has constructed the following IDL file:
+.LP
.LP
-Suppose that you work for a company named ABC that has constructed the following IDL file:
-.br
-\f4Widgets.idl\fP
+.LP
+\f4Widgets.idl\fP
.LP
-\f2module Widgets\fP
-.br
-\f2{\fP
-.br
-\f2\ interface W1 {...};\fP
-.br
-\f2\ interface W2 {...};\fP
-.br
-\f2};\fP\
+.nf
+\f3
+.fl
+module Widgets
+.fl
+{
+.fl
+ interface W1 {...};
+.fl
+ interface W2 {...};
+.fl
+};
+.fl
+\fP
+.fi
+
.LP
-Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: \f2idlj \fP\f4\-pkgPrefix Widgets com.abc\fP\f2 Widgets.idl\fP
+
+.LP
+.LP
+Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following:
.LP
-If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package.
+.nf
+\f3
+.fl
+idlj \fP\f3\-pkgPrefix Widgets com.abc\fP Widgets.idl
+.fl
+.fi
+
+.LP
+.LP
+If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package.
+.LP
.LP
If you have a number of these packages that require prefixes, it might be easier to place them into the \f2idl.config\fP file described above. Each package prefix line should be of the form:
.LP
-\f2PkgPrefix.<type>=<prefix>\fP
+.nf
+\f3
+.fl
+PkgPrefix.<type>=<prefix>
+.fl
+\fP
+.fi
+
.LP
-So the line for the above example would be: \f2PkgPrefix.Widgets=com.abc\fP
+So the line for the above example would be:
+.nf
+\f3
+.fl
+PkgPrefix.Widgets=com.abc
+.fl
+\fP
+.fi
+
.LP
.LP
The use of this option does not affect the Repository ID.
.LP
-.RE
.SS
Defining Symbols Before Compilation
.LP
-.RS 3
+.LP
+You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-d\fP MYDEF My.idl
+.fl
+.fi
.LP
-You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command \f2idlj \fP\f4\-d\fP\f2 MYDEF My.idl\fP
.LP
is the equivalent of putting the line \f2#define MYDEF\fP inside \f2My.idl\fP.
-.RE
+.LP
.SS
Preserving Pre\-Existing Bindings
.LP
-.RS 3
+.LP
+If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-keep\fP My.idl
+.fl
+.fi
.LP
-If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command \f2idlj \fP\f4\-keep\fP\f2 My.idl\fP
.LP
-emit all client\-side bindings that do not already exist.
-.RE
+emits all client\-side bindings that do not already exist.
+.LP
.SS
Viewing Progress of Compilation
.LP
-.RS 3
+.LP
+The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-v\fP My.idl
+.fl
+.fi
.LP
-The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: \f2idlj \fP\f4\-v\fP\f2 My.idl\fP
.LP
By default the compiler does not operate in verbose mode.
-.RE
+.LP
.SS
Displaying Version Information
.LP
-.RS 3
-
-.LP
.LP
To display the build version of the IDL\-to\-Java compiler, specify the \f2\-version\fP option on the command\-line:
.LP
-.LP
-\f2idlj \-version\fP
+.nf
+\f3
+.fl
+idlj \-version
+.fl
+\fP
+.fi
+
.LP
.LP
Version information also appears within the bindings generated by the compiler. Any additional options appearing on the command\-line are ignored.
.LP
-.RE
.SH "Options"
.LP
-
-.LP
.RS 3
.TP 3
\-d symbol
This is equivalent to the following line in an IDL file:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -386,7 +620,6 @@
.fl
\fP
.fi
-.RE
.TP 3
\-emitAll
Emit all types, including those found in \f2#include\fP files.
@@ -410,8 +643,9 @@
Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module.
.TP 3
\-pkgTranslate type package
-Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly.
-.LP
+Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly.
+.br
+.br
If more than one translation matches an identifier, the longest match is chosen. For example, if the arguments include:
.nf
\f3
@@ -420,7 +654,6 @@
.fl
\fP
.fi
-.LP
The following translations would occur:
.nf
\f3
@@ -435,7 +668,6 @@
.fl
\fP
.fi
-.LP
The following package names cannot be translated:
.RS 3
.TP 2
@@ -445,8 +677,7 @@
o
\f2org.omg\fP or any subpackages of \f2org.omg\fP
.RE
-.LP
-Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error.
+Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error.
.TP 3
\-skeletonName xxx%yyy
Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are:
@@ -481,11 +712,11 @@
.RE
.LP
-See the Description section for more option information.
+.LP
+See the Description section for more option information.
+.LP
.SH "Restrictions:"
.LP
-
-.LP
.RS 3
.TP 2
o
@@ -498,8 +729,6 @@
.LP
.SH "Known Problems:"
.LP
-
-.LP
.RS 3
.TP 2
o
--- a/jdk/src/linux/doc/man/ja/appletviewer.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/appletviewer.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH appletviewer 1 "14 Apr 2011"
+.TH appletviewer 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/apt.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/apt.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH apt 1 "14 Apr 2011"
+.TH apt 1 "07 May 2011"
.LP
.SH "NAME"
@@ -50,7 +50,10 @@
.SH "ÀâÌÀ"
.LP
.LP
-Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¿·¤·¤¤¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
+\f3Ãí\fP: \f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
+.LP
+.LP
+Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
.LP
.LP
¥Ä¡¼¥ë¤Îµ¡Ç½¤Ë´Ø¤¹¤ë¾ÜºÙ¤È¡¢\f2apt\fP ¤ò»ÈÍѤ·¤¿³«È¯ÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
@@ -59,13 +62,6 @@
.fi
http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
-.RS 3
-.TP 3
-Ãí:
-\f2apt\fP ¤Îµ¡Ç½¤Ï¡¢\f2javac(1)\fP ¥Ä¡¼¥ë¤Î°ìÉô¤È¤Ê¤Ã¤¿Ãí¼á½èÍý¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤ËÁȤ߹þ¤Þ¤ì¡¢¤¹¤Ù¤Æ¤Î Java ¥³¥ó¥Ñ¥¤¥é¤Ç»ÈÍѤǤ¤ë¤è¤¦¤Ëɸ½à²½¤µ¤ì¤Þ¤·¤¿¡£¤³¤Î¿·¤·¤¤¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤Ï¡¢¸À¸ì¥â¥Ç¥ë¤ª¤è¤Ó Java ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î°ìÉô¤È¤Ê¤Ã¤¿Ãí¼á½èÍý API ¤Ë°Í¸¤·¤Þ¤¹¡£Ãí¼á¥×¥í¥»¥Ã¥µ¤Î³«È¯¤Ï¡¢¿·¤·¤¤ API ¤ª¤è¤Ó \f2javac\fP ¥Ä¡¼¥ë¤Ë´ð¤Å¤¤¤Æ¹Ô¤¦¤è¤¦¤ª´«¤á¤·¤Þ¤¹¡£
-.RE
-
-.LP
.SH "¥ª¥×¥·¥ç¥ó"
.LP
.SS
@@ -143,7 +139,7 @@
.SH "Ãí"
.LP
.LP
-\f2apt\fP ¤Îµ¡Ç½¤Ï¡¢\f2javac\fP ¤Ë¤è¤êÄ󶡤µ¤ì¤ëɸ½àÃí¼á½èÍý¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤ËÁȤ߹þ¤Þ¤ì¤Þ¤·¤¿¡£º£¸å¤Î JDK ¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢\f2apt\fP ¤ª¤è¤Ó´ØÏ¢¤¹¤ë API ¤Î¥µ¥Ý¡¼¥È¤¬Ãæ»ß¤¹¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
+\f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.SH "´ØÏ¢¹àÌÜ"
.LP
--- a/jdk/src/linux/doc/man/ja/extcheck.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/extcheck.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH extcheck 1 "14 Apr 2011"
+.TH extcheck 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/idlj.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/idlj.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH idlj 1 "14 Apr 2011"
+.TH idlj 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jar.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jar.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jar 1 "14 Apr 2011"
+.TH jar 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jarsigner.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jarsigner.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jarsigner 1 "14 Apr 2011"
+.TH jarsigner 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -110,16 +110,16 @@
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
- \-keypass dukekeypasswd MyJARFile.jar duke
+ \-keypass \fP\f4<Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 MyJARFile.jar duke
.fl
\fP
.fi
.LP
.LP
-¥¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É (¾å¤ÎÎã¤Ç¤Ï mypass) ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤Ç¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢Èó¸ø³«¸°¤â¥¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É (¾å¤ÎÎã¤Ç¤Ï dukekeypasswd) ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¥³¥Þ¥ó¥É¹Ô¤ÇÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¡¢¤Þ¤¿¡¢»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤È°ã¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
+¥¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤Ç¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢Èó¸ø³«¸°¤â¥¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤ÇÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¡¢¤Þ¤¿¡¢»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤È°ã¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
.LP
.SS
¥¡¼¥¹¥È¥¢¤Î¾ì½ê
@@ -500,7 +500,7 @@
.LP
\f2file\fP ¤Ë»ÈÍѤǤ¤ëʸ»ú¤Ï¡Öa\-zA\-Z0\-9_\-¡×¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢Ê¸»ú¡¢¿ô»ú¡¢²¼Àþ¡¢¤ª¤è¤Ó¥Ï¥¤¥Õ¥ó¤À¤±¤ò»ÈÍѤǤ¤Þ¤¹¡£Ãí: .SF ¤ª¤è¤Ó .DSA ¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¡¢¾®Ê¸»ú¤Ï¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
.LP
-\-sigfile \f2¥ª¥×¥·¥ç¥ó\fP ¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF ¥Õ¥¡¥¤¥ë¤È .DSA ¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¹Ô¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î 8 ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬ 8 ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»È¤ï¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ (_) ¤ËÃÖ¤´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
+\-sigfile \f2\-sigfile\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF ¥Õ¥¡¥¤¥ë¤È .DSA ¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¹Ô¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î 8 ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬ 8 ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»È¤ï¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ (_) ¤ËÃÖ¤´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
.TP 3
\-sigalg algorithm
JAR ¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë½ð̾¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
@@ -609,7 +609,7 @@
\fP
.fi
.TP 3
-\-Jjavaoption
+¤Ç¤¤Þ¤¹javaoption
»ØÄꤵ¤ì¤¿ \f2javaoption\fP ʸ»úÎó¤ò Java ¥¤¥ó¥¿¥×¥ê¥¿¤ËľÀÜÅϤ·¤Þ¤¹¡£\f3jarsigner\fP ¤Ï¡¢¼ÂºÝ¤Ë¤Ï Java ¥¤¥ó¥¿¥×¥ê¥¿¤ËÂФ¹¤ë¡Ö¥é¥Ã¥Ñ¡¼¡×¤Ç¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¼Â¹Ô´Ä¶¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤòÄ´À°¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£»ÈÍѲÄǽ¤Ê¥¤¥ó¥¿¥×¥ê¥¿¥ª¥×¥·¥ç¥ó¤Î°ìÍ÷¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢ \f2java \-h\fP ¤Þ¤¿¤Ï \f2java \-X\fP ¤È¥³¥Þ¥ó¥É¹Ô¤«¤éÆþÎϤ·¤Þ¤¹¡£
.LP
.TP 3
@@ -676,14 +676,14 @@
JAR ¥Õ¥¡¥¤¥ë¤Î½ð̾
.LP
.LP
-bundle.jar ¤È¤¤¤¦Ì¾Á°¤Î JAR ¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤¬ jane ¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈó¸ø³«¸°¤ò»È¤Ã¤Æ¡¢½ð̾¤òÉÕ¤±¤ë¤È¤·¤Þ¤¹¡£¥¡¼¥¹¥È¥¢¤Ï¡¢mystore ¤È¤¤¤¦Ì¾Á°¤Ç¡¢C ¥É¥é¥¤¥Ö¤Î working ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¡¢¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤Ï mypass¡¢\f2jane\fP ¤ÎÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ï j638klm ¤È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢JAR ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Æ sbundle.jar ¤È¤¤¤¦½ð̾ÉÕ¤ JAR ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤¤Þ¤¹¡£
+bundle.jar ¤È¤¤¤¦Ì¾Á°¤Î JAR ¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤¬ jane ¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈó¸ø³«¸°¤ò»È¤Ã¤Æ¡¢½ð̾¤òÉÕ¤±¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢JAR ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Æ sbundle.jar ¤È¤¤¤¦½ð̾ÉÕ¤ JAR ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤¤Þ¤¹¡£
.LP
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
- \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane
+ \-keypass \fP\f4<Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -800,7 +800,7 @@
¾ÚÌÀ½ñ¾ðÊó¤ò»È¤Ã¤¿¸¡¾Ú
.LP
.LP
-¸¡¾Ú»þ¤Ë \-verify ¤È \-verbose ¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¤Æ \f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢ JAR ¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤â½ÐÎϤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¼±ÊÌ̾¾ðÊó (X.509 ¾ÚÌÀ½ñ¤Î¾ì¹ç¤Î¤ß)¡¢¤ª¤è¤Ó JAR ¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ë°ìÃפ·¤¿¾ì¹ç¤Ë¤Ï¡¢³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿½ð̾¼Ô¤Î¥¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
+¸¡¾Ú»þ¤Ë \-verify ¤È \-verbose ¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¤Æ \f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢ ¤ª¤è¤Ó JAR ¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤â½ÐÎϤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¼±ÊÌ̾¾ðÊó (X.509 ¾ÚÌÀ½ñ¤Î¾ì¹ç¤Î¤ß)¡¢¤ª¤è¤Ó JAR ¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ë°ìÃפ·¤¿¾ì¹ç¤Ë¤Ï¡¢³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿½ð̾¼Ô¤Î¥¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
.LP
.nf
\f3
@@ -862,7 +862,7 @@
JAR ¥Õ¥¡¥¤¥ë¤¬¡¢JDK 1.1 ¤Î \f3javakey\fP ¥Ä¡¼¥ë¤ò»È¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢½ð̾¼Ô¤Ï¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ç¤¹¡£¤³¤Î¾ì¹ç¡¢¸¡¾Ú¤Î½ÐÎÏ¤Ë¤Ï i ¤È¤¤¤¦µ¹æ¤¬´Þ¤Þ¤ì¤Þ¤¹¡£JAR ¥Õ¥¡¥¤¥ë¤¬¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤È¥¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤ÎξÊý¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢k ¤È i ¤ÎξÊý¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
.LP
.LP
-\f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤ë¤Î¤ËÂФ·¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+\f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤ë¤Î¤ËÂФ·¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -978,7 +978,7 @@
.fl
¤³¤Î JAR ¤Ë¤Ï¡¢¤³¤Î¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤½ð̾ÉÕ¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹
.fl
-
+
.fl
\fP
.fi
@@ -993,7 +993,7 @@
.nf
\f3
.fl
-failure 1
+failure 1
.fl
\fP
.fi
@@ -1649,7 +1649,7 @@
.na
\f4jarsigner\fP\f2 ¥Ä¡¼¥ë¤Î»ÈÍÑÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢\fP @
.fi
-http://download.oracle.com/javase/tutorial/index.html
+http://download.oracle.com/javase/tutorial/security/index.html
.na
\f2¡ÖJava ¥Á¥å¡¼¥È¥ê¥¢¥ë¡×\fP\f4¤Î\fP @
.fi
--- a/jdk/src/linux/doc/man/ja/java.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/java.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH java 1 "14 Apr 2011"
+.TH java 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/javac.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/javac.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javac 1 "14 Apr 2011"
+.TH javac 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -136,10 +136,6 @@
\f3\-sourcepath\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤â¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Ñ¥¹¤«¤é¸¡º÷¤µ¤ì¤Þ¤¹¡£
.LP
\f3\-processorpath\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢Ãí¼á¥×¥í¥»¥Ã¥µ¤â¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Ñ¥¹¤«¤é¸¡º÷¤µ¤ì¤Þ¤¹¡£
-.LP
-Êص¹¾å¡¢ \f2*\fP ¤Î¥Ù¡¼¥¹Ì¾¤ò´Þ¤à¥¯¥é¥¹¥Ñ¥¹Í×ÁǤϡ¢¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î³ÈÄ¥»Ò \f2.jar\fP ¤Þ¤¿¤Ï \f2.JAR\fP ¤ò»ý¤Ä¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò»ØÄꤹ¤ë¤Î¤ÈƱ¤¸¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£
-.LP
-¤¿¤È¤¨¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê \f2foo\fP ¤Ë \f2a.jar\fP ¤È \f2b.JAR\fP ¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹Í×ÁÇ \f2foo/*\fP ¤Ï \f2A.jar:b.JAR\fP ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢JAR ¥Õ¥¡¥¤¥ë¤Î½çÈ֤ϻØÄꤵ¤ì¤Þ¤»¤ó¡£¤³¤Î¥ê¥¹¥È¤Ë¤Ï¡¢±£¤·¥Õ¥¡¥¤¥ë¤â´Þ¤á¡¢»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î JAR ¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£ \f2*\fP ¤À¤±¤«¤éÀ®¤ë¥¯¥é¥¹¥Ñ¥¹¥¨¥ó¥È¥ê¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î JAR ¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ËŸ³«¤µ¤ì¤Þ¤¹¡£ \f2CLASSPATH\fP ´Ä¶ÊÑ¿ô¤â¡¢ÄêµÁ»þ¤Ë¤ÏƱÍͤËŸ³«¤µ¤ì¤Þ¤¹¡£\f3Ãí:\fP ¥³¥Þ¥ó¥É¹Ô´Ä¶¤Î¹½À®¤Ë¤è¤Ã¤Æ¤Ï¡¢ \f2javac \-cp "*.jar" MyClass.java\fP ¤Ê¤É¤Î¤è¤¦¤Ë¡¢¥ï¥¤¥ë¥É¥«¡¼¥Éʸ»ú¤ò°úÍÑÉä¤Ç°Ï¤à¤³¤È¤¬É¬Íפʾì¹ç¤â¤¢¤ê¤Þ¤¹¡£
.TP 3
\-Djava.ext.dirs=directories
¥¤¥ó¥¹¥È¡¼¥ë·¿³ÈÄ¥µ¡Ç½¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
@@ -315,7 +311,7 @@
¿ä¾©¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò͸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò͸ú¤Ë¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
.TP 3
\-Xlint:none
-Java ¸À¸ì»ÅÍͤǤϻØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
+¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
.TP 3
\-Xlint:name
·Ù¹ð \f2name\fP ¤ò͸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç͸ú¤Ë¤Ç¤¤ë·Ù¹ð¤Î¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢¡Ö\-Xlint ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ͸ú¤Þ¤¿¤Ï̵¸ú¤Ë¤Ç¤¤ë·Ù¹ð¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -617,7 +613,7 @@
¤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤Ë¤Ï¡¢¥¯¥é¥¹ \f2AnnosWithoutProcessors\fP ¤ÇÄêµÁ¤ª¤è¤Ó»ÈÍѤµ¤ì¤ëÃí¼á¤Î̾Á°¤ò \f2Anno\fP ¤«¤é \f2NotAnno\fP ¤ËÊѹ¹¤·¤Þ¤¹¡£
.TP 3
rawtypes
-raw ·¿¤ËÂФ¹¤ë̤¸¡ººÁàºî¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£Æäˤ³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢·¿°ú¿ô¤ò»ý¤¿¤Ê¤¤¥Ñ¥é¥á¡¼¥¿²½¤µ¤ì¤¿·¿¤ò»ÈÍѤ¹¤ë¥æ¡¼¥¶¡¼¤ËÂФ·¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤Îʸ¤Ç¤Ï¡¢ \f2rawtypes\fP ·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
+raw ·¿¤ËÂФ¹¤ë̤¸¡ººÁàºî¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤Îʸ¤Ç¤Ï¡¢ \f2rawtypes\fP ·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
.nf
\f3
.fl
--- a/jdk/src/linux/doc/man/ja/javadoc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/javadoc.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javadoc 1 "14 Apr 2011"
+.TH javadoc 1 "07 May 2011"
.SH "̾Á°"
javadoc \- Java API ¥É¥¥å¥á¥ó¥È¥¸¥§¥Í¥ì¡¼¥¿
.LP
@@ -38,11 +38,7 @@
¥¹¥Ú¡¼¥¹¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢ \f2java.lang\ java.lang.reflect\ java.awt ¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹\fP¡£¥É¥¥å¥á¥ó¥È²½¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¸ÄÊ̤˻ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥ï¥¤¥ë¥É¥«¡¼¥É¤Ï»ÈÍÑÉԲĤǤ¹¡£ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë¤Ï¡¢\-subpackages ¤ò»ÈÍѤ·¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢\f2\-sourcepath\fP ¤ò»ÈÍѤ·¤Æ¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¸¡º÷¤·¤Þ¤¹¡£¡Ö1 ¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.TP 3
sourcefilenames
-¥¹¥Ú¡¼¥¹¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£ ³Æ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥¹¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯ (*) ¤Ê¤É¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤¬¡Ö.java¡×¤È¤¤¤¦³ÈÄ¥»Ò¤Ç½ª¤ï¤ê¡¢¤½¤Î³ÈÄ¥»Ò¤ò½ü¤¤¤¿Ì¾Á°¤¬¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹ (
-.na
-\f2¡ÖIdentifiers¡×\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625¤ò»²¾È)¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ï¥¤¥Õ¥ó¤ò´Þ¤à̾Á° ( \f2X\-Buffer\fP ¤Ê¤É) ¤ä¡¢¤½¤Î¾¤Î̵¸ú¤Êʸ»ú¤ò´Þ¤à̾Á°¤òÉÕ¤±¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥É¥¥å¥á¥ó¥È²½¤ÎÂоݤ«¤é½ü³°¤Ç¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Æ¥¹¥ÈÍѤΥե¡¥¤¥ë¤ä¡¢¥Æ¥ó¥×¥ì¡¼¥È¤«¤éÀ¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ÎÁ°¤Ë»ØÄꤷ¤¿¥Ñ¥¹¤Ë¤è¤Ã¤Æ¡¢javadoc ¤¬¤½¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤¬·è¤Þ¤ê¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¤³¤ì¤é¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¸¡º÷¤¹¤ë¤È¤¤Ë¤Ï \f2\-sourcepath\fP ¤ò»ÈÍѤ·¤Þ¤»¤ó¡£ÁêÂХѥ¹¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òµ¯ÅÀ¤È¤¹¤ë¤¿¤á¡¢ \f2Button.java\fP ¤òÅϤ¹¤³¤È¤Ï¡¢ \f2./Button.java\fP ¤òÅϤ¹¤³¤È¤ÈƱ¤¸¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¥Õ¥ë¥Ñ¥¹¤Ç»ØÄꤹ¤ë¤È¡¢ \f2/home/src/java/awt/Graphics*.java ¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹\fP¡£ ¡Ö1 ¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢¡Ö¥Ñ¥Ã¥±¡¼¥¸¤È¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤Î¤è¤¦¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
+¥¹¥Ú¡¼¥¹¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£ ³Æ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥¹¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯ (*) ¤Ê¤É¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤¬¡Ö.java¡×¤È¤¤¤¦³ÈÄ¥»Ò¤Ç½ª¤ï¤ê¡¢¤½¤Î³ÈÄ¥»Ò¤ò½ü¤¤¤¿Ì¾Á°¤¬¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹ (Java ¸À¸ì»ÅÍͤò»²¾È)¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ï¥¤¥Õ¥ó¤ò´Þ¤à̾Á° ( \f2X\-Buffer\fP ¤Ê¤É) ¤ä¡¢¤½¤Î¾¤Î̵¸ú¤Êʸ»ú¤ò´Þ¤à̾Á°¤òÉÕ¤±¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥É¥¥å¥á¥ó¥È²½¤ÎÂоݤ«¤é½ü³°¤Ç¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Æ¥¹¥ÈÍѤΥե¡¥¤¥ë¤ä¡¢¥Æ¥ó¥×¥ì¡¼¥È¤«¤éÀ¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ÎÁ°¤Ë»ØÄꤷ¤¿¥Ñ¥¹¤Ë¤è¤Ã¤Æ¡¢javadoc ¤¬¤½¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤¬·è¤Þ¤ê¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¤³¤ì¤é¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¸¡º÷¤¹¤ë¤È¤¤Ë¤Ï \f2\-sourcepath\fP ¤ò»ÈÍѤ·¤Þ¤»¤ó¡£ÁêÂХѥ¹¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òµ¯ÅÀ¤È¤¹¤ë¤¿¤á¡¢ \f2Button.java\fP ¤òÅϤ¹¤³¤È¤Ï¡¢ \f2./Button.java\fP ¤òÅϤ¹¤³¤È¤ÈƱ¤¸¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¥Õ¥ë¥Ñ¥¹¤Ç»ØÄꤹ¤ë¤È¡¢ \f2/home/src/java/awt/Graphics*.java ¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹\fP¡£ ¡Ö1 ¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢¡Ö¥Ñ¥Ã¥±¡¼¥¸¤È¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤Î¤è¤¦¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
.TP 3
\-subpackages pkg1:pkg2:...
¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤«¤é»ØÄꤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ª¤è¤Ó¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËºÆµ¢Åª¤Ë¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Þ¤¿¤Ï¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
@@ -62,11 +58,7 @@
.RS 3
.TP 2
o
-̾Á°¤«¤éÀÜÈø¼¡Ö\f2.java\fP¡×¤ò¼è¤ê½ü¤¯¤È¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ë¤Ê¤Ã¤Æ¤¤¤ë (͸ú¤Êʸ»ú¤Ë¤Ä¤¤¤Æ¤Ï
-.na
-\f2¡ÖIdentifiers¡×\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625¤ò»²¾È)
+̾Á°¤«¤éÀÜÈø¼¡Ö\f2.java\fP¡×¤ò¼è¤ê½ü¤¯¤È¡¢¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ë¤Ê¤Ã¤Æ¤¤¤ë (Java ¸À¸ì»ÅÍͤÎ͸ú¤Êʸ»ú¤ò»²¾È)
.TP 2
o
¥½¡¼¥¹¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤«¤éÁêÂÐŪ¤Ê¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹¤¬¡¢¶èÀÚ¤êʸ»ú¤ò¥É¥Ã¥È¤ËÊÑ´¹¤¹¤ë¤È¡¢¼ÂºÝ¤Ë͸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë¤Ê¤Ã¤Æ¤¤¤ë
@@ -111,11 +103,7 @@
.LP
¼ÂºÝ¤Ë¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥á¥½¥Ã¥ÉËÜÂΤò»ý¤¿¤Ê¤¤½ã¿è¤Ê¥¹¥¿¥Ö¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤è¤¦¤Ê \f2.java\fP ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤âÆ°ºî¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢API ¤ÎºîÀ®»þ¤Ë¤Ï¡¢¼ÂÁõ¤òµ½Ò¤¹¤ëÁ°¤ÎÀ߷פÎÁᤤÃʳ¬¤Ç¡¢¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤òµ½Ò¤·¤Æ javadoc ¥Ä¡¼¥ë¤ò¼Â¹Ô¤Ç¤¤Þ¤¹¡£
.LP
-¥³¥ó¥Ñ¥¤¥é¤Ë°Í¸¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢HTML ½ÐÎϤϡ¢¼ÂºÝ¤Î¼ÂÁõ¤ËÀµ³Î¤ËÂбþ¤·¤Þ¤¹¡£¼ÂºÝ¤Î¼ÂÁõ¤Ï¡¢ÌÀ¼¨Åª¤Ê¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ç¤Ï¤Ê¤¯¡¢°ÅÌۤΥ½¡¼¥¹¥³¡¼¥É¤Ë°Í¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢.class ¥Õ¥¡¥¤¥ë¤Ë¤Ï¸ºß¤¹¤ë¤¬¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ï¸ºß¤·¤Ê¤¤
-.na
-\f2¥Ç¥Õ¥©¥ë¥È¥³¥ó¥¹¥È¥é¥¯¥¿\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (Java ¸À¸ì»ÅÍͤΥ»¥¯¥·¥ç¥ó 8.6.7) \f2¤ò¥É¥¥å¥á¥ó¥È²½\fP ¤·¤Þ¤¹¡£
+¥³¥ó¥Ñ¥¤¥é¤Ë°Í¸¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢HTML ½ÐÎϤϡ¢¼ÂºÝ¤Î¼ÂÁõ¤ËÀµ³Î¤ËÂбþ¤·¤Þ¤¹¡£¼ÂºÝ¤Î¼ÂÁõ¤Ï¡¢ÌÀ¼¨Åª¤Ê¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ç¤Ï¤Ê¤¯¡¢°ÅÌۤΥ½¡¼¥¹¥³¡¼¥É¤Ë°Í¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢.class ¥Õ¥¡¥¤¥ë¤Ë¤Ï¸ºß¤¹¤ë¤¬¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ï¸ºß¤·¤Ê¤¤¥Ç¥Õ¥©¥ë¥È¥³¥ó¥¹¥È¥é¥¯¥¿ (Java ¸À¸ì»ÅÍͤò»²¾È) \f2¤ò¥É¥¥å¥á¥ó¥È²½\fP ¤·¤Þ¤¹¡£
.LP
Ä̾Javadoc ¥Ä¡¼¥ë¤Ç¤Ï¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥³¡¼¥É¤¬ÉÔ´°Á´¤Þ¤¿¤Ï¥¨¥é¡¼¤ò´Þ¤ó¤Ç¤¤¤ë¾ì¹ç¤Ç¤â¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤Ç¤¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢¥Ç¥Ð¥Ã¥°¤ä¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤ò´°Î»¤¹¤ëÁ°¤Ë¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Java ¸À¸ì»ÅÍͤˤè¤ë¤È¡¢Ãê¾Ý¥á¥½¥Ã¥É¤ò´Þ¤à¥¯¥é¥¹¤Ï¡¢¤½¤ì¼«ÂÎÃê¾Ý¤È¤·¤ÆÀë¸À¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤Î¥¨¥é¡¼¤ò¸¡½Ð¤¹¤ë¤È¡¢javac ¥³¥ó¥Ñ¥¤¥é¤ÏÄä»ß¤·¤Þ¤¹¤¬¡¢Javadoc ¥Ä¡¼¥ë¤Ï·Ù¹ð¤ò½Ð¤µ¤º¤Ë½èÍý¤ò³¹Ô¤·¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤Î´ðËÜŪ¤Ê¥Á¥§¥Ã¥¯¤ò¹Ô¤¤¤Þ¤¹¡£¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¤è¤ê¾Ü¤·¤¯¥Á¥§¥Ã¥¯¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢DocCheck ¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
.LP
@@ -161,7 +149,7 @@
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html \- ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤Îµ½ÒÊýË¡¤Ë´Ø¤¹¤ë Sun ¤Îµ¬Ìó
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html \- ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤Îµ½ÒÊýË¡¤Ë´Ø¤¹¤ë Sun ¤Îµ¬Ìó
.TP 2
o
.na
@@ -179,13 +167,13 @@
.na
\f2DocCheck ¥É¥Ã¥¯¥ì¥Ã¥È\fP @
.fi
-http://java.sun.com/javadoc/doccheck \- ¥½¡¼¥¹¥Õ¥¡¥¤¥ëÆâ¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¥Á¥§¥Ã¥¯¤·¡¢¸¡½Ð¤µ¤ì¤¿¥¨¥é¡¼¤äÉÔÀµ¤Î¥ì¥Ý¡¼¥È¤òÀ¸À®¤·¤Þ¤¹¡£Doc Check ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤Î°ìÉô¤Ç¤¹¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- ¥½¡¼¥¹¥Õ¥¡¥¤¥ëÆâ¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¥Á¥§¥Ã¥¯¤·¡¢¸¡½Ð¤µ¤ì¤¿¥¨¥é¡¼¤äÉÔÀµ¤Î¥ì¥Ý¡¼¥È¤òÀ¸À®¤·¤Þ¤¹¡£Doc Check ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤Î°ìÉô¤Ç¤¹¡£
.TP 2
o
.na
\f2MIF ¥É¥Ã¥¯¥ì¥Ã¥È\fP @
.fi
-http://java.sun.com/javadoc/mifdoclet \- MIF¡¢FrameMaker¡¢PDF ¤Î½ñ¼°¤Ç API ¥É¥¥å¥á¥ó¥È¤ò¼«Æ°À¸À®¤·¤Þ¤¹¡£MIF ¤Ï Adobe FrameMaker ¤Î¸ò´¹½ñ¼°¤Ç¤¹¡£
+http://java.sun.com/j2se/javadoc/mifdoclet/ \- MIF¡¢FrameMaker¡¢PDF ¤Î½ñ¼°¤Ç API ¥É¥¥å¥á¥ó¥È¤ò¼«Æ°À¸À®¤·¤Þ¤¹¡£MIF ¤Ï Adobe FrameMaker ¤Î¸ò´¹½ñ¼°¤Ç¤¹¡£
.RE
.SS
ÍѸì
@@ -218,7 +206,7 @@
.na
\f21.3\fP @
.fi
-http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ¤«¤éÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£javadoc ¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤È¤¤Ï¡¢Javadoc ¤Î¥Ö¡¼¥È¥¯¥é¥¹¥Ñ¥¹¤ª¤è¤Ó¥¯¥é¥¹¥Ñ¥¹Æâ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î»²¾È¥¯¥é¥¹¤ò¥á¥â¥ê¡¼¤Ë¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö¥¯¥é¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡×¤È¤¤¤¦·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥¯¥é¥¹¤Î¸ºß¤È¤½¤Î¥á¥ó¥Ð¡¼¤Î´°Á´»ØÄê¤Î̾Á°¤òȽÊ̤¹¤ë¤Î¤ËɬÍפʤ¹¤Ù¤Æ¤Î¾ðÊó¤ò¡¢.class ¥Õ¥¡¥¤¥ë¤«¤é°ú¤½Ð¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
+http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ¤«¤éÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£javadoc ¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤È¤¤Ï¡¢Javadoc ¤Î¥Ö¡¼¥È¥¯¥é¥¹¥Ñ¥¹¤ª¤è¤Ó¥¯¥é¥¹¥Ñ¥¹Æâ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î»²¾È¥¯¥é¥¹¤ò¥á¥â¥ê¡¼¤Ë¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö¥¯¥é¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡×¤È¤¤¤¦·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥¯¥é¥¹¤Î¸ºß¤È¤½¤Î¥á¥ó¥Ð¡¼¤Î´°Á´»ØÄê¤Î̾Á°¤òȽÊ̤¹¤ë¤Î¤ËɬÍפʤ¹¤Ù¤Æ¤Î¾ðÊó¤ò¡¢.class ¥Õ¥¡¥¤¥ë¤«¤é°ú¤½Ð¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
.LP
.TP 3
³°Éô»²¾È¥¯¥é¥¹ (external referenced classes)
@@ -310,7 +298,7 @@
.na
\f2package.html\fP¤ÎÎã @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
\f3¥Ñ¥Ã¥±¡¼¥¸¥³¥á¥ó¥È¥Õ¥¡¥¤¥ë¤Î½èÍý\fP \- Javadoc ¥Ä¡¼¥ë¤Ï¡¢¼Â¹Ô»þ¤Ë¥Ñ¥Ã¥±¡¼¥¸¥³¥á¥ó¥È¥Õ¥¡¥¤¥ë¤ò¼«Æ°Åª¤Ë¸¡º÷¤·¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¼¡¤Î½èÍý¤ò¹Ô¤¤¤Þ¤¹¡£
.RS 3
@@ -350,7 +338,7 @@
.RS 3
.TP 2
o
-\f2<body>\fP ¥¿¥°¤È \f2</body>\fP ¥¿¥°¤Î´Ö¤Ë¤¢¤ë¤¹¤Ù¤Æ¤ÎÆâÍƤò½èÍýÂоݤȤ·¤Æ¥³¥Ô¡¼¤¹¤ë
+\f2<body>\fP ¤È \f2</body>\fP ¥¿¥°¤Î´Ö¤Ë¤¢¤ë¤¹¤Ù¤Æ¤ÎÆâÍƤò½èÍýÂоݤȤ·¤Æ¥³¥Ô¡¼¤¹¤ë
.TP 2
o
³µÍ×¥¿¥°¤¬¤¢¤ì¤Ð¡¢¤¹¤Ù¤Æ½èÍý¤¹¤ë
@@ -408,11 +396,7 @@
.LP
¥Æ¥¹¥È¥Õ¥¡¥¤¥ë¤Ë doc ¥³¥á¥ó¥È¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ë¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤ó¤À¥Æ¥¹¥È¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ÇÅϤ·¤Æ¥Æ¥¹¥È¥Õ¥¡¥¤¥ë¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ë¤è¤¦¤Ë¡¢Javadoc ¥Ä¡¼¥ë¤òÊ̸Ĥ˼¹ԤǤ¤ë¤è¤¦¤ËÀßÄê¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢ \f2com/package1/test\-files/*.java ¤Ê¤É¤Ç¤¹\fP¡£
.LP
-\f3¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È\fP \- ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡Ö.java¡×¤Ç½ª¤ï¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤¤Þ¤»¤ó¡£¥½¡¼¥¹¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÊÝ»ý¤·¤¿¤¤¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤¬¤¢¤ë¾ì¹ç¤Ï¡¢ \f2Buffer\-Template.java\fP ¤Î¤è¤¦¤Ë¥Ï¥¤¥Õ¥ó¤ä¤½¤Î¾¤Î̵¸ú¤Ê Java ʸ»ú¤ò̾Á°¤Ë´Þ¤á¤ë¤³¤È¤Ç¡¢¥Æ¥ó¥×¥ì¡¼¥È¤¬½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¡Ö.java¡×ÀÜÈø¼¤ò½ü¤¤¤¿Ì¾Á°¤¬ Àµµ¬¤Î¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤À¤±¤Ç¤¢¤ë¤¿¤á¤Ç¤¹ (
-.na
-\f2¡ÖIdentifiers¡×\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625»²¾È)¡£
+\f3¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È\fP \- ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡Ö.java¡×¤Ç½ª¤ï¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤¤Þ¤»¤ó¡£¥½¡¼¥¹¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÊÝ»ý¤·¤¿¤¤¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤¬¤¢¤ë¾ì¹ç¤Ï¡¢ \f2Buffer\-Template.java\fP ¤Î¤è¤¦¤Ë¥Ï¥¤¥Õ¥ó¤ä¤½¤Î¾¤Î̵¸ú¤Ê Java ʸ»ú¤ò̾Á°¤Ë´Þ¤á¤ë¤³¤È¤Ç¡¢¥Æ¥ó¥×¥ì¡¼¥È¤¬½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¡Ö.java¡×ÀÜÈø¼¤ò½ü¤¤¤¿Ì¾Á°¤¬ Àµµ¬¤Î¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤À¤±¤Ç¤¢¤ë¤¿¤á¤Ç¤¹ (Java ¸À¸ì»ÅÍͤΡÖIdentifiers¡×¤Ë´Ø¤¹¤ë¾ðÊó¤ò»²¾È)¡£
.SH "À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë"
.LP
¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢javadoc ¥Ä¡¼¥ë¤Ï¡¢HTML ·Á¼°¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ëɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤ò»È¤¤¤Þ¤¹¡£¤³¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤Ï¡¢°Ê²¼¤Î¼ïÎà¤Î¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î HTML ¥Ú¡¼¥¸¤Ï¡¢¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤ËÁêÅö¤·¤Þ¤¹¡£javadoc ¤¬À¸À®¤¹¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ë¤Ï¡¢¥¯¥é¥¹¤ä¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î̾Á°¤Ë¤Á¤Ê¤ó¤À¤â¤Î¤È¡¢¤½¤¦¤Ç¤Ê¤¤¤â¤Î ( \f2package\-summary.html ¤Ê¤É\fP) ¤Î 2 ¼ïÎब¤¢¤ê¤Þ¤¹¡£¸å¼Ô¤Î¥°¥ë¡¼¥×¤Î¥Õ¥¡¥¤¥ë̾¤Ë¤Ï¡¢Á°¼Ô¤Î¥°¥ë¡¼¥×¤È¥Õ¥¡¥¤¥ë̾¤¬¶¥¹ç¤·¤Ê¤¤¤è¤¦¤Ë¡¢¥Ï¥¤¥Õ¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -756,7 +740,7 @@
¤³¤ÎÆ°ºî¤Ï¥Ð¡¼¥¸¥ç¥ó 1.3 °ÊÁ°¤ÎÆ°ºî¤È¤ÏÂоÈŪ¤Ç¤¹¡£¤³¤ì¤Þ¤Ç¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¤¬Â¸ºß¤¹¤ì¤Ð¡¢¥³¥á¥ó¥È¤Ï°ìÀڷѾµ¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£
.TP 2
o
-\f3{@inheritDoc} ¥¿¥°¤ò´Þ¤à¥³¥á¥ó¥È¤òÌÀ¼¨Åª¤Ë·Ñ¾µ¤¹¤ë\fP \- ¥¤¥ó¥é¥¤¥ó¥¿¥° \f2{@inheritDoc}\fP ¤ò¡¢¥á¥½¥Ã¥É¤Î¼çÀâÌÀÆâ¤Þ¤¿¤Ï \f2@return\fP¡¢ \f2@param\fP ¡¢ \f2@throws\fP ¤Î¤¤¤º¤ì¤«¤Î¥¿¥°¥³¥á¥ó¥ÈÆâ¤ËÁÞÆþ¤·¤Þ¤¹¡£Âбþ¤¹¤ë·Ñ¾µ¤µ¤ì¤¿¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¥³¥á¥ó¥È¤¬¤½¤Î°ÌÃ֤˥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
+\f3{@inheritDoc} ¥¿¥°¤ò´Þ¤à¥³¥á¥ó¥È¤òÌÀ¼¨Åª¤Ë·Ñ¾µ¤¹¤ë\fP \- ¥¤¥ó¥é¥¤¥ó¥¿¥° \f2{@inheritDoc}\fP ¤ò¡¢¥á¥½¥Ã¥É¤Î¼çÀâÌÀÆâ¤Þ¤¿¤Ï \f2@return\fP ¥¿¥°¡¢ \f2@param\fP ¥¿¥°¡¢¤Þ¤¿¤Ï \f2@throws\fP ¤Î¤¤¤º¤ì¤«¤Î¥¿¥°¥³¥á¥ó¥ÈÆâ¤ËÁÞÆþ¤·¤Þ¤¹¡£Âбþ¤¹¤ë·Ñ¾µ¤µ¤ì¤¿¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¥³¥á¥ó¥È¤¬¤½¤Î°ÌÃ֤˥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
.RE
.LP
¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¼ÂºÝ¤Ë¥³¥Ô¡¼¤ËÍøÍѤ¹¤ë¤Ë¤Ï¡¢·Ñ¾µ¤·¤¿¥á¥½¥Ã¥É¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤¬ \-sourcepath ¤Ç»ØÄꤷ¤¿¥Ñ¥¹¤À¤±¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¤³¤È¤¬É¬Íפˤʤê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤Ç¡¢¥¯¥é¥¹¤â¥Ñ¥Ã¥±¡¼¥¸¤âÅϤ¹É¬ÍפϤ¢¤ê¤Þ¤»¤ó¡£¤³¤ÎÅÀ¤Ï¡¢¥¯¥é¥¹¤¬¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤«¤Ã¤¿ 1.3.x °ÊÁ°¤Î¥ê¥ê¡¼¥¹¤È°Û¤Ê¤ê¤Þ¤¹¡£
@@ -954,7 +938,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 867 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 851 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1079,7 +1063,7 @@
.na
\f2@author ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.RS 3
.TP 3
@@ -1094,11 +1078,11 @@
.na
\f2@deprecated ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.RS 3
.TP 2
o
-Javadoc 1.2 °Ê¹ß¤Ç¤Ï \f2{@link}\fP ¥¿¥°¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢É¬Íפʾì½ê¤Ë¥¤¥ó¥é¥¤¥ó¤Ç¥ê¥ó¥¯¤òºîÀ®¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+Javadoc 1.2 °Ê¹ß¤Ç¤Ï \f2{@link}\fP ¥¿¥°¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢É¬Íפʾì½ê¤Ë¥¤¥ó¥é¥¤¥ó¤Ç¥ê¥ó¥¯¤òºîÀ®¤Ç¤¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
.nf
\f3
.fl
@@ -1292,7 +1276,7 @@
.na
\f2{@link} ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
{@linkplain\ package.class#member\ label}
@@ -1386,7 +1370,7 @@
.na
\f2@param ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
@return\ description
@@ -1396,7 +1380,7 @@
.na
\f2@return ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
@see\ reference
@@ -1644,7 +1628,7 @@
.nr 40 \n(79+(0*\n(38)
.nr 80 +\n(40
.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1358 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1342 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1751,7 +1735,7 @@
.LP
\f3@see ¤Î¸¡º÷½ç½ø\fP \- Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë (.java)¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë (package.html ¤Þ¤¿¤Ï package\-info.java) ¤Þ¤¿¤Ï³µÍ×¥Õ¥¡¥¤¥ë (overview.html) ¤Ë´Þ¤Þ¤ì¤ë \f2@see\fP ¥¿¥°¤ò½èÍý¤·¤Þ¤¹¡£¸å¼Ô¤Î 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢´°Á´»ØÄê¤Î̾Á°¤ò \f2@see\fP ¥¿¥°¤Ë»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢´°Á´»ØÄê¤Î̾Á°¡¢¤Þ¤¿¤ÏÉôʬ»ØÄê¤Î̾Á°¤ò»ØÄê¤Ç¤¤Þ¤¹¡£
.LP
-Javadoc ¥Ä¡¼¥ë¤Ï¡¢´°Á´»ØÄê¤Ç¤Ê¤¤Ì¾Á°¤¬µ½Ò¤µ¤ì¤¿ \f2@see\fP ¥¿¥°¤ò \f2.java ¥Õ¥¡¥¤¥ëÆâ¤Ç¸«¤Ä¤±¤ë¤È¡¢\fP Java ¥³¥ó¥Ñ¥¤¥é¤ÈƱ¤¸½ç½ø¤Ç»ØÄꤵ¤ì¤¿Ì¾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£ ¤¿¤À¤·¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢ÆÃÄê¤Î̾Á°¶õ´Ö¤Î¤¢¤¤¤Þ¤¤¤µ¤ò¸¡½Ð¤·¤Þ¤»¤ó¡£ ¤³¤ì¤Ï¡¢¥½¡¼¥¹¥³¡¼¥É¤Ë¤³¤ì¤é¤Î¥¨¥é¡¼¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤ë¤¿¤á¤Ç¤¹¡£¤³¤Î¸¡º÷½ç½ø¤Ï¡¢Java ¸À¸ì»ÅÍÍÂè 2 ÈǤÎÂè 6 ¾Ï¡ÖNames¡×¤ÇÀµ¼°¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢´ØÏ¢¤¹¤ë¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¡¢¤ª¤è¤Ó¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¤Î¤¹¤Ù¤Æ¤«¤é̾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢¼¡¤Î½ç½ø¤Ç¸¡º÷¤·¤Þ¤¹¡£
+Javadoc ¥Ä¡¼¥ë¤Ï¡¢´°Á´»ØÄê¤Ç¤Ê¤¤Ì¾Á°¤¬µ½Ò¤µ¤ì¤¿ \f2@see\fP ¥¿¥°¤ò \f2.java ¥Õ¥¡¥¤¥ëÆâ¤Ç¸«¤Ä¤±¤ë¤È¡¢\fP Java ¥³¥ó¥Ñ¥¤¥é¤ÈƱ¤¸½ç½ø¤Ç»ØÄꤵ¤ì¤¿Ì¾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£ ¤¿¤À¤·¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢ÆÃÄê¤Î̾Á°¶õ´Ö¤Î¤¢¤¤¤Þ¤¤¤µ¤ò¸¡½Ð¤·¤Þ¤»¤ó¡£ ¤³¤ì¤Ï¡¢¥½¡¼¥¹¥³¡¼¥É¤Ë¤³¤ì¤é¤Î¥¨¥é¡¼¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤ë¤¿¤á¤Ç¤¹¡£¤³¤Î¸¡º÷½ç½ø¤Ï¡¢\f2Java ¸À¸ì»ÅÍÍ\fP¤ÇÀµ¼°¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢´ØÏ¢¤¹¤ë¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¡¢¤ª¤è¤Ó¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¤Î¤¹¤Ù¤Æ¤«¤é̾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢¼¡¤Î½ç½ø¤Ç¸¡º÷¤·¤Þ¤¹¡£
.RS 3
.TP 3
1.
@@ -1990,7 +1974,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 1434 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1418 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2131,7 +2115,7 @@
.LP
\f3@see ¤ÎÎã\fP
.br
-±¦Â¦¤Î¥³¥á¥ó¥È¤Ï¡¢ \f2@see\fP ¥¿¥°¤¬ \f2java.applet.Applet\fP ¤Î¤è¤¦¤ÊÊ̤Υѥ屡¼¥¸¤Î¥¯¥é¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ë¡¢Ì¾Á°¤¬¤É¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
+±¦Â¦¤Î¥³¥á¥ó¥È¤Ï¡¢ \f2@see\fP ¥¿¥°¤¬ \f2java.applet.Applet\fP ¤Ê¤É¤ÎÊ̤Υѥ屡¼¥¸¤Î¥¯¥é¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ë¡¢Ì¾Á°¤¬¤É¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
.nf
\f3
.fl
@@ -2163,7 +2147,7 @@
.na
\f2@see ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.RE
.RE
.LP
@@ -2198,7 +2182,7 @@
.na
\f2¡ÖľÎ󲽤ΠFAQ¡×\fP @
.fi
-http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î FAQ ¤Ë¤Ï¡¢¡Ö\-private ¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤Ê¤¤¤Ç javadoc ¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¤Î¤Ë private ¥Õ¥£¡¼¥ë¥É¤Î @serial ¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¤È¤¤¤¦ javadoc ¤Î·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë¡×¤Ê¤É¤Î°ìÈÌŪ¤Ê¼ÁÌä¤Ø¤Î²óÅú¤¬µºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Ä¾Îó²½·Á¼°»ÅÍͤ˥¯¥é¥¹¤ò´Þ¤á¤ë¾ì¹ç¤Ë¤Ï¡¢
+http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î FAQ ¤Ë¤Ï¡¢¡Ö\-private ¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤Ê¤¤¤Ç javadoc ¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¤Î¤Ë private ¥Õ¥£¡¼¥ë¥É¤Î @serial ¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¤È¤¤¤¦ javadoc ¤Î·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë¡×¤Ê¤É¤Î°ìÈÌŪ¤Ê¼ÁÌä¤Ø¤Î²óÅú¤¬µºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Ä¾Îó²½·Á¼°»ÅÍͤ˥¯¥é¥¹¤ò´Þ¤á¤ë¾ì¹ç¤Ë¤Ï¡¢
.na
\f2¡ÖSun ¤Î»ÅÍÍ¡×\fP @
.fi
@@ -2241,7 +2225,7 @@
.na
\f2@throws ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
{@value\ package.class#field}
@@ -2293,13 +2277,13 @@
@version\ version\-text
\-version ¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤ë¤È¡¢À¸À®¥É¥¥å¥á¥ó¥È¤Ë [¥Ð¡¼¥¸¥ç¥ó] ¾®¸«½Ð¤·¤òÄɲä·¡¢»ØÄꤵ¤ì¤¿ \f2version\-text\fP ¤ò½ñ¤¹þ¤ß¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¤³¤Î¥³¡¼¥É¤¬´Þ¤Þ¤ì¤ë¥½¥Õ¥È¥¦¥§¥¢¤Î¸½ºß¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÊÝ»ý¤¹¤ë¤è¤¦¤Ë°Õ¿Þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤ËÂФ·¡¢@since ¤Ï¡¢¤³¤Î¥³¡¼¥É¤¬Æ³Æþ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÊÝ»ý¤·¤Þ¤¹¡£ \f2version\-text\fP ¤Ë¤Ï¡¢ÆÃÊ̤ÊÆâÉô¹½Â¤¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥Ð¡¼¥¸¥ç¥ó¥¿¥°¤ò»ÈÍѤǤ¤ë¾ì½ê¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢¡Ö¥¿¥°¤ò»ÈÍѤǤ¤ë¾ì½ê¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
-1 ¤Ä¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ËÊ£¿ô¤Î \f2@version\fP ¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£°ÕÌ£¤¬¼º¤ï¤ì¤Ê¤¤ÈÏ°ÏÆâ¤Ç¡¢1 ¤Ä¤Î \f2@version\fP ¥¿¥°¤Ë 1 ¤Ä¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¡¢Ê£¿ô¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£Á°¼Ô¤Î¾ì¹ç¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ̾Á°¤È̾Á°¤Î´Ö¤Ë¥³¥ó¥Þ (\f2,\fP) ¤È¶õÇò¤¬Ì¾Á°¤Î´Ö¤ËÁÞÆþ¤µ¤ì¤Þ¤¹¡£¸å¼Ô¤Î¾ì¹ç¤Ï¡¢¥Æ¥¥¹¥ÈÁ´ÂΤ¬¡¢²òÀϤµ¤ì¤ë¤³¤È¤Ê¤¯¡¢À¸À®¥É¥¥å¥á¥ó¥È¤Ë¤½¤Î¤Þ¤Þ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥³¥ó¥Þ¤Ç¤Ï¤Ê¤¯¡¢³Æ¸À¸ì¤ËÂбþ¤·¤¿Ì¾Á°¶èÀÚ¤êʸ»ú¤ò»È¤¦É¬Íפ¬¤¢¤ë¤È¤¤Ï¡¢1 ¤Ä¤Î¥¿¥°¤ËÊ£¿ô¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+1 ¤Ä¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ËÊ£¿ô¤Î \f2@version\fP ¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£°ÕÌ£¤¬¼º¤ï¤ì¤Ê¤¤ÈÏ°ÏÆâ¤Ç¡¢1 ¤Ä¤Î \f2@version\fP ¥¿¥°¤Ë 1 ¤Ä¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¡¢Ê£¿ô¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£Á°¼Ô¤Î¾ì¹ç¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ̾Á°¤È̾Á°¤Î´Ö¤Ë¥³¥ó¥Þ (\f2,\fP) ¤È¶õÇò¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹¡£¸å¼Ô¤Î¾ì¹ç¤Ï¡¢¥Æ¥¥¹¥ÈÁ´ÂΤ¬¡¢²òÀϤµ¤ì¤ë¤³¤È¤Ê¤¯¡¢À¸À®¥É¥¥å¥á¥ó¥È¤Ë¤½¤Î¤Þ¤Þ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥³¥ó¥Þ¤Ç¤Ï¤Ê¤¯¡¢³Æ¸À¸ì¤ËÂбþ¤·¤¿Ì¾Á°¶èÀÚ¤êʸ»ú¤ò»È¤¦É¬Íפ¬¤¢¤ë¤È¤¤Ï¡¢1 ¤Ä¤Î¥¿¥°¤ËÊ£¿ô¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
.LP
¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
.na
\f2@version ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.RE
.SS
¥¿¥°¤ò»ÈÍѤǤ¤ë¾ì½ê
@@ -2789,7 +2773,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 2009 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1993 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2982,7 +2966,7 @@
.LP
.TP 3
\-classpath\ classpathlist
-javadoc ¤¬»²¾È¥¯¥é¥¹ (\f2.class\fP ¥Õ¥¡¥¤¥ë) ¤Î¸¡º÷¤ò¹Ô¤¦¤È¤¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤È¤Ï¡¢¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤È¡¢¤½¤ì¤é¤Î¥¯¥é¥¹¤«¤é»²¾È¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤ò»Ø¤·¤Þ¤¹¡£\f2classpathlist\fP ¤Ë¤Ï¡¢¥³¥í¥ó (\f2:\fP) ¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¹¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ Javadoc ¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¤·¤Þ¤¹¡£classpathlist ¤ò»ØÄꤹ¤ë¤È¤¤Ï¡¢
+javadoc ¤¬»²¾È¥¯¥é¥¹ (\f2.class\fP ¥Õ¥¡¥¤¥ë) ¤Î¸¡º÷¤ò¹Ô¤¦¤È¤¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤È¤Ï¡¢¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤È¡¢¤½¤ì¤é¤Î¥¯¥é¥¹¤«¤é»²¾È¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤ò»Ø¤·¤Þ¤¹¡£\f2classpathlist\fP ¤Ë¤Ï¡¢¥³¥í¥ó (\f2:\fP) ¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¹¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¤·¤Þ¤¹¡£classpathlist ¤ò»ØÄꤹ¤ë¤È¤¤Ï¡¢
.na
\f2¥¯¥é¥¹¥Ñ¥¹\fP @
.fi
@@ -3243,13 +3227,13 @@
.LP
\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- \f2java.lang\fP¡¢ \f2java.io\fP ¡¢¤½¤Î¾¤Î Java ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸ (
.na
-\f2http://java.sun.com/javase/6/docs/api/\fP @
+\f2http://download.oracle.com/javase/7/docs/api/\fP @
.fi
-http://java.sun.com/javase/6/docs/api Æâ) ¤Ë¥ê¥ó¥¯¤¹¤ë¾ì¹ç¤ò¹Í¤¨¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤ä \f2\-d\fP ¤Ê¤É¡¢¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¼¨¤·¤Æ¤¤¤Þ¤»¤ó¡£
+http://download.oracle.com/javase/7/docs/api/ Æâ) ¤Ë¥ê¥ó¥¯¤·¤¿¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤ä \f2\-d\fP ¤Ê¤É¡¢¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¼¨¤·¤Æ¤¤¤Þ¤»¤ó¡£
.nf
\f3
.fl
- % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP
+ % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP
.fl
.fi
\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÁêÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- 2 ¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¡¢¤½¤Î¥É¥¥å¥á¥ó¥È¤¬ Javadoc ¥Ä¡¼¥ë¤òÊ£¿ô²ó¼Â¹Ô¤·¤¿·ë²ÌÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤È¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢¤³¤ì¤é¤Î¥É¥¥å¥á¥ó¥È¤¬ÁêÂХѥ¹¤Çʬ³ä¤µ¤ì¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£¤³¤ÎÎã¤Î¾ì¹ç¡¢¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢API ¤Ç¤¢¤ë \f2com.apipackage\fP ¤È¡¢SPI (¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¥¤¥ó¥¿¥Õ¥§¡¼¥¹) ¤Ç¤¢¤ë \f2com.spipackage\fP ¤Ç¤¹¡£¥É¥¥å¥á¥ó¥È¤Î³ÊǼÀè¤Ï¡¢ \f2docs/api/com/apipackage\fP ¤È \f2docs/spi/com/spipackage\fP ¤Ç¤¹¡£API ¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥¥å¥á¥ó¥È¤Ï¤¹¤Ç¤ËÀ¸À®ºÑ¤ß¤Ç¡¢ \f2docs\fP ¤¬¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È²¾Äꤹ¤ë¤È¡¢API ¥É¥¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤à SPI ¥Ñ¥Ã¥±¡¼¥¸¤ò¥É¥¥å¥á¥ó¥È²½¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
@@ -3294,9 +3278,9 @@
.LP
¤¿¤È¤¨¤Ð¡¢Java SE 6 API ¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤Ï
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list ¤Ë¤¢¤ê¡¢¼¡¤Î¤è¤¦¤ÊÆâÍƤǻϤޤäƤ¤¤Þ¤¹¡£
+http://download.oracle.com/javase/7/docs/api/package\-list ¤Ë¤¢¤ê¡¢¼¡¤Î¤è¤¦¤ÊÆâÍƤǻϤޤäƤ¤¤Þ¤¹¡£
.nf
\f3
.fl
@@ -3355,15 +3339,15 @@
.LP
1 ²ó¤Î javadoc ¼Â¹Ô¤ÇÊ£¿ô¤Î \f2\-linkoffline\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤¤Þ¤¹¡£1.2.2 ¤è¤êÁ°¤Ï¡¢Ê£¿ô¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£
.LP
-\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- http://java.sun.com/javase/6/docs/api Æâ¤Î \f2java.lang\fP¡¢ \f2java.io\fP ¡¢¤ª¤è¤Ó¤½¤Î¾¤Î Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸ \f2¤Ë¥ê¥ó¥¯¤·¤¿¤¯¤Æ¤â\fP Web ¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Ê¤¤¾ì¹ç¤ò¹Í¤¨¤Þ¤¹¡£¥Ö¥é¥¦¥¶¤Ç \f2¡¢\fP
+\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- http://download.oracle.com/javase/7/docs/api/ Æâ¤Î \f2java.lang\fP¡¢ \f2java.io\fP ¡¢¤ª¤è¤Ó¤½¤Î¾¤Î Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸ \f2¤Ë¥ê¥ó¥¯¤·¤¿¤¯¤Æ¤â¡¢\fPWeb ¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Ê¤¤¾ì¹ç¤ò¹Í¤¨¤Þ¤¹¡£¥Ö¥é¥¦¥¶¤Ç \f2¡¢\fP
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list ¤Ë¤¢¤ë package\-list ¥Õ¥¡¥¤¥ë¤ò³«¤¡¢¤½¤ì¤ò¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¡¢Âè 2 °ú¿ô \f2packagelistLoc\fP ¤Ç¤³¤Î¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê "\f2.\fP" ¤ËÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤Ê¤É¡¢¤½¤Î¾¤ÎɬÍ×¥ª¥×¥·¥ç¥ó¤Ï¼¨¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
+http://download.oracle.com/javase/7/docs/api/package\-list ¤Ë¤¢¤ë package\-list ¥Õ¥¡¥¤¥ë¤ò³«¤¡¢¤½¤ì¤ò¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¡¢Âè 2 °ú¿ô \f2packagelistLoc\fP ¤Ç¤³¤Î¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê "\f2.\fP" ¤ËÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤Ê¤É¡¢¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¼¨¤·¤Æ¤¤¤Þ¤»¤ó¡£
.nf
\f3
.fl
-% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP
+% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP
.fl
.fi
.LP
@@ -3694,7 +3678,7 @@
.na
\f2¡ÖComparing Annotations and Javadoc Tags¡×\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
\-taglet ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¤è¤êÊ£»¨¤Ê¥Ö¥í¥Ã¥¯¥¿¥°¤ä¥«¥¹¥¿¥à¥¤¥ó¥é¥¤¥ó¥¿¥°¤ò ºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
.LP
@@ -3890,13 +3874,13 @@
.fl
<font size="\-1">
.fl
- <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a><br/>
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
.fl
Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
.fl
Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
.fl
- Other names may be trademarks of their respective owners.</font>
+ ¤½¤Î¾¤Î̾¾Î¤Ï¡¢¤½¤ì¤¾¤ì¤Î½êͼԤξ¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</font>
.fl
\fP
.fi
@@ -3945,7 +3929,7 @@
.RS 3
.TP 2
o
-\f3¥±¡¼¥¹ 1 \- 1 ¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤«¤é¤Îµ¯Æ°¤òºÆµ¢Åª¤Ë¼Â¹Ô\fP \- ¤³¤ÎÎã¤Ç¤Ï javadoc ¤¬Ç¤°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼Â¹Ô¤Ç¤¤ë¤è¤¦¤Ë¡¢\-sourcepath ¤ò»ÈÍѤ·¡¢ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë \-subpackages (1.4 ¤Î¿·¥ª¥×¥·¥ç¥ó) ¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ï¡¢ \f2java\fP ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò¤¿¤É¤ê¤Þ¤¹¤¬¡¢¤½¤ÎºÝ¤Ë¡¢ \f2java.net\fP ¤È \f2java.lang\fP ¤ò¥ë¡¼¥È¤Ë»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤Ï½ü³°¤µ¤ì¤Þ¤¹¡£¤³¤Î¤È¤¡¢ \f2java.lang ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸\fP¤Ç¤¢¤ë java.lang.ref ¤â \f2½ü³°¤µ¤ì¤Þ¤¹\fP¡£
+\f3¥±¡¼¥¹ 1 \- 1 ¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤«¤é¤Îµ¯Æ°¤òºÆµ¢Åª¤Ë¼Â¹Ô\fP \- ¤³¤ÎÎã¤Ç¤Ï javadoc ¤¬Ç¤°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼Â¹Ô¤Ç¤¤ë¤è¤¦¤Ë¡¢\-sourcepath ¤ò»ÈÍѤ·¡¢ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë \-subpackages (1.4 ¤Î¿·¥ª¥×¥·¥ç¥ó) ¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ï¡¢ \f2java\fP ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò¤¿¤É¤ê¤Þ¤¹¤¬¡¢¤½¤ÎºÝ¤Ë¡¢ \f2java.net\fP ¤È \f2java.lang\fP ¤ò¥ë¡¼¥È¤Ë»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤¬½ü³°¤µ¤ì¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢ \f2java.lang\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¢¤ë \f2java.lang.ref\fP¡£
.nf
\f3
.fl
@@ -4068,13 +4052,13 @@
.fl
\-bottom '<font size="\-1">
.fl
- <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a><br/>
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
.fl
Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
.fl
Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
.fl
- Other names may be trademarks of their respective owners.</font>' \\
+ ¤½¤Î¾¤Î̾¾Î¤Ï¡¢¤½¤ì¤¾¤ì¤Î½êͼԤξ¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</font>' \\
.fl
\-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
.fl
@@ -4087,7 +4071,7 @@
\fP
.fi
.LP
-¾åµ¤Î¥³¥Þ¥ó¥É¤Ç¡¢ \f2packages\fP ¤Ï¡¢½èÍýÂоݤΥѥ屡¼¥¸Ì¾ ( \f2java.applet java.lang\fP ¤Ê¤É) ¤¬Æþ¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£³Æ¥ª¥×¥·¥ç¥ó¤Î¡¢Ã±°ì°úÍÑÉä¤Ç°Ï¤Þ¤ì¤¿°ú¿ô¤ÎÆ⦤ˤϡ¢²þ¹Ôʸ»ú¤òÁÞÆþ¤Ç¤¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢¤³¤ÎÎã¤ò¥³¥Ô¡¼¡õ¥Ú¡¼¥¹¥È¤¹¤ë¾ì¹ç¤Ï¡¢ \f2\-bottom\fP ¥ª¥×¥·¥ç¥ó¤«¤é²þ¹Ôʸ»ú¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£¤µ¤é¤Ë¡¢¤³¤Î¤¢¤È¤Î¡ÖÃí¡×¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+¤³¤³¤Ç¡¢ \f2packages\fP ¤Ï¡¢½èÍýÂоݤΥѥ屡¼¥¸Ì¾ ( \f2java.applet java.lang\fP ¤Ê¤É) ¤¬Æþ¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£³Æ¥ª¥×¥·¥ç¥ó¤Î¡¢Ã±°ì°úÍÑÉä¤Ç°Ï¤Þ¤ì¤¿°ú¿ô¤ÎÆ⦤ˤϡ¢²þ¹Ôʸ»ú¤òÁÞÆþ¤Ç¤¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢¤³¤ÎÎã¤ò¥³¥Ô¡¼¡õ¥Ú¡¼¥¹¥È¤¹¤ë¾ì¹ç¤Ï¡¢ \f2\-bottom\fP ¥ª¥×¥·¥ç¥ó¤«¤é²þ¹Ôʸ»ú¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£¤µ¤é¤Ë¡¢¤³¤Î¤¢¤È¤Î¡ÖÃí¡×¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.SS
Makefile ¤ÎÎã
.LP
@@ -4139,13 +4123,13 @@
.fl
BOTTOM = '<font size="\-1">
.fl
- <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a><br/>
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
.fl
Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
.fl
Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
.fl
- Other names may be trademarks of their respective owners.</font>'
+ ¤½¤Î¾¤Î̾¾Î¤Ï¡¢¤½¤ì¤¾¤ì¤Î½êͼԤξ¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</font>'
.fl
GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"'
.fl
@@ -4229,13 +4213,13 @@
.na
\f2Javadoc ¤Î¥Û¡¼¥à¥Ú¡¼¥¸\fP @
.fi
-http://java.sun.com/j2se/javadoc/index.jsp
+http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html
.TP 2
o
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html
.TP 2
o
.na
--- a/jdk/src/linux/doc/man/ja/javah.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/javah.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javah 1 "14 Apr 2011"
+.TH javah 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/javap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/javap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javap 1 "14 Apr 2011"
+.TH javap 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -33,7 +33,7 @@
.nf
\f3
.fl
-javap [ \fP\f3options\fP\f3 ] class. . .
+javap [ \fP\f3options\fP\f3 ] classes
.fl
\fP
.fi
@@ -42,7 +42,20 @@
.SH "ÀâÌÀ"
.LP
.LP
-\f3javap\fP ¥³¥Þ¥ó¥É¤Ï¡¢¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òµÕ¥¢¥»¥ó¥Ö¥ë¤·¤Þ¤¹¡£¤½¤Î½ÐÎϤϻØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê°Û¤Ê¤ê¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\f3javap\fP ¤Ï¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¡¢ÅϤµ¤ì¤¿¥¯¥é¥¹¤Î protected ¤ª¤è¤Ó public ¤Î¥Õ¥£¡¼¥ë¥É¤È¥á¥½¥Ã¥É¤ò½ÐÎϤ·¤Þ¤¹¡£\f3javap\fP ¤Ï¤½¤Î½ÐÎϤòɸ½à½ÐÎϤËɽ¼¨¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥¯¥é¥¹Àë¸À¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤·¤Þ¤¹¡£
+\f3javap\fP ¥³¥Þ¥ó¥É¤Ï¡¢1 ¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òµÕ¥¢¥»¥ó¥Ö¥ë¤·¤Þ¤¹¡£¤½¤Î½ÐÎϤϻØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê°Û¤Ê¤ê¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\f3javap\fP ¤Ï¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¡¢ÅϤµ¤ì¤¿¥¯¥é¥¹¤Î protected ¤ª¤è¤Ó public ¤Î¥Õ¥£¡¼¥ë¥É¤È¥á¥½¥Ã¥É¤ò½ÐÎϤ·¤Þ¤¹¡£\f3javap\fP ¤Ï¤½¤Î½ÐÎϤòɸ½à½ÐÎϤËɽ¼¨¤·¤Þ¤¹¡£
+.LP
+.RS 3
+.TP 3
+options
+¥³¥Þ¥ó¥É¹Ô¥ª¥×¥·¥ç¥ó¡£
+.TP 3
+classes
+Ãí¼á¤Î½èÍýÂоݤȤʤë 1 ¤Ä°Ê¾å¤Î¥¯¥é¥¹ \f2DocFooter.class\fP ¤Ê¤É) ¤Î¥ê¥¹¥È (¶õÇò¶èÀÚ¤ê)¡£¥¯¥é¥¹¥Ñ¥¹¤Ç¸«¤Ä¤«¤ë¥¯¥é¥¹¤Ï¡¢¥Õ¥¡¥¤¥ë̾ ( \f2/home/user/myproject/src/DocFooter.class\fP ¤Ê¤É) ¤Þ¤¿¤Ï URL ( \f2file:///home/user/myproject/src/DocFooter.class\fP ¤Ê¤É) ¤Ç»ØÄê¤Ç¤¤Þ¤¹¡£
+.RE
+
+.LP
+.LP
+¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥¯¥é¥¹Àë¸À¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -88,24 +101,24 @@
.LP
.LP
-\f3javap DocFooter\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+\f3javap DocFooter.class\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
+ java.lang.String date;
.fl
- java.lang.String email;
+ java.lang.String email;
.fl
- public DocFooter();
+ public DocFooter();
.fl
- public void init();
+ public void init();
.fl
- public void paint(java.awt.Graphics);
+ public void paint(java.awt.Graphics);
.fl
}
.fl
@@ -114,114 +127,116 @@
.LP
.LP
-\f3javap \-c DocFooter\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+\f3javap \-c DocFooter.class\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
-.fl
- java.lang.String email;
-.fl
- public DocFooter();
+ java.lang.String date;
.fl
- public void init();
+
.fl
- public void paint(java.awt.Graphics);
-.fl
-}
+ java.lang.String email;
.fl
.fl
-Method DocFooter()
+ public DocFooter();
.fl
- 0 aload_0
+ Code:
.fl
- 1 invokespecial #1 <Method java.applet.Applet()>
+ 0: aload_0
.fl
- 4 return
+ 1: invokespecial #1 // Method java/applet/Applet."<init>":()V
+.fl
+ 4: return
.fl
.fl
-Method void init()
+ public void init();
.fl
- 0 aload_0
+ Code:
.fl
- 1 sipush 500
+ 0: aload_0
.fl
- 4 bipush 100
+ 1: sipush 500
.fl
- 6 invokevirtual #2 <Method void resize(int, int)>
+ 4: bipush 100
.fl
- 9 aload_0
+ 6: invokevirtual #2 // Method resize:(II)V
.fl
- 10 aload_0
+ 9: aload_0
.fl
- 11 ldc #3 <String "LAST_UPDATED">
+ 10: aload_0
.fl
- 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 11: ldc #3 // String LAST_UPDATED
.fl
- 16 putfield #5 <Field java.lang.String date>
+ 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 19 aload_0
+ 16: putfield #5 // Field date:Ljava/lang/String;
.fl
- 20 aload_0
+ 19: aload_0
.fl
- 21 ldc #6 <String "EMAIL">
+ 20: aload_0
.fl
- 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 21: ldc #6 // String EMAIL
.fl
- 26 putfield #7 <Field java.lang.String email>
+ 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 29 return
+ 26: putfield #7 // Field email:Ljava/lang/String;
+.fl
+ 29: return
.fl
.fl
-Method void paint(java.awt.Graphics)
+ public void paint(java.awt.Graphics);
.fl
- 0 aload_1
+ Code:
.fl
- 1 new #8 <Class java.lang.StringBuffer>
+ 0: aload_1
.fl
- 4 dup
+ 1: new #8 // class java/lang/StringBuilder
.fl
- 5 invokespecial #9 <Method java.lang.StringBuffer()>
+ 4: dup
.fl
- 8 aload_0
+ 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V
.fl
- 9 getfield #5 <Field java.lang.String date>
+ 8: aload_0
+.fl
+ 9: getfield #5 // Field date:Ljava/lang/String;
.fl
- 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 15 ldc #11 <String " by ">
+ 15: ldc #11 // String by
.fl
- 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 20 invokevirtual #12 <Method java.lang.String toString()>
+ 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String;
.fl
- 23 bipush 100
+ 23: bipush 100
+.fl
+ 25: bipush 15
.fl
- 25 bipush 15
+ 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 30: aload_1
.fl
- 30 aload_1
+ 31: aload_0
.fl
- 31 aload_0
+ 32: getfield #7 // Field email:Ljava/lang/String;
.fl
- 32 getfield #7 <Field java.lang.String email>
+ 35: sipush 290
.fl
- 35 sipush 290
+ 38: bipush 15
.fl
- 38 bipush 15
+ 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 43: return
.fl
- 43 return
+}
.fl
\fP
.fi
@@ -284,22 +299,7 @@
¥á¥½¥Ã¥É¤Î¥¹¥¿¥Ã¥¯¥µ¥¤¥º¡¢¤ª¤è¤Ó \f2locals\fP ¤È \f2args\fP ¤Î¿ô¤ò½ÐÎϤ·¤Þ¤¹¡£
.TP 3
\-classpath path
-\f3javap\fP ¤¬¥¯¥é¥¹¤òõ¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Þ¤¿¤Ï CLASSPATH ´Ä¶ÊÑ¿ôÀßÄê¤ò¾å½ñ¤¤·¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2path\fP ¤Î°ìÈÌ·Á¼°¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-.nf
-\f3
-.fl
- .:<your_path>
-.fl
-\fP
-.fi
-¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
+\f3javap\fP ¤¬¥¯¥é¥¹¤òõ¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Þ¤¿¤Ï CLASSPATH ´Ä¶ÊÑ¿ôÀßÄê¤ò¾å½ñ¤¤·¤Þ¤¹¡£
.TP 3
\-bootclasspath path
¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥¯¥é¥¹¤ò¥í¡¼¥É¤¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥¯¥é¥¹¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï \f2jre/lib/rt.jar\fP ¤ª¤è¤Ó¾¤Î¤¤¤¯¤Ä¤«¤Î JAR ¥Õ¥¡¥¤¥ë ¤Ë¤¢¤ë¡¢¥³¥¢ Java 2 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¤Ç¤¹¡£
@@ -309,22 +309,6 @@
.RE
.LP
-.SH "´Ä¶ÊÑ¿ô"
-.LP
-.RS 3
-.TP 3
-CLASSPATH
-¥æ¡¼¥¶¡¼ÄêµÁ¥¯¥é¥¹¤Ø¤Î¥Ñ¥¹¤ò¥·¥¹¥Æ¥à¤Ë»ØÄꤷ¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
-.RE
-
-.LP
.SH "´ØÏ¢¹àÌÜ"
.LP
.LP
--- a/jdk/src/linux/doc/man/ja/javaws.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/javaws.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javaws 1 "14 Apr 2011"
+.TH javaws 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -81,7 +81,7 @@
\f2\-Xnosplash\fP
.LP
.LP
-ºÇ½é¤Î¥¹¥×¥é¥Ã¥·¥å²èÌ̤Îɽ¼¨¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
+½é´ü¥¹¥×¥é¥Ã¥·¥å²èÌ̤òɽ¼¨¤·¤Þ¤»¤ó¡£
.LP
.LP
\f2\-open <arguments>\fP
@@ -99,7 +99,7 @@
\f2\-online\fP
.LP
.LP
-¥ª¥ó¥é¥¤¥ó¥â¡¼¥É¤Ç¼Â¹Ô¤·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî)¡£
+¥ª¥ó¥é¥¤¥ó¥â¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî)¡£
.LP
.LP
\f2\-wait\fP
--- a/jdk/src/linux/doc/man/ja/jconsole.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jconsole.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jconsole 1 "14 Apr 2011"
+.TH jconsole 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jdb.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jdb.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jdb 1 "14 Apr 2011"
+.TH jdb 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jhat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jhat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jhat 1 "14 Apr 2011"
+.TH jhat 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jinfo.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jinfo.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jinfo 1 "14 Apr 2011"
+.TH jinfo 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jmap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jmap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jmap 1 "14 Apr 2011"
+.TH jmap 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jps.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jps.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jps 1 "14 Apr 2011"
+.TH jps 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jrunscript.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jrunscript.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jrunscript 1 "14 Apr 2011"
+.TH jrunscript 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jsadebugd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jsadebugd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jsadebugd 1 "14 Apr 2011"
+.TH jsadebugd 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jstack.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jstack.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstack 1 "14 Apr 2011"
+.TH jstack 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jstat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jstat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstat 1 "14 Apr 2011"
+.TH jstat 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jstatd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jstatd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstatd 1 "14 Apr 2011"
+.TH jstatd 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/jvisualvm.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/jvisualvm.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jvisualvm 1 "14 Apr 2011"
+.TH jvisualvm 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -110,7 +110,7 @@
.na
\f2Java VisualVM ³«È¯¼Ô¤Î¥µ¥¤¥È\fP @
.fi
-https://visualvm.dev.java.net
+http://visualvm.java.net
.TP 2
o
.na
--- a/jdk/src/linux/doc/man/ja/keytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/keytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998-2010 keytool tool, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH keytool 1 "14 Apr 2011"
+.TH keytool 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -1087,9 +1087,9 @@
.fl
keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US"
.fl
- \-alias business \-keypass kpi135 \-keystore /working/mykeystore
+ \-alias business \-keypass \fP\f4<Èó¸ø³«¸°¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-keystore /working/mykeystore
.fl
- \-storepass ab987c \-validity 180
+ \-storepass \fP\f4<¥¡¼¥¹¥È¥¢¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-validity 180
.fl
\fP
.fi
@@ -1099,10 +1099,10 @@
Ãí: ¤³¤Î¥³¥Þ¥ó¥É¤Ï 1 ¹Ô¤ËÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Îã¤ÇÊ£¿ô¹Ô¤ËÆþÎϤ·¤Æ¤¤¤ë¤Î¤ÏÆɤߤ䤹¤¯¤¹¤ë¤¿¤á¤Ç¤¹¡£
.LP
.LP
-¤³¤ÎÎã¤Ç¤Ï¡¢working ¥Ç¥£¥ì¥¯¥È¥ê¤Ë mykeystore ¤È¤¤¤¦Ì¾Á°¤Î¥¡¼¥¹¥È¥¢¤òºîÀ®¤· (¥¡¼¥¹¥È¥¢¤Ï¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¤È²¾Äꤹ¤ë)¡¢ºîÀ®¤·¤¿¥¡¼¥¹¥È¥¢¤Ë¥Ñ¥¹¥ï¡¼¥É ab987c ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£À¸À®¤¹¤ë¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥Ú¥¢¤ËÂбþ¤¹¤ë¥¨¥ó¥Æ¥£¥Æ¥£¡¼¤Î¡Ö¼±ÊÌ̾¡×¤Ï¡¢Ä̾Τ¬¡ÖMark Jones¡×¡¢ÁÈ¿¥Ã±°Ì¤¬¡ÖJava¡×¡¢ÁÈ¿¥¤¬¡ÖOracle¡×¡¢2 ʸ»ú¤Î¹ñÈֹ椬¡ÖUS¡×¤Ç¤¹¡£¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥µ¥¤¥º¤Ï¤É¤Á¤é¤â 1024 ¥Ó¥Ã¥È¤Ç¡¢¸°¤ÎºîÀ®¤Ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Î DSA ¸°À¸À®¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£
+¤³¤ÎÎã¤Ç¤Ï¡¢working ¥Ç¥£¥ì¥¯¥È¥ê¤Ë mykeystore ¤È¤¤¤¦Ì¾Á°¤Î¥¡¼¥¹¥È¥¢¤òºîÀ®¤· (¥¡¼¥¹¥È¥¢¤Ï¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¤È²¾Äꤹ¤ë)¡¢ºîÀ®¤·¤¿¥¡¼¥¹¥È¥¢¤Ë¡¢\f2<¥¡¼¥¹¥È¥¢¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP ¤Ç»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥É ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£À¸À®¤¹¤ë¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥Ú¥¢¤ËÂбþ¤¹¤ë¥¨¥ó¥Æ¥£¥Æ¥£¡¼¤Î¡Ö¼±ÊÌ̾¡×¤Ï¡¢Ä̾Τ¬¡ÖMark Jones¡×¡¢ÁÈ¿¥Ã±°Ì¤¬¡ÖJava¡×¡¢ÁÈ¿¥¤¬¡ÖOracle¡×¡¢2 ʸ»ú¤Î¹ñÈֹ椬¡ÖUS¡×¤Ç¤¹¡£¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥µ¥¤¥º¤Ï¤É¤Á¤é¤â 1024 ¥Ó¥Ã¥È¤Ç¡¢¸°¤ÎºîÀ®¤Ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Î DSA ¸°À¸À®¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£
.LP
.LP
-¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¸ø³«¸°¤È¼±ÊÌ̾¾ðÊó¤ò´Þ¤à¼«¸Ê½ð̾¾ÚÌÀ½ñ (¥Ç¥Õ¥©¥ë¥È¤Î SHA1withDSA ½ð̾¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ) ¤òºîÀ®¤·¤Þ¤¹¡£¾ÚÌÀ½ñ¤Î͸ú´ü´Ö¤Ï 180 Æü¤Ç¤¹¡£ ¾ÚÌÀ½ñ¤Ï¡¢ÊÌ̾¡Öbusiness¡×¤ÇÆÃÄꤵ¤ì¤ë¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥êÆâ¤ÎÈó¸ø³«¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Þ¤¹¡£Èó¸ø³«¸°¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¡Ökpi135¡×¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
+¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¸ø³«¸°¤È¼±ÊÌ̾¾ðÊó¤ò´Þ¤à¼«¸Ê½ð̾¾ÚÌÀ½ñ (¥Ç¥Õ¥©¥ë¥È¤Î SHA1withDSA ½ð̾¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ) ¤òºîÀ®¤·¤Þ¤¹¡£¾ÚÌÀ½ñ¤Î͸ú´ü´Ö¤Ï 180 Æü¤Ç¤¹¡£ ¾ÚÌÀ½ñ¤Ï¡¢ÊÌ̾¡Öbusiness¡×¤ÇÆÃÄꤵ¤ì¤ë¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥êÆâ¤ÎÈó¸ø³«¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Þ¤¹¡£Èó¸ø³«¸°¤Ë¤Ï¡¢\f2<Èó¸ø³«¸°¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP ¤Ç»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥É¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
.LP
.LP
¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò»È¤¦¾ì¹ç¤Ï¡¢¾å¤Ë¼¨¤·¤¿¥³¥Þ¥ó¥É¤òÂçÉý¤Ëû¤¯¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¼ÂºÝ¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò 1 ¤Ä¤â»ØÄꤻ¤º¤Ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£ ¥Ç¥Õ¥©¥ë¥ÈÃͤò»ý¤Ä¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»È¤ï¤ì¡¢É¬ÍפÊÃͤˤĤ¤¤Æ¤ÏÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Ã±¤Ë¼¡¤Î¤è¤¦¤ËÆþÎϤ¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
@@ -1120,7 +1120,7 @@
¤³¤Î¾ì¹ç¤Ï¡¢mykey ¤È¤¤¤¦ÊÌ̾¤Ç¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥ê¤¬ºîÀ®¤µ¤ì¡¢¿·¤·¤¯À¸À®¤µ¤ì¤¿¸°¤Î¥Ú¥¢¡¢¤ª¤è¤Ó 90 Æü´Ö͸ú¤Ê¾ÚÌÀ½ñ¤¬¤³¤Î¥¨¥ó¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¨¥ó¥È¥ê¤Ï¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î .keystore ¤È¤¤¤¦Ì¾Á°¤Î¥¡¼¥¹¥È¥¢¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥¡¼¥¹¥È¥¢¤¬¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ºîÀ®¤µ¤ì¤Þ¤¹¡£¼±ÊÌ̾¾ðÊó¡¢¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¡¢¤ª¤è¤ÓÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤Ä¤¤¤Æ¤Ï¡¢ÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
.LP
.LP
-°Ê²¼¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤â¤Î¤È¤·¤ÆÎã¤ò¼¨¤·¤Þ¤¹¡£¾ðÊó¤ÎÆþÎϤòµá¤á¤é¤ì¤¿¾ì¹ç¤Ï¡¢ºÇ½é¤Ë¼¨¤·¤¿ \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ÎÃͤòÆþÎϤ·¤¿¤â¤Î¤È¤·¤Þ¤¹ (¤¿¤È¤¨¤Ð¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤Ï kpi135 ¤È»ØÄê)¡£
+°Ê²¼¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤â¤Î¤È¤·¤ÆÎã¤ò¼¨¤·¤Þ¤¹¡£¾ðÊó¤ÎÆþÎϤòµá¤á¤é¤ì¤¿¾ì¹ç¤Ï¡¢ºÇ½é¤Ë¼¨¤·¤¿ \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ÎÃͤòÆþÎϤ·¤¿¤â¤Î¤È¤·¤Þ¤¹ (¤¿¤È¤¨¤Ð¡¢¼±ÊÌ̾¤Ë¤Ï cn=Mark Jones, ou=Java, o=Oracle, c=US ¤È»ØÄê)¡£
.LP
.SS
¾ÚÌÀ½ñȯ¹Ô¶É¤ËÂФ¹¤ë½ð̾ÉÕ¤¾ÚÌÀ½ñ¤ÎÍ×µá
@@ -1240,14 +1240,14 @@
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<¥½¡¼¥¹¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-deststorepass \fP\f4<¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
\fP
.fi
.LP
.LP
-¤Þ¤¿¡¢importkeystore ¥³¥Þ¥ó¥É¤ò»È¤¨¤Ð¡¢¤¢¤ë¥½¡¼¥¹¥¡¼¥¹¥È¥¢Æâ¤Îñ°ì¤Î¥¨¥ó¥È¥ê¤ò¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¾åµ¤ÎÎã¤Ç¼¨¤·¤¿¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¡¢¥¤¥ó¥Ý¡¼¥ÈÂоݤȤʤëÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£srcalias ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¾ì¹ç¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤â¥³¥Þ¥ó¥É¹Ô¤«¤é»ØÄê¤Ç¤¤ë¤Û¤«¡¢ÈëÌ©/Èó¸ø³«¸°¤ÎÊݸîÍѥѥ¹¥ï¡¼¥É¤ä¥¿¡¼¥²¥Ã¥ÈÊݸîÍѥѥ¹¥ï¡¼¥É¤â»ØÄê¤Ç¤¤Þ¤¹¡£¤½¤¦¤¹¤ì¤Ð¡¢¥×¥í¥ó¥×¥È¤Î¤Þ¤Ã¤¿¤¯É½¼¨¤µ¤ì¤Ê¤¤ \f3keytool\fP ¥³¥Þ¥ó¥É¤òȯ¹Ô¤Ç¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f3keytool\fP ¥³¥Þ¥ó¥É¤ò¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤Ë´Þ¤á¤ëºÝ¤ËÈó¾ï¤ËÊØÍø¤Ç¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
+¤Þ¤¿¡¢importkeystore ¥³¥Þ¥ó¥É¤ò»È¤¨¤Ð¡¢¤¢¤ë¥½¡¼¥¹¥¡¼¥¹¥È¥¢Æâ¤Îñ°ì¤Î¥¨¥ó¥È¥ê¤ò¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¾åµ¤ÎÎã¤Ç¼¨¤·¤¿¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¡¢¥¤¥ó¥Ý¡¼¥ÈÂоݤȤʤëÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£srcalias ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¾ì¹ç¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤â¥³¥Þ¥ó¥É¹Ô¤«¤é»ØÄê¤Ç¤¤ë¤Û¤«¡¢ÈëÌ©/Èó¸ø³«¸°¤ÎÊݸîÍѥѥ¹¥ï¡¼¥É¤ä¥¿¡¼¥²¥Ã¥ÈÊݸîÍѥѥ¹¥ï¡¼¥É¤â»ØÄê¤Ç¤¤Þ¤¹¡£¤½¤ÎÊýË¡¤ò¼¨¤¹¥³¥Þ¥ó¥É¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -1258,11 +1258,11 @@
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<¥½¡¼¥¹¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-deststorepass \fP\f4<¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
\-srcalias myprivatekey \-destalias myoldprivatekey
.fl
- \-srckeypass oldkeypass \-destkeypass mynewkeypass
+ \-srckeypass \fP\f4<¥½¡¼¥¹¥¨¥ó¥È¥ê¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-destkeypass \fP\f4<¥¿¡¼¥²¥Ã¥È¥¨¥ó¥È¥ê¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
\-noprompt
.fl
@@ -1711,7 +1711,7 @@
½ÅÍ×: ¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤È¤·¤Æ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ë¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤò¿µ½Å¤ËÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
.LP
.LP
-¤Þ¤º¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤· (\-printcert ¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤«¡¢¤Þ¤¿¤Ï \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \-importcert ¥³¥Þ¥ó¥É¤ò»ÈÍÑ)¡¢ ɽ¼¨¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬¡¢´üÂÔ¤µ¤ì¤ë¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤¢¤ë¥æ¡¼¥¶¡¼¤«¤é¾ÚÌÀ½ñ¤¬Á÷¤é¤ì¤Æ¤¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò /tmp/cert ¤È¤¤¤¦Ì¾Á°¤Ç¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£ ¤³¤Î¾ì¹ç¤Ï¡¢¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¤³¤Î¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë¡¢ \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤òɽ¼¨¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
+¤Þ¤º¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤· (\-printcert ¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤«¡¢¤Þ¤¿¤Ï \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \-importcert ¥³¥Þ¥ó¥É¤ò»ÈÍÑ)¡¢ ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¡¢ ɽ¼¨¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬¡¢´üÂÔ¤µ¤ì¤ë¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤¢¤ë¥æ¡¼¥¶¡¼¤«¤é¾ÚÌÀ½ñ¤¬Á÷¤é¤ì¤Æ¤¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò /tmp/cert ¤È¤¤¤¦Ì¾Á°¤Ç¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£ ¤³¤Î¾ì¹ç¤Ï¡¢¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¤³¤Î¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë¡¢ \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤òɽ¼¨¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -1744,7 +1744,7 @@
¼¡¤Ë¡¢¾ÚÌÀ½ñ¤òÁ÷¿®¤·¤¿¿Íʪ¤ËÏ¢Íí¤·¡¢¤³¤Î¿Íʪ¤¬Ä󼨤·¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¡¢¾å¤Î¥³¥Þ¥ó¥É¤Çɽ¼¨¤µ¤ì¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¤òÈæ³Ó¤·¤Þ¤¹¡£¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬°ìÃפ¹¤ì¤Ð¡¢Á÷¿®ÅÓÃæ¤Ç¤Û¤«¤Î²¿¼Ô¤« (¹¶·â¼Ô¤Ê¤É) ¤Ë¤è¤ë¾ÚÌÀ½ñ¤Î¤¹¤êÂؤ¨¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤Ç¤¤Þ¤¹¡£Á÷¿®ÅÓÃæ¤Ç¤³¤Î¼ï¤Î¹¶·â¤¬¹Ô¤ï¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤º¤Ë¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È¡¢¹¶·â¼Ô¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¤â¤Î (¹¶·âŪ°Õ¿Þ¤ò»ý¤Ä¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤À JAR ¥Õ¥¡¥¤¥ë¤Ê¤É) ¤ò¿®Íꤹ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
.LP
.LP
-Ãí: ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ëɬ¤º \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥¡¼¥¹¥È¥¢Æâ¤Î¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë \f2\-importcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¾ÚÌÀ½ñ¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¡¢³Îǧ¤òµá¤á¤ë¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¥¤¥ó¥Ý¡¼¥ÈÁàºî¤Ï¡¢¤³¤Î»þÅÀ¤ÇÃæ»ß¤Ç¤¤Þ¤¹¡£¤¿¤À¤·¡¢³Îǧ¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¤Î¤Ï¡¢\-importcert ¥³¥Þ¥ó¥É¤ò \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤻ¤º¤Ë¼Â¹Ô¤·¤¿¾ì¹ç¤À¤±¤Ç¤¹¡£ \f2\-noprompt\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤È¤ÎÂÐÏäϹԤï¤ì¤Þ¤»¤ó¡£
+Ãí: ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ëɬ¤º \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥¡¼¥¹¥È¥¢Æâ¤Î¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë \f2\-importcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¾ÚÌÀ½ñ¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¡¢³Îǧ¤òµá¤á¤ë¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¥¤¥ó¥Ý¡¼¥ÈÁàºî¤Ï¡¢¤³¤Î»þÅÀ¤ÇÃæ»ß¤Ç¤¤Þ¤¹¡£¤¿¤À¤·¡¢³Îǧ¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¤Î¤Ï¡¢\-importcert ¥³¥Þ¥ó¥É¤ò \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤻ¤º¤Ë¼Â¹Ô¤·¤¿¾ì¹ç¤À¤±¤Ç¤¹¡£ ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¡¢ \f2\-noprompt\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤È¤ÎÂÐÏäϹԤï¤ì¤Þ¤»¤ó¡£
.LP
.SS
¥Ñ¥¹¥ï¡¼¥É¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à
--- a/jdk/src/linux/doc/man/ja/native2ascii.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/native2ascii.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH native2ascii 1 "14 Apr 2011"
+.TH native2ascii 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/orbd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/orbd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH orbd 1 "14 Apr 2011"
+.TH orbd 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/pack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/pack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH pack200 1 "14 Apr 2011"
+.TH pack200 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/policytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/policytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH policytool 1 "14 Apr 2011"
+.TH policytool 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/rmic.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/rmic.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmic 1 "14 Apr 2011"
+.TH rmic 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/rmid.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/rmid.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmid 1 "14 Apr 2011"
+.TH rmid 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -121,7 +121,7 @@
.LP
.LP
-ɬÍפ˱þ¤¸¤Æ¥µ¡¼¥Ó¥¹¤ò³«»Ï¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢ \f2inetd\fP (Solaris) ¤Þ¤¿¤Ï \f2xinetd\fP (Linux) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+ɬÍפ˱þ¤¸¤Æ¥µ¡¼¥Ó¥¹¤ò³«»Ï¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢ \f2inetd\fP (Solaris ¤Î¾ì¹ç)¡¢¤Þ¤¿¤Ï \f2xinetd\fP (Linux) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.SH "¥ª¥×¥·¥ç¥ó"
.LP
@@ -239,7 +239,7 @@
.fl
\fP
.fi
-ºÇ½é¤ËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¡¢¥Ñ¥¹Ì¾¤Ë¤è¤êÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤ë \f2java\fP ¥³¥Þ¥ó¥É¤Î 1.7.0 ¥Ð¡¼¥¸¥ç¥ó¤Î¼Â¹Ô¤òµö²Ä¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢java.home ¤Ë¤¢¤ë¥Ð¡¼¥¸¥ç¥ó¤Î \f2java\fP ¥³¥Þ¥ó¥É ( \f2rmid\fP ¤¬»ÈÍѤ¹¤ë¤Î¤ÈƱ¤¸¥Ð¡¼¥¸¥ç¥ó) ¤¬»ÈÍѤµ¤ì¤ë¤¿¤á¡¢¤½¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤Ç»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£2 ÈÖÌܤΥ¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¤Æ¡¢¥Ç¥£¥ì¥¯¥È¥ê \f2/files/apps/rmidcmds\fP Æâ¤ÎǤ°Õ¤Î¥³¥Þ¥ó¥É¤Î¼Â¹Ô¸¢¸Â¤òµö²Ä¤·¤Þ¤¹¡£
+ºÇ½é¤ËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¡¢¥Ñ¥¹Ì¾¤Ë¤è¤êÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤ë \f2java\fP ¥³¥Þ¥ó¥É¤Î 1.7.0 ¥Ð¡¼¥¸¥ç¥ó¤Î¼Â¹Ô¤òµö²Ä¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢java.home ¤Ë¤¢¤ë¥Ð¡¼¥¸¥ç¥ó¤Î \f2java\fP ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£ \f2rmid\fP ¤¬»ÈÍѤ¹¤ë¤Î¤ÈƱ¤¸¥Ð¡¼¥¸¥ç¥ó) ¤¬»ÈÍѤµ¤ì¤ë¤¿¤á¡¢¤½¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤Ç»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£2 ÈÖÌܤΥ¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¤Æ¡¢¥Ç¥£¥ì¥¯¥È¥ê \f2/files/apps/rmidcmds\fP Æâ¤ÎǤ°Õ¤Î¥³¥Þ¥ó¥É¤Î¼Â¹Ô¸¢¸Â¤òµö²Ä¤·¤Þ¤¹¡£
.LP
3 ÈÖÌܤËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢ \f2ExecOptionPermission\fP ¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¤Æ¡¢¥»¥¥å¥ê¥Æ¥£¡¼¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤ò \f2/files/policies/group.policy\fP ¤È¤·¤ÆÄêµÁ¤·¤Æ¤¤¤ëµ¯Æ°¥°¥ë¡¼¥×¤Î³«»Ï¤òµö²Ä¤·¤Þ¤¹¡£¼¡¤Î¥¢¥¯¥»¥¹¸¢¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤¬ \f2java.security.debug\fP ¥×¥í¥Ñ¥Æ¥£¡¼¤ò»ÈÍѤ¹¤ë¤³¤È¤òµö²Ä¤·¤Æ¤¤¤Þ¤¹¡£ºÇ¸å¤Î¥¢¥¯¥»¥¹¸¢¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤¬ \f2sun.rmi\fP ¤È¤¤¤¦¥×¥í¥Ñ¥Æ¥£¡¼Ì¾¤Î³¬ÁØÆâ¤ÎǤ°Õ¤Î¥×¥í¥Ñ¥Æ¥£¡¼¤ò»ÈÍѤ¹¤ë¤³¤È¤òµö²Ä¤·¤Æ¤¤¤Þ¤¹¡£
.LP
--- a/jdk/src/linux/doc/man/ja/rmiregistry.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/rmiregistry.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmiregistry 1 "14 Apr 2011"
+.TH rmiregistry 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/schemagen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/schemagen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH schemagen 1 "14 Apr 2011"
+.TH schemagen 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/serialver.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/serialver.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH serialver 1 "14 Apr 2011"
+.TH serialver 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/servertool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/servertool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH servertool 1 "14 Apr 2011"
+.TH servertool 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/tnameserv.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/tnameserv.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH tnameserv 1 "14 Apr 2011"
+.TH tnameserv 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/unpack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/unpack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH unpack200 1 "14 Apr 2011"
+.TH unpack200 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/linux/doc/man/ja/wsgen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/wsgen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsgen 1 "14 Apr 2011"
+.TH wsgen 1 "07 May 2011"
.SH "̾Á°"
wsgen \- XML Web Services (JAX\-WS) 2.0 ¤Î¤¿¤á¤Î Java(TM) API
.LP
--- a/jdk/src/linux/doc/man/ja/wsimport.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/wsimport.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsimport 1 "14 Apr 2011"
+.TH wsimport 1 "07 May 2011"
.SH "̾Á°"
wsimport \- XML Web Services (JAX\-WS) 2.0 ¤Î¤¿¤á¤Î Java(TM) API
.LP
@@ -818,7 +818,7 @@
.ll \n(34u*1u/3u
.if \n(.l<\n(81 .ll \n(81u
.in 0
-ǧ¾Ú¾ðÊó¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë WSDL URI ¤Ç¤¹¡£¤³¤Î URI ¤Î·Á¼°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹ http://username:password@example.org/stock?wsdl
+ǧ¾Ú¾ðÊó¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë WSDL URI ¤Ç¤¹¡£¤³¤Î URI ¤Î·Á¼°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹ http://\f2<¥æ¡¼¥¶¡¼Ì¾>\fP:\f2<¥Ñ¥¹¥ï¡¼¥É>\fP@\f2<¥Û¥¹¥È̾>\fP/\f2<Web ¥µ¡¼¥Ó¥¹Ì¾>\fP?wsdl
.br
.di
.nr b| \n(dn
@@ -1057,10 +1057,10 @@
.nf
\f3
.fl
-\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP
+\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP
.fl
.fi
.LP
-Java ¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢ \f2http://stockquote.xyz/quote?wsdl\fP ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤Ç¡¢¤½¤ì¤é¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
+Java ¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢ \f2http://stockquote.example.com/quote?wsdl\fP ¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Æ¤½¤Î Java ¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹
.br
--- a/jdk/src/linux/doc/man/ja/xjc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/ja/xjc.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH xjc 1 "14 Apr 2011"
+.TH xjc 1 "07 May 2011"
.LP
.ad c
--- a/jdk/src/linux/doc/man/jar.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jar.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,17 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jar 1 "02 Jun 2010"
+.TH jar 1 "10 May 2011"
.LP
.SH "Name"
jar\-The Java Archive Tool
.LP
-\f3jar\fP combines multiple files into a single JAR archive file.
+\f3jar\fP combines multiple files into a single JAR archive file.
.SH "SYNOPSIS"
.LP
-
-.LP
.RS 3
.TP 3
Create jar file
@@ -53,9 +51,6 @@
where:
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
cuxtiv0Mmfe
Options that control the \f2jar\fP command.
@@ -80,11 +75,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
The \f3jar\fP tool combines multiple files into a single JAR archive file. \f3jar\fP is a general\-purpose archiving and compression tool, based on ZIP and the
.na
\f2ZLIB\fP @
@@ -93,9 +85,6 @@
.LP
Typical usage to combine files into a jar file is:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -103,20 +92,16 @@
.fl
\fP
.fi
-.RE
.LP
In this example, all the class files in the current directory are placed into the file named \f2myFile.jar\fP. The jar tool automatically generates a manifest file entry named \f2META\-INF/MANIFEST.MF\fP. It is always the first entry in the jar file. The manifest file declares meta\-information about the archive, and stores that data as \f2name\ :\ value\fP pairs. Refer to the
.na
\f2JAR file specification\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file.
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file.
.LP
If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -124,7 +109,6 @@
.fl
\fP
.fi
-.RE
.LP
An existing manifest file must end with a new line character.\ \f3jar\fP does not parse the last line of a manifest file if it does not end with a new line character.
@@ -135,9 +119,6 @@
.LP
\f3Note:\ \fP A jar command that specifies \f2cfm\fP on the command line instead of \f2cmf\fP (the order of the m and \-f options are reversed), the \f3jar\fP command line must specify the name of the jar archive first, followed by the name of the manifest file:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -145,16 +126,12 @@
.fl
\fP
.fi
-.RE
.LP
The manifest is in a text format inspired by RFC822 ASCII format, so it is easy to view and process manifest\-file contents.
.LP
To extract the files from a jar file, use \f2x\fP:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -162,15 +139,11 @@
.fl
\fP
.fi
-.RE
.LP
.LP
To extract individual files from a jar file, supply their filenames:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -178,7 +151,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -186,10 +158,7 @@
.na
\f2JarIndex\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
-.LP
-.RS 3
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
.LP
.nf
\f3
@@ -198,7 +167,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -210,9 +178,6 @@
.br
To copy directories, first compress files in \f2dir1\fP to \f2stdout\fP, then extract from \f2stdin\fP to \f2dir2\fP (omitting the \f2\-f\fP option from both \f2jar\fP commands):
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -220,7 +185,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -228,12 +192,10 @@
.na
\f2Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar.
+http://download.oracle.com/javase/tutorial/deployment/jar.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
c
@@ -241,9 +203,6 @@
.TP 3
u
Updates an existing file \f2jarfile\fP (when \f2f\fP is specified) by adding to it files and directories specified by \f2inputfiles\fP. For example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -251,11 +210,7 @@
.fl
\fP
.fi
-.RE
would add the file \f2foo.class\fP to the existing jar file \f2foo.jar\fP. The \f2\-u\fP option can also update the manifest entry, as given by this example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -263,7 +218,6 @@
.fl
\fP
.fi
-.RE
updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP.
.TP 3
x
@@ -274,9 +228,6 @@
.TP 3
i
Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -284,9 +235,8 @@
.fl
\fP
.fi
-.RE
.LP
-would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.
+would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.
.TP 3
f
Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u).
@@ -301,12 +251,10 @@
Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u).
.TP 3
m
-Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value.
-.LP
+Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value.
+.br
+.br
On the command line, the letters \f3m\fP and \f3f\fP must appear in the same order that \f2manifest\fP and \f2jarfile\fP appear. Example use:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -314,22 +262,18 @@
.fl
\fP
.fi
-.RE
You can add special\-purpose \f2name\ :\ value\fP attribute pairs to the manifest that aren't contained in the default manifest. For example, you can add attributes specifying vendor information, version information, package sealing, or to make JAR\-bundled applications executable. See the
.na
\f2JAR Files\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option.
-.LP
+http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option.
.TP 3
e
Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file.
.br
.br
+.br
For example, this command creates \f2Main.jar\fP where the \f2Main\-Class\fP attribute value in the manifest is set to \f2Main\fP:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -337,12 +281,7 @@
.fl
\fP
.fi
-.RE
-.LP
The java runtime can directly invoke this application by running the following command:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -350,11 +289,7 @@
.fl
\fP
.fi
-.RE
If the entrypoint class name is in a package it may use either a dot (".") or slash ("/") character as the delimiter. For example, if \f2Main.class\fP is in a package called \f2foo\fP the entry point can be specified in the following ways:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -362,11 +297,7 @@
.fl
\fP
.fi
-.RE
or
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -374,18 +305,13 @@
.fl
\fP
.fi
-.RE
-\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted.
-.LP
+\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted.
.TP 3
-\-C \ dir
+\-C\ dir
Temporarily changes directories (\f2cd\fP\ \f2dir\fP) during execution of the \f2jar\fP command while processing the following \f2inputfiles\fP argument. Its operation is intended to be similar to the \f2\-C\fP option of the UNIX \f2tar\fP utility.
.br
.br
For example, this command changes to the \f2classes\fP directory and adds the \f2bar.class\fP from that directory to \f2foo.jar\fP:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -393,11 +319,7 @@
.fl
\fP
.fi
-.RE
This command changes to the \f2classes\fP directory and adds to \f2foo.jar\fP all files within the \f2classes\fP directory (without creating a classes directory in the jar file), then changes back to the original directory before changing to the \f2bin\fP directory to add \f2xyz.class\fP to \f2foo.jar\fP.
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -405,11 +327,7 @@
.fl
\fP
.fi
-.RE
If \f2classes\fP holds files \f2bar1\fP and \f2bar2\fP, then here's what the jar file will contain using \f2jar tf foo.jar\fP:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -425,7 +343,6 @@
.fl
\fP
.fi
-.RE
.LP
.TP 3
\-Joption
@@ -435,8 +352,6 @@
.LP
.SH "COMMAND LINE ARGUMENT FILES"
.LP
-
-.LP
To shorten or simplify the jar command line, you can specify one or more files that themselves contain arguments to the \f2jar\fP command (except \f2\-J\fP options). This enables you to create jar commands of any length, overcoming command line limits imposed by the operating system.
.LP
An argument file can include options and filenames. The arguments within a file can be space\-separated or newline\-separated. Filenames within an argument file are relative to the current directory, not relative to the location of the argument file. Wildcards (*) that might otherwise be expanded by the operating system shell are not expanded. Use of the \f2@\fP character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files.
@@ -447,24 +362,17 @@
.br
The example below, \f2classes.list\fP holds the names of files output by a \f2find\fP command:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
% find \fP\f3.\fP \-name '*.class' \-print > classes.list
.fl
.fi
-.RE
.LP
.LP
You can then execute the \f2jar\fP command on \f2Classes.list\fP by passing it to \f2jar\fP using argfile syntax:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -472,13 +380,9 @@
.fl
\fP
.fi
-.RE
.LP
An argument file can specify a path, but any filenames inside the argument file that have relative paths are relative to the current working directory, not to the path passed in. Here is an example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -486,7 +390,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -494,12 +397,7 @@
.LP
.SH "EXAMPLES"
.LP
-
-.LP
To add all the files in a particular directory to an archive (overwriting contents if the archive already exists). Enumerating verbosely (with the \f2\-v\fP option) will tell you more information about the files in the archive, such as their size and last modified date.
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -535,13 +433,9 @@
.fl
\fP
.fi
-.RE
.LP
If you already have separate subdirectories for images, audio files and classes, you can combine them into a single jar file:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -585,13 +479,9 @@
.fl
\fP
.fi
-.RE
.LP
To see the entry names in the jarfile, use the \f2t\fP option:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -619,7 +509,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -630,9 +519,6 @@
.br
.LP
-.RS 3
-
-.LP
If you split the inter\-dependent classes for a stock trade application into three jar files: \f2main.jar\fP, \f2buy.jar\fP, and \f2sell.jar\fP.
.br
@@ -660,38 +546,34 @@
.fi
.LP
-An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources.
-.RE
+An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources.
.SH "SEE ALSO"
.LP
-
.LP
.na
\f2The Jar Overview\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jarGuide.html
-.br
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
+.LP
.LP
.na
\f2The Jar File Specification\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html
-.br
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
+.LP
.LP
.na
\f2The JarIndex Spec\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index
-.br
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
+.LP
.LP
.na
\f2Jar Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar on the Java Software web site.
-.br
-
+http://download.oracle.com/javase/tutorial/deployment/jar/index.html
+.LP
.LP
-pack200(1)
+pack200(1)
+.LP
+
--- a/jdk/src/linux/doc/man/jarsigner.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jarsigner.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jarsigner 1 "02 Jun 2010"
+.TH jarsigner 1 "10 May 2011"
.LP
.SH "Name"
jarsigner \- JAR Signing and Verification Tool
.LP
-.RS 3
-
-.LP
.LP
Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -51,8 +45,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jarsigner\fP tool is used for two purposes:
.LP
@@ -109,9 +101,6 @@
.SS
Keystore Aliases
.LP
-.RS 3
-
-.LP
.LP
All keystore entities are accessed via unique \f2aliases\fP.
.LP
@@ -121,37 +110,29 @@
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
.fl
- \-keypass dukekeypasswd MyJARFile.jar duke
+ \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke
.fl
\fP
.fi
.LP
.LP
-Keystores are protected with a password, so the store password (in this case "myspass") must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password (in this case "dukekeypasswd") must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password.
+Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password.
.LP
-.RE
.SS
Keystore Location
.LP
-.RS 3
-
-.LP
.LP
\f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory.
.LP
.LP
Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device.
.LP
-.RE
.SS
Keystore Implementation
.LP
-.RS 3
-
-.LP
.LP
The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
.LP
@@ -166,13 +147,13 @@
.na
\f2How to Implement a Provider for the Java Cryptography Architecture\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
.LP
.LP
Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
.LP
.LP
-\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
+\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
.LP
.LP
For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu.
@@ -227,41 +208,36 @@
.na
\f2KeyTool and JarSigner\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
.LP
-.RE
.SS
Supported Algorithms
.LP
-.RS 3
-
.LP
-.LP
-By default, \f3jarsigner\fP signs a JAR file using either
+By default, \f3jarsigner\fP signs a JAR file using one of the following:
.LP
.RS 3
.TP 2
o
-DSA (Digital Signature Algorithm) with the SHA\-1 digest algorithm, or
+DSA (Digital Signature Algorithm) with the SHA1 digest algorithm
.TP 2
o
-the RSA algorithm with the SHA\-256 digest algorithm.
+RSA algorithm with the SHA256 digest algorithm.
+.TP 2
+o
+EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm).
.RE
.LP
.LP
-That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm.
+That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm.
.LP
.LP
These default signature algorithms can be overridden using the \f2\-sigalg\fP option.
.LP
-.RE
.SS
The Signed JAR File
.LP
-.RS 3
-
-.LP
.LP
When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory:
.LP
@@ -271,7 +247,7 @@
a signature file, with a .SF extension, and
.TP 2
o
-a signature block file, with a .DSA extension.
+a signature block file, with a .DSA, .RSA, or .EC extension.
.RE
.LP
@@ -281,23 +257,20 @@
.nf
\f3
.fl
- \-sigFile MKSIGN
+\-sigFile MKSIGN
.fl
\fP
.fi
.LP
.LP
-the files are named "MKSIGN.SF" and "MKSIGN.DSA".
+The files are named "MKSIGN.SF" and "MKSIGN.DSA".
.LP
.LP
If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens.
.LP
\f3The Signature (.SF) File\fP
.LP
-.RS 3
-
-.LP
.LP
A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following:
.LP
@@ -320,25 +293,14 @@
.LP
The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification.
.LP
-.RE
-\f3The Signature Block (.DSA) File\fP
-.LP
-.RS 3
-
+\f3The Signature Block File\fP
.LP
-.LP
-The .SF file is signed and the signature is placed in the .DSA file. The .DSA file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing.
-.LP
-.RE
-.RE
+The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used.
.SS
Signature Timestamp
.LP
-.RS 3
-
.LP
-.LP
-\f2jarsigner\fP tool can now generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options:
+\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options:
.LP
.RS 3
.TP 2
@@ -359,31 +321,31 @@
.LP
Each of these options is detailed in the Options section below.
.LP
-.RE
.SS
JAR File Verification
.LP
-.RS 3
-
-.LP
.LP
A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps:
.LP
.RS 3
.TP 3
1.
-Verify the signature of the .SF file itself.
-.LP
-That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with.
+Verify the signature of the .SF file itself.
+.br
+.br
+That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with.
.TP 3
2.
-Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest.
-.LP
-The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step.
-.LP
-If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File).
-.LP
-One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file.
+Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest.
+.br
+.br
+The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step.
+.br
+.br
+If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File).
+.br
+.br
+One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file.
.TP 3
3.
Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails.
@@ -393,13 +355,9 @@
.LP
If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP.
.LP
-.RE
.SS
Multiple Signatures for a JAR File
.LP
-.RS 3
-
-.LP
.LP
A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in:
.LP
@@ -435,11 +393,8 @@
.LP
Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP.
.LP
-.RE
.SH "OPTIONS"
.LP
-
-.LP
.LP
The various \f3jarsigner\fP options are listed and described below. Note:
.LP
@@ -462,12 +417,15 @@
.RS 3
.TP 3
\-keystore url
-Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property.
-.LP
-A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default).
-.LP
-A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore.
-.LP
+Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property.
+.br
+.br
+A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default).
+.br
+.br
+A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore.
+.br
+.br
Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is,
.nf
\f3
@@ -494,79 +452,93 @@
\f2\-storetype PKCS11\fP
.RE
For example, this command lists the contents of the configured PKCS#11 token:
-.RS 3
-
-.LP
.nf
\f3
.fl
jarsigner \-keystore NONE \-storetype PKCS11 \-list
.fl
-
-.fl
\fP
.fi
-.RE
.TP 3
\-storetype storetype
-Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP.
-.LP
-The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified.
+Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP.
+.br
+.br
+The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified.
.TP 3
-\-storepass password
-Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password.
-.LP
-Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
+\-storepass[:env | :file] argument
+Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password.
+.br
+.br
+If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
+.RS 3
+.TP 2
+o
+\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
+.TP 2
+o
+\f2file\fP: Retrieve the password from the file named \f2argument\fP
+.RE
+Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
.TP 3
-\-keypass password
-Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it.
-.LP
-Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. Also, when typing in a password at the password prompt, the password is echoed (displayed exactly as typed), so be careful not to type it in front of anyone.
+\-keypass[:env | :file] argument
+Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it.
+.br
+.br
+If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
+.RS 3
+.TP 2
+o
+\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
+.TP 2
+o
+\f2file\fP: Retrieve the password from the file named \f2argument\fP
+.RE
+Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
.TP 3
\-sigfile file
-Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file.
-.LP
-The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names.
-.LP
-If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name.
+Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file.
+.br
+.br
+The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names.
+.br
+.br
+If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name.
.TP 3
\-sigalg algorithm
-.RS 3
-
-.LP
-Specifies the name of the signature algorithm to use to sign the JAR file.
-.LP
+Specifies the name of the signature algorithm to use to sign the JAR file.
+.br
+.br
See
.na
\f2Appendix A\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA or SHA256withRSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
-.LP
-.RE
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
.TP 3
\-digestalg algorithm
-.RS 3
-Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
-.LP
+Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
+.br
+.br
See
.na
\f2Appendix A\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA\-256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
-.LP
-.RE
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
.TP 3
\-signedjar file
-Specifies the name to be used for the signed JAR file.
-.LP
-If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file.
+Specifies the name to be used for the signed JAR file.
+.br
+.br
+If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file.
.TP 3
\-verify
-If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)"
-.LP
-It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both.
-.LP
-For further information on verification, see JAR File Verification.
+If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)"
+.br
+.br
+It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both.
+.br
+.br
+For further information on verification, see JAR File Verification.
.TP 3
\-certs
If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes
@@ -578,7 +550,6 @@
o
if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer
.RE
-.LP
The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed:
.RS 3
.TP 2
@@ -596,26 +567,25 @@
In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
.TP 3
\-sectionsonly
-If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File .
-.LP
-By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file.
-.LP
-For further information, see JAR File Verification.
-.LP
-\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
+If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File .
+.br
+.br
+By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file.
+.br
+.br
+For further information, see JAR File Verification.
+.br
+.br
+\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
.TP 3
\-protected
Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
-.RE
-.RS 3
.TP 3
-\-provider provider\-class\-name
-Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP.
-.LP
+\-providerClass provider\-class\-name
+Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP.
+.br
+.br
Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file.
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -629,19 +599,16 @@
.fl
\fP
.fi
-.RE
.TP 3
\-providerName providerName
-If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider.
-.LP
+If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider.
+.br
+.br
For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the
.na
\f2configuration attributes table\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP:
-.RS 3
-
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP:
.nf
\f3
.fl
@@ -653,58 +620,59 @@
.fl
\fP
.fi
-.RE
.TP 3
\-Jjavaoption
-Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
-.LP
+Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
.TP 3
\-tsa url
-If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore.
-.LP
+If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore.
+.br
+.br
To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in
.na
\f2RFC 3161\fP @
.fi
-http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file.
-.LP
+http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file.
.TP 3
\-tsacert alias
-If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA.
-.LP
-The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP.
-.LP
+If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA.
+.br
+.br
+The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP.
.TP 3
\-altsigner class
-Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism.
-.LP
-For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP
-.LP
+Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism.
+.br
+.br
+For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP
.TP 3
\-altsignerpath classpathlist
-Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below.
-.LP
-An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path.
-.LP
+Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below.
+.br
+.br
+An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path.
+.br
+.br
Example of specifying the path to a jar file that contains the class file:
-.RS 3
-
-.LP
-.LP
-\f2\-altsignerpath /home/user/lib/authsigner.jar\fP
-.LP
-.RE
-.LP
-Note that the JAR file name is included.
-.LP
+.nf
+\f3
+.fl
+\-altsignerpath /home/user/lib/authsigner.jar
+.fl
+\fP
+.fi
+Note that the JAR file name is included.
+.br
+.br
Example of specifying the path to the jar file that contains the class file:
-.RS 3
-.LP
-\f2\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP
-.LP
-.RE
-.LP
-Note that the JAR file name is omitted.
+.nf
+\f3
+.fl
+\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
+.fl
+\fP
+.fi
+Note that the JAR file name is omitted.
.TP 3
\-strict
During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details.
@@ -712,25 +680,22 @@
\-verbose:sub\-options
For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information.
.RE
-.SH "EXAMPLES"
+
.LP
-
+.SH "EXAMPLES"
.LP
.SS
Signing a JAR File
.LP
-.RS 3
-
.LP
-.LP
-Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. Suppose the keystore password is "myspass" and the password for \f2jane\fP's private key is "j638klm". You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar":
+Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar":
.LP
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
.fl
- \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane
+ \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -747,7 +712,7 @@
.fl
jarsigner \-keystore /working/mystore
.fl
- \-signedjar sbundle.jar bundle.jar jane
+ \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -759,7 +724,7 @@
.nf
\f3
.fl
- jarsigner \-signedjar sbundle.jar bundle.jar jane
+ jarsigner \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -771,26 +736,22 @@
.nf
\f3
.fl
- jarsigner bundle.jar jane
+ jarsigner bundle.jar jane
.fl
\fP
.fi
-.RE
.LP
.SS
Verifying a Signed JAR File
.LP
-.RS 3
-
-.LP
.LP
To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following:
.LP
.nf
\f3
.fl
- jarsigner \-verify sbundle.jar
+ jarsigner \-verify sbundle.jar
.fl
\fP
.fi
@@ -851,7 +812,7 @@
Verification with Certificate Information
.LP
.LP
-If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (iff it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example,
+If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example,
.LP
.nf
\f3
@@ -961,11 +922,8 @@
.LP
Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias.
.LP
-.RE
.SH "WARNINGS"
.LP
-
-.LP
During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows:
.nf
\f3
@@ -980,25 +938,25 @@
.fl
This jar contains entries whose signer certificate has expired.
.fl
-
+
.fl
notYetValidCert 4
.fl
This jar contains entries whose signer certificate is not yet valid.
.fl
-
+
.fl
chainNotValidated 4
.fl
This jar contains entries whose certificate chain cannot be correctly validated.
.fl
-
+
.fl
badKeyUsage 8
.fl
This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
.fl
-
+
.fl
badExtendedKeyUsage 8
.fl
@@ -1006,33 +964,33 @@
.fl
doesn't allow code signing.
.fl
-
+
.fl
badNetscapeCertType 8
.fl
- This jar contains entries whose signer certificate's NetscapeCertType extension
+ This jar contains entries whose signer certificate's NetscapeCertType extension
.fl
doesn't allow code signing.
.fl
-
+
.fl
hasUnsignedEntry 16
.fl
This jar contains unsigned entries which have not been integrity\-checked.
.fl
-
+
.fl
notSignedByAlias 32
.fl
This jar contains signed entries which are not signed by the specified alias(es)
.fl
-
+
.fl
aliasNotInStore 32
.fl
This jar contains signed entries that are not signed by alias in this keystore
.fl
-
+
.fl
\fP
.fi
@@ -1042,24 +1000,20 @@
When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned.
.LP
.LP
-\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the exit code
+\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned:
.LP
.nf
\f3
.fl
-failure 1
+failure 1
.fl
\fP
.fi
.LP
-will be returned.
.SS
Compatibility with JDK 1.1
.LP
-.RS 3
-
-.LP
.LP
The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them.
.LP
@@ -1083,7 +1037,6 @@
The following table explains how JAR files that were signed in JDK 1.1.x are treated in the Java 2 platform.
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -1390,7 +1343,7 @@
.nr 44 \n(83+(3*\n(38)
.nr 84 +\n(44
.nr TW \n(84
-.if t .if \n(TW>\n(.li .tm Table at line 1128 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1566,7 +1519,6 @@
.rm g+
.rm h+
.rm i+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
.LP
@@ -1591,8 +1543,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.RS 3
.TP 2
o
@@ -1606,13 +1556,12 @@
.na
\f4Security\fP @
.fi
-http://java.sun.com/docs/books/tutorial/security/index.html trail of the
+http://download.oracle.com/javase/tutorial/security/index.html trail of the
.na
\f4Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool
+http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool
.RE
.LP
-.RE
--- a/jdk/src/linux/doc/man/java.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/java.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH java 1 "02 Jun 2010"
+.TH java 1 "10 May 2011"
.LP
.SH "Name"
@@ -38,9 +38,6 @@
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options.
@@ -56,11 +53,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method.
.LP
@@ -70,7 +64,7 @@
.nf
\f3
.fl
- public static void main(String args[])
+public static void main(String args[])
.fl
\fP
.fi
@@ -87,76 +81,79 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases.
.LP
.SH "Standard Options"
.LP
-
-.LP
.RS 3
.TP 3
\-client
-.LP
-Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
-.LP
+Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
+.br
+.br
+For default VM selection, see
+.na
+\f2Server\-Class Machine Detection\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html
+.TP 3
+\-server
+Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
+.br
+.br
For default VM selection, see
.na
\f2Server\-Class Machine Detection\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html
-.TP 3
-\-server
-.LP
-Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
-.LP
-For default VM selection, see
-.na
-\f2Server\-Class Machine Detection\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html
.TP 3
\-agentlib:libname[=options]
-Load native agent library \f2libname\fP, e.g.
-.LP
-\-agentlib:hprof
-.LP
-\-agentlib:jdwp=help
-.LP
-\-agentlib:hprof=help
-.LP
+Load native agent library \f2libname\fP, e.g.
+.br
+.br
+\-agentlib:hprof
+.br
+.br
+\-agentlib:jdwp=help
+.br
+.br
+\-agentlib:hprof=help
+.br
+.br
For more information, see
.na
\f2JVMTI Agent Command Line Options\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting.
+http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting.
.TP 3
\-agentpath:pathname[=options]
Load a native agent library by full pathname. For more information, see
.na
\f2JVMTI Agent Command Line Options\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting.
+http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting.
.TP 3
\-classpath classpath
.TP 3
\-cp classpath
-Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable.
-.LP
+Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable.
+.br
+.br
If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP).
-.LP
+.br
+.br
As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
.br
.br
For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
-.LP
+.br
+.br
For more information on class paths, see
.na
\f2Setting the Class Path\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath.
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath.
.TP 3
\-Dproperty=value
Set a system property value.
@@ -164,19 +161,23 @@
\-d32
.TP 3
\-d64
-Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported.
-.LP
-Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release.
-.LP
-If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release.
+Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported.
+.br
+.br
+Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release.
+.br
+.br
+If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release.
.TP 3
\-enableassertions[:<package name>"..." | :<class name> ]
.TP 3
\-ea[:<package name>"..." | :<class name> ]
-Enable assertions. Assertions are disabled by default.
-.LP
-With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
-.LP
+Enable assertions. Assertions are disabled by default.
+.br
+.br
+With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
+.br
+.br
If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used:
.nf
\f3
@@ -185,26 +186,26 @@
.fl
\fP
.fi
-.LP
-The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below.
+The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below.
.TP 3
\-disableassertions[:<package name>"..." | :<class name> ]
.TP 3
\-da[:<package name>"..." | :<class name> ]
-Disable assertions. This is the default.
-.LP
-With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class.
-.LP
+Disable assertions. This is the default.
+.br
+.br
+With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class.
+.br
+.br
To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used:
.nf
\f3
.fl
-java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat <Main Class>
+java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3
.fl
\fP
.fi
-.LP
-The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below.
+The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below.
.TP 3
\-enablesystemassertions
.TP 3
@@ -215,29 +216,36 @@
.TP 3
\-dsa
Disables asserts in all system classes.
-.LP
.TP 3
\-jar
Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the
.na
\f2Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar for information about working with Jar files and Jar\-file manifests.
-.LP
-When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
-.LP
+http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.
+.br
+.br
+When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
+.br
+.br
Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to
.na
\f2Java Archive (JAR) Files\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/index.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html.
.TP 3
\-javaagent:jarpath[=options]
Load a Java programming language agent, see
.na
\f2java.lang.instrument\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/lang/instrument/package\-summary.html.
+http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html.
+.TP 3
+\-jre\-restrict\-search
+Include user\-private JREs in the version search.
+.TP 3
+\-no\-jre\-restrict\-search
+Exclude user\-private JREs in the version search.
.TP 3
\-verbose
.TP 3
@@ -254,8 +262,9 @@
Display version information and exit.
.TP 3
\-version:release
-Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
-.LP
+Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
+.br
+.br
\f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example:
.nf
\f3
@@ -264,11 +273,13 @@
.fl
\fP
.fi
-The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56).
-.LP
-For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
-.LP
-See the following NOTES section for important policy information on the use of this option.
+The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56).
+.br
+.br
+For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
+.br
+.br
+See the following NOTES section for important policy information on the use of this option.
.TP 3
\-showversion
Display version information and continue.
@@ -278,6 +289,9 @@
\-help
Display usage information and exit.
.TP 3
+\-splash:imagepath
+Show splash screen with image specified by \f2imagepath\fP.
+.TP 3
\-X
Display information about non\-standard options and exit.
.RE
@@ -287,9 +301,6 @@
Non\-Standard Options
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Xint
Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode.
@@ -319,18 +330,20 @@
Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program.
.TP 3
\-Xloggc:file
-Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event.
-.LP
-Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line.
-.LP
+Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event.
+.br
+.br
+Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line.
.TP 3
\-Xmsn
-Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics
+Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see
+.na
+\f2HotSpot Ergonomics\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+.br
.br
Examples:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -340,19 +353,20 @@
.fl
\-Xms6m
.fl
-
+
.fl
\fP
.fi
-.RE
.TP 3
\-Xmxn
-Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics
+Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see
+.na
+\f2HotSpot Ergonomics\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+.br
.br
Examples:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -362,28 +376,31 @@
.fl
\-Xmx80m
.fl
-
+
.fl
\fP
.fi
-.RE
On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000m minus overhead amounts.
.TP 3
\-Xprof
Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems.
-.LP
.TP 3
\-Xrs
-Reduces use of operating\-system signals by the Java virtual machine (JVM).
-.LP
-In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly.
-.LP
-Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks.
-.LP
-The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps.
-.LP
-Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed.
-.LP
+Reduces use of operating\-system signals by the Java virtual machine (JVM).
+.br
+.br
+In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly.
+.br
+.br
+Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks.
+.br
+.br
+The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps.
+.br
+.br
+Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed.
+.br
+.br
There are two consequences of specifying \f3\-Xrs\fP:
.RS 3
.TP 2
@@ -402,12 +419,11 @@
.RE
.LP
-.RE
.SH "NOTES"
.LP
-
.LP
-The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
+The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
+.LP
.RS 3
.TP 3
1.
@@ -422,8 +438,7 @@
.fl
\fP
.fi
-.LP
-Would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified.
+This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified.
.TP 3
3.
A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example:
@@ -448,10 +463,23 @@
.RE
.LP
-.SH "SEE ALSO"
+.SH "EXIT STATUS"
+.LP
+.LP
+The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP.
.LP
+.RS 3
+.TP 2
+o
+\f20\fP: Successful completion
+.TP 2
+o
+\f2>0\fP: An error occurred
+.RE
.LP
+.SH "SEE ALSO"
+.LP
.RS 3
.TP 2
o
@@ -470,13 +498,13 @@
.na
\f2The Java Extensions Framework\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
.TP 2
o
.na
\f2Security Features\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/index.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html.
.TP 2
o
.na
--- a/jdk/src/linux/doc/man/javac.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/javac.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javac 1 "02 Jun 2010"
+.TH javac 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,14 +27,12 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
\fP\f3javac\fP [ options ] [ sourcefiles ] [ classes ] [ @argfiles ]
.fl
-
+
.fl
.fi
@@ -43,9 +41,6 @@
Arguments may be in any order.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options.
@@ -61,11 +56,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3javac\fP tool reads class and interface definitions, written in the Java programming language, and compiles them into bytecode class files. It can also process annotations in Java source files and classes.
.LP
@@ -96,8 +88,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The compiler has a set of standard options that are supported on the current development environment and will be supported in future releases. An additional set of non\-standard options are specific to the current virtual machine and compiler implementations and are subject to change in the future. Non\-standard options begin with \f3\-X\fP.
.LP
@@ -105,28 +95,18 @@
Standard Options
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Akey[=value]
Options to pass to annotation processors. These are not interpreted by javac directly, but are made available for use by individual processors. \f2key\fP should be one or more identifiers separated by ".".
.TP 3
\-cp path or \-classpath path
-Specify where to find user class files, and (optionally) annotation processors and source files. This classpath overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See
-.na
-\f2Setting the Class Path\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath for more details.
-.LP
-If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files.
-.LP
-If the \f3\-processorpath\fP option is not specified, the classpath is also searched for annotation processors.
-.LP
-As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP.
+Specify where to find user class files, and (optionally) annotation processors and source files. This class path overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See Setting the Class Path for more details.
.br
.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. \f3Note:\fP \ Depending of the configuration of your command line environment, you may have to quote the wild card character, for example, \f2javac \-cp "*.jar" MyClass.java\fP.
+>If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files.
+.br
+.br
+If the \f3\-processorpath\fP option is not specified, the class path is also searched for annotation processors.
.TP 3
\-Djava.ext.dirs=directories
Override the location of installed extensions.
@@ -135,17 +115,28 @@
Override the location of endorsed standards path.
.TP 3
\-d directory
-Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP.
-.LP
-If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated.
-.LP
-\f3Note:\fP \ The directory specified by \f3\-d\fP is not automatically added to your user class path.
+Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP.
+.br
+.br
+If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated.
+.br
+.br
+\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path.
.TP 3
\-deprecation
Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP.
.TP 3
\-encoding encoding
-Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.
+Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.
+.TP 3
+\-endorseddirs directories
+Override the location of endorsed standards path.
+.TP 3
+\-extdirs directories
+Overrides the location of the \f2ext\fP directory. The \f2directories\fP variable is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. All JAR archives found are automatically part of the class path.
+.br
+.br
+If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information.
.TP 3
\-g
Generate all debugging information, including local variables. By default, only line number and source file information is generated.
@@ -171,7 +162,13 @@
Print a synopsis of standard options.
.TP 3
\-implicit:{class,none}
-Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types.
+Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types.
+.TP 3
+\-Joption
+Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
+.br
+.br
+\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher.
.TP 3
\-nowarn
Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP.
@@ -183,7 +180,7 @@
Names of the annotation processors to run. This bypasses the default discovery process.
.TP 3
\-processorpath path
-Specify where to find annotation processors; if this option is not used, the classpath will be searched for processors.
+Specify where to find annotation processors; if this option is not used, the class path will be searched for processors.
.TP 3
\-s dir
Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP.
@@ -218,41 +215,42 @@
.RE
.TP 3
\-sourcepath sourcepath
-Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name.
-.LP
-\f3Note:\fP \ Classes found through the classpath may be subject to automatic recompilation if their sources are also found. See Searching For Types.
+Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name.
+.br
+.br
+\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types.
.TP 3
\-verbose
Verbose output. This includes information about each class loaded and each source file compiled.
.TP 3
\-version
-Print version information.
+Print version information.
+.TP 3
+\-Werror
+Terminate compilation if warnings occur.
.TP 3
\-X
Display information about non\-standard options and exit.
.RE
.LP
-.RE
.SS
Cross\-Compilation Options
.LP
-.RS 3
-
-.LP
.LP
By default, classes are compiled against the bootstrap and extension classes of the platform that \f3javac\fP shipped with. But \f3javac\fP also supports \f2cross\-compiling\fP, where classes are compiled against a bootstrap and extension classes of a different Java platform implementation. It is important to use \f3\-bootclasspath\fP and \f3\-extdirs\fP when cross\-compiling; see Cross\-Compilation Example below.
.LP
.RS 3
.TP 3
\-target version
-Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP).
-.LP
+Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP).
+.br
+.br
The default for \f3\-target\fP depends on the value of \f3\-source\fP:
.RS 3
.TP 2
o
-If \-source is \f3not specified\fP, the value of \-target is \f31.6\fP
+If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP
.TP 2
o
If \-source is \f31.2\fP, the value of \-target is \f31.4\fP
@@ -261,25 +259,18 @@
If \-source is \f31.3\fP, the value of \-target is \f31.4\fP
.TP 2
o
-For \f3all other values\fP of \-source, the value of \-target is the value of \f3\-source\fP.
+For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP.
.RE
.TP 3
\-bootclasspath bootclasspath
Cross\-compile against the specified set of boot classes. As with the user class path, boot class path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives.
-.TP 3
-\-extdirs directories
-Cross\-compile against the specified extension directories. \f2Directories\fP is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files.
.RE
.LP
-.RE
.SS
Non\-Standard Options
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Xbootclasspath/p:path
Prepend to the bootstrap class path.
@@ -291,54 +282,19 @@
Override location of bootstrap class files.
.TP 3
\-Xlint
-Enable all recommended warnings. In this release, all available warnings are recommended.
+Enable all recommended warnings. In this release, enabling all available warnings is recommended.
+.TP 3
+\-Xlint:all
+Enable all recommended warnings. In this release, enabling all available warnings is recommended.
.TP 3
\-Xlint:none
-Disable all warnings not mandated by the Java Language Specification.
+Disable all warnings.
+.TP 3
+\-Xlint:name
+Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option.
.TP 3
\-Xlint:\-name
-Disable warning \f2name\fP, where \f2name\fP is one of the warning names supported for \f3\-Xlint:\fP\f2name\fP, below.
-.TP 3
-\-Xlint:unchecked
-Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification.
-.TP 3
-\-Xlint:path
-Warn about nonexistent path (classpath, sourcepath, etc) directories.
-.TP 3
-\-Xlint:serial
-Warn about missing \f2serialVersionUID\fP definitions on serializable classes.
-.TP 3
-\-Xlint:finally
-Warn about \f2finally\fP clauses that cannot complete normally.
-.TP 3
-\-Xlint:fallthrough
-Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement:
-.RS 3
-
-.LP
-.nf
-\f3
-.fl
-switch (x) {
-.fl
-case 1:
-.fl
- System.out.println("1");
-.fl
- // No break; statement here.
-.fl
-case 2:
-.fl
- System.out.println("2");
-.fl
-}
-.fl
-
-.fl
-\fP
-.fi
-.RE
-If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question.
+Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option.
.TP 3
\-Xmaxerrs number
Set the maximum number of errors to print.
@@ -350,7 +306,10 @@
Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP.
.TP 3
\-Xprefer:{newer,source}
-Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.
+Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.
+.TP 3
+\-Xpkginfo:{always,legacy,nonempty}
+Specify handling of package\-info files
.TP 3
\-Xprint
Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change.
@@ -363,27 +322,420 @@
.RE
.LP
-.RE
.SS
-The \-J Option
+Warnings That Can Be Enabled or Disabled with \-Xlint Option
.LP
-.RS 3
-
+.LP
+Enable warning \f2name\fP with the option \f3\-Xlint:\fP\f2name\fP, where \f2name\fP is one of the following warning names. Similarly, you can disable warning \f2name\fP with the option \f3\-Xlint:\-\fP\f2name\fP:
.LP
.RS 3
.TP 3
-\-Joption
-Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f3\-X\fP, it is not a `standard option' of \f3javac\fP. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
-.LP
-\f3Note:\fP \ \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher.
+cast
+Warn about unnecessary and redundant casts. For example:
+.nf
+\f3
+.fl
+String s = (String)"Hello!"
+.fl
+\fP
+.fi
+.TP 3
+classfile
+Warn about issues related to classfile contents.
+.TP 3
+deprecation
+Warn about use of deprecated items. For example:
+.nf
+\f3
+.fl
+ java.util.Date myDate = new java.util.Date();
+.fl
+ int currentDay = myDate.getDay();
+.fl
+\fP
+.fi
+The method \f2java.util.Date.getDay\fP has been deprecated since JDK 1.1.
+.TP 3
+dep\-ann
+Warn about items that are documented with an \f2@deprecated\fP Javadoc comment, but do not have a \f2@Deprecated\fP annotation. For example:
+.nf
+\f3
+.fl
+ /**
+.fl
+ * @deprecated As of Java SE 7, replaced by {@link #newMethod()}
+.fl
+ */
+.fl
+
+.fl
+ public static void deprecatedMethood() { }
+.fl
+
+.fl
+ public static void newMethod() { }
+.fl
+\fP
+.fi
+.TP 3
+divzero
+Warn about division by constant integer 0. For example:
+.nf
+\f3
+.fl
+ int divideByZero = 42 / 0;
+.fl
+\fP
+.fi
+.TP 3
+empty
+Warn about empty statements after \f2if\fP statements. For example:
+.nf
+\f3
+.fl
+class E {
+.fl
+ void m() {
+.fl
+ if (true) ;
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+.TP 3
+fallthrough
+Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement:
+.nf
+\f3
+.fl
+switch (x) {
+.fl
+case 1:
+.fl
+ System.out.println("1");
+.fl
+ // No break statement here.
+.fl
+case 2:
+.fl
+ System.out.println("2");
+.fl
+}
+.fl
+\fP
+.fi
+If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question.
+.TP 3
+finally
+Warn about \f2finally\fP clauses that cannot complete normally. For example:
+.nf
+\f3
+.fl
+ public static int m() {
+.fl
+ try {
+.fl
+ throw new NullPointerException();
+.fl
+ } catch (NullPointerException e) {
+.fl
+ System.err.println("Caught NullPointerException.");
+.fl
+ return 1;
+.fl
+ } finally {
+.fl
+ return 0;
+.fl
+ }
+.fl
+ }
+.fl
+\fP
+.fi
+The compiler generates a warning for \f2finally\fP block in this example. When this method is called, it returns a value of \f20\fP, not \f21\fP. A \f2finally\fP block always executes when the \f2try\fP block exits. In this example, if control is transferred to the \f2catch\fP, then the method exits. However, the \f2finally\fP block must be executed, so it is executed, even though control has already been transferred outside the method.
+.TP 3
+options
+Warn about issues relating to the use of command line options. See Cross\-Compilation Example for an example of this kind of warning.
+.TP 3
+overrides
+Warn about issues regarding method overrides. For example, consider the following two classes:
+.nf
+\f3
+.fl
+public class ClassWithVarargsMethod {
+.fl
+ void varargsMethod(String... s) { }
+.fl
+}
+.fl
+\fP
+.fi
+.nf
+\f3
+.fl
+public class ClassWithOverridingMethod extends ClassWithVarargsMethod {
+.fl
+ @Override
+.fl
+ void varargsMethod(String[] s) { }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates a warning similar to the following:
+.br
+.br
+\f2warning: [override] varargsMethod(String[]) in ClassWithOverridingMethod overrides varargsMethod(String...) in ClassWithVarargsMethod; overriding method is missing '...'\fP
+.br
+.br
+When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. In the method \f2ClassWithVarargsMethod.varargsMethod\fP, the compiler translates the varargs formal parameter \f2String... s\fP to the formal parameter \f2String[] s\fP, an array, which matches the formal parameter of the method \f2ClassWithOverridingMethod.varargsMethod\fP. Consequently, this example compiles.
+.TP 3
+path
+Warn about invalid path elements and nonexistent path directories on the command line (with regards to the class path, the source path, and other paths). Such warnings cannot be suppressed with the \f2@SuppressWarnings\fP annotation. For example:
+.nf
+\f3
+.fl
+javac \-Xlint:path \-classpath /nonexistentpath Example.java
+.fl
+\fP
+.fi
+.TP 3
+processing
+Warn about issues regarding annotation processing. The compiler generates this warning if you have a class that has an annotation, and you use an annotation processor that cannot handle that type of exception. For example, the following is a simple annotation processor:
+.br
+.br
+\f3Source file \fP\f4AnnoProc.java\fP:
+.nf
+\f3
+.fl
+import java.util.*;
+.fl
+import javax.annotation.processing.*;
+.fl
+import javax.lang.model.*;
+.fl
+import javax.lang.model.element.*;
+.fl
+
+.fl
+@SupportedAnnotationTypes("NotAnno")
+.fl
+public class AnnoProc extends AbstractProcessor {
+.fl
+ public boolean process(Set<? extends TypeElement> elems, RoundEnvironment renv) {
+.fl
+ return true;
+.fl
+ }
+.fl
+
+.fl
+ public SourceVersion getSupportedSourceVersion() {
+.fl
+ return SourceVersion.latest();
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+\f3Source file \fP\f4AnnosWithoutProcessors.java\fP\f3:\fP
+.nf
+\f3
+.fl
+@interface Anno { }
+.fl
+
+.fl
+@Anno
+.fl
+class AnnosWithoutProcessors { }
+.fl
+\fP
+.fi
+The following commands compile the annotation processor \f2AnnoProc\fP, then run this annotation processor against the source file \f2AnnosWithoutProcessors.java\fP:
+.nf
+\f3
+.fl
+% javac AnnoProc.java
+.fl
+% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java
+.fl
+\fP
+.fi
+When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning:
+.br
+.br
+\f2warning: [processing] No processor claimed any of these annotations: Anno\fP
+.br
+.br
+To resolve this issue, you can rename the annotation defined and used in the class \f2AnnosWithoutProcessors\fP from \f2Anno\fP to \f2NotAnno\fP.
+.TP 3
+rawtypes
+Warn about unchecked operations on raw types. The following statement generates a \f2rawtypes\fP warning:
+.nf
+\f3
+.fl
+void countElements(List l) { ... }
+.fl
+\fP
+.fi
+The following does not generate a \f2rawtypes\fP warning:
+.nf
+\f3
+.fl
+void countElements(List<?> l) { ... }
+.fl
+\fP
+.fi
+\f2List\fP is a raw type. However, \f2List<?>\fP is a unbounded wildcard parameterized type. Because \f2List\fP is a parameterized interface, you should always specify its type argument. In this example, the \f2List\fP formal argument is specified with a unbounded wildcard (\f2?\fP) as its formal type parameter, which means that the \f2countElements\fP method can accept any instantiation of the \f2List\fP interface.
+.TP 3
+serial
+Warn about missing \f2serialVersionUID\fP definitions on serializable classes. For example:
+.nf
+\f3
+.fl
+public class PersistentTime implements Serializable
+.fl
+{
+.fl
+ private Date time;
+.fl
+
+.fl
+ public PersistentTime() {
+.fl
+ time = Calendar.getInstance().getTime();
+.fl
+ }
+.fl
+
+.fl
+ public Date getTime() {
+.fl
+ return time;
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates the following warning:
+.br
+.br
+\f2warning: [serial] serializable class PersistentTime has no definition of serialVersionUID\fP
+.br
+.br
+If a serializable class does not explicitly declare a field named \f2serialVersionUID\fP, then the serialization runtime will calculate a default \f2serialVersionUID\fP value for that class based on various aspects of the class, as described in the Java Object Serialization Specification. However, it is strongly recommended that all serializable classes explicitly declare \f2serialVersionUID\fP values because the default process of computing \f2serialVersionUID\fP vales is highly sensitive to class details that may vary depending on compiler implementations, and can thus result in unexpected \f2InvalidClassExceptions\fP during deserialization. Therefore, to guarantee a consistent \f2serialVersionUID\fP value across different Java compiler implementations, a serializable class must declare an explicit \f2serialVersionUID\fP value.
+.TP 3
+static
+Warn about issues relating to use of statics. For example:
+.nf
+\f3
+.fl
+class XLintStatic {
+.fl
+ static void m1() { }
+.fl
+ void m2() { this.m1(); }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates the following warning:
+.nf
+\f3
+.fl
+warning: [static] static method should be qualified by type name, XLintStatic, instead of by an expression
+.fl
+\fP
+.fi
+To resolve this issue, you can call the static method \f2m1\fP as follows:
+.nf
+\f3
+.fl
+XLintStatic.m1();
+.fl
+\fP
+.fi
+Alternatively, you can remove the \f2static\fP keyword from the declaration of the method \f2m1\fP.
+.TP 3
+try
+Warn about issues relating to use of \f2try\fP blocks, including try\-with\-resources statements. For example, a warning is generated for the following statement because the resource \f2ac\fP declared in the \f2try\fP statement is not used:
+.nf
+\f3
+.fl
+try ( AutoCloseable ac = getResource() ) {
+.fl
+ // do nothing
+.fl
+}
+.fl
+\fP
+.fi
+.TP 3
+unchecked
+Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. For example:
+.nf
+\f3
+.fl
+ List l = new ArrayList<Number>();
+.fl
+ List<String> ls = l; // unchecked warning
+.fl
+\fP
+.fi
+During type erasure, the types \f2ArrayList<Number>\fP and \f2List<String>\fP become \f2ArrayList\fP and \f2List\fP, respectively.
+.br
+.br
+The variable \f2ls\fP has the parameterized type \f2List<String>\fP. When the \f2List\fP referenced by \f2l\fP is assigned to \f2ls\fP, the compiler generates an unchecked warning; the compiler is unable to determine at compile time, and moreover knows that the JVM will not be able to determine at runtime, if \f2l\fP refers to a \f2List<String>\fP type; it does not. Consequently, heap pollution occurs.
+.br
+.br
+In detail, a heap pollution situation occurs when the \f2List\fP object \f2l\fP, whose static type is \f2List<Number>\fP, is assigned to another \f2List\fP object, \f2ls\fP, that has a different static type, \f2List<String>\fP. However, the compiler still allows this assignment. It must allow this assignment to preserve backwards compatibility with versions of Java SE that do not support generics. Because of type erasure, \f2List<Number>\fP and \f2List<String>\fP both become \f2List\fP. Consequently, the compiler allows the assignment of the object \f2l\fP, which has a raw type of \f2List\fP, to the object \f2ls\fP.
+.TP 3
+varargs
+Warn about unsafe usages of variable arguments (varargs) methods, in particular, those that contain non\-reifiable arguments. For example:
+.nf
+\f3
+.fl
+public class ArrayBuilder {
+.fl
+ public static <T> void addToList (List<T> listArg, T... elements) {
+.fl
+ for (T x : elements) {
+.fl
+ listArg.add(x);
+.fl
+ }
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates the following warning for the definition of the method \f2ArrayBuilder.addToList\fP:
+.nf
+\f3
+.fl
+warning: [varargs] Possible heap pollution from parameterized vararg type T
+.fl
+\fP
+.fi
+When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. However, the Java programming language does not permit the creation of arrays of parameterized types. In the method \f2ArrayBuilder.addToList\fP, the compiler translates the varargs formal parameter \f2T... elements\fP to the formal parameter \f2T[] elements\fP, an array. However, because of type erasure, the compiler converts the varargs formal parameter to \f2Object[] elements\fP. Consequently, there is a possibility of heap pollution.
.RE
.LP
-.RE
.SH "COMMAND LINE ARGUMENT FILES"
.LP
-
-.LP
.LP
To shorten or simplify the javac command line, you can specify one or more files that themselves contain arguments to the \f2javac\fP command (except \f2\-J\fP options). This enables you to create javac commands of any length on any operating system.
.LP
@@ -405,9 +757,7 @@
.nf
\f3
.fl
- % \fP\f3javac @argfile\fP
-.fl
-
+% \fP\f3javac @argfile\fP
.fl
.fi
@@ -433,7 +783,7 @@
.fl
\-sourcepath /java/pubs/ws/1.3/src/share/classes
.fl
-
+
.fl
\fP
.fi
@@ -451,7 +801,7 @@
.fl
MyClass3.java
.fl
-
+
.fl
\fP
.fi
@@ -465,7 +815,7 @@
.fl
% \fP\f3javac @options @classes\fP
.fl
-
+
.fl
.fi
@@ -479,17 +829,13 @@
.nf
\f3
.fl
- % \fP\f3javac @path1/options @path2/classes\fP
-.fl
-
+% \fP\f3javac @path1/options @path2/classes\fP
.fl
.fi
.LP
.SH "ANNOTATION PROCESSING"
.LP
-
-.LP
.LP
\f3javac\fP provides direct support for annotation processing, superseding the need for the separate annotation processing tool, \f3apt\fP.
.LP
@@ -500,11 +846,7 @@
Overview of annotation processing
.LP
.LP
-Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named
-.br
-\f2\ META\-INF/services/javax.annotation.processing.Processor\fP
-.br
-on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option.
+Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named \f2META\-INF/services/javax.annotation.processing.Processor\fP on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option.
.LP
.LP
After scanning the source files and classes on the command line to determine what annotations are present, the compiler queries the processors to determine what annotations they process. When a match is found, the processor will be invoked. A processor may "claim" the annotations it processes, in which case no further attempt is made to find any processors for those annotations. Once all annotations have been claimed, the compiler does not look for additional processors.
@@ -523,8 +865,6 @@
.LP
.SH "SEARCHING FOR TYPES"
.LP
-
-.LP
.LP
When compiling a source file, the compiler often needs information about a type whose definition did not appear in the source files given on the command line. The compiler needs type information for every class or interface used, extended, or implemented in the source file. This includes classes and interfaces not explicitly mentioned in the source file but which provide information through inheritance.
.LP
@@ -532,11 +872,7 @@
For example, when you subclass \f3java.applet.Applet\fP, you are also using \f3Applet's\fP ancestor classes: \f3java.awt.Panel\fP, \f3java.awt.Container\fP, \f3java.awt.Component\fP, and \f3java.lang.Object\fP.
.LP
.LP
-When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see
-.na
-\f2Setting the Class Path\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath).
+When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see Setting the Class Path).
.LP
.LP
If you set the \-sourcepath option, the compiler searches the indicated path for source files; otherwise the compiler searches the user class path for both class files and source files.
@@ -555,8 +891,6 @@
.LP
.SH "PROGRAMMATIC INTERFACE"
.LP
-
-.LP
.LP
\f3javac\fP supports the new Java Compiler API defined by the classes and interfaces in the \f2javax.tools\fP package.
.LP
@@ -573,8 +907,6 @@
.fl
int rc = javac.run(null, null, null, args);
.fl
-
-.fl
\fP
.fi
@@ -588,11 +920,8 @@
.SS
Old Interface
.LP
-.RS 3
-
.LP
-.LP
-\f3Note:\fP \ This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above.
+\f3Note:\fP This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above.
.LP
.LP
The \f2com.sun.tools.javac.Main\fP class provides two static methods to invoke the compiler from a program:
@@ -604,8 +933,6 @@
.fl
public static int compile(String[] args, PrintWriter out);
.fl
-
-.fl
\fP
.fi
@@ -622,21 +949,14 @@
.LP
Note that all \f3other\fP classes and methods found in a package whose name starts with \f2com.sun.tools.javac\fP (informally known as sub\-packages of \f2com.sun.tools.javac\fP) are strictly internal and subject to change at any time.
.LP
-.RE
.SH "EXAMPLES"
.LP
.SS
Compiling a Simple Program
.LP
-.RS 3
-
-.LP
.LP
One source file, \f2Hello.java\fP, defines a class called \f3greetings.Hello\fP. The \f2greetings\fP directory is the package directory both for the source file and the class file and is off the current directory. This allows us to use the default user class path. It also makes it unnecessary to specify a separate destination directory with \f3\-d\fP.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -682,25 +1002,15 @@
.fl
Hello Everyone
.fl
-
-.fl
.fi
-.RE
.LP
-.RE
.SS
Compiling Multiple Source Files
.LP
-.RS 3
-
-.LP
.LP
This example compiles all the source files in the package \f2greetings\fP.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -720,27 +1030,15 @@
.fl
Aloha.java GutenTag.java Hello.java Hi.java
.fl
-
-.fl
-
-.fl
.fi
-.RE
.LP
-.RE
.SS
Specifying a User Class Path
.LP
-.RS 3
-
-.LP
.LP
Having changed one of the source files in the previous example, we recompile it:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -750,35 +1048,23 @@
.fl
% \f3javac greetings/Hi.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
Since \f2greetings.Hi\fP refers to other classes in the \f2greetings\fP package, the compiler needs to find these other classes. The example above works, because our default user class path happens to be the directory containing the package directory. But suppose we want to recompile this file and not worry about which directory we're in? Then we need to add \f2/examples\fP to the user class path. We can do this by setting \f3CLASSPATH\fP, but here we'll use the \f3\-classpath\fP option.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
% \fP\f3javac \-classpath /examples /examples/greetings/Hi.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
If we change \f2greetings.Hi\fP again, to use a banner utility, that utility also needs to be accessible through the user class path.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -786,42 +1072,26 @@
.fl
/examples/greetings/Hi.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
To execute a class in \f2greetings\fP, we need access both to \f2greetings\fP and to the classes it uses.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
% \fP\f3java \-classpath /examples:/lib/Banners.jar greetings.Hi\fP
.fl
-
-.fl
.fi
-.RE
.LP
-.RE
.SS
Separating Source Files and Class Files
.LP
-.RS 3
-
-.LP
.LP
It often makes sense to keep source files and class files in separate directories, especially on large projects. We use \f3\-d\fP to indicate the separate class file destination. Since the source files are not in the user class path, we use \f3\-sourcepath\fP to help the compiler find them.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -855,61 +1125,56 @@
.fl
Base.class GoodBye.class
.fl
-
-.fl
-
-.fl
.fi
-.RE
.LP
.LP
-\f3Note:\fP \ The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option.
+\f3Note:\fP The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option.
.LP
-.RE
.SS
Cross\-Compilation Example
.LP
-.RS 3
-
.LP
-.LP
-Here we use \f3javac\fP to compile code that will run on a 1.7 VM.
-.LP
-.RS 3
-
+Here we use \f3javac\fP to compile code that will run on a 1.6 VM.
.LP
.nf
\f3
.fl
-% \fP\f3javac \-target 1.7 \-bootclasspath jdk1.7.0/lib/rt.jar \\
+% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\
.fl
\-extdirs "" OldCode.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
-The \f3\-target 1.7\fP option ensures that the generated class files will be compatible with 1.7 VMs. By default, \f3javac\fP compiles for JDK 6.
+The \f2\-source 1.6\fP option specifies that version 1.6 (or 6) of the Java programming language be used to compile \f2OldCode.java\fP. The option \f3\-target 1.6\fP option ensures that the generated class files will be compatible with 1.6 VMs. Note that in most cases, the value of the \f3\-target\fP option is the value of the \f3\-source\fP option; in this example, you can omit the \f3\-target\fP option.
.LP
.LP
-The Java Platform JDK's \f3javac\fP would also by default compile against its own bootstrap classes, so we need to tell \f3javac\fP to compile against JDK 1.7 bootstrap classes instead. We do this with \f3\-bootclasspath\fP and \f3\-extdirs\fP. Failing to do this might allow compilation against a Java Platform API that would not be present on a 1.7 VM and would fail at runtime.
+You must specify the \f3\-bootclasspath\fP option to specify the correct version of the bootstrap classes (the \f2rt.jar\fP library). If not, the compiler generates a warning:
.LP
-.RE
+.nf
+\f3
+.fl
+% \fP\f3javac \-source 1.6 OldCode.java\fP
+.fl
+warning: [options] bootstrap class path not set in conjunction with \-source 1.6
+.fl
+.fi
+
+.LP
+.LP
+If you do not specify the correct version of bootstrap classes, the compiler will use the old language rules (in this example, it will use version 1.6 of the Java programming language) combined with the new bootstrap classes, which can result in class files that do not work on the older platform (in this case, Java SE 6) because reference to non\-existent methods can get included.
+.LP
.SH "SEE ALSO"
.LP
-
-.LP
.RS 3
.TP 2
o
.na
\f2The javac Guide\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javac/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html
.TP 2
o
java(1) \- the Java Application Launcher
@@ -933,7 +1198,7 @@
.na
\f2The Java Extensions Framework\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
.RE
.LP
--- a/jdk/src/linux/doc/man/javadoc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/javadoc.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,27 +19,16 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javadoc 1 "02 Jun 2010"
+.TH javadoc 1 "10 May 2011"
.SH "Name"
javadoc \- The Java API Documentation Generator
-.RS 3
-
.LP
-.LP
-Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Sun Solaris.
-.LP
-.RE
+Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Solaris.
.SH "SYNOPSIS"
.LP
-.LP
\f4javadoc\fP\f2\ [\ \fP\f2options\fP\f2\ ]\ [\ packagenames\ ]\ [\ sourcefilenames\ ]\ [\ \-subpackages\fP\ \f2pkg1:pkg2:...\fP\f2\ ]\ [\ \fP\f2@argfiles\fP\f2\ ]\fP
.LP
-.LP
Arguments can be in any order. See processing of Source Files for details on how the Javadoc tool determines which "\f2.java\fP" files to process.
-.LP
-.RS 3
-
-.LP
.RS 3
.TP 3
options
@@ -49,11 +38,7 @@
A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages
.TP 3
sourcefilenames
-A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see
-.na
-\f2Identifiers\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes
+A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes
.TP 3
\-subpackages pkg1:pkg2:...
Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames.
@@ -61,31 +46,19 @@
@argfiles
One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files.
.RE
-
-.LP
-.RE
.SH "DESCRIPTION"
.LP
-.LP
The \f3Javadoc\fP tool parses the declarations and documentation comments in a set of Java source files and produces a corresponding set of HTML pages describing (by default) the public and protected classes, nested classes (but not anonymous inner classes), interfaces, constructors, methods, and fields. You can use it to generate the API (Application Programming Interface) documentation or the implementation documentation for a set of source files.
.LP
-.LP
You can run the Javadoc tool on entire packages, individual source files, or both. When documenting entire packages, you can either use \f2\-subpackages\fP for traversing recursively down from a top\-level directory, or pass in an explicit list of package names. When documenting individual source files, you pass in a list of source (\f2.java\fP) filenames. Examples are given at the end of this document. How Javadoc processes source files is covered next.
-.LP
.SS
Processing of source files
.LP
-.LP
The Javadoc tool processes files that end in "\f2.java\fP" plus other files described under Source Files. If you run the Javadoc tool by explicitly passing in individual source filenames, you can determine exactly which "\f2.java\fP" files are processed. However, that is not how most developers want to work, as it is simpler to pass in package names. The Javadoc tool can be run three ways without explicitly specifying the source filenames. You can (1) pass in package names, (2) use \f2\-subpackages\fP, and (3) use wildcards with source filenames (\f2*.java\fP). In these cases, the Javadoc tool processes a "\f2.java\fP" file only if it fulfills all of the following requirements:
-.LP
.RS 3
.TP 2
o
-Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see
-.na
-\f2Identifiers\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625 for legal characters)
+Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see the Java Language Specification for legal characters)
.TP 2
o
Its directory path relative to the root of the source tree is actually a legal package name (after converting its separators to dots)
@@ -93,11 +66,8 @@
o
Its package statement contains the legal package name (specified in the previous bullet)
.RE
-
-.LP
.LP
\f3Processing of links\fP \- During a run, the Javadoc tool automatically adds cross\-reference links to package, class and member names that are being documented as part of that run. Links appear in several places:
-.LP
.RS 3
.TP 2
o
@@ -124,69 +94,50 @@
o
The index
.RE
-
-.LP
.LP
You can add hyperlinks to existing text for classes not included on the command line (but generated separately) by way of the \f2\-link\fP and \f2\-linkoffline\fP options.
.LP
-.LP
\f3Other processing details\fP \- The Javadoc tool produces one complete document each time it is run; it cannot do incremental builds \-\- that is, it cannot modify or \f2directly\fP incorporate results from previous runs of the Javadoc tool. However, it can link to results from other runs, as just mentioned.
.LP
-.LP
As implemented, the Javadoc tool requires and relies on the java compiler to do its job. The Javadoc tool calls part of \f2javac\fP to compile the declarations, ignoring the member implementation. It builds a rich internal representation of the classes, including the class hierarchy, and "use" relationships, then generates the HTML from that. The Javadoc tool also picks up user\-supplied documentation from documentation comments in the source code.
.LP
-.LP
In fact, the Javadoc tool will run on \f2.java\fP source files that are pure stub files with no method bodies. This means you can write documentation comments and run the Javadoc tool in the earliest stages of design while creating the API, before writing the implementation.
.LP
-.LP
-Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents
-.na
-\f2default constructors\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (section 8.6.7 of \f2Java Language Specification\fP) that are present in the \f2.class\fP files but not in the source code.
-.LP
+Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents default constructors (see Java Language Specification) that are present in the \f2.class\fP files but not in the source code.
.LP
In many cases, the Javadoc tool allows you to generate documentation for source files whose code is incomplete or erroneous. This is a benefit that enables you to generate documentation before all debugging and troubleshooting is done. For example, according to the \f2Java Language Specification\fP, a class that contains an abstract method should itself be declared abstract. The Javadoc tool does not check for this, and would proceed without a warning, whereas the javac compiler stops on this error. The Javadoc tool does do some primitive checking of doc comments. Use the DocCheck doclet to check the doc comments more thoroughly.
.LP
-.LP
When the Javadoc tool builds its internal structure for the documentation, it loads all referenced classes. Because of this, the Javadoc tool must be able to find all referenced classes, whether bootstrap classes, extensions, or user classes. For more about this, see
.na
\f2How Classes Are Found\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
.SS
Javadoc Doclets
.LP
-.LP
You can customize the content and format of the Javadoc tool's output by using doclets. The Javadoc tool has a default "built\-in" doclet, called the standard doclet, that generates HTML\-formatted API documentation. You can modify or subclass the standard doclet, or write your own doclet to generate HTML, XML, MIF, RTF or whatever output format you'd like. Information about doclets and their use is at the following locations:
-.LP
.RS 3
.TP 2
o
.na
\f2Javadoc Doclets\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html
.TP 2
o
The \f2\-doclet\fP command\-line option
.RE
-
-.LP
.LP
When a custom doclet is not specified with the \f2\-doclet\fP command line option, the Javadoc tool will use the default standard doclet. The javadoc tool has several command line options that are available regardless of which doclet is being used. The standard doclet adds a supplementary set of command line options. Both sets of options are described below in the options section.
-.LP
.SS
Related Documentation and Doclets
-.LP
.RS 3
.TP 2
o
.na
\f2Javadoc Enhancements\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc.
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc.
.TP 2
o
.na
@@ -198,7 +149,7 @@
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html for more information about Sun conventions for writing documentation comments.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html for more information about Sun conventions for writing documentation comments.
.TP 2
o
.na
@@ -216,22 +167,18 @@
.na
\f2DocCheck Doclet\fP @
.fi
-http://java.sun.com/javadoc/doccheck \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Sun Doc Check Utilities.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Doc Check Utilities.
.TP 2
o
.na
\f2MIF Doclet\fP @
.fi
-http://java.sun.com/javadoc/mifdoclet \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format.
+http://java.sun.com/j2se/javadoc/mifdoclet/ \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format.
.RE
-
-.LP
.SS
Terminology
.LP
-.LP
The terms \f2documentation comment\fP, \f2doc comment\fP, \f2main description\fP, \f2tag\fP, \f2block tag\fP, and \f2in\-line tag\fP are described at Documentation Comments. These other terms have specific meanings within the context of the Javadoc tool:
-.LP
.RS 3
.TP 3
generated document
@@ -259,34 +206,25 @@
.na
\f21.3\fP @
.fi
-http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members.
+http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members.
.LP
.TP 3
external referenced classes
The referenced classes whose documentation is not being generated during a javadoc run. In other words, these classes are not passed into the Javadoc tool on the command line. Links in the generated documentation to those classes are said to be \f2external references\fP or \f2external links\fP. For example, if you run the Javadoc tool on only the \f2java.awt\fP package, then any class in \f2java.lang\fP, such as \f2Object\fP, is an external referenced class. External referenced classes can be linked to using the \f2\-link\fP and \f2\-linkoffline\fP options. An important property of an external referenced class is that its source comments are normally not available to the Javadoc run. In this case, these comments cannot be inherited.
.RE
-
-.LP
.SH "SOURCE FILES"
.LP
-.LP
The Javadoc tool will generate output originating from four different types of "source" files: Java language source files for classes (\f2.java\fP), package comment files, overview comment files, and miscellaneous unprocessed files. This section also covers test files and template files that can also be in the source tree, but which you want to be sure not to document.
-.LP
.SS
Class Source Code Files
.LP
-.LP
Each class or interface and its members can have their own documentation comments, contained in a \f2.java\fP file. For more details about these doc comments, see Documentation Comments.
-.LP
.SS
Package Comment Files
.LP
-.LP
Each package can have its own documentation comment, contained in its own "source" file, that the Javadoc tool will merge into the package summary page that it generates. You typically include in this comment any documentation that applies to the entire package.
.LP
-.LP
To create a package comment file, you have a choice of two files to place your comments:
-.LP
.RS 3
.TP 2
o
@@ -295,52 +233,18 @@
o
\f2package.html\fP \- Can contain only package comments and Javadoc tags, no package annotations.
.RE
-
-.LP
.LP
A package may have a single \f2package.html\fP file or a single \f2package\-info.java\fP file but not both. Place either file in the package directory in the source tree along with your \f2.java\fP files.
.LP
-.LP
\f4package\-info.java\fP \- This file can contain a package comment of the following structure \-\- the comment is placed before the package declaration:
.LP
-.LP
File: \f2java/applet/package\-info.java\fP
-.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
.nf
\f3
.fl
/**
.fl
- * Provides the classes necessary to create an
+ * Provides the classes necessary to create an
.fl
* applet and the classes an applet uses
.fl
@@ -372,105 +276,12 @@
.fl
\fP
.fi
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 352 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
-
-.LP
.LP
Note that while the comment separators \f2/**\fP and \f2/*\fP must be present, the leading asterisks on the intermediate lines can be omitted.
.LP
-.LP
\f4package.html\fP \- This file can contain a package comment of the following structure \-\- the comment is placed in the \f2<body>\fP element:
.LP
-.LP
File: \f2java/applet/package.html\fP
-.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
.nf
\f3
.fl
@@ -478,7 +289,7 @@
.fl
<BODY>
.fl
-Provides the classes necessary to create an applet and the
+Provides the classes necessary to create an applet and the
.fl
classes an applet uses to communicate with its applet context.
.fl
@@ -506,77 +317,14 @@
.fl
\fP
.fi
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 405 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-40
-
-.LP
.LP
Notice this is just a normal HTML file and does not include a package declaration. The content of the package comment file is written in HTML, like all other comments, with one exception: The documentation comment should not include the comment separators \f2/**\fP and \f2*/\fP or leading asterisks. When writing the comment, you should make the first sentence a summary about the package, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include package tags; as with any documentation comment, all block tags must appear after the main description. If you add a \f2@see\fP tag in a package comment file, it must have a fully\-qualified name. For more details, see the
.na
\f2example of \fP\f2package.html\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments.
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments.
.LP
\f3Processing of package comment file\fP \- When the Javadoc tool runs, it will automatically look for the package comment file; if found, the Javadoc tool does the following:
-.LP
.RS 3
.TP 2
o
@@ -590,35 +338,27 @@
.na
\f2Package Summary\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/applet/package\-summary.html.
+http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html.
.TP 2
o
Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in
.na
\f2Overview Summary\fP @
.fi
-http://java.sun.com/javase/6/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions.
+http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions.
.RE
-
-.LP
.SS
Overview Comment File
.LP
-.LP
Each application or set of packages that you are documenting can have its own overview documentation comment, kept in its own "source" file, that the Javadoc tool will merge into the overview page that it generates. You typically include in this comment any documentation that applies to the entire application or set of packages.
.LP
-.LP
To create an overview comment file, you can name the file anything you want, typically \f4overview.html\fP and place it anywhere, typically at the top level of the source tree. For example, if the source files for the \f2java.applet\fP package are contained in \f2/home/user/src/java/applet\fP directory, you could create an overview comment file at \f2/home/user/src/overview.html\fP.
.LP
-.LP
Notice you can have multiple overview comment files for the same set of source files, in case you want to run javadoc multiple times on different sets of packages. For example, you could run javadoc once with \-private for internal documentation and again without that option for public documentation. In this case, you could describe the documentation as public or internal in the first sentence of each overview comment file.
.LP
-.LP
The content of the overview comment file is one big documentation comment, written in HTML, like the package comment file described previously. See that description for details. To re\-iterate, when writing the comment, you should make the first sentence a summary about the application or set of packages, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include overview tags; as with any documentation comment, all tags except in\-line tags, such as \f2{@link}\fP, must appear after the main description. If you add a \f2@see\fP tag, it must have a fully\-qualified name.
.LP
-.LP
When you run the Javadoc tool, you specify the overview comment file name with the \-overview option. The file is then processed similar to that of a package comment file.
-.LP
.RS 3
.TP 2
o
@@ -632,25 +372,19 @@
.na
\f2Overview Summary\fP @
.fi
-http://java.sun.com/javase/6/docs/api/overview\-summary.html.
+http://download.oracle.com/javase/7/docs/api/overview\-summary.html.
.TP 2
o
Copies the first sentence of the overview comment to the top of the overview summary page.
.RE
-
-.LP
.SS
Miscellaneous Unprocessed Files
.LP
-.LP
You can also include in your source any miscellaneous files that you want the Javadoc tool to copy to the destination directory. These typically includes graphic files, example Java source (.java) and class (.class) files, and self\-standing HTML files whose content would overwhelm the documentation comment of a normal Java source file.
.LP
-.LP
To include unprocessed files, put them in a directory called \f4doc\-files\fP which can be a subdirectory of any package directory that contains source files. You can have one such subdirectory for each package. You might include images, example code, source files, .class files, applets and HTML files. For example, if you want to include the image of a button \f2button.gif\fP in the \f2java.awt.Button\fP class documentation, you place that file in the \f2/home/user/src/java/awt/doc\-files/\fP directory. Notice the \f2doc\-files\fP directory should not be located at \f2/home/user/src/java/doc\-files\fP because \f2java\fP is not a package \-\- that is, it does not directly contain any source files.
.LP
-.LP
All links to these unprocessed files must be hard\-coded, because the Javadoc tool does not look at the files \-\- it simply copies the directory and all its contents to the destination. For example, the link in the \f2Button.java\fP doc comment might look like:
-.LP
.nf
\f3
.fl
@@ -664,23 +398,16 @@
.fl
\fP
.fi
-
-.LP
.SS
Test Files and Template Files
.LP
-.LP
Some developers have indicated they want to store test files and templates files in the source tree near their corresponding source files. That is, they would like to put them in the same directory, or a subdirectory, of those source files.
.LP
-.LP
If you run the Javadoc tool by explicitly passing in individual source filenames, you can deliberately omit test and templates files and prevent them from being processed. However, if you are passing in package names or wildcards, you need to follow certain rules to ensure these test files and templates files are not processed.
.LP
-.LP
Test files differ from template files in that the former are legal, compilable source files, while the latter are not, but may end with ".java".
.LP
-.LP
\f3Test files\fP \- Often developers want to put compilable, runnable test files for a given package in the \f2same\fP directory as the source files for that package. But they want the test files to belong to a package other than the source file package, such as the unnamed package (so the test files have no package statement or a different package statement from the source). In this scenario, when the source is being documented by specifying its package name specified on the command line, the test files will cause warnings or errors. You need to put such test files in a subdirectory. For example, if you want to add test files for source files in \f2com.package1\fP, put them in a subdirectory that would be an invalid package name (because it contains a hyphen):
-.LP
.nf
\f3
.fl
@@ -688,29 +415,17 @@
.fl
\fP
.fi
-
-.LP
.LP
The test directory will be skipped by the Javadoc tool with no warnings.
.LP
-.LP
If your test files contain doc comments, you can set up a separate run of the Javadoc tool to produce documentation of the test files by passing in their test source filenames with wildcards, such as \f2com/package1/test\-files/*.java\fP.
.LP
-.LP
-\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see
-.na
-\f2Identifiers\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625).
-.LP
+\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see information about Identifiers in the Java Language Specification).
.SH "GENERATED FILES"
.LP
-.LP
By default, javadoc uses a standard doclet that generates HTML\-formatted documentation. This doclet generates the following kinds of files (where each HTML "page" corresponds to a separate file). Note that javadoc generates files with two types of names: those named after classes/interfaces, and those that are not (such as \f2package\-summary.html\fP). Files in the latter group contain hyphens to prevent filename conflicts with those in the former group.
.LP
-.LP
\f3Basic Content Pages\fP
-.LP
.RS 3
.TP 2
o
@@ -722,11 +437,8 @@
o
One \f3overview page\fP (\f2overview\-summary.html\fP) for the entire set of packages. This is the front page of the generated document. The Javadoc tool will include any HTML text provided in a file specified with the \f2\-overview\fP option. Note that this file is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
.RE
-
-.LP
.LP
\f3Cross\-Reference Pages\fP
-.LP
.RS 3
.TP 2
o
@@ -750,15 +462,12 @@
o
An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English).
.RE
-
-.LP
.LP
\f3Support Files\fP
-.LP
.RS 3
.TP 2
o
-A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP.
+A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP.
.TP 2
o
One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content.
@@ -775,45 +484,14 @@
o
A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree.
.RE
-
-.LP
.LP
\f3HTML Frames\fP
.LP
-.LP
The Javadoc tool will generate either two or three HTML frames, as shown in the figure below. It creates the minimum necessary number of frames by omitting the list of packages if there is only one package (or no packages). That is, when you pass a single package name or source files (*.java) belonging to a single package as arguments into the javadoc command, it will create only one frame (C) in the left\-hand column \-\- the list of classes. When you pass into javadoc two or more package names, it creates a third frame (P) listing all packages, as well as an overview page (Detail). This overview page has the filename \f2overview\-summary.html\fP. Thus, this file is created only if you pass in two or more package names. You can bypass frames by clicking on the "No Frames" link or entering at overview\-summary.html.
.LP
-.LP
If you are unfamiliar with HTML frames, you should be aware that frames can have \f2focus\fP for printing and scrolling. To give a frame focus, click on it. Then on many browsers the arrow keys and page keys will scroll that frame, and the print menu command will print it.
.LP
-.nf
-\f3
-.fl
- \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\-
-.fl
- |C| Detail | |P| Detail |
-.fl
- | | | | | |
-.fl
- | | | |\-| |
-.fl
- | | | |C| |
-.fl
- | | | | | |
-.fl
- | | | | | |
-.fl
- \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\-
-.fl
- javadoc *.java javadoc java.lang java.awt
-.fl
-\fP
-.fi
-
-.LP
-.LP
Load one of the following two files as the starting page depending on whether you want HTML frames or not:
-.LP
.RS 3
.TP 2
o
@@ -822,24 +500,14 @@
o
\f2overview\-summary.html\fP (for no frames)
.RE
-
-.LP
.LP
\f3Generated File Structure\fP
.LP
-.LP
The generated class and interface files are organized in the same directory hierarchy that Java source files and class files are organized. This structure is one directory per subpackage.
.LP
-.LP
For example, the document generated for the class \f2java.applet.Applet\fP class would be located at \f2java/applet/Applet.html\fP. The file structure for the java.applet package follows, given that the destination directory is named \f2apidocs\fP. All files that contain the word "frame" appear in the upper\-left or lower\-left frames, as noted. All other HTML files appear in the right\-hand frame.
.LP
-.RS 3
-
-.LP
-.LP
NOTE \- Directories are shown in \f3bold\fP. The asterisks (\f2*\fP) indicate the files and directories that are \f2omitted\fP when the arguments to javadoc are source filenames (*.java) rather than package names. Also when arguments are source filenames, \f2package\-list\fP is created but is empty. The doc\-files directory will not be created in the destination unless it exists in the source tree.
-.LP
-.RE
.nf
\f3
.fl
@@ -922,44 +590,31 @@
AudioClip.html Page for AudioClip source code
.fl
.fi
-
-.LP
.SS
Generated API Declarations
.LP
-.LP
The Javadoc tool generates a declaration at the start of each class, interface, field, constructor, and method description for that API item. For example, the declaration for the \f2Boolean\fP class is:
.LP
-.LP
\f2public final class Boolean\fP
.br
\f2extends Object\fP
.br
\f2implements Serializable\fP
.LP
-.LP
and the declaration for the \f2Boolean.valueOf\fPmethod is:
.LP
-.LP
\f2public static Boolean valueOf(String s)\fP
.LP
-.LP
The Javadoc tool can include the modifiers \f2public\fP, \f2protected\fP, \f2private\fP, \f2abstract\fP, \f2final\fP, \f2static\fP, \f2transient\fP, and \f2volatile\fP, but not \f2synchronized\fP or \f2native\fP. These last two modifiers are considered implementation detail and not part of the API specification.
.LP
-.LP
Rather than relying on the keyword \f2synchronized\fP, APIs should document their concurrency semantics in the comment's main description, as in "a single \f2Enumeration\fP cannot be used by multiple threads concurrently". The document should not describe how to achieve these semantics. As another example, while \f2Hashtable\fP should be thread\-safe, there's no reason to specify that we achieve this by synchronizing all of its exported methods. We should reserve the right to synchronize internally at the bucket level, thus offering higher concurrency.
-.LP
.SH "DOCUMENTATION COMMENTS"
.LP
-.LP
The original "Documentation Comment Specification" can be found under related documentation.
-.LP
.SS
Commenting the Source Code
.LP
-.LP
You can include \f2documentation comments\fP ("doc comments") in the source code, ahead of declarations for any class, interface, method, constructor, or field. You can also create doc comments for each package and another one for the overview, though their syntax is slightly different. Doc comments are also known informally as "Javadoc comments" (but this term violates its trademark usage). A doc comment consists of the characters between the characters \f2/**\fP that begin the comment and the characters \f2*/\fP that end it. Leading asterisks are allowed on each line and are described further below. The text in a comment can continue onto multiple lines.
-.LP
.nf
\f3
.fl
@@ -973,11 +628,8 @@
.fl
\fP
.fi
-
-.LP
.LP
To save space you can put a comment on one line:
-.LP
.nf
\f3
.fl
@@ -985,14 +637,10 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Placement of comments\fP \- Documentation comments are recognized only when placed immediately before class, interface, constructor, method, or field declarations \-\- see the class example, method example, and field example. Documentation comments placed in the body of a method are ignored. Only one documentation comment per declaration statement is recognized by the Javadoc tool.
.LP
-.LP
A common mistake is to put an \f2import\fP statement between the class comment and the class declaration. Avoid this, as the Javadoc tool will ignore the class comment.
-.LP
.nf
\f3
.fl
@@ -1014,11 +662,8 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3A doc comment is composed of a \fP\f4main description\fP\f3 followed by a \fP\f4tag section\fP \- The \f2main description\fP begins after the starting delimiter \f2/**\fP and continues until the tag section. The \f2tag section\fP starts with the first block tag, which is defined by the first \f2@\fP character that begins a line (ignoring leading asterisks, white space, and leading separator \f2/**\fP). It is possible to have a comment with only a tag section and no main description. The main description cannot continue after the tag section begins. The argument to a tag can span multiple lines. There can be any number of tags \-\- some types of tags can be repeated while others cannot. For example, this \f2@see\fP starts the tag section:
-.LP
.nf
\f3
.fl
@@ -1032,11 +677,8 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Block tags and in\-line tags\fP \- A \f2tag\fP is a special keyword within a doc comment that the Javadoc tool can process. There are two kinds of tags: block tags, which appear as \f2@tag\fP (also known as "standalone tags"), and in\-line tags, which appear within curly braces, as \f2{@tag}\fP. To be interpreted, a block tag must appear at the beginning of a line, ignoring leading asterisks, white space, and separator (\f2/**\fP). This means you can use the \f2@\fP character elsewhere in the text and it will not be interpreted as the start of a tag. If you want to start a line with the \f2@\fP character and not have it be interpreted, use the HTML entity \f2@\fP. Each block tag has associated text, which includes any text following the tag up to, but not including, either the next tag, or the end of the doc comment. This associated text can span multiple lines. An in\-line tag is allowed and interpreted anywhere that text is allowed. The following example contains the block tag \f2@deprecated\fP and in\-line tag \f2{@link}\fP.
-.LP
.nf
\f3
.fl
@@ -1048,17 +690,12 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Comments are written in HTML\fP \- The text must be written in HTML, in that they should use HTML entities and can use HTML tags. You can use whichever version of HTML your browser supports; we have written the standard doclet to generate HTML 3.2\-compliant code elsewhere (outside of the documentation comments) with the inclusion of cascading style sheets and frames. (We preface each generated file with "HTML 4.0" because of the frame sets.)
.LP
-.LP
For example, entities for the less\-than (\f2<\fP) and greater\-than (\f2>\fP) symbols should be written \f2<\fP and \f2>\fP. Likewise, the ampersand (\f2&\fP) should be written \f2&\fP. The bold HTML tag \f2<b>\fP is shown in the following example.
.LP
-.LP
Here is a doc comment:
-.LP
.nf
\f3
.fl
@@ -1072,20 +709,12 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Leading asterisks\fP \- When javadoc parses a doc comment, leading asterisk (\f2*\fP) characters on each line are discarded; blanks and tabs preceding the initial asterisk (\f2*\fP) characters are also discarded. Starting with 1.4, if you omit the leading asterisk on a line, the leading white space is no longer removed. This enables you to paste code examples directly into a doc comment inside a \f2<PRE>\fP tag, and its indentation will be honored. Spaces are generally interpreted by browsers more uniformly than tabs. Indentation is relative to the left margin (rather than the separator \f2/**\fP or \f2<PRE>\fP tag).
.LP
-.LP
\f3First sentence\fP \- The first sentence of each doc comment should be a summary sentence, containing a concise but complete description of the declared entity. This sentence ends at the first period that is followed by a blank, tab, or line terminator, or at the first block tag. The Javadoc tool copies this first sentence to the member summary at the top of the HTML page.
.LP
-.LP
\f3Declaration with multiple fields\fP \- Java allows declaring multiple fields in a single statement, but this statement can have only one documentation comment, which is copied for all fields. Therefore if you want individual documentation comments for each field, you must declare each field in a separate statement. For example, the following documentation comment doesn't make sense written as a single declaration and would be better handled as two declarations:
-.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -1099,51 +728,32 @@
.fl
\fP
.fi
-.RE
-
-.LP
.LP
The Javadoc tool generates the following documentation from the above code:
-.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
public int \fP\f3x\fP
.fl
.fi
-
-.LP
.RS 3
The horizontal and vertical distances of point (x,y)
.RE
-
-.LP
.nf
\f3
.fl
public int \fP\f3y\fP
.fl
.fi
-
-.LP
.RS 3
The horizontal and vertical distances of point (x,y)
.RE
-
-.LP
-.RE
.LP
\f3Use header tags carefully\fP \- When writing documentation comments for members, it's best not to use HTML heading tags such as <H1> and <H2>, because the Javadoc tool creates an entire structured document and these structural tags might interfere with the formatting of the generated document. However, it is fine to use these headings in class and package comments to provide your own structure.
-.LP
.SS
Automatic Copying of Method Comments
.LP
-.LP
The Javadoc tool has the ability to copy or "inherit" method comments in classes and interfaces under the following two circumstances. Constructors, fields and nested classes do not inherit doc comments.
-.LP
.RS 3
.TP 2
o
@@ -1156,14 +766,10 @@
o
\f3Explicitly inherit comment with {@inheritDoc} tag\fP \- Insert the inline tag \f2{@inheritDoc}\fP in a method main description or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag comment \-\- the corresponding inherited main description or tag comment is copied into that spot.
.RE
-
-.LP
.LP
The source file for the inherited method need only be on the path specified by \-sourcepath for the doc comment to actually be available to copy. Neither the class nor its package needs to be passed in on the command line. This contrasts with 1.3.x and earlier releases, where the class had to be a documented class
.LP
-.LP
\f3Inherit from classes and interfaces\fP \- Inheriting of comments occurs in all three possible cases of inheritance from classes and interfaces:
-.LP
.RS 3
.TP 2
o
@@ -1175,17 +781,12 @@
o
When a method in a class implements a method in an interface
.RE
-
-.LP
.LP
In the first two cases, for method overrides, the Javadoc tool generates a subheading "Overrides" in the documentation for the overriding method, with a link to the method it is overriding, whether or not the comment is inherited.
.LP
-.LP
In the third case, when a method in a given class implements a method in an interface, the Javadoc tool generates a subheading "Specified by" in the documentation for the overriding method, with a link to the method it is implementing. This happens whether or not the comment is inherited.
.LP
-.LP
\f3Algorithm for Inheriting Method Comments\fP \- If a method does not have a doc comment, or has an {@inheritDoc} tag, the Javadoc tool searches for an applicable comment using the following algorithm, which is designed to find the most specific applicable doc comment, giving preference to interfaces over superclasses:
-.LP
.RS 3
.TP 3
1.
@@ -1205,16 +806,11 @@
If step 3a failed to find a doc comment, recursively apply this entire algorithm to the superclass.
.RE
.RE
-
-.LP
.SH "JAVADOC TAGS"
.LP
-.LP
The Javadoc tool parses special tags when they are embedded within a Java doc comment. These doc tags enable you to autogenerate a complete, well\-formatted API from your source code. The tags start with an "at" sign (\f2@\fP) and are case\-sensitive \-\- they must be typed with the uppercase and lowercase letters as shown. A tag must start at the beginning of a line (after any leading spaces and an optional asterisk) or it is treated as normal text. By convention, tags with the same name are grouped together. For example, put all \f2@see\fP tags together.
.LP
-.LP
Tags come in two types:
-.LP
.RS 3
.TP 2
o
@@ -1223,8 +819,6 @@
o
\f3Inline tags\fP \- Can be placed anywhere in the main description or in the comments for block tags. Inline tags are denoted by curly braces: \f2{@tag}\fP.
.RE
-
-.LP
.LP
For information about tags we might introduce in future releases, see
.na
@@ -1232,14 +826,8 @@
.fi
http://java.sun.com/j2se/javadoc/proposed\-tags.html.
.LP
-.LP
The current tags are:
.LP
-.RS 3
-
-.LP
-.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -1350,7 +938,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 1122 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 873 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1448,55 +1036,35 @@
.nr T. 1
.T# 1
.35
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
-
-.LP
.LP
For custom tags, see the \-tag option.
-.LP
-.RE
.RS 3
.TP 3
@author\ name\-text
Adds an "Author" entry with the specified \f2name\-text\fP to the generated docs when the \-author option is used. A doc comment may contain multiple \f2@author\fP tags. You can specify one name per \f2@author\fP tag or multiple names per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma.
+.RE
.LP
For more details, see Where Tags Can Be Used and
.na
\f2writing @author tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author.
-.LP
-.TP 3
-@deprecated\ deprecated\-text
-.RS 3
-
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author.
.LP
-Note: You can deprecate a program element using the
-.na
-\f2@Deprecated annotation\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/deprecation.html.
-.LP
+.RS 3
+.TP 3
+@deprecated\ deprecated\-text Note: You can deprecate a program element using the @Deprecated annotation.
.RE
-.RE
-.RS 3
-
-.LP
.LP
Adds a comment indicating that this API should no longer be used (even though it may continue to work). The Javadoc tool moves the \f2deprecated\-text\fP ahead of the main description, placing it in italics and preceding it with a bold warning: "Deprecated". This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field.
.LP
-.LP
The first sentence of \f2deprecated\-text\fP should at least tell the user when the API was deprecated and what to use as a replacement. The Javadoc tool copies just the first sentence to the summary section and index. Subsequent sentences can also explain why it has been deprecated. You should include a \f2{@link}\fP tag (for Javadoc 1.2 or later) that points to the replacement API:
.LP
-.LP
For more details, see
.na
\f2writing @deprecated tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated.
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated.
.RS 3
.TP 2
o
@@ -1518,19 +1086,13 @@
o
For Javadoc 1.1, the standard format is to create a \f2@see\fP tag (which cannot be in\-line) for each \f2@deprecated\fP tag.
.RE
-
-.LP
.LP
For more about deprecation, see
.na
\f2The @deprecated tag\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/index.html.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
.LP
-
-.LP
-.RE
.RS 3
.TP 3
{@code\ text}
@@ -1700,7 +1262,7 @@
.na
\f2writing {@link} tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}.
.LP
.TP 3
{@linkplain\ package.class#member\ label}
@@ -1716,13 +1278,8 @@
.fi
.LP
This would display as:
-.RS 3
-
.LP
-.LP
-Refer to the overridden method.
-.LP
-.RE
+Refer to the overridden method.
.LP
.TP 3
{@literal\ text}
@@ -1799,7 +1356,7 @@
.na
\f2writing @param tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param.
.LP
.TP 3
@return\ description
@@ -1809,7 +1366,7 @@
.na
\f2writing @return tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return.
.LP
.TP 3
@see\ reference
@@ -1834,18 +1391,12 @@
.RS 3
.RS 3
.RS 3
-
-.LP
-.RS 3
.RS 3
.TP 3
See Also:
"The Java Programming Language"
.RE
.RE
-
-.LP
-.RE
.TP 3
@see <a href="URL#value">label</a>
Adds a link as defined by \f2URL\fP#\f2value\fP. The \f2URL\fP#\f2value\fP is a relative or absolute URL. The Javadoc tool distinguishes this from other cases by looking for a less\-than symbol (\f2<\fP) as the first character. For example:
@@ -1858,14 +1409,10 @@
.fi
This generates a link such as:
.RS 3
-.RS 3
.TP 3
See Also:
Java Spec
.RE
-
-.LP
-.RE
.TP 3
@see\ package.class#member\ label
Adds a link, with visible text \f2label\fP, that points to the documentation for the specified name in the Java Language that is referenced. The \f2label\fP is optional; if omitted, the name appears instead as the visible text, suitably shortened \-\- see How a name is displayed. Use \-noqualifier to globally remove the package name from this visible text. Use the label when you want the visible text to be different from the auto\-generated visible text.
@@ -1885,7 +1432,6 @@
.RE
.LP
\f3Example\fP \- In this example, an \f2@see\fP tag (in the \f2Character\fP class) refers to the \f2equals\fP method in the \f2String\fP class. The tag includes both arguments: the name "\f2String#equals(Object)\fP" and the label "\f2equals\fP".
-.RS 3
.nf
\f3
.fl
@@ -1897,11 +1443,7 @@
.fl
\fP
.fi
-.RE
The standard doclet produces HTML something like this:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -1915,26 +1457,18 @@
.fl
\fP
.fi
-.RE
Which looks something like this in a browser, where the label is the visible link text:
.RS 3
-
-.LP
-.RS 3
.TP 3
See Also:
equals
.RE
-
-.LP
-.RE
.LP
\f3Specifying a name\fP \- This \f2package.class\fP\f2#\fP\f2member\fP name can be either fully\-qualified, such as \f2java.lang.String#toUpperCase()\fP or not, such as \f2String#toUpperCase()\fP or \f2#toUpperCase()\fP. If less than fully\-qualified, the Javadoc tool uses the normal Java compiler search order to find it, further described below in Search order for @see. The name can contain whitespace within parentheses, such as between method arguments.
.LP
Of course the advantage of providing shorter, "partially\-qualified" names is that they are shorter to type and there is less clutter in the source code. The following table shows the different forms of the name, where \f2Class\fP can be a class or interface, \f2Type\fP can be a class, interface, array, or primitive, and \f2method\fP can be a method or constructor.
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -2079,7 +1613,7 @@
.nr 40 \n(79+(0*\n(38)
.nr 80 +\n(40
.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1665 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1364 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2165,7 +1699,6 @@
.rm b+
.rm c+
.rm d+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-58
.LP
The following notes apply to the above table:
@@ -2186,7 +1719,7 @@
.LP
\f3Search order for @see\fP \- the Javadoc tool will process a \f2@see\fP tag that appears in a source file (.java), package file (package.html or package\-info.java) or overview file (overview.html). In the latter two files, you must fully\-qualify the name you supply with \f2@see\fP. In a source file, you can specify a name that is fully\-qualified or partially\-qualified.
.LP
-When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in Chapter 6, "Names" of the \f2Java Language Specification\fP, Second Edition. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order:
+When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in the \f2Java Language Specification\fP. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order:
.RS 3
.TP 3
1.
@@ -2214,7 +1747,6 @@
Use \-noqualifier to globally remove the package names.
.br
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -2425,7 +1957,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 1741 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1440 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2561,7 +2093,6 @@
.rm g+
.rm h+
.rm i+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-28
.LP
\f3Examples of @see\fP
@@ -2598,14 +2129,9 @@
.na
\f2writing @see tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see.
.RE
.RE
-.RS 3
-
-.LP
-.LP
-
.LP
.RS 3
.TP 3
@@ -2634,11 +2160,11 @@
.na
\f2Documenting Serializable Fields and Data for a Class\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the
+http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the
.na
\f2Serialization FAQ\fP @
.fi
-http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see
+http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see
.na
\f2Sun's criteria\fP @
.fi
@@ -2681,7 +2207,7 @@
.na
\f2writing @throws tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception.
.LP
.TP 3
{@value\ package.class#field}
@@ -2727,7 +2253,7 @@
.na
\f2Constant Field Values\fP @
.fi
-http://java.sun.com/javase/6/docs/api/constant\-values.html page.
+http://download.oracle.com/javase/7/docs/api/constant\-values.html page.
.LP
.TP 3
@version\ version\-text
@@ -2739,376 +2265,111 @@
.na
\f2writing @version tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version.
-.RE
-
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version.
.RE
.SS
Where Tags Can Be Used
.LP
-.LP
The following sections describe where the tags can be used. Note that these tags can be used in all doc comments: \f2@see\fP, \f2@since\fP, \f2@deprecated\fP, \f2{@link}\fP, \f2{@linkplain}\fP, and \f2{@docroot}\fP.
-.LP
-.RS 3
-
-.LP
.SS
Overview Documentation Tags
.LP
-.LP
Overview tags are tags that can appear in the documentation comment for the overview page (which resides in the source file typically named \f2overview.html\fP). Like in any other documentation comments, these tags must appear after the main description.
.LP
-.LP
\f3NOTE\fP \- The \f2{@link}\fP tag has a bug in overview documents in version 1.2 \-\- the text appears properly but has no link. The \f2{@docRoot}\fP tag does not currently work in overview documents.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@author\fP
-.br
-\f2@version\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Overview Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1962 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Overview Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-20
-
-.LP
+\f3Overview Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@author\fP
+.TP 2
+o
+\f2@version\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
.SS
Package Documentation Tags
.LP
-.LP
Package tags are tags that can appear in the documentation comment for a package (which resides in the source file named \f2package.html\fP or \f2package\-info.java\fP). The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@serial\fP
-.br
-\f2@author\fP
-.br
-\f2@version\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Package Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1994 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Package Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-22
-
-.LP
+\f3Package Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@serial\fP
+.TP 2
+o
+\f2@author\fP
+.TP 2
+o
+\f2@version\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
.SS
Class and Interface Documentation Tags
.LP
-.LP
The following are tags that can appear in the documentation comment for a class or interface. The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@deprecated\fP
-.br
-\f2@serial\fP
-.br
-\f2@author\fP
-.br
-\f2@version\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Class/Interface Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 2028 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Class/Interface Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-24
-
-.LP
+\f3Class/Interface Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@deprecated\fP
+.TP 2
+o
+\f2@serial\fP
+.TP 2
+o
+\f2@author\fP
+.TP 2
+o
+\f2@version\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
\f3An example of a class comment:\fP
-.LP
.nf
\f3
.fl
@@ -3146,129 +2407,42 @@
.fl
\fP
.fi
-
-.LP
.SS
Field Documentation Tags
.LP
-.LP
-The following are the tags that can appear in the documentation comment for a field.
-.LP
+The following are the tags that can appear in
.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@deprecated\fP
-.br
-\f2@serial\fP
-.br
-\f2@serialField\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-\f2{@value}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Field Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 2103 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Field Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-24
-
-.LP
+\f3Field Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@deprecated\fP
+.TP 2
+o
+\f2@serial\fP
+.TP 2
+o
+\f2@serialField\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.TP 2
+o
+\f2{@value}\fP
+.RE
\f3An example of a field comment:\fP
-.LP
.nf
\f3
.fl
@@ -3286,133 +2460,48 @@
.fl
\fP
.fi
-
-.LP
.SS
Constructor and Method Documentation Tags
.LP
-.LP
The following are the tags that can appear in the documentation comment for a constructor or method, except for \f2@return\fP, which cannot appear in a constructor, and \f2{@inheritDoc}\fP, which has certain restrictions. The \f2@serialData\fP tag can only be used in the doc comment for certain serialization methods.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@deprecated\fP
-.br
-\f2@param\fP
-.br
-\f2@return\fP
-.br
-\f2@throws\fP and \f2@exception\fP
-.br
-\f2@serialData\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@inheritDoc}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Method/Constructor Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 2162 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Method/Constructor Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-28
-
-.LP
+\f3Method/Constructor Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@deprecated\fP
+.TP 2
+o
+\f2@param\fP
+.TP 2
+o
+\f2@return\fP
+.TP 2
+o
+\f2@throws\fP and \f2@exception\fP
+.TP 2
+o
+\f2@serialData\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@inheritDoc}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
\f3An example of a method doc comment:\fP
-.LP
.nf
\f3
.fl
@@ -3446,24 +2535,12 @@
.fl
\fP
.fi
-.RE
-
-.LP
.SH "OPTIONS"
.LP
-
-.LP
-.LP
The javadoc tool uses doclets to determine its output. The Javadoc tool uses the default standard doclet unless a custom doclet is specified with the \-doclet option. The Javadoc tool provides a set of command\-line options that can be used with any doclet \-\- these options are described below under the sub\-heading Javadoc Options. The standard doclet provides an additional set of command\-line options that are described below under the sub\-heading Options Provided by the Standard Doclet. All option names are case\-insensitive, though their arguments can be case\-sensitive.
.LP
-.LP
The options are:
.LP
-.RS 3
-
-.LP
-.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -3615,6 +2692,8 @@
.br
\-\f2sourcepath\fP
.br
+\-sourcetab
+.br
\-splitindex
.br
\-stylesheetfile
@@ -3627,6 +2706,8 @@
.br
\-tagletpath
.br
+\-top
+.br
\-title
.br
\-use
@@ -3673,7 +2754,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 2340 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 2015 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -3728,54 +2809,47 @@
.rm a+
.rm b+
.rm c+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-123
-
-.LP
-.RE
+.if \n-(b.=0 .nr c. \n(.c-\n(d.-127
.LP
Options shown in \f2italic\fP are the Javadoc core options, which are provided by the front end of the Javadoc tool and are available to all doclets. The standard doclet itself provides the non\-italic options.
-.LP
.SS
Javadoc Options
-.LP
.RS 3
.TP 3
\-overview \ path/filename
-Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the \f2\-sourcepath\fP.
-.LP
-While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example.
-.LP
-For information about the file specified by \f2path/filename\fP, see overview comment file.
-.LP
-Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
-.LP
-The title on the overview page is set by \f2\-doctitle\fP.
-.LP
+Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the current directory.
+.br
+.br
+While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example.
+.br
+.br
+For information about the file specified by \f2path/filename\fP, see overview comment file.
+.br
+.br
+Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
+.br
+.br
+The title on the overview page is set by \f2\-doctitle\fP.
.TP 3
\-public
-Shows only public classes and members.
-.LP
+Shows only public classes and members.
.TP 3
\-protected
-Shows only protected and public classes and members. This is the default.
-.LP
+Shows only protected and public classes and members. This is the default.
.TP 3
\-package
-Shows only package, protected, and public classes and members.
-.LP
+Shows only package, protected, and public classes and members.
.TP 3
\-private
-Shows all classes and members.
-.LP
+Shows all classes and members.
.TP 3
\-help
-Displays the online help, which lists these javadoc and doclet command line options.
-.LP
+Displays the online help, which lists these javadoc and doclet command line options.
.TP 3
\-doclet\ class
-Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option.
-.LP
+Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option.
+.br
+.br
For example, to call the MIF doclet, use:
.nf
\f3
@@ -3784,17 +2858,16 @@
.fl
\fP
.fi
-.LP
For full, working examples of running a particular doclet, see the
.na
\f2MIF Doclet documentation\fP @
.fi
-http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-.LP
+http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
.TP 3
\-docletpath\ classpathlist
-Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path.
-.LP
+Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path.
+.br
+.br
Example of path to jar file that contains the starting doclet class file. Notice the jar filename is included.
.nf
\f3
@@ -3815,207 +2888,33 @@
.na
\f2MIF Doclet documentation\fP @
.fi
-http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-.LP
+http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
.TP 3
\-1.1
-\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP
-.LP
+\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP
.TP 3
\-source release
Specifies the version of source code accepted. The following values for \f2release\fP are allowed:
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80 81
-.nr 34 \n(.lu
-.eo
-.am 81
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/3u
-.if \n(.l<\n(81 .ll \n(81u
-.in 0
-javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used.
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.eo
-.am 81
-.br
-.di b+
-.35
-.ft \n(.f
-.ll \n(34u*1u/3u
-.if \n(.l<\n(81 .ll \n(81u
-.in 0
-javadoc accepts code containing assertions, which were introduced in JDK 1.4.
-.br
-.di
-.nr b| \n(dn
-.nr b- \n(dl
-..
-.ec \
-.eo
-.am 81
-.br
-.di c+
-.35
-.ft \n(.f
-.ll \n(34u*1u/3u
-.if \n(.l<\n(81 .ll \n(81u
-.in 0
-javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
-.br
-.di
-.nr c| \n(dn
-.nr c- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 31 0
-.nr 32 0
-.nr 38 \w\f31
-.if \n(31<\n(38 .nr 31 \n(38
-.nr 38 \w.5\fP
-.if \n(32<\n(38 .nr 32 \n(38
-.nr 38 \w\f31
-.if \n(31<\n(38 .nr 31 \n(38
-.nr 38 \w.4\fP
-.if \n(32<\n(38 .nr 32 \n(38
-.nr 38 \w\f31
-.if \n(31<\n(38 .nr 31 \n(38
-.nr 38 \w.3\fP
-.if \n(32<\n(38 .nr 32 \n(38
-.80
-.rm 80
-.nr 60 \n(31
-.nr 38 \n(60+\n(32
-.if \n(38>\n(80 .nr 80 \n(38
-.if \n(38<\n(80 .nr 60 +(\n(80-\n(38)/2
-.nr 81 0
-.81
-.rm 81
-.nr 38 \n(a-
-.if \n(81<\n(38 .nr 81 \n(38
-.nr 38 \n(b-
-.if \n(81<\n(38 .nr 81 \n(38
-.nr 38 \n(c-
-.if \n(81<\n(38 .nr 81 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr 60 +\n(40
-.nr 41 \n(80+(3*\n(38)
-.nr 81 +\n(41
-.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 2450 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(60u \n(80u \n(81u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f31.5\fP\h'|\n(41u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(41u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.ne \n(b|u+\n(.Vu
-.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
-.ta \n(60u \n(80u \n(81u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f31.4\fP\h'|\n(41u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(41u
-.in +\n(37u
-.b+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.ne \n(c|u+\n(.Vu
-.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
-.ta \n(60u \n(80u \n(81u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f31.3\fP\h'|\n(41u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(41u
-.in +\n(37u
-.c+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.rm b+
-.rm c+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-14
-.LP
-Use the value of \f2release\fP corresponding to that used when compiling the code with javac.
-.LP
+.RS 3
+.TP 2
+o
+\f31.5\fP \- javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used.
+.TP 2
+o
+\f31.4\fP \- javadoc accepts code containing assertions, which were introduced in JDK 1.4.
+.TP 2
+o
+\f31.3\fP \- javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
+.RE
+Use the value of \f2release\fP corresponding to that used when compiling the code with javac.
.TP 3
\-sourcepath\ sourcepathlist
-Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented.
-.LP
-Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files.
-.LP
+Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented.
+.br
+.br
+Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files.
+.br
+.br
Set \f2sourcepathlist\fP to the root directory of the source tree for the package you are documenting. For example, suppose you want to document a package called \f2com.mypackage\fP whose source files are located at:
.nf
\f3
@@ -4031,8 +2930,9 @@
% \fP\f3javadoc \-sourcepath /home/user/src/ com.mypackage\fP
.fl
.fi
-This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP.
-.LP
+This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP.
+.br
+.br
To point to two source paths:
.nf
\f3
@@ -4040,17 +2940,18 @@
% \fP\f3javadoc \-sourcepath /home/user1/src:/home/user2/src com.mypackage\fP
.fl
.fi
-.LP
.TP 3
\-classpath\ classpathlist
Specifies the paths where javadoc will look for referenced classes (\f2.class\fP files) \-\- these are the documented classes plus any classes referenced by those classes. The \f2classpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Follow the instructions in
.na
\f2class path\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
-.LP
-If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
+.br
+.br
+If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP.
+.br
+.br
For example, if you want to document \f2com.mypackage\fP, whose source files reside in the directory \f2/home/user/src/com/mypackage\fP, and if this package relies on a library in \f2/home/user/lib\fP, you would specify:
.nf
\f3
@@ -4058,23 +2959,25 @@
% \fP\f3javadoc \-classpath /home/user/lib \-sourcepath /home/user/src com.mypackage\fP
.fl
.fi
-As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory.
-.LP
+As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory.
+.br
+.br
For an in\-depth description of how the Javadoc tool uses \f2\-classpath\fP to find user classes as it relates to extension classes and bootstrap classes, see
.na
\f2How Classes Are Found\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html.
-.LP
-As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
-.br
-.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.
+.br
+.br
+As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations).
+.br
+.br
+For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
.TP 3
\-subpackages\ \ package1:package2:...
-Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files.
-.LP
+Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files.
+.br
+.br
For example:
.nf
\f3
@@ -4082,10 +2985,10 @@
% \fP\f3javadoc \-d docs \-sourcepath /home/user/src \-subpackages java:javax.swing\fP
.fl
.fi
-This command generates documentation for packages named "java" and "javax.swing" and all their subpackages.
-.LP
-You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages.
-.LP
+This command generates documentation for packages named "java" and "javax.swing" and all their subpackages.
+.br
+.br
+You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages.
.TP 3
\-exclude\ \ packagename1:packagename2:...
Unconditionally excludes the specified packages and their subpackages from the list formed by \f2\-subpackages\fP. It excludes those packages even if they would otherwise be included by some previous or later \f2\-subpackages\fP option. For example:
@@ -4095,36 +2998,32 @@
% \fP\f3javadoc \-sourcepath /home/user/src \-subpackages java \-exclude java.net:java.lang\fP
.fl
.fi
-would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
-.LP
+would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
.TP 3
\-bootclasspath\ classpathlist
Specifies the paths where the boot classes reside. These are nominally the Java platform classes. The bootclasspath is part of the search path the Javadoc tool will use to look up source and class files. See
.na
\f2How Classes Are Found\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).
.TP 3
\-extdirs\ dirlist
-Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).
-.LP
+Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).
.TP 3
\-verbose
-Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.
-.LP
+Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.
.TP 3
\-quiet
-Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.
-.LP
+Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.
.TP 3
\-breakiterator\
Uses the internationalized sentence boundary of
.na
\f2java.text.BreakIterator\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
-.LP
+http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
+.br
+.br
From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm:
.RS 3
.TP 2
@@ -4134,31 +3033,22 @@
o
Breakiterator sentence\-break algorithm \- In general, stops at a period, question mark or exclamation mark followed by a space if the next word starts with a capital letter. This is meant to handle most abbreviations (such as "The serial no. is valid", but won't handle "Mr. Smith"). Doesn't stop at HTML tags or sentences that begin with numbers or symbols. Stops at the last period in "../filename", even if embedded in an HTML tag.
.RE
-.RS 3
-
-.LP
-.LP
-NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused.
-.LP
-.RE
+NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused.
.TP 3
\-locale\ language_country_variant
-.RS 3
-.LP
\f3Important\fP \- The \f2\-locale\fP option must be placed \f2ahead\fP (to the left) of any options provided by the standard doclet or any other doclet. Otherwise, the navigation bars will appear in English. This is the only command\-line option that is order\-dependent.
-.LP
-.RE
-.LP
-Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant).
-.LP
-Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes.
-.LP
+.br
+.br
+Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant).
+.br
+.br
+Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes.
.TP 3
\-encoding\ name
-Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used.
-.LP
-Also see \-docencoding and \-charset.
-.LP
+Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used.
+.br
+.br
+Also see \-docencoding and \-charset.
.TP 3
\-Jflag
Passes \f2flag\fP directly to the runtime system java that runs javadoc. Notice there must be no space between the \f2J\fP and the \f2flag\fP. For example, if you need to ensure that the system sets aside 32 megabytes of memory in which to process the generated documentation, then you would call the \f2\-Xmx\fP option of java as follows (\f2\-Xms\fP is optional, as it only sets the size of initial memory, which is useful if you know the minimum amount of memory required):
@@ -4183,12 +3073,12 @@
.RE
.SS
Options Provided by the Standard Doclet
-.LP
.RS 3
.TP 3
\-d\ directory
-Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run.
-.LP
+Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run.
+.br
+.br
For example, the following generates the documentation for the package \f2com.mypackage\fP and saves the results in the \f2/home/user/doc/\fP directory:
.nf
\f3
@@ -4196,28 +3086,27 @@
% \fP\f3javadoc \-d /home/user/doc com.mypackage\fP
.fl
.fi
-.LP
.TP 3
\-use
-Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C.
-.LP
-For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP.
-.LP
-Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP.
-.LP
-You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.
+Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C.
+.br
+.br
+For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP.
+.br
+.br
+Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP.
+.br
+.br
+You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.
.TP 3
\-version
-Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.
-.LP
+Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.
.TP 3
\-author
-Includes the @author text in the generated docs.
-.LP
+Includes the @author text in the generated docs.
.TP 3
\-splitindex
-Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.
-.LP
+Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.
.TP 3
\-windowtitle\ title
Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option.
@@ -4238,8 +3127,7 @@
.fi
.TP 3
\-title\ title
-\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title.
-.LP
+\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title.
.TP 3
\-header\ header
Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped.
@@ -4249,28 +3137,30 @@
% \fP\f3javadoc \-header "<b>Java 2 Platform </b><br>v1.4" com.mypackage\fP
.fl
.fi
-.LP
.TP 3
\-footer\ footer
Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped.
-.LP
+.TP 3
+\-top
+Specifies the text to be placed at the top of each output file.
.TP 3
\-bottom\ text
-Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped.
-.LP
+Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped.
.TP 3
\-link\ extdocURL
-Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument:
-.LP
+Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument:
.RS 3
.TP 2
o
-\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file.
-.LP
-You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to.
-.LP
-When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system.
-.LP
+\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file.
+.br
+.br
+You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to.
+.br
+.br
+When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system.
+.br
+.br
In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the
.na
\f2URL Memo\fP @
@@ -4288,8 +3178,11 @@
\f2\-link <directory>/<directory>/.../<name>\fP
.RE
.RE
-.LP
-You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. \f3Choosing between \-linkoffline and \-link\fP:
+You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents.
+.br
+.br
+\f3Choosing between \-linkoffline and \-link\fP:
+.br
.br
Use \f2\-link\fP:
.RS 3
@@ -4306,16 +3199,17 @@
o
when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side.
.RE
-.LP
+.br
+.br
\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at
.na
-\f2http://java.sun.com/javase/6/docs/api/\fP @
+\f2http://download.oracle.com/javase/7/docs/api/\fP @
.fi
-http://java.sun.com/javase/6/docs/api. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.)
+http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.)
.nf
\f3
.fl
- % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP
+ % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP
.fl
.fi
\f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running:
@@ -4325,17 +3219,21 @@
% \fP\f3javadoc \-d ./spi \-link ../api com.spipackage\fP
.fl
.fi
-.LP
-Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP).
-.LP
-\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP.
-.LP
-Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.)
-.LP
-This option can create links in several places in the generated documentation.
-.LP
-Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets.
-.LP
+Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP).
+.br
+.br
+\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP.
+.br
+.br
+Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.)
+.br
+.br
+This option can create links in several places in the generated documentation.
+.br
+.br
+Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets.
+.br
+.br
\f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced:
.RS 3
.TP 2
@@ -4353,16 +3251,17 @@
.br
The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement.
.RE
-.LP
-An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above.
-.LP
-\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL.
-.LP
+An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above.
+.br
+.br
+\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL.
+.br
+.br
For example, the package list for the Java SE 6 API is located at
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list. and starts as follows:
+http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows:
.nf
\f3
.fl
@@ -4384,31 +3283,39 @@
.fl
\fP
.fi
-.LP
-When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP.
-.LP
-In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists.
-.LP
-\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2.
-.LP
-Specify a different link option for each external document to link to:
-.LP
-\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP
-.LP
-where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP.
-.LP
-\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document.
-.LP
-In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist.
-.LP
+When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP.
+.br
+.br
+In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists.
+.br
+.br
+\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2.
+.br
+.br
+Specify a different link option for each external document to link to:
+.br
+.br
+\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP
+.br
+.br
+where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP.
+.br
+.br
+\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document.
+.br
+.br
+In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist.
.TP 3
\-linkoffline\ extdocURL\ packagelistLoc
-This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection.
-.LP
-More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation.
-.LP
-Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below.
-.LP
+This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection.
+.br
+.br
+More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation.
+.br
+.br
+Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below.
+.br
+.br
The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP:
.RS 3
.TP 2
@@ -4418,35 +3325,39 @@
o
\f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename.
.RE
-.LP
-You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.)
-.LP
-\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://java.sun.com/javase/6/docs/api\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at
+You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.)
+.br
+.br
+\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.)
+http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.)
.nf
\f3
.fl
-% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP
+% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP
.fl
.fi
-.LP
-\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example.
-.LP
-\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously.
-.LP
-\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity):
-.LP
+\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example.
+.br
+.br
+\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously.
+.br
+.br
+\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity):
+.br
+.br
\f2% \fP\f4javadoc \-linkoffline\fP \f2extdocURL1\fP \f2packagelistLoc1\fP \f2\\\fP
.br
\f2\ \ \ \ \ \ \ \ \ \ \fP\f4\-linkoffline\fP \f2extdocURL2\fP \f2packagelistLoc2\fP \f2\\\fP
.br
-\f2\ \ \ \ \ \ \ \ \ \ ...\fP
-.LP
-\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places.
-.LP
+\f2\ \ \ \ \ \ \ \ \ \ ...\fP
+.br
+.br
+\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places.
+.br
+.br
First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update:
.nf
\f3
@@ -4454,14 +3365,15 @@
% \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP
.fl
.fi
-When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP.
-.LP
+When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP.
.TP 3
\-linksource\
-Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes.
-.LP
-\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links.
-.LP
+Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes.
+.br
+.br
+\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links.
+.br
+.br
Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button":
.nf
\f3
@@ -4482,7 +3394,6 @@
.fl
\fP
.fi
-.LP
.TP 3
\-group\ groupheading\ packagepattern:packagepattern:...
Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP.
@@ -4494,16 +3405,12 @@
o
\f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP).
.RE
-.RS 3
-
-.LP
-.LP
\f3NOTE: If using an asterisk in a pattern or pattern list, the pattern list must be inside quotes, such as \fP\f4"java.lang*:java.util"\fP
-.LP
-.RE
-.LP
-If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages".
-.LP
+.br
+.br
+If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages".
+.br
+.br
For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package.
.nf
\f3
@@ -4517,7 +3424,6 @@
.fi
This results in the groupings:
.RS 3
-.RS 3
.TP 3
Core Packages
\f2java.lang\fP
@@ -4530,38 +3436,27 @@
Other Packages
\f2java.new\fP
.RE
-
-.LP
-.RE
-.LP
.TP 3
\-nodeprecated
-Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.
-.LP
+Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.
.TP 3
\-nodeprecatedlist
-Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.
-.LP
+Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.
.TP 3
\-nosince
-Omits from the generated docs the "Since" sections associated with the @since tags.
-.LP
+Omits from the generated docs the "Since" sections associated with the @since tags.
.TP 3
\-notree
-Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.
-.LP
+Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.
.TP 3
\-noindex
-Omits the index from the generated docs. The index is produced by default.
-.LP
+Omits the index from the generated docs. The index is produced by default.
.TP 3
\-nohelp
-Omits the HELP link in the navigation bars at the top and bottom of each page of output.
-.LP
+Omits the HELP link in the navigation bars at the top and bottom of each page of output.
.TP 3
\-nonavbar
-Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.
-.LP
+Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.
.TP 3
\-helpfile\ path/filename
Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example:
@@ -4582,8 +3477,7 @@
.fi
.TP 3
\-serialwarn
-Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods.
-.LP
+Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods.
.TP 3
\-charset\ name
Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the
@@ -4609,10 +3503,10 @@
.na
\f2HTML standard\fP @
.fi
-http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321)
-.LP
+http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321)
+.br
+.br
Also see \-encoding and \-docencoding.
-.LP
.TP 3
\-docencoding\ name
Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the
@@ -4626,12 +3520,12 @@
% \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP
.fl
.fi
-Also see \-encoding and \-charset.
-.LP
+Also see \-encoding and \-charset.
.TP 3
\-keywords
-Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.)
-.LP
+Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.)
+.br
+.br
The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords:
.nf
\f3
@@ -4646,16 +3540,21 @@
.fl
\fP
.fi
-.LP
.TP 3
\-tag\ \ tagname:Xaoptcmf:"taghead"
-Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run.
-.LP
-The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name.
-.LP
-The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading.
-.LP
-\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: \f4X\fP (disable tag)
+Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run.
+.br
+.br
+The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name.
+.br
+.br
+The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading.
+.br
+.br
+\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters:
+.br
+.br
+\f4X\fP (disable tag)
.br
\f4a\fP (all)
.br
@@ -4670,7 +3569,8 @@
\f4m\fP (methods)
.br
\f4f\fP (fields)
-.LP
+.br
+.br
\f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is:
.nf
\f3
@@ -4715,8 +3615,9 @@
.fl
\fP
.fi
-\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases.
-.LP
+\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases.
+.br
+.br
You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use:
.nf
\f3
@@ -4733,13 +3634,15 @@
.fl
\fP
.fi
-.LP
-The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet.
-.LP
-\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example.
-.LP
-If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order.
-.LP
+The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet.
+.br
+.br
+\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example.
+.br
+.br
+If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order.
+.br
+.br
\f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed):
.nf
\f3
@@ -4758,21 +3661,23 @@
.fl
\fP
.fi
-.LP
-When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown.
-.LP
-The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position.
-.LP
-\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Sun will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Sun. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Sun later creates a standard tag of the same name.
-.LP
+When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown.
+.br
+.br
+The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position.
+.br
+.br
+\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Oracle will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Oracle. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Oracle later creates a standard tag of the same name.
+.br
+.br
\f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See
.na
\f2Comparing Annotations and Javadoc Tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations
-.LP
-You can also create more complex block tags, or custom inline tags with the \-taglet option.
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations<
+.br
+.br
+You can also create more complex block tags, or custom inline tags with the \-taglet option.
.TP 3
\-taglet\ \ class
Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see:
@@ -4782,13 +3687,14 @@
.na
\f2Taglet Overview\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/taglet/overview.html
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html
.RE
-.LP
-Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes.
-.LP
-Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process.
-.LP
+Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes.
+.br
+.br
+Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process.
+.br
+.br
Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages:
.nf
\f3
@@ -4809,25 +3715,21 @@
.fl
\fP
.fi
-.LP
-Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.
-.LP
+Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.
.TP 3
\-tagletpath\ \ tagletpathlist
-Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.
-.LP
+Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.
.TP 3
\-docfilessubdirs\
-Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.
-.LP
+Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.
.TP 3
\-excludedocfilessubdir\ \ name1:name2...
-Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.
-.LP
+Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.
.TP 3
\-noqualifier\ \ all\ | \ packagename1:packagename2:...
-Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear.
-.LP
+Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear.
+.br
+.br
The following example omits all package qualifiers:
.nf
\f3
@@ -4852,8 +3754,7 @@
.fl
\fP
.fi
-Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used.
-.LP
+Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used.
.TP 3
\-notimestamp\
Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this:
@@ -4864,53 +3765,40 @@
.fl
\fP
.fi
-.LP
.TP 3
\-nocomment\
Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project.
+.TP 3
+\-sourcetab tabLength
+Specify the number of spaces each tab takes up in the source.
.RE
.SH "COMMAND LINE ARGUMENT FILES"
.LP
-
-.LP
-.LP
To shorten or simplify the javadoc command line, you can specify one or more files that themselves contain arguments to the \f2javadoc\fP command (except \f2\-J\fP options). This enables you to create javadoc commands of any length on any operating system.
.LP
-.LP
An argument file can include javac options and source filenames in any combination. The arguments within a file can be space\-separated or newline\-separated. If a filename contains embedded spaces, put the whole filename in double quotes.
.LP
-.LP
Filenames within an argument file are relative to the current directory, not the location of the argument file. Wildcards (*) are not allowed in these lists (such as for specifying \f2*.java\fP). Use of the '\f2@\fP' character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files.
.LP
-.LP
When executing javadoc, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javadoc encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list.
-.LP
.SS
Example \- Single Arg File
.LP
-.LP
You could use a single argument file named "\f2argfile\fP" to hold all Javadoc arguments:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @argfile\fP
.fl
.fi
-
-.LP
.LP
This argument file could contain the contents of both files shown in the next example.
-.LP
.SS
Example \- Two Arg Files
.LP
-.LP
You can create two argument files \-\- one for the Javadoc options and the other for the package names or source filenames: (Notice the following lists have no line\-continuation characters.)
.LP
-.LP
Create a file named "\f2options\fP" containing:
-.LP
.nf
\f3
.fl
@@ -4920,13 +3808,13 @@
.fl
\-splitindex
.fl
- \-windowtitle 'Java(TM) SE 7 API Specification'
-.fl
- \-doctitle 'Java(TM) SE 7 API Specification'
-.fl
- \-header '<b>Java(TM); SE 7'
-.fl
- \-bottom 'Copyright 1993\-2009 Sun Microsystems, Inc. All Rights Reserved.'
+ \-windowtitle 'Java SE 7 API Specification'
+.fl
+ \-doctitle 'Java SE 7 API Specification'
+.fl
+ \-header '<b>Java(TM) SE 7</b>'
+.fl
+ \-bottom 'Copyright © 1993\-2011 Oracle and/or its affiliates. All rights reserved.'
.fl
\-group "Core Packages" "java.*"
.fl
@@ -4936,11 +3824,8 @@
.fl
\fP
.fi
-
-.LP
.LP
Create a file named "\f2packages\fP" containing:
-.LP
.nf
\f3
.fl
@@ -4952,120 +3837,85 @@
.fl
\fP
.fi
-
-.LP
.LP
You would then run javadoc with:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @options @packages\fP
.fl
.fi
-
-.LP
.SS
Example \- Arg Files with Paths
.LP
-.LP
The argument files can have paths, but any filenames inside the files are relative to the current working directory (not \f2path1\fP or \f2path2\fP):
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @path1/options @path2/packages\fP
.fl
.fi
-
-.LP
.SS
Example \- Option Arguments
.LP
-.LP
Here's an example of saving just an argument to a javadoc option in an argument file. We'll use the \f2\-bottom\fP option, since it can have a lengthy argument. You could create a file named "\f2bottom\fP" containing its text argument:
-.LP
.nf
\f3
.fl
-'<font size="\-1"><a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a
-.fl
-bug or feature</a><br><br>Java is a trademark or registered trademark of
-.fl
-Sun Microsystems, Inc. in the US and other countries.<br>Copyright 1993\-2000 Sun
-.fl
-Microsystems, Inc. 901 San Antonio Road,<br>Palo Alto, California, 94303, U.S.A.
-.fl
-All Rights Reserved.</font>'
+<font size="\-1">
+.fl
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
+.fl
+ Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
+.fl
+ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
+.fl
+ Other names may be trademarks of their respective owners.</font>
.fl
\fP
.fi
-
-.LP
.LP
Then run the Javadoc tool with:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc \-bottom @bottom @packages\fP
.fl
.fi
-
-.LP
.LP
Or you could include the \f2\-bottom\fP option at the start of the argument file, and then just run it as:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @bottom @packages\fP
.fl
.fi
-
-.LP
-
-.LP
.SH "Name"
Running
-.LP
.SH "RUNNING JAVADOC"
.LP
-
-.LP
-.LP
\f3Version Numbers\fP \- The version number of javadoc can be determined using \f3javadoc \-J\-version\fP. The version number of the standard doclet appears in its output stream. It can be turned off with \f2\-quiet\fP.
.LP
-.LP
\f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see
.na
\f2Standard Doclet\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
.LP
\f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the
.na
\f2MIF Doclet documentation\fP @
.fi
http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-.LP
.SH "SIMPLE EXAMPLES"
.LP
-
-.LP
-.LP
You can run javadoc on entire packages or individual source files. Each package name has a corresponding directory name. In the following examples, the source files are located at \f2/home/src/java/awt/*.java\fP. The destination directory is \f2/home/html\fP.
-.LP
.SS
Documenting One or More Packages
.LP
-.LP
To document a package, the source files (\f2*.java\fP) for that package must be located in a directory having the same name as the package. If a package name is made up of several identifiers (separated by dots, such as \f2java.awt.color\fP), each subsequent identifier must correspond to a deeper subdirectory (such as \f2java/awt/color\fP). You may split the source files for a single package among two such directory trees located at different places, as long as \f2\-sourcepath\fP points to them both \-\- for example \f2src1/java/awt/color\fP and \f2src2/java/awt/color\fP.
.LP
-.LP
You can run javadoc either by changing directories (with \f2cd\fP) or by using \f2\-sourcepath\fP option. The examples below illustrate both alternatives.
-.LP
.RS 3
.TP 2
o
@@ -5108,17 +3958,12 @@
.fl
.fi
.RE
-
-.LP
.LP
Result: All cases generate HTML\-formatted documentation for the public and protected classes and interfaces in packages \f2java.awt\fP and \f2java.awt.event\fP and save the HTML files in the specified destination directory (\f2/home/html\fP). Because two or more packages are being generated, the document has three HTML frames \-\- for the list of packages, the list of classes, and the main class pages.
-.LP
.SS
Documenting One or More Classes
.LP
-.LP
The second way to run the Javadoc tool is by passing in one or more source files (\f2.java\fP). You can run javadoc either of the following two ways \-\- by changing directories (with \f2cd\fP) or by fully\-specifying the path to the \f2.java\fP files. Relative paths are relative to the current directory. The \f2\-sourcepath\fP option is ignored when passing in source files. You can use command line wildcards, such as asterisk (*), to specify groups of classes.
-.LP
.RS 3
.TP 2
o
@@ -5155,93 +4000,76 @@
.fi
This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP.
.RE
-
-.LP
.SS
Documenting Both Packages and Classes
.LP
-.LP
You can document entire packages and individual classes at the same time. Here's an example that mixes two of the previous examples. You can use \f2\-sourcepath\fP for the path to the packages but not for the path to the individual classes.
-.LP
.nf
\f3
.fl
% \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt /home/src/java/applet/Applet.java\fP
.fl
.fi
-
-.LP
.LP
This example generates HTML\-formatted documentation for the package \f2java.awt\fP and class \f2Applet\fP. (The Javadoc tool determines the package name for \f2Applet\fP from the package declaration, if any, in the \f2Applet.java\fP source file.)
-.LP
.SH "REAL WORLD EXAMPLE"
.LP
-
-.LP
-.LP
The Javadoc tool has many useful options, some of which are more commonly used than others. Here is effectively the command we use to run the Javadoc tool on the Java platform API. We use 180MB of memory to generate the documentation for the 1500 (approx.) public and protected classes in the Java SE Platform, Standard Edition, v1.2.
.LP
-.LP
The same example is shown twice \-\- first as executed on the command line, then as executed from a makefile. It uses absolute paths in the option arguments, which enables the same \f2javadoc\fP command to be run from any directory.
-.LP
.SS
Command Line Example
.LP
-.LP
-This command line example is over 900 characters, which is too long for some shells, such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation.
-.LP
+The following example may be too long for some shells such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation.
.nf
\f3
.fl
-% javadoc \-sourcepath /java/jdk/src/share/classes \\
-.fl
- \-overview /java/jdk/src/share/classes/overview.html \\
-.fl
- \-d /java/jdk/build/api \\
-.fl
- \-use \\
-.fl
- \-splitIndex \\
-.fl
- \-windowtitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\
-.fl
- \-doctitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\
-.fl
- \-header '<b>Java(TM) SE </b><br><font size="\-1">7</font>' \\
-.fl
- \-bottom '<font size="\-1"><a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit
-.fl
-a bug or feature</a><br><br>Java is a trademark or registered trademark of Sun Microsystems,
-.fl
-Inc. in the US and other countries.<br>Copyright 1993\-1999 Sun Microsystems, Inc.
-.fl
-901 San Antonio Road,<br>Palo Alto, California, 94303, U.S.A. All Rights Reserved.</font>' \\
+% javadoc \-sourcepath /java/jdk/src/share/classes \\
+.fl
+ \-overview /java/jdk/src/share/classes/overview.html \\
+.fl
+ \-d /java/jdk/build/api \\
+.fl
+ \-use \\
+.fl
+ \-splitIndex \\
+.fl
+ \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\
+.fl
+ \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\
+.fl
+ \-header '<b>Java(TM) SE 7</b>' \\
+.fl
+ \-bottom '<font size="\-1">
+.fl
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
+.fl
+ Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
+.fl
+ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
+.fl
+ Other names may be trademarks of their respective owners.</font>' \\
.fl
\-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
.fl
- \-group "Extension Packages" "javax.*" \\
-.fl
- \-J\-Xmx180m \\
+ \-group "Extension Packages" "javax.*" \\
+.fl
+ \-J\-Xmx180m \\
.fl
@packages
.fl
\fP
.fi
-
-.LP
.LP
where \f2packages\fP is the name of a file containing the packages to process, such as \f2java.applet java.lang\fP. None of the options should contain any newline characters between the single quotes. (For example, if you copy and paste this example, delete the newline characters from the \f2\-bottom\fP option.) See the other notes listed below.
-.LP
.SS
Makefile Example
.LP
-.LP
This is an example of a GNU makefile. For an example of a Windows makefile, see
.na
\f2creating a makefile for Windows\fP @
.fi
http://java.sun.com/j2se/javadoc/faq/index.html#makefiles.
-.LP
.nf
\f3
.fl
@@ -5283,15 +4111,15 @@
.fl
HEADER = '<b>Java(TM) SE 7</font>'
.fl
-BOTTOM = '<font size="\-1"><a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit
-.fl
- a bug or feature</a><br><br>Java is a trademark or registered trademark
-.fl
- of Sun Microsystems, Inc. in the US and other countries.<br>Copyright 1993\-1999
-.fl
- Sun Microsystems, Inc. 901 San Antonio Road,<br>Palo Alto, California, 94303, U.S.A.
-.fl
- All Rights Reserved.</font>'
+BOTTOM = '<font size="\-1">
+.fl
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
+.fl
+ Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
+.fl
+ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
+.fl
+ Other names may be trademarks of their respective owners.</font>'
.fl
GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"'
.fl
@@ -5301,14 +4129,10 @@
.fl
\fP
.fi
-
-.LP
.LP
Single quotes are used to surround makefile arguments.
.LP
-.LP
\f3NOTES\fP
-.LP
.RS 3
.TP 2
o
@@ -5320,15 +4144,9 @@
o
Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP.
.RE
-
-.LP
.SH "TROUBLESHOOTING"
-.LP
-
-.LP
.SS
General Troubleshooting
-.LP
.RS 3
.TP 2
o
@@ -5347,37 +4165,23 @@
o
\f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename.
.RE
-
-.LP
.SS
Errors and Warnings
.LP
-.LP
Error and warning messages contain the filename and line number to the declaration line rather than to the particular line in the doc comment.
-.LP
.RS 3
.TP 2
o
\f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP.
.RE
-
-.LP
.SH "ENVIRONMENT"
-.LP
-
-.LP
.RS 3
.TP 3
CLASSPATH
Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example:
.:/home/classes:/usr/local/java/classes
.RE
-
-.LP
.SH "SEE ALSO"
-.LP
-
-.LP
.RS 3
.TP 2
o
@@ -5399,75 +4203,24 @@
.na
\f2Javadoc Home Page\fP @
.fi
-http://java.sun.com/j2se/javadoc/index.jsp
+http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html
.TP 2
o
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html
.TP 2
o
.na
\f2Setting the Class Path\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#general
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general
.TP 2
o
.na
\f2How Javac and Javadoc Find Classes\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar)
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar)
.RE
-
-.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 80 0
-.80
-.rm 80
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 3869 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.fc
-.nr T. 1
-.T# 1
-.35
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-3
-
-.LP
--- a/jdk/src/linux/doc/man/javah.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/javah.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,38 +19,28 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javah 1 "02 Jun 2010"
+.TH javah 1 "10 May 2011"
.LP
.SH "Name"
javah \- C Header and Stub File Generator
.LP
-.RS 3
-
-.LP
.LP
\f3javah\fP produces C header files and C source files from a Java class. These files provide the connective glue that allow your Java and C code to interact.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
javah [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . .
.fl
-javah_g [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . .
-.fl
\fP
.fi
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3javah\fP generates C header and source files that are needed to implement native methods. The generated header and source files are used by C programs to reference an object's instance variables from native source code. The .h file contains a struct definition whose layout parallels the layout of the corresponding class. The fields in the struct correspond to instance variables in the class.
.LP
@@ -63,13 +53,8 @@
.LP
The new native method interface, Java Native Interface (JNI), does not require header information or stub files. \f3javah\fP can still be used to generate native method function proptotypes needed for JNI\-style native methods. \f3javah\fP produces JNI\-style output by default, and places the result in the .h file.
.LP
-.LP
-\f3javah_g\fP is a non\-optimized version of \f3javah\fP suitable for use with debuggers like jdb(1).
-.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-o outputfile
@@ -110,11 +95,10 @@
.fl
\fP
.fi
-.LP
As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
.br
.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
+For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
.TP 3
\-bootclasspath path
Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files.
@@ -132,8 +116,6 @@
.LP
.SH "ENVIRONMENT VARIABLES"
.LP
-
-.LP
.RS 3
.TP 3
CLASSPATH
@@ -150,8 +132,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
javac(1), java(1), jdb(1), javap(1), javadoc(1)
.LP
--- a/jdk/src/linux/doc/man/javap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/javap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,27 +19,21 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javap 1 "02 Jun 2010"
+.TH javap 1 "10 May 2011"
.LP
.SH "Name"
javap \- The Java Class File Disassembler
.LP
-.RS 3
-
-.LP
.LP
Disassembles class files.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
-javap [ \fP\f3options\fP\f3 ] class. . .
+javap [ \fP\f3options\fP\f3 ] classes
.fl
\fP
.fi
@@ -47,13 +41,21 @@
.LP
.SH "DESCRIPTION"
.LP
+.LP
+The \f3javap\fP command disassembles one or more class files. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout.
+.LP
+.RS 3
+.TP 3
+options
+Command\-line options.
+.TP 3
+classes
+List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP).
+.RE
.LP
.LP
-The \f3javap\fP command disassembles a class file. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. For example, compile the following class declaration:
-.LP
-.RS 3
-
+For example, compile the following class declaration:
.LP
.nf
\f3
@@ -96,166 +98,160 @@
.fl
\fP
.fi
-.RE
.LP
.LP
-The output from \f3javap DocFooter\fP yields:
-.LP
-.RS 3
-
+The output from \f3javap DocFooter.class\fP yields:
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
+ java.lang.String date;
.fl
- java.lang.String email;
+ java.lang.String email;
.fl
- public DocFooter();
+ public DocFooter();
.fl
- public void init();
+ public void init();
.fl
- public void paint(java.awt.Graphics);
+ public void paint(java.awt.Graphics);
.fl
}
.fl
\fP
.fi
-.RE
.LP
.LP
-The output from \f3javap \-c DocFooter\fP yields:
-.LP
-.RS 3
-
+The output from \f3javap \-c DocFooter.class\fP yields:
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
-.fl
- java.lang.String email;
-.fl
- public DocFooter();
+ java.lang.String date;
.fl
- public void init();
+
.fl
- public void paint(java.awt.Graphics);
-.fl
-}
+ java.lang.String email;
.fl
.fl
-Method DocFooter()
+ public DocFooter();
.fl
- 0 aload_0
+ Code:
.fl
- 1 invokespecial #1 <Method java.applet.Applet()>
+ 0: aload_0
.fl
- 4 return
+ 1: invokespecial #1 // Method java/applet/Applet."<init>":()V
+.fl
+ 4: return
.fl
.fl
-Method void init()
+ public void init();
.fl
- 0 aload_0
+ Code:
.fl
- 1 sipush 500
+ 0: aload_0
.fl
- 4 bipush 100
+ 1: sipush 500
.fl
- 6 invokevirtual #2 <Method void resize(int, int)>
+ 4: bipush 100
.fl
- 9 aload_0
+ 6: invokevirtual #2 // Method resize:(II)V
.fl
- 10 aload_0
+ 9: aload_0
.fl
- 11 ldc #3 <String "LAST_UPDATED">
+ 10: aload_0
.fl
- 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 11: ldc #3 // String LAST_UPDATED
.fl
- 16 putfield #5 <Field java.lang.String date>
+ 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 19 aload_0
+ 16: putfield #5 // Field date:Ljava/lang/String;
.fl
- 20 aload_0
+ 19: aload_0
.fl
- 21 ldc #6 <String "EMAIL">
+ 20: aload_0
.fl
- 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 21: ldc #6 // String EMAIL
.fl
- 26 putfield #7 <Field java.lang.String email>
+ 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 29 return
+ 26: putfield #7 // Field email:Ljava/lang/String;
+.fl
+ 29: return
.fl
.fl
-Method void paint(java.awt.Graphics)
+ public void paint(java.awt.Graphics);
.fl
- 0 aload_1
+ Code:
.fl
- 1 new #8 <Class java.lang.StringBuffer>
+ 0: aload_1
.fl
- 4 dup
+ 1: new #8 // class java/lang/StringBuilder
.fl
- 5 invokespecial #9 <Method java.lang.StringBuffer()>
+ 4: dup
.fl
- 8 aload_0
+ 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V
.fl
- 9 getfield #5 <Field java.lang.String date>
+ 8: aload_0
+.fl
+ 9: getfield #5 // Field date:Ljava/lang/String;
.fl
- 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 15 ldc #11 <String " by ">
+ 15: ldc #11 // String by
.fl
- 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 20 invokevirtual #12 <Method java.lang.String toString()>
+ 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String;
.fl
- 23 bipush 100
+ 23: bipush 100
+.fl
+ 25: bipush 15
.fl
- 25 bipush 15
+ 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 30: aload_1
.fl
- 30 aload_1
+ 31: aload_0
.fl
- 31 aload_0
+ 32: getfield #7 // Field email:Ljava/lang/String;
.fl
- 32 getfield #7 <Field java.lang.String email>
+ 35: sipush 290
.fl
- 35 sipush 290
+ 38: bipush 15
.fl
- 38 bipush 15
+ 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 43: return
.fl
- 43 return
+}
.fl
\fP
.fi
-.RE
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
-\-help
+\-help \-\-help \-?
Prints out help message for \f3javap\fP.
.TP 3
+\-version
+Prints out version information.
+.TP 3
\-l
Prints out line and local variable tables.
.TP 3
@@ -268,14 +264,11 @@
\-package
Shows only package, protected, and public classes and members. This is the default.
.TP 3
-\-private
+\-private \-p
Shows all classes and members.
.TP 3
\-Jflag
Pass \f2flag\fP directly to the runtime system. Some examples:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -285,11 +278,16 @@
.fl
\fP
.fi
-.RE
.TP 3
\-s
Prints internal type signatures.
.TP 3
+\-sysinfo
+Shows system information (path, size, date, MD5 hash) of the class being processed.
+.TP 3
+\-constants
+Shows static final constants.
+.TP 3
\-c
Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the
.na
@@ -301,22 +299,7 @@
Prints stack size, number of \f2locals\fP and \f2args\fP for methods.
.TP 3
\-classpath path
-Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
-.nf
-\f3
-.fl
- .:<your_path>
-.fl
-\fP
-.fi
-For example:
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
+Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set.
.TP 3
\-bootclasspath path
Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files.
@@ -326,32 +309,8 @@
.RE
.LP
-.SH "ENVIRONMENT VARIABLES"
-.LP
-
-.LP
-.RS 3
-.TP 3
-CLASSPATH
-Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example, For example:
-.RS 3
-
-.LP
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
-.RE
-.RE
-
-.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
javac(1), java(1), jdb(1), javah(1), javadoc(1)
.LP
--- a/jdk/src/linux/doc/man/javaws.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/javaws.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,30 +19,18 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javaws 1 "02 Jun 2010"
+.TH javaws 1 "10 May 2011"
.LP
.SH "Name"
\f2javaws\fP Command Line
.LP
-.LP
-\
-.LP
-.SS
-NAME
-.LP
-.RS 3
-
+.SH "NAME"
.LP
.LP
\f2javaws\fP \- Java Web Start launcher command
.LP
-.RE
-.SS
-SYNOPSIS
-.LP
-.RS 3
-
+.SH "SYNOPSIS"
.LP
.LP
\f2javaws [run\-options] <jnlp>\fP
@@ -50,49 +38,27 @@
.LP
\f2javaws [control\-options]\fP
.LP
-.RE
-.SS
-PARAMETERS
-.LP
-.RS 3
-
+.SH "PARAMETERS"
.LP
.LP
\f2[run\-options]\fP
.LP
-.RS 3
-
-.LP
.LP
Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below.
.LP
-.RE
.LP
\f2<jnlp>\fP
.LP
-.RS 3
-
-.LP
.LP
This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file.
.LP
-.RE
.LP
\f2[control\-options]\fP
.LP
-.RS 3
-
-.LP
.LP
Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below.
.LP
-.RE
-.RE
-.SS
-DESCRIPTION
-.LP
-.RS 3
-
+.SH "DESCRIPTION"
.LP
.LP
The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network.
@@ -103,256 +69,154 @@
.LP
The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release.
.LP
-.RE
-.SS
-RUN\-OPTIONS
-.LP
-.RS 3
-
+.SH "RUN\-OPTIONS"
.LP
.LP
\f2\-offline\fP
.LP
-.RS 3
-
-.LP
.LP
-run Java Web Start in offline mode.
+Run Java Web Start in offline mode.
.LP
-.RE
.LP
\f2\-Xnosplash\fP
.LP
-.RS 3
-
+.LP
+Do not display the initial splash screen.
.LP
.LP
-disable the display of the initial splash screen.
-.LP
-.RE
-.LP
\f2\-open <arguments>\fP
.LP
-.RS 3
-
-.LP
.LP
If specified, replaces the arguments in the jnlp file with \f2\-open <arguments>\fP.
.LP
-.RE
.LP
\f2\-print <arguments>\fP
.LP
-.RS 3
-
-.LP
.LP
If specified, replaces the arguments in the jnlp file with \f2\-print <arguments>\fP.
.LP
-.RE
.LP
\f2\-online\fP
.LP
-.RS 3
-
-.LP
.LP
-run in online mode (default behavior).
+Use online mode (default behavior).
.LP
-.RE
.LP
\f2\-wait\fP
.LP
-.RS 3
-
-.LP
.LP
-If specified, the \f2javaws\fP process will not exit until the application exits.
+If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms.
.LP
-.RE
.LP
\f2\-verbose\fP
.LP
-.RS 3
-
-.LP
.LP
-display additional output.
+Display additional output.
.LP
-.RE
.LP
\f2\-J<option>\fP
.LP
-.RS 3
-
-.LP
.LP
-supply options to the vm.
+Supply options to the VM.
.LP
-.RE
.LP
\f2\-system\fP
.LP
-.RS 3
-
-.LP
-.LP
-run the application from the system cache only.
.LP
-.RE
-.RE
-.SS
-CONTROL\-OPTIONS
+Run the application from the system cache only.
.LP
-.RS 3
-
+.SH "CONTROL\-OPTIONS"
.LP
.LP
\f2\-viewer\fP
.LP
-.RS 3
-
+.LP
+Show the Cache Viewer in the Java Control Panel.
.LP
.LP
-show the Cache Viewer in the java control panel
+\f2\-clearcache\fP
+.LP
.LP
-.RE
+Remove all non\-installed applications from the cache.
+.LP
.LP
\f2\-userConfig <property name>\fP
.LP
-.RS 3
-
-.LP
.LP
-clear the specified deployment property.
+Clear the specified deployment property.
.LP
-.RE
.LP
\f2\-userConfig <property name> <property value>\fP
.LP
-.RS 3
-
-.LP
.LP
-set the specified deployment property to the specified value.
+Set the specified deployment property to the specified value.
.LP
-.RE
.LP
\f2\-uninstall\fP
.LP
-.RS 3
-
-.LP
.LP
-remove all applications from the cache.
+Remove all applications from the cache.
.LP
-.RE
.LP
\f2\-uninstall <jnlp>\fP
.LP
-.RS 3
-
-.LP
.LP
-remove the application from the cache.
+Remove the application from the cache.
.LP
-.RE
.LP
\f2\-import [import\-options] <jnlp>\fP
.LP
-.RS 3
-
-.LP
.LP
-import the application to the cache.
+Import the application to the cache.
.LP
-.RE
-\f3IMPORT\-OPTIONS\fP
+.SH "IMPORT\-OPTIONS"
.LP
.LP
\f2\-silent\fP
.LP
-.RS 3
-
-.LP
.LP
-import silently (with no user interface).
+Import silently (with no user interface).
.LP
-.RE
.LP
\f2\-system\fP
.LP
-.RS 3
-
-.LP
.LP
-import application to the system cache.
+Import application to the system cache.
.LP
-.RE
.LP
\f2\-codebase <url>\fP
.LP
-.RS 3
-
-.LP
.LP
-retrieve resources from the given codebase.
+Retrieve resources from the given codebase.
.LP
-.RE
.LP
\f2\-shortcut\fP
.LP
-.RS 3
-
-.LP
.LP
-install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
+Install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
-.RE
.LP
\f2\-association\fP
.LP
-.RS 3
-
-.LP
-.LP
-install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
-.RE
-.RE
-.SS
-FILES
+Install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
-.RS 3
-
+.SH "FILES"
.LP
.LP
For information about the user and system cache and deployment.properties files, see
.na
\f2System\- and User\-Level Properties\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
.LP
-.RE
-.SS
-MORE INFORMATION
-.LP
-.RS 3
-
+.SH "MORE INFORMATION"
.LP
.LP
For more information about Java Web Start, see
.na
\f2Java Web Start\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.html.
-.LP
-.RS 3
-
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
.LP
-\
-.LP
-.RE
-.RE
--- a/jdk/src/linux/doc/man/jconsole.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jconsole.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jconsole 1 "02 Jun 2010"
+.TH jconsole 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,41 +39,40 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
Options, if used, should follow immediately after the command name.
-.br
.TP 3
connection = pid | host:port | jmxUrl
.RS 3
-\f2pid\fP\ \ \ Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See
+.TP 2
+o
+\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See
.na
\f2JMX Monitoring and Management\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details.
-.br
-\f2host\fP:\f2port\fP\ \ Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See
+http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
+.TP 2
+o
+\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See
.na
\f2JMX Monitoring and Management\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details.
-.br
-\f2jmxUrl\fP\ \ Address of the JMX agent to be connected to as described in
+http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
+.TP 2
+o
+\f2jmxUrl\fP Address of the JMX agent to be connected to as described in
.na
\f2JMXServiceURL\fP @
.fi
-http://java.sun.com/javase/6/docs/api/javax/management/remote/JMXServiceURL.html.
+http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html.
.RE
.RE
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jconsole\fP command launches a graphical console tool that enables you to monitor and manage Java applications and virtual machines on a local or remote machine.
.LP
@@ -84,17 +81,15 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-interval=n
Set the update interval to \f2n\fP seconds (default is 4 seconds).
.TP 3
-\-notile\
+\-notile
Do not tile windows initially (for two or more connections).
.TP 3
-\-pluginpath\ plugins
+\-pluginpath plugins
Specify a list of directories or JAR files which are searched for JConsole plugins. The \f2plugins\fP path should contain a provider\-configuration file named:
.br
.nf
@@ -104,20 +99,19 @@
.fl
\fP
.fi
-.LP
containing one line for each plugin specifying the fully qualified class name of the class implementing the
.na
\f2com.sun.tools.jconsole.JConsolePlugin\fP @
.fi
-http://java.sun.com/javase/6/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class.
+http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class.
.TP 3
-\-version\
+\-version
Output version information and exit.
.TP 3
-\-help\
+\-help
Output help message and exit.
.TP 3
-\-J<flag>\
+\-J<flag>
Pass <flag> to the Java virtual machine on which jconsole is run.
.RE
@@ -130,13 +124,13 @@
.na
\f2Using JConsole\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html
+http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html
.TP 2
o
.na
\f2Monitoring and Management for Java Platform\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html
.RE
.LP
--- a/jdk/src/linux/doc/man/jdb.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jdb.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jdb 1 "02 Jun 2010"
+.TH jdb 1 "10 May 2011"
.LP
.SH "Name"
jdb \- The Java Debugger
.LP
-.RS 3
-
-.LP
.LP
\f3jdb\fP helps you find and fix bugs in Java language programs.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -45,9 +39,6 @@
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options, as specified below.
@@ -60,24 +51,18 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the
.na
\f2Java Platform Debugger Architecture\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
+http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
.LP
.SS
Starting a jdb Session
.LP
-.RS 3
-
-.LP
.LP
There are many ways to start a jdb session. The most frequently used way is to have \f3jdb\fP launch a new Java Virtual Machine (VM) with the main class of the application to be debugged. This is done by substituting the command \f3jdb\fP for \f3java\fP in the command line. For example, if your application's main class is MyClass, you use the following command to debug it under JDB:
.LP
@@ -137,7 +122,7 @@
.na
\f2documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the
+http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the
.na
\f21.4.2 documentation\fP @
.fi
@@ -150,9 +135,6 @@
The following is a list of the basic \f3jdb\fP commands. The Java debugger supports other commands which you can list using \f3jdb\fP's \f2help\fP command.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
help, or ?
The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description.
@@ -164,10 +146,12 @@
Continues execution of the debugged application after a breakpoint, exception, or step.
.TP 3
print
-Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object.
-.LP
-\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option.
-.LP
+Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object.
+.br
+.br
+\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option.
+.br
+.br
\f2print\fP supports many simple Java expressions including those with method invocations, for example:
.RS 3
.TP 2
@@ -188,15 +172,13 @@
.RE
.TP 3
dump
-For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included.
-.LP
-The \f2dump\fP command supports the same set of expressions as the \f2print\fP command.
+For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included.
+.br
+.br
+The \f2dump\fP command supports the same set of expressions as the \f2print\fP command.
.TP 3
threads
List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -204,26 +186,22 @@
.fl
\fP
.fi
-.RE
In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running,
.TP 3
thread
Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above.
.TP 3
where
-\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread.
-.LP
-If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current.
+\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread.
+.br
+.br
+If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current.
.RE
.LP
-.RE
.SS
Breakpoints
.LP
-.RS 3
-
-.LP
.LP
Breakpoints can be set in \f3jdb\fP at line numbers or at the first instruction of a method, for example:
.LP
@@ -249,23 +227,15 @@
.LP
The \f2clear\fP command removes breakpoints using a syntax as in "\f2clear\ MyClass:45\fP". Using the \f2clear\fP or command with no argument displays a list of all breakpoints currently set. The \f2cont\fP command continues execution.
.LP
-.RE
.SS
Stepping
.LP
-.RS 3
-
-.LP
.LP
The \f2step\fP commands advances execution to the next line whether it is in the current stack frame or a called method. The \f2next\fP command advances execution to the next line in the current stack frame.
.LP
-.RE
.SS
Exceptions
.LP
-.RS 3
-
-.LP
.LP
When an exception occurs for which there isn't a catch statement anywhere in the throwing thread's call stack, the VM normally prints an exception trace and exits. When running under \f3jdb\fP, however, control returns to \f3jdb\fP at the offending throw. You can then use \f3jdb\fP to diagnose the cause of the exception.
.LP
@@ -278,12 +248,8 @@
.LP
\f2NOTE: The \fP\f2ignore\fP command does not cause the debugged VM to ignore specific exceptions, only the debugger.
.LP
-.RE
-.RE
.SH "Command Line Options"
.LP
-
-.LP
.LP
When you use \f3jdb\fP in place of the Java application launcher on the command line, \f3jdb\fP accepts many of the same options as the java command, including \f2\-D\fP, \f2\-classpath\fP, and \f2\-X<option>\fP.
.LP
@@ -335,7 +301,7 @@
.na
\f2documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
+http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
.LP
.SS
Options Forwarded to Debuggee Process
@@ -358,8 +324,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
javac(1), java(1), javah(1), javap(1), javadoc(1).
.LP
--- a/jdk/src/linux/doc/man/jhat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jhat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jhat 1 "02 Jun 2010"
+.TH jhat 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,17 +39,17 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
Options, if used, should follow immediately after the command name.
-.br
.TP 3
heap\-dump\-file
Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3".
-.SH "DESCRIPTION"
+.RE
+
+.LP
+.SH "DESCRIPTION"
.LP
.LP
The \f3jhat\fP command parses a java heap dump file and launches a webserver. jhat enables you to browse heap dumps using your favorite webbrowser. jhat supports pre\-designed queries (such as 'show all instances of a known class "Foo"') as well as \f3OQL\fP (\f3O\fPbject \f3Q\fPuery \f3L\fPanguage) \- a SQL\-like query language to query heap dumps. Help on OQL is available from the OQL help page shown by jhat. With the default port, OQL help is available at http://localhost:7000/oqlhelp/
@@ -69,7 +67,7 @@
.na
\f2HotSpotDiagnosticMXBean\fP @
.fi
-http://java.sun.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime;
+http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime;
.TP 2
o
Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option;
@@ -86,7 +84,8 @@
.LP
\f3NOTE:\fP This tool is \f3experimental\fP and may \f3not\fP be available in future versions of the JDK.
.LP
-.SH "OPTIONS"
+.SH "OPTIONS"
+.LP
.RS 3
.TP 3
\-stack false/true
@@ -107,21 +106,22 @@
\-debug int
Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes.
.TP 3
-\-version\
+\-version
Report version number and exit.
.TP 3
-\-h\
+\-h
Output help message and exit.
.TP 3
-\-help\
+\-help
Output help message and exit.
.TP 3
-\-J<flag>\
+\-J<flag>
Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB.
.RE
.LP
-.SH "SEE ALSO"
+.SH "SEE ALSO"
+.LP
.RS 3
.TP 2
o
@@ -136,5 +136,6 @@
.fi
http://java.sun.com/developer/technicalArticles/Programming/HPROF.html
.RE
-.RE
+
+.LP
--- a/jdk/src/linux/doc/man/jinfo.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jinfo.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jinfo 1 "02 Jun 2010"
+.TH jinfo 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -43,54 +41,55 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
option
Options are mutually exclusive. Option, if used, should follow immediately after the command name.
+.RE
+
+.LP
.RS 3
.TP 3
pid
process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
.RE
+
+.LP
.RS 3
.TP 3
executable
Java executable from which the core dump was produced.
.RE
+
+.LP
.RS 3
.TP 3
core
core file for which the configuration info is to be printed.
.RE
+
+.LP
.RS 3
.TP 3
remote\-hostname\-or\-IP
remote debug server's (see jsadebugd(1)) hostname or IP address.
.RE
+
+.LP
.RS 3
.TP 3
server\-id
optional unique id, if multiple debug servers are running on the same remote host.
.RE
-.RE
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jinfo\fP prints Java configuration information for a given Java process or core file or a remote debug server. Configuration information includes Java System properties and Java virtual machine command line flags. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.:
.br
-
+jinfo \-J\-d64 \-sysprops pid
.LP
-.RS 3
-
-.LP
-jinfo \-J\-d64 \-sysprops pid
-.RE
.LP
\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' need to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
.LP
@@ -99,8 +98,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
<no option>
--- a/jdk/src/linux/doc/man/jmap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jmap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jmap 1 "02 Jun 2010"
+.TH jmap 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -43,8 +41,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
option
@@ -74,14 +70,9 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jmap\fP prints shared object memory maps or heap memory details of a given process or core file or a remote debug server. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -89,10 +80,11 @@
.fl
\fP
.fi
-.RE
.LP
-\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
+.LP
+\f3NOTE: This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
+.LP
.LP
\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
.LP
@@ -101,12 +93,10 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
<no option>
-When no option is used \f3jmap\fP prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility.
+When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility.
.br
.TP 3
\-dump:[live,]format=b,file=<filename>
--- a/jdk/src/linux/doc/man/jps.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jps.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jps 1 "02 Jun 2010"
+.TH jps 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,8 +39,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
@@ -55,8 +51,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jps\fP tool lists the instrumented HotSpot Java Virtual Machines (JVMs) on the target system. The tool is limited to reporting information on JVMs for which it has the access permissions.
.LP
@@ -77,8 +71,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The \f3jps\fP command supports a number of options that modify the output of the command. These options are subject to change or removal in the future.
.LP
@@ -107,9 +99,6 @@
.SS
HOST IDENTIFIER
.LP
-.RS 3
-
-.LP
.LP
The host identifier, or \f2hostid\fP is a string that indicates the target system. The syntax of the \f2hostid\fP string largely corresponds to the syntax of a URI:
.LP
@@ -140,11 +129,8 @@
.RE
.LP
-.RE
.SH "OUTPUT FORMAT"
.LP
-
-.LP
.LP
The output of the \f3jps\fP command follows the following pattern:
.LP
@@ -169,8 +155,6 @@
.LP
.SH "EXAMPLES"
.LP
-
-.LP
.LP
This section provides examples of the \f3jps\fP command.
.LP
--- a/jdk/src/linux/doc/man/jrunscript.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jrunscript.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jrunscript 1 "02 Jun 2010"
+.TH jrunscript 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -39,8 +37,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
@@ -53,8 +49,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jrunscript\fP is a command line script shell. jrunscript supports both an interactive (read\-eval\-print) mode and a batch (\-f option) mode of script execution. This is a scripting language independent shell. By default, JavaScript is the language used, but the \-l option can be used to specify a different language. Through Java to scripting language communication, jrunscript supports "exploratory programming" style.
.LP
@@ -63,8 +57,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-classpath path
@@ -112,10 +104,8 @@
.LP
.SH "EXAMPLES"
.LP
-\f3Executing inline scripts\fP
-.LP
-.RS 3
-
+.SS
+Executing inline scripts
.LP
.nf
\f3
@@ -126,13 +116,10 @@
.fl
\fP
.fi
-.RE
.LP
-\f3Use specified language and evaluate given script file\fP
-.LP
-.RS 3
-
+.SS
+Use specified language and evaluate given script file
.LP
.nf
\f3
@@ -141,42 +128,42 @@
.fl
\fP
.fi
-.RE
.LP
-\f3Interactive mode\fP
-.LP
-.RS 3
-
+.SS
+Interactive mode
.LP
.nf
\f3
.fl
jrunscript
.fl
-js>print('hello world');
+js> print('Hello World\\n');
+.fl
+Hello World
.fl
-hello world
+js> 34 + 55
.fl
-js>34 + 55
+89.0
.fl
-89
+js> t = new java.lang.Thread(function() { print('Hello World\\n'); })
+.fl
+Thread[Thread\-0,5,main]
.fl
-js> thread(function() { print('hello world'); }
+js> t.start()
.fl
-hello world
+js> Hello World
+.fl
+
.fl
js>
.fl
\fP
.fi
-.RE
.LP
-\f3Run script file with script arguments\fP
-.LP
-.RS 3
-
+.SS
+Run script file with script arguments
.LP
.nf
\f3
@@ -185,13 +172,16 @@
.fl
\fP
.fi
-.RE
.LP
test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array.
.SH "SEE ALSO"
.LP
.LP
-If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in jsdocs.
+If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in
+.na
+\f2jsdocs\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html.
.LP
--- a/jdk/src/linux/doc/man/jsadebugd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jsadebugd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jsadebugd 1 "02 Jun 2010"
+.TH jsadebugd 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,35 +39,16 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
pid
process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process.
-.RE
-
-.LP
-.RS 3
.TP 3
executable
-.RE
-
-.LP
-.RS 3
-.TP 3
Java executable from which the core dump was produced
-.RE
-
-.LP
-.RS 3
.TP 3
core
Core file to which the debug server should attach.
-.RE
-
-.LP
-.RS 3
.TP 3
server\-id
Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique.
@@ -78,17 +57,12 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP,
.na
\f2rmiregistry\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi must be started with:
-.LP
-.RS 3
-
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with:
.LP
.nf
\f3
@@ -97,17 +71,16 @@
.fl
\fP
.fi
-.RE
.LP
.LP
where \f2$JAVA_HOME\fP is the JDK installation directory. If rmiregistry was not started, jsadebugd will start an rmiregistry in a standard (1099) port internally. Debug server may be stopped by sending SIGINT (pressing Ctrl\-C) to it.
.LP
.LP
-\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
+\f3NOTE\fP \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \f2PATH\fP environment variable should contain the location of \f2jvm.dll\fP used by the target process or the location from which the Crash Dump file was produced.
.LP
.LP
-\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
+For example, \f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
.LP
.SH "SEE ALSO"
.LP
@@ -129,7 +102,7 @@
.na
\f2rmiregistry\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi
.RE
.LP
--- a/jdk/src/linux/doc/man/jstack.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jstack.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstack 1 "02 Jun 2010"
+.TH jstack 1 "10 May 2011"
.LP
.SH "Name"
@@ -29,8 +29,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -45,8 +43,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.LP
Options are mutually exclusive. Option, if used, should follow immediately after the command name. See OPTIONS.
.LP
@@ -78,16 +74,11 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jstack\fP prints Java stack traces of Java threads for a given Java process or core file or a remote debug server. For each Java frame, the full class name, method name, 'bci' (byte code index) and line number, if available, are printed. With the \-m option, jstack prints both Java and native frames of all threads along with the 'pc' (program counter). For each native frame, the closest native symbol to 'pc', if available, is printed. C++ mangled names are not demangled. To demangle C++ names, the output of this command may be piped to \f3c++filt\fP. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.:
.br
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -95,7 +86,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -106,8 +96,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-F
@@ -118,7 +106,7 @@
.na
\f2ownable synchronizers\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html.
+http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html.
.TP 3
\-m
prints mixed mode (both Java and native C/C++ frames) stack trace.
@@ -154,8 +142,6 @@
.LP
.SH "KNOWN BUGS"
.LP
-
-.LP
.LP
Mixed mode stack trace, the \-m option, does not work with the remote debug server.
.LP
--- a/jdk/src/linux/doc/man/jstat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jstat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstat 1 "02 Jun 2010"
+.TH jstat 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -39,8 +37,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
generalOption
@@ -60,17 +56,15 @@
The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details.
.TP 3
interval[s|ms]
-Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds.\ Must be a positive integer.\ If specified, \f3jstat\fP will produce its output at each interval.
+Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval.
.TP 3
count
-Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated.\ Must be a positive integer.
+Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer.
.RE
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jstat\fP tool displays performance statistics for an instrumented HotSpot Java virtual machine (JVM). The target JVM is identified by its virtual machine identifier, or \f2vmid\fP option described below.
.LP
@@ -82,9 +76,6 @@
.SS
VIRTUAL MACHINE IDENTIFIER
.LP
-.RS 3
-
-.LP
.LP
The syntax of the \f2vmid\fP string largely corresponds to the syntax of a URI:
.LP
@@ -115,11 +106,8 @@
.RE
.LP
-.RE
.SH "OPTIONS"
.LP
-
-.LP
.LP
The \f3jstat\fP command supports two types of options, general options and output options. General options cause \f3jstat\fP to display simple usage and version information. Output options determine the content and format of the statistical output.
.br
@@ -150,14 +138,11 @@
.SS
OUTPUT OPTIONS
.LP
-.RS 3
-
+.LP
+If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J). The \f2statOption\fP must come first.
.LP
.LP
-If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J).\ The \f2statOption\fP must come first.
-.LP
-.LP
-Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns.\ Use the \f3\-h\fP option to set the frequency at which the header is displayed.\ Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same.
+Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns. Use the \f3\-h\fP option to set the frequency at which the header is displayed. Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same.
.LP
.LP
Use the \f3\-t\fP option to display a time stamp column, labeled \f2Timestamp\fP as the first column of output. The \f2Timestamp\fP column contains the elapsed time, in seconds, since startup of the target JVM. The resolution of the time stamp is dependent on various factors and is subject to variation due to delayed thread scheduling on heavily loaded systems.
@@ -171,11 +156,10 @@
.RS 3
.TP 3
\-statOption
-Determines the statistics information that \f3jstat\fP displays. The following table lists the available options.\ Use the \f3\-options\fP general option to display the list of options for a particular platform installation.
+Determines the statistics information that \f3jstat\fP displays. The following table lists the available options. Use the \f3\-options\fP general option to display the list of options for a particular platform installation.
.br
.br
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -457,7 +441,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 230 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 215 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -683,7 +667,6 @@
.rm j+
.rm k+
.rm l+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-52
.TP 3
\-h n
@@ -697,13 +680,9 @@
.RE
.LP
-.RE
.SS
STATOPTIONS AND OUTPUT
.LP
-.RS 3
-
-.LP
.LP
The following tables summarize the columns that \f3jstat\fP outputs for each \f2statOption\fP.
.br
@@ -713,7 +692,6 @@
\-class Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -825,7 +803,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 280 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 261 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -910,7 +888,6 @@
.rm a+
.rm b+
.rm c+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-21
.LP
@@ -918,7 +895,6 @@
\-compiler Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -1082,7 +1058,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 316 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 297 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1210,7 +1186,6 @@
.rm d+
.rm e+
.rm f+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-29
.LP
@@ -1218,7 +1193,6 @@
\-gc Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -1546,7 +1520,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 386 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 367 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1814,7 +1788,6 @@
.rm l+
.rm m+
.rm n+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-63
.LP
@@ -1822,7 +1795,6 @@
\-gccapacity Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -2170,7 +2142,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 460 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 441 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2455,7 +2427,6 @@
.rm m+
.rm n+
.rm o+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-67
.LP
@@ -2466,7 +2437,6 @@
This option displays the same summary of garbage collection statistics as the \f3\-gcutil\fP option, but includes the causes of the last garbage collection event and (if applicable) the current garbage collection event. In addition to the columns listed for \f3\-gcutil\fP, this option adds the following columns:
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -2550,7 +2520,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 483 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 464 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2610,7 +2580,6 @@
.35
.rm a+
.rm b+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-13
.LP
@@ -2618,7 +2587,6 @@
\-gcnew Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -2866,7 +2834,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 537 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 518 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -3066,7 +3034,6 @@
.rm h+
.rm i+
.rm j+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-47
.LP
@@ -3074,7 +3041,6 @@
\-gcnewcapacity Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -3094,15 +3060,14 @@
.rm 80 81
.nr 34 \n(.lu
.eo
-.am 80
+.am 81
.br
.di a+
.35
.ft \n(.f
.ll \n(34u*1u/3u
-.if \n(.l<\n(80 .ll \n(80u
+.if \n(.l<\n(81 .ll \n(81u
.in 0
-NGCMN\ \ \ \ \ \ \ \ \ T}~T{
Minimum new generation capacity (KB).
.br
.di
@@ -3262,9 +3227,11 @@
.if \n(80<\n(38 .nr 80 \n(38
.nr 38 \w\f3Column\fP
.if \n(80<\n(38 .nr 80 \n(38
-.nr 38 \wNGCMX \ \ \
+.nr 38 \wNGCMN
.if \n(80<\n(38 .nr 80 \n(38
-.nr 38 \wNGC \ \ \
+.nr 38 \wNGCMX
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \wNGC
.if \n(80<\n(38 .nr 80 \n(38
.nr 38 \wS0CMX
.if \n(80<\n(38 .nr 80 \n(38
@@ -3284,8 +3251,6 @@
.if \n(80<\n(38 .nr 80 \n(38
.80
.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
.nr 81 0
.nr 38 \w\f3Description\fP
.if \n(81<\n(38 .nr 81 \n(38
@@ -3293,6 +3258,8 @@
.if \n(81<\n(38 .nr 81 \n(38
.81
.rm 81
+.nr 38 \n(a-
+.if \n(81<\n(38 .nr 81 \n(38
.nr 38 \n(b-
.if \n(81<\n(38 .nr 81 \n(38
.nr 38 \n(c-
@@ -3321,7 +3288,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 593 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 572 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -3348,11 +3315,11 @@
.ta \n(80u \n(81u
.nr 31 \n(.f
.nr 35 1m
-\&\h'|\n(40u'\h'|\n(41u'
+\&\h'|\n(40u'NGCMN\h'|\n(41u'
.mk ##
.nr 31 \n(##
.sp |\n(##u-1v
-.nr 37 \n(40u
+.nr 37 \n(41u
.in +\n(37u
.a+
.in -\n(37u
@@ -3364,7 +3331,7 @@
.ta \n(80u \n(81u
.nr 31 \n(.f
.nr 35 1m
-\&\h'|\n(40u'NGCMX \ \ \\h'|\n(41u'
+\&\h'|\n(40u'NGCMX\h'|\n(41u'
.mk ##
.nr 31 \n(##
.sp |\n(##u-1v
@@ -3380,7 +3347,7 @@
.ta \n(80u \n(81u
.nr 31 \n(.f
.nr 35 1m
-\&\h'|\n(40u'NGC \ \ \\h'|\n(41u'
+\&\h'|\n(40u'NGC\h'|\n(41u'
.mk ##
.nr 31 \n(##
.sp |\n(##u-1v
@@ -3521,15 +3488,13 @@
.rm h+
.rm i+
.rm j+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-49
+.if \n-(b.=0 .nr c. \n(.c-\n(d.-47
.LP
.SS
\-gcold Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -3717,7 +3682,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 635 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 614 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -3866,7 +3831,6 @@
.rm e+
.rm f+
.rm g+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-35
.LP
@@ -3874,7 +3838,6 @@
\-gcoldcapacity Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -4062,7 +4025,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 677 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 656 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -4211,7 +4174,6 @@
.rm e+
.rm f+
.rm g+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-35
.LP
@@ -4219,7 +4181,6 @@
\-gcpermcapacity Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -4407,7 +4368,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 719 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 698 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -4556,7 +4517,6 @@
.rm e+
.rm f+
.rm g+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-35
.LP
@@ -4564,7 +4524,6 @@
\-gcutil Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -4792,7 +4751,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 769 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 748 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -4975,7 +4934,6 @@
.rm g+
.rm h+
.rm i+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-43
.LP
@@ -4983,7 +4941,6 @@
\-printcompilation Option
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -5091,7 +5048,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 795 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 774 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -5172,14 +5129,10 @@
.rm a+
.rm b+
.rm c+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-19
.LP
-.SS
-
-.LP
-.SH ""
+.SH "EXAMPLES"
.LP
.LP
This section presents some examples of monitoring a local JVM with a \f2lvmid\fP of 21891.
@@ -5355,7 +5308,6 @@
.LP
The \f2lvmid\fP is combined with the name of the remote host to construct a \f2vmid\fP of \f240496@remote.domain\fP. This \f2vmid\fP results in the use of the \f3rmi\fP protocol to communicate to the default \f3jstatd\fP server on the remote host. The \f3jstatd\fP server is located using the \f3rmiregistry\fP on \f2remote.domain\fP that is bound to the default \f3rmiregistry\fP port (port 1099).
.LP
-.RE
.SH "SEE ALSO"
.LP
.RS 3
--- a/jdk/src/linux/doc/man/jstatd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/jstatd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstatd 1 "02 Jun 2010"
+.TH jstatd 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -42,8 +40,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
@@ -53,8 +49,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jstatd\fP tool is an RMI server application that monitors for the creation and termination of instrumented HotSpot Java virtual machines (JVMs) and provides a interface to allow remote monitoring tools to attach to JVMs running on the local host.
.LP
@@ -66,8 +60,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The \f3jstatd\fP command supports the following options:
.LP
@@ -89,8 +81,6 @@
.LP
.SH "SECURITY"
.LP
-
-.LP
.LP
The \f3jstatd\fP server can only monitor JVMs for which it has the appropriate native access permissions. Therefor the \f3jstatd\fP process must be running with the same user credentials as the target JVMs. Some user credentials, such as the \f2root\fP user in UNIX(TM) based systems, have permission to access the instrumentation exported by any JVM on the system. A \f3jstatd\fP process running with such credentials can monitor any JVM on the system, but introduces additional security concerns.
.LP
@@ -102,7 +92,7 @@
.na
\f2Policy File Syntax\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html.
.LP
.LP
The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server.
@@ -145,15 +135,11 @@
.LP
.SH "REMOTE INTERFACE"
.LP
-
-.LP
.LP
The interface exported by the \f3jstatd\fP process is proprietary and is guaranteed to change. Users and developers are discouraged from writing to this interface.
.LP
.SH "EXAMPLES"
.LP
-
-.LP
.LP
Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background.
.LP
@@ -264,7 +250,7 @@
.na
\f2rmiregistry\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry
.RE
.LP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/linux/doc/man/jvisualvm.1 Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,104 @@
+." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+." 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.
+."
+.TH jvisualvm 1 "10 May 2011"
+
+.LP
+.SH "Name"
+\f2jvisualvm\fP \- Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool
+.LP
+.SH "SYNOPSIS"
+.LP
+.nf
+\f3
+.fl
+ \fP\f3jvisualvm\fP [ \f2options\fP ]
+.fl
+.fi
+
+.LP
+.SH "PARAMETERS"
+.LP
+.LP
+Options, if used, should follow immediately after the command name. Options may be in any order. For a discussion of parameters that apply to a specific option, see OPTIONS below.
+.LP
+.SH "DESCRIPTION"
+.LP
+.LP
+Java VisualVM is an intuitive graphical user interface that provides detailed information about Java technology\-based applications (Java applications) while they are running on a given Java Virtual Machine (JVM(*)). The name Java VisualVM comes from the fact that Java VisualVM provides information about the JVM software \f2visually\fP.
+.LP
+.LP
+Java VisualVM combines several monitoring, troubleshooting, and profiling utilities into a single tool. For example, most of the functionality offered by the standalone tools \f2jmap\fP, \f2jinfo\fP, \f2jstat\fP and \f2jstack\fP have been integrated into Java VisualVM. Other functionalities, such as some of those offered by the JConsole tool, can be added as optional plug\-ins.
+.LP
+.SH "OPTIONS"
+.LP
+.LP
+The following option is possible when you launch Java VisualVM.
+.LP
+.RS 3
+.TP 3
+\-J<jvm_option>\
+Pass this \f2<jvm_option>\fP to the JVM software.
+.RE
+
+.LP
+.SH "USAGE"
+.LP
+.LP
+Java VisualVM is useful to Java application developers to troubleshoot applications and to monitor and improve the applications' performance. Java VisualVM can allow developers to generate and analyse heap dumps, track down memory leaks, perform and monitor garbage collection, and perform lightweight memory and CPU profiling. Plug\-ins also exist that expand the functionality of Java VisualVM. For example, most of the functionality of the JConsole tool is available via the MBeans Tab and JConsole Plug\-in Wrapper plug\-ins. You can choose from a catalog of standard Java VisualVM plug\-ins by selecting 'Tools' | 'Plugins' in the Java VisualVM menus.
+.LP
+.LP
+Start Java VisualVM with the following command:
+.LP
+.nf
+\f3
+.fl
+% jvisualvm \fP\f4<options>\fP\f3
+.fl
+\fP
+.fi
+
+.LP
+.SH "SEE ALSO"
+.LP
+.LP
+For more details about Java VisualVM see the following pages.
+.LP
+.RS 3
+.TP 2
+o
+.na
+\f2Java VisualVM developers' site\fP @
+.fi
+http://visualvm.java.net
+.TP 2
+o
+.na
+\f2Java VisualVM in Java SE platform documentation\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html
+.RE
+
+.LP
+.LP
+\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP
+.LP
+
--- a/jdk/src/linux/doc/man/keytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/keytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH keytool 1 "02 Jun 2010"
+.TH keytool 1 "10 May 2011"
.LP
.SH "Name"
keytool \- Key and Certificate Management Tool
.LP
-.RS 3
-
.LP
Manages a keystore (database) of cryptographic keys, X.509 certificate chains, and trusted certificates.
-.RE
+.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +43,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
\f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers.
.LP
A \f2certificate\fP is a digitally signed statement from one entity (person, company, etc.), saying that the public key (and some other information) of some other entity has a particular value. (See Certificates.) When data is digitally signed, the signature can be verified to check the data integrity and authenticity. \f2Integrity\fP means that the data has not been modified or tampered with, and \f2authenticity\fP means the data indeed comes from whoever claims to have created and signed it.
@@ -57,14 +51,12 @@
\f3keytool\fP also enables users to administer secret keys used in symmetric encryption/decryption (e.g. DES).
.LP
.LP
-\f3keytool\fP stores the keys and certificates in a \f2keystore\fP.
+\f3keytool\fP stores the keys and certificates in a \f2keystore\fP.
.LP
.SH "COMMAND AND OPTION NOTES"
.LP
-
.LP
-.LP
-The various commands and their options are listed and described below . Note:
+The various commands and their options are listed and described below. Note:
.LP
.RS 3
.TP 2
@@ -114,6 +106,7 @@
.fl
\fP
.fi
+.LP
is equivalent to
.nf
\f3
@@ -128,10 +121,9 @@
.SS
Option Defaults
.LP
-.RS 3
-
.LP
-Below are the defaults for various option values.
+Below are the defaults for various option values.
+.LP
.nf
\f3
.fl
@@ -153,12 +145,16 @@
.fl
1024 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "DSA")
.fl
+ 256 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "EC")
+.fl
56 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DES")
.fl
168 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DESede")
.fl
.fl
+
+.fl
\-validity 90
.fl
@@ -169,7 +165,7 @@
.fl
\-storetype the value of the "keystore.type" property in the security properties file,
.fl
- which is returned by the static \fP\f4getDefaultType\fP\f3 method in
+ which is returned by the static \fP\f4getDefaultType\fP\f3 method in
.fl
\fP\f4java.security.KeyStore\fP\f3
.fl
@@ -181,25 +177,39 @@
.fl
\-protected false
.fl
-
-.fl
\fP
.fi
.LP
-In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA", and if the underlying private key is of type "RSA", \f2\-sigalg\fP defaults to "SHA256withRSA". Please consult the
+.LP
+In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key:
+.LP
+.RS 3
+.TP 2
+o
+If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA"
+.TP 2
+o
+If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA".
+.TP 2
+o
+If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA".
+.RE
+
+.LP
+.LP
+Please consult the
.na
\f2Java Cryptography Architecture API Specification & Reference\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
-.RE
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
+.LP
.SS
Common Options
.LP
-.RS 3
-
.LP
-The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output.
+The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output.
+.LP
.LP
There is also a \f2\-J\fP\f2javaoption\fP option that may appear for any command. If it appears, the specified \f2javaoption\fP string is passed through directly to the Java interpreter. This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
.LP
@@ -209,46 +219,65 @@
.RS 3
.TP 3
\-storetype storetype
-This qualifier specifies the type of keystore to be instantiated.
+.LP
+This qualifier specifies the type of keystore to be instantiated.
.TP 3
\-keystore keystore
+.LP
The keystore location.
.LP
If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created
.LP
Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device).
.TP 3
-\-storepass storepass
+\-storepass[:env|:file] argument
+.LP
The password which is used to protect the integrity of the keystore.
.LP
-\f2storepass\fP must be at least 6 characters long. It must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it.
+If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows:
+.RS 3
+.TP 2
+o
+\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
+.TP 2
+o
+\f2file\fP: Retrieve the password from the file named \f2argument\fP
+.RE
+.LP
+\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).)
+.LP
+The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it.
.LP
When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed.
.TP 3
\-providerName provider_name
-Used to identify a cryptographic service provider's name when listed in the security properties file.
+.LP
+Used to identify a cryptographic service provider's name when listed in the security properties file.
.TP 3
\-providerClass provider_class_name
-Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.
+.LP
+Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.
.TP 3
\-providerArg provider_arg
-Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.
+.LP
+Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.
.TP 3
\-protected
+.LP
Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
.LP
Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively.
.TP 3
\-ext {name{:critical}{=value}}
-Denotes an X.509 certificate extension. The option can be used in \f2\-genkeypair\fP and \f2\-gencert\fP to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2":critical"\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false.
-.RS 3
+.LP
+Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP.
+.RE
.LP
.LP
Currently keytool supports these named extensions (case\-insensitive):
.LP
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -478,7 +507,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 289 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 319 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -649,7 +678,6 @@
.rm h+
.rm i+
.rm j+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-38
.LP
@@ -657,7 +685,7 @@
For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then.
.LP
.LP
-A special name \f2"honored"\fP, used in \-gencert only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma\-seperated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default.
+A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default.
.LP
.LP
If, besides the \-ext honored option, another named or OID \-ext option is provided, this extension will be added to those already honored. However, if this name (or OID) also appears in the honored value, its value and criticality overrides the one in the request.
@@ -668,32 +696,61 @@
.LP
\f3Note:\fP Users should be aware that some combinations of extensions (and other certificate fields) may not conform to the Internet standard. See Warning Regarding Certificate Conformance for details.
.LP
-.RE
-.RE
-.RE
.SH "COMMANDS"
.LP
-
-.LP
.SS
Creating or Adding Data to the Keystore
.LP
.RS 3
-
+.TP 3
+\-gencert {\-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}
.LP
-.RS 3
-.TP 3
-\-gencert {\-infile infile} {\-outfile outfile} {\-dname dname} {\-ext ext}* {\-rfc} {\-alias alias} {\-sigalg sigalg} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] [\-keypass keypass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
+Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created.
.LP
-Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from infile (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into outfile (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created.
-.LP
-\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. valDays tells the number of days for which the certificate should be considered valid.
+\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid.
.LP
If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used.
.LP
-\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP.
+\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP.
+.LP
+The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain.
+.LP
+The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP:
+.nf
+\f3
+.fl
+keytool \-alias ca \-dname CN=CA \-genkeypair
+.fl
+keytool \-alias ca1 \-dname CN=CA \-genkeypair
+.fl
+keytool \-alias ca2 \-dname CN=CA \-genkeypair
+.fl
+keytool \-alias e1 \-dname CN=E1 \-genkeypair
+.fl
+\fP
+.fi
+.LP
+The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued:
+.nf
+\f3
+.fl
+keytool \-alias ca1 \-certreq | keytool \-alias ca \-gencert \-ext san=dns:ca1 | keytool \-alias ca1 \-importcert
+.fl
+keytool \-alias ca2 \-certreq | $KT \-alias ca1 \-gencert \-ext san=dns:ca2 | $KT \-alias ca2 \-importcert
+.fl
+\fP
+.fi
+.LP
+The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain:
+.nf
+\f3
+.fl
+keytool \-alias e1 \-certreq | keytool \-alias ca2 \-gencert > e1.cert
+.fl
+\fP
+.fi
.TP 3
-\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
+\-genkeypair {\-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}
.LP
Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP.
.LP
@@ -704,30 +761,18 @@
\f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
.LP
\f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field.
-.RS 3
-
.LP
-.LP
-The option value can be set in one of these two forms:
-.LP
+The option value can be set in one of these two forms:
.RS 3
.TP 3
1.
-.LP
-([+\-]\f2nnn\fP[ymdHMS])+
+([+\-]\f2nnn\fP[ymdHMS])+
.TP 3
2.
-.LP
-[yyyy/mm/dd] [HH:MM:SS]
+[yyyy/mm/dd] [HH:MM:SS]
.RE
-
-.LP
.LP
-With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be:
-.LP
-.RS 3
-
-.LP
+With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be:
.nf
\f3
.fl
@@ -743,16 +788,10 @@
.fl
\fP
.fi
-.RE
-
-.LP
.LP
-With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local timezone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format.
-.LP
+With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format.
.LP
-When the option is not provided, the start date is the current time. The option can be provided at most once.
-.LP
-.RE
+When the option is not provided, the start date is the current time. The option can be provided at most once.
.LP
\f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid.
.LP
@@ -790,25 +829,17 @@
\f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply.
.RE
\f3Importing a New Trusted Certificate\fP
-.RS 3
-.LP
-Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore.
-.LP
.LP
-If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts".
+Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore.
.LP
-.LP
-If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user.
+If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts".
.LP
-.RE
+If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user.
\f3Importing a Certificate Reply\fP
-.RS 3
.LP
-When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified).
-.LP
+When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified).
.LP
-The methods of determining whether the certificate reply is trusted are described in the following:
-.LP
+The methods of determining whether the certificate reply is trusted are described in the following:
.RS 3
.TP 2
o
@@ -817,12 +848,8 @@
o
\f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it.
.RE
-
.LP
-.LP
-If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it.
-.LP
-.RE
+If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it.
.LP
This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward.
.TP 3
@@ -842,14 +869,12 @@
.LP
Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input.
.RE
-.RE
+
+.LP
.SS
Exporting Data
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-certreq {\-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}
.LP
@@ -879,14 +904,10 @@
.RE
.LP
-.RE
.SS
Displaying Data
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption}
.LP
@@ -896,27 +917,36 @@
.LP
You cannot specify both \f2\-v\fP and \f2\-rfc\fP.
.TP 3
-\-printcert {\-file cert_file | \-sslserver host[:port]} {\-rfc} {\-v} {\-Jjavaoption}
+\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}
.LP
+Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin.
.LP
If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard.
.LP
If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard
.LP
-If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the JSSE Reference Guide for more information.
+If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the
+.na
+\f2JSSE Reference Guide\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information.
+.LP
+\f3Note\fP: This option can be used independently of a keystore.
+.TP 3
+\-printcrl \-file crl_ {\-v}
+.LP
+Reads the certificate revocation list (CRL) from the file \f2crl_file\fP.
+.LP
+A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP.
.LP
\f3Note\fP: This option can be used independently of a keystore.
.RE
.LP
-.RE
.SS
Managing the Keystore
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
.LP
@@ -940,46 +970,45 @@
.RE
.LP
-.RE
.SS
Getting Help
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-help
.LP
-Lists the basic commands and their options.
+Lists the basic commands and their options.
+.LP
+For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command:
+.nf
+\f3
+.fl
+ keytool \-\fP\f4command_name\fP\f3 \-help
+.fl
+\fP
+.fi
.RE
.LP
-.RE
.SH "EXAMPLES"
.LP
-
-.LP
.LP
Suppose you want to create a keystore for managing your public/private key pair and certificates from entities you trust.
.LP
.SS
Generating Your Key Pair
.LP
-.RS 3
-
-.LP
.LP
The first thing you need to do is create a keystore and generate the key pair. You could use a command such as the following:
.LP
.nf
\f3
.fl
- keytool \-genkeypair \-dname "cn=Mark Jones, ou=JavaSoft, o=Sun, c=US"
+ keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US"
.fl
- \-alias business \-keypass kpi135 \-keystore /working/mykeystore
+ \-alias business \-keypass \fP\f4<new password for private key>\fP\f3 \-keystore /working/mykeystore
.fl
- \-storepass ab987c \-validity 180
+ \-storepass \fP\f4<new password for keystore>\fP\f3 \-validity 180
.fl
\fP
.fi
@@ -989,10 +1018,10 @@
(Please note: This must be typed as a single line. Multiple lines are used in the examples just for legibility purposes.)
.LP
.LP
-This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password "ab987c". It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "JavaSoft", organization of "Sun" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long.
+This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password specified by \f2<new password for keystore>\fP. It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "Java", organization of "Oracle" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long.
.LP
.LP
-It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password "kpi135".
+It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password specified by \f2<new password for private key>\fP.
.LP
.LP
The command could be significantly shorter if option defaults were accepted. As a matter of fact, no options are required; defaults are used for unspecified options that have default values, and you are prompted for any required values. Thus, you could simply have the following:
@@ -1006,17 +1035,15 @@
.fi
.LP
-In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password.
+.LP
+In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password.
.LP
-The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (a private key password of "kpi135", etc.)
.LP
-.RE
+The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (for example, a distinguished name of "cn=Mark Jones, ou=Java, o=Oracle, c=US").
+.LP
.SS
Requesting a Signed Certificate from a Certification Authority
.LP
-.RS 3
-
-.LP
.LP
So far all we've got is a self\-signed certificate. A certificate is more likely to be trusted by others if it is signed by a Certification Authority (CA). To get such a signature, you first generate a Certificate Signing Request (CSR), via the following:
.LP
@@ -1029,14 +1056,12 @@
.fi
.LP
+.LP
This creates a CSR (for the entity identified by the default alias "mykey") and puts the request in the file named "MarkJ.csr". Submit this file to a CA, such as VeriSign, Inc. The CA will authenticate you, the requestor (usually off\-line), and then will return a certificate, signed by them, authenticating your public key. (In some cases, they will actually return a chain of certificates, each one authenticating the public key of the signer of the previous certificate in the chain.)
-.RE
+.LP
.SS
Importing a Certificate for the CA
.LP
-.RS 3
-
-.LP
.LP
You need to replace your self\-signed certificate with a certificate chain, where each certificate in the chain authenticates the public key of the signer of the previous certificate in the chain, up to a "root" CA.
.LP
@@ -1054,7 +1079,7 @@
.LP
.LP
-The "cacerts" keystore file ships with five VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate".
+The "cacerts" keystore file ships with several VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate".
.LP
.LP
A certificate from a CA is usually either self\-signed, or signed by another CA (in which case you also need a certificate authenticating that CA's public key). Suppose company ABC, Inc., is a CA, and you obtain a file named "ABCCA.cer" that is purportedly a self\-signed certificate from ABC, authenticating that CA's public key.
@@ -1074,14 +1099,12 @@
.fi
.LP
+.LP
This creates a "trusted certificate" entry in the keystore, with the data from the file "ABCCA.cer", and assigns the alias "abc" to the entry.
-.RE
+.LP
.SS
Importing the Certificate Reply from the CA
.LP
-.RS 3
-
-.LP
.LP
Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file.
.LP
@@ -1095,16 +1118,14 @@
.fl
\fP
.fi
-.RE
.LP
.SS
Exporting a Certificate Authenticating Your Public Key
.LP
-.RS 3
-
.LP
-Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature.
+Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature.
+.LP
.LP
One way they can do this is by first importing your public key certificate into their keystore as a "trusted" entry. You can export the certificate and supply it to your clients. As an example, you can copy your certificate to a file named \f2MJ.cer\fP via the following, assuming the entry is aliased by "mykey":
.LP
@@ -1117,14 +1138,12 @@
.fi
.LP
+.LP
Given that certificate, and the signed JAR file, a client can use the \f3jarsigner\fP tool to authenticate your signature.
-.RE
+.LP
.SS
Importing Keystore
.LP
-.RS 3
-
-.LP
.LP
The command "importkeystore" is used to import an entire keystore into another keystore, which means all entries from the source keystore, including keys and certificates, are all imported to the destination keystore within a single command. You can use this command to import entries from a different type of keystore. During the import, all new entries in the destination keystore will have the same alias names and protection passwords (for secret keys and private keys). If \f3keytool\fP has difficulties recover the private keys or secret keys from the source keystore, it will prompt you for a password. If it detects alias duplication, it will ask you for a new one, you can specify a new alias or simply allow \f3keytool\fP to overwrite the existing one.
.LP
@@ -1134,128 +1153,108 @@
.nf
\f3
.fl
-keytool \-importkeystore
+ keytool \-importkeystore
.fl
\-srckeystore key.jks \-destkeystore NONE
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3
.fl
\fP
.fi
.LP
.LP
-The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the desination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. In this way, you can issue a \f3keytool\fP command that will never ask you a question. This makes it very convenient to include a \f3keytool\fP command into a script file, like this:
+The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the destination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. The following command demonstrates this:
.LP
.nf
\f3
.fl
-keytool \-importkeystore
+ keytool \-importkeystore
.fl
\-srckeystore key.jks \-destkeystore NONE
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3
.fl
\-srcalias myprivatekey \-destalias myoldprivatekey
.fl
- \-srckeypass oldkeypass \-destkeypass mynewkeypass
+ \-srckeypass \fP\f4<source entry password>\fP\f3 \-destkeypass \fP\f4<destination entry password>\fP\f3
.fl
\-noprompt
.fl
\fP
.fi
-.RE
.LP
.SS
-Generating Certificates for a typical SSL Server
-.LP
-.RS 3
-
+Generating Certificates for a Typical SSL Server
.LP
.LP
-Keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermadiate CA (ca), and SSL server (server) are as follows:
+The following are keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermediate CA (ca), and SSL server (server). Ensure that you store all the certificates in the same keystore. In these examples, it is recommended that you specify RSA as the key algorithm.
.LP
.nf
\f3
.fl
-keytool \-keystore root.jks \-genkeypair \-alias root \-ext bc:c
+keytool \-genkeypair \-keystore root.jks \-alias root \-ext bc:c
.fl
-keytool \-keystore ca.jks \-alias ca
+keytool \-genkeypair \-keystore ca.jks \-alias ca \-ext bc:c
.fl
-keytool \-keystore server.jks \-alias server
+keytool \-genkeypair \-keystore server.jks \-alias server
.fl
-
+
.fl
-keytool \-keystore root.jks \-alias root \-exportcert > root.pem
+keytool \-keystore root.jks \-alias root \-exportcert \-rfc > root.pem
.fl
-
+
.fl
-keytool \-keystore ca.jks \-certreq \-alias ca | keytool \-keystore root.jks \-gencert \-alias root \-ext BC=0 > ca.pem
+keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-certreq \-alias ca | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore root.jks \-gencert \-alias root \-ext BC=0 \-rfc > ca.pem
.fl
keytool \-keystore ca.jks \-importcert \-alias ca \-file ca.pem
.fl
-
+
.fl
-keytool \-keystore server.jks \-certreq \-alias server | keytool \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE >server.pem
+keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore server.jks \-certreq \-alias server | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE \-rfc > server.pem
.fl
cat root.pem ca.pem server.pem | keytool \-keystore server.jks \-importcert \-alias server
.fl
\fP
.fi
-.RE
.LP
.SH "TERMINOLOGY and WARNINGS"
.LP
-
-.LP
.SS
KeyStore
.LP
-.RS 3
-
.LP
A keystore is a storage facility for cryptographic keys and certificates.
-.RE
+.LP
.RS 3
.TP 2
o
-.TP 2
-o
\f3KeyStore Entries\fP
-.RS 3
-
.LP
Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include:
.RS 3
.TP 3
1.
-\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types od entry, while \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains.
+\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains.
.TP 3
2.
\f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate.
.RE
-
-.LP
-.RE
.TP 2
o
\f3KeyStore Aliases\fP
-.RS 3
.LP
-All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP.
-.LP
+All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP.
.LP
-An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity.
-.LP
+An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity.
.LP
-For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command:
-.LP
+For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command:
.nf
\f3
.fl
@@ -1263,9 +1262,8 @@
.fl
\fP
.fi
-
.LP
-This specifies an inital password of "dukekeypasswd" required by subsequent commands to access the private key assocated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following:
+This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following:
.nf
\f3
.fl
@@ -1273,49 +1271,37 @@
.fl
\fP
.fi
-
.LP
This changes the password from "dukekeypasswd" to "newpass".
.LP
-Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it.
-.LP
-.RE
+Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it.
.TP 2
o
\f3KeyStore Implementation\fP
-.RS 3
+.LP
The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
.LP
-Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it.
-.LP
+Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it.
.LP
-There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
-.LP
+There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
.LP
Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in
.na
\f2How to Implement a Provider for the Java Cryptography Architecture\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
.LP
-Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
-.LP
+Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
.LP
-\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
-.LP
+\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
.LP
-For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu.
-.LP
+For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu.
.LP
-If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
-.LP
+If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
.LP
-Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
-.LP
+Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
.LP
-The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
-.LP
+The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
.nf
\f3
.fl
@@ -1323,11 +1309,8 @@
.fl
\fP
.fi
-
.LP
-.LP
-The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file:
-.LP
+The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file:
.nf
\f3
.fl
@@ -1335,14 +1318,10 @@
.fl
\fP
.fi
-
-.LP
.LP
-To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type.
-.LP
+To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type.
.LP
-For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
-.LP
+For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
.nf
\f3
.fl
@@ -1350,50 +1329,45 @@
.fl
\fP
.fi
+.LP
+Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
+.RE
.LP
-Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
-.RE
-.RE
.SS
Certificate
.LP
+A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value.
.RS 3
-
-.LP
-A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value.
-.RE
-.RS 3
-.TP 2
-o
.TP 2
o
\f3Certificate Terms\fP
.RS 3
-
-.LP
-.RS 3
.TP 3
Public Keys
-These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.
+.LP
+These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.
.TP 3
Digitally Signed
-If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.
+.LP
+If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.
.TP 3
Identity
-A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.
+.LP
+A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.
.TP 3
Signature
-A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).
+.LP
+A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).
.TP 3
Private Keys
-These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.
+.LP
+These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.
.TP 3
Entity
-An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.
+.LP
+An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.
.RE
-
-.LP
.LP
Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as
.na
@@ -1407,26 +1381,22 @@
.na
\f2Entrust\fP @
.fi
-http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as the Netscape/Microsoft Certificate Servers or the Entrust CA product for your organization.
-.LP
-.LP
-Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates.
+http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization.
.LP
+Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates.
.LP
-\f3keytool\fP currently handles X.509 certificates.
-.LP
-.RE
+\f3keytool\fP currently handles X.509 certificates.
.TP 2
o
\f3X.509 Certificates\fP
-.RS 3
+.LP
The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data.
.LP
-All X.509 certificates have the following data, in addition to the signature:
-.LP
+All X.509 certificates have the following data, in addition to the signature:
.RS 3
.TP 3
Version
+.LP
This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates.
.LP
\f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic.
@@ -1436,475 +1406,86 @@
\f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use.
.TP 3
Serial Number
-The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).
+.LP
+The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).
.TP 3
Signature Algorithm Identifier
-This identifies the algorithm used by the CA to sign the certificate.
+.LP
+This identifies the algorithm used by the CA to sign the certificate.
.TP 3
Issuer Name
-The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)
+.LP
+The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)
.TP 3
Validity Period
-Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.
+.LP
+Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.
.TP 3
Subject Name
+.LP
The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example,
.nf
\f3
.fl
- CN=Java Duke, OU=Java Software Division, O=Sun Microsystems Inc, C=US
+ CN=Java Duke, OU=Java Software Division, O=Oracle Corporation, C=US
.fl
\fP
.fi
-(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.)
+.LP
+(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.)
.TP 3
Subject Public Key Information
-This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters.
-.RE
-
.LP
+This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters.
.RE
.TP 2
o
\f3Certificate Chains\fP
-.RS 3
.LP
-\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key.
-.LP
+\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key.
.LP
-When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate.
-.LP
+When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate.
.LP
-Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key.
-.LP
+Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key.
.LP
-In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain.
-.LP
+In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain.
.LP
-Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore.
-.LP
+Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore.
.LP
-A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP.
-.LP
+A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP.
.LP
-The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's webpage, etc.).
-.LP
-.RE
+The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.).
.TP 2
o
\f3The cacerts Certificates File\fP
-.RS 3
.LP
-A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
-.LP
-.LP
-The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with several root CA certificates with the following aliases and X.500 owner distinguished names:
+A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
.LP
-.RS 3
-.TP 2
-*
-\f3Alias\fP: thawtepersonalfreemailca
-.br
-\f3Owner DN\fP: EmailAddress=personal\-freemail@thawte.com,
-.br
-CN=Thawte Personal Freemail CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawtepersonalbasicca
-.br
-\f3Owner DN\fP: EmailAddress=personal\-basic@thawte.com,
-.br
-CN=Thawte Personal Basic CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawtepersonalpremiumca
-.br
-\f3Owner DN\fP: EmailAddress=personal\-premium@thawte.com,
-.br
-CN=Thawte Personal Premium CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawteserverca
-.br
-\f3Owner DN\fP: EmailAddress=server\-certs@thawte.com,
-.br
-CN=Thawte Server CA, OU=Certification Services Division,
-.br
-O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawtepremiumserverca
-.br
-\f3Owner DN\fP: EmailAddress=premium\-server@thawte.com,
-.br
-CN=Thawte Premium Server CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: verisignclass1ca
-.br
-\f3Owner DN\fP: OU=Class 1 Public Primary Certification Authority,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass2ca
-.br
-\f3Owner DN\fP: OU=Class 2 Public Primary Certification Authority,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass3ca
-.br
-\f3Owner DN\fP: OU=Class 3 Public Primary Certification Authority,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignserverca
-.br
-\f3Owner DN\fP: OU=Secure Server Certification Authority,
-.br
-O="RSA Data Security, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass1g2ca
-.br
-\f3Owner DN\fP: OU=VeriSign Trust Network,
-.br
-OU="(c) 1998 VeriSign, Inc. \- For authorized use only",
-.br
-OU=Class 1 Public Primary Certification Authority \- G2,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass1g3ca
-.br
-\f3Owner DN\fP: CN=VeriSign Class 1 Public Primary Certification Authority \- G3, OU="(c) 1999 VeriSign, Inc. \- For authorized use only",
-.br
-OU=VeriSign Trust Network,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass2g2ca
-.br
-\f3Owner DN\fP: OU=VeriSign Trust Network,
-.br
-OU="(c) 1998 VeriSign, Inc. \- For authorized use only",
-.br
-OU=Class 2 Public Primary Certification Authority \- G2,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass2g3ca
-.br
-\f3Owner DN\fP: CN=VeriSign Class 2 Public Primary Certification Authority \- G3,
-.br
-OU="(c) 1999 VeriSign, Inc. \- For authorized use only",
-.br
-OU=VeriSign Trust Network,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass3g2ca
-.br
-\f3Owner DN\fP: OU=VeriSign Trust Network,
-.br
-OU="(c) 1998 VeriSign, Inc. \- For authorized use only",
-.br
-OU=Class 3 Public Primary Certification Authority \- G2,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass3g3ca
-.br
-\f3Owner DN\fP: CN=VeriSign Class 3 Public Primary Certification Authority \- G3,
-.br
-OU="(c) 1999 VeriSign, Inc. \- For authorized use only",
-.br
-OU=VeriSign Trust Network,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: baltimorecodesigningca
-.br
-\f3Owner DN\fP: CN=Baltimore CyberTrust Code Signing Root,
-.br
-OU=CyberTrust, O=Baltimore, C=IE
-.TP 2
-*
-\f3Alias\fP: gtecybertrustglobalca
-.br
-\f3Owner DN\fP: CN=GTE CyberTrust Global Root,
-.br
-OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US
-.TP 2
-*
-\f3Alias\fP: baltimorecybertrustca
-.br
-\f3Owner DN\fP: CN=Baltimore CyberTrust Root,
-.br
-OU=CyberTrust, O=Baltimore, C=IE
-.TP 2
-*
-\f3Alias\fP: gtecybertrust5ca
-.br
-\f3Owner DN\fP: CN=GTE CyberTrust Root 5,
-.br
-OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US
-.TP 2
-*
-\f3Alias\fP: entrustclientca
-.br
-\f3Owner DN\fP: CN=Entrust.net Client Certification Authority,
-.br
-OU=(c) 1999 Entrust.net Limited,
-.br
-OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab.,
-.br
-O=Entrust.net, C=US
-.TP 2
-*
-\f3Alias\fP: entrustglobalclientca
-.br
-\f3Owner DN\fP: CN=Entrust.net Client Certification Authority,
-.br
-OU=(c) 2000 Entrust.net Limited,
-.br
-OU=www.entrust.net/GCCA_CPS incorp. by ref. (limits liab.),
-.br
-O=Entrust.net
-.TP 2
-*
-\f3Alias\fP: entrust2048ca
-.br
-\f3Owner DN\fP: CN=Entrust.net Certification Authority (2048),
-.br
-OU=(c) 1999 Entrust.net Limited,
-.br
-OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.),
-.br
-O=Entrust.net
-.TP 2
-*
-\f3Alias\fP: entrustsslca
-.br
-\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority,
-.br
-OU=(c) 1999 Entrust.net Limited,
-.br
-OU=www.entrust.net/CPS incorp. by ref. (limits liab.),
-.br
-O=Entrust.net, C=US
-.TP 2
-*
-\f3Alias\fP: entrustgsslca
-.br
-\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority,
-.br
-OU=(c) 2000 Entrust.net Limited,
-.br
-OU=www.entrust.net/SSL_CPS incorp. by ref. (limits liab.),
-.br
-O=Entrust.net
-.TP 2
-*
-\f3Alias\fP: godaddyclass2ca
-.br
-\f3Owner DN\fP: OU=Go Daddy Class 2 Certification Authority,
-.br
-O="The Go Daddy Group, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: starfieldclass2ca
-.br
-\f3Owner DN\fP: OU=Starfield Class 2 Certification Authority,
-.br
-O="Starfield Technologies, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: valicertclass2ca
-.br
-\f3Owner DN\fP: EMAILADDRESS=info@valicert.com,
-.br
-CN=http://www.valicert.com/,
-.br
-OU=ValiCert Class 2 Policy Validation Authority,
-.br
-O="ValiCert, Inc.", L=ValiCert Validation Network
-.TP 2
-*
-\f3Alias\fP: geotrustglobalca
-.br
-\f3Owner DN\fP: CN=GeoTrust Global CA,
-.br
-O=GeoTrust Inc., C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureca
-.br
-\f3Owner DN\fP: OU=Equifax Secure Certificate Authority,
-.br
-O=Equifax, C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureebusinessca1
-.br
-\f3Owner DN\fP: CN=Equifax Secure eBusiness CA\-1,
-.br
-O=Equifax Secure Inc., C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureebusinessca2
-.br
-\f3Owner DN\fP: OU=Equifax Secure eBusiness CA\-2,
-.br
-O=Equifax Secure, C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureglobalebusinessca1
-.br
-\f3Owner DN\fP: CN=Equifax Secure Global eBusiness CA\-1,
-.br
-O=Equifax Secure Inc., C=US
-.TP 2
-*
-\f3Alias\fP: soneraclass1ca
-.br
-\f3Owner DN\fP: CN=Sonera Class1 CA, O=Sonera, C=FI
-.TP 2
-*
-\f3Alias\fP: soneraclass2ca
-.br
-\f3Owner DN\fP: CN=Sonera Class2 CA, O=Sonera, C=FI
-.TP 2
-*
-\f3Alias\fP: comodoaaaca
-.br
-\f3Owner DN\fP: CN=AAA Certificate Services,
-.br
-O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-.TP 2
-*
-\f3Alias\fP: addtrustclass1ca
-.br
-\f3Owner DN\fP: CN=AddTrust Class 1 CA Root,
-.br
-OU=AddTrust TTP Network, O=AddTrust AB, C=SE
-.TP 2
-*
-\f3Alias\fP: addtrustexternalca
-.br
-\f3Owner DN\fP: CN=AddTrust External CA Root,
-.br
-OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
-.TP 2
-*
-\f3Alias\fP: addtrustqualifiedca
-.br
-\f3Owner DN\fP: CN=AddTrust Qualified CA Root,
-.br
-OU=AddTrust TTP Network, O=AddTrust AB, C=SE
-.TP 2
-*
-\f3Alias\fP: utnuserfirsthardwareca
-.br
-\f3Owner DN\fP: CN=UTN\-USERFirst\-Hardware,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.TP 2
-*
-\f3Alias\fP: utnuserfirstclientauthemailca
-.br
-\f3Owner DN\fP: CN=UTN\-USERFirst\-Client Authentication and Email,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.TP 2
-*
-\f3Alias\fP: utndatacorpsgcca
-.br
-\f3Owner DN\fP: CN=UTN \- DATACorp SGC,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.TP 2
-*
-\f3Alias\fP: utnuserfirstobjectca
-.br
-\f3Owner DN\fP: CN=UTN\-USERFirst\-Object,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.RE
-
+The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command:
+.nf
+\f3
+.fl
+keytool \-list \-keystore \fP\f4java.home\fP\f3/lib/security/cacerts
+.fl
+\fP
+.fi
.LP
-.LP
-The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK.
-.LP
-.RS 3
-
-.LP
-
+The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK.
.LP
-\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP
-.br
-
-.LP
-Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file.
-.br
-
-.LP
-.RE
-
-.LP
-.RE
+\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file.
.TP 2
o
\f3The Internet RFC 1421 Certificate Encoding Standard\fP
-.RS 3
-.LP
-Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism.
.LP
+Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism.
.LP
-Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded.
-.LP
+Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded.
.LP
-The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified.
-.LP
+The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified.
.LP
-The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format.
-.LP
+The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format.
.LP
-In its printable encoding format, the encoded certificate is bounded at the beginning by
-.LP
+In its printable encoding format, the encoded certificate is bounded at the beginning by
.nf
\f3
.fl
@@ -1912,11 +1493,8 @@
.fl
\fP
.fi
-
.LP
-.LP
-and at the end by
-.LP
+and at the end by
.nf
\f3
.fl
@@ -1925,23 +1503,21 @@
\fP
.fi
.RE
-.RE
.LP
.SS
X.500 Distinguished Names
.LP
-.RS 3
-
.LP
-X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts:
+X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts:
+.LP
.RS 3
.TP 2
o
\f2commonName\fP \- common name of a person, e.g., "Susan Jones"
.TP 2
o
-\f2organizationUnit\fP \- small organization (e.g, department or division) name, e.g., "Purchasing"
+\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing"
.TP 2
o
\f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc."
@@ -1975,7 +1551,7 @@
.nf
\f3
.fl
- CN=commonName
+ CN=commonName
.fl
OU=organizationUnit
.fl
@@ -1997,17 +1573,19 @@
.nf
\f3
.fl
-CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US
+CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, S=California, C=US
.fl
\fP
.fi
.LP
-and a sample command using such a string is
+.LP
+and a sample command using such a string is
+.LP
.nf
\f3
.fl
-keytool \-genkeypair \-dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino,
+keytool \-genkeypair \-dname "CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino,
.fl
S=California, C=US" \-alias mark
.fl
@@ -2024,7 +1602,7 @@
.nf
\f3
.fl
-CN=Steve Meier, OU=SunSoft, O=Sun, C=US
+CN=Steve Meier, OU=Java, O=Oracle, C=US
.fl
\fP
.fi
@@ -2036,7 +1614,7 @@
.nf
\f3
.fl
- cn=peter schuster, o=Sun Microsystems\\, Inc., o=sun, c=us
+ cn=Peter Schuster, ou=Java\\, Product Development, o=Oracle, c=US
.fl
\fP
.fi
@@ -2045,14 +1623,12 @@
.LP
It is never necessary to specify a distinguished name string on a command line. If it is needed for a command, but not supplied on the command line, the user is prompted for each of the subcomponents. In this case, a comma does not need to be escaped by a "\\".
.LP
-.RE
.SS
WARNING Regarding Importing Trusted Certificates
.LP
-.RS 3
-
.LP
-IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate!
+IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate!
+.LP
.LP
View it first (using the \f2\-printcert\fP command, or the \f2\-importcert\fP command without the \f2\-noprompt\fP option), and make sure that the displayed certificate fingerprint(s) match the expected ones. For example, suppose someone sends or emails you a certificate, and you put it in a file named \f2/tmp/cert\fP. Before you consider adding the certificate to your list of trusted certificates, you can execute a \f2\-printcert\fP command to view its fingerprints, as in
.LP
@@ -2083,17 +1659,15 @@
.fi
.LP
-Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside).
+.LP
+Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside).
+.LP
.LP
Note: it is not required that you execute a \f2\-printcert\fP command prior to importing a certificate, since before adding a certificate to the list of trusted certificates in the keystore, the \f2\-importcert\fP command prints out the certificate information and prompts you to verify it. You then have the option of aborting the import operation. Note, however, this is only the case if you invoke the \f2\-importcert\fP command without the \f2\-noprompt\fP option. If the \f2\-noprompt\fP option is given, there is no interaction with the user.
.LP
-.RE
.SS
Warning Regarding Passwords
.LP
-.RS 3
-
-.LP
.LP
Most commands operating on a keystore require the store password. Some commands require a private/secret key password.
.LP
@@ -2103,13 +1677,9 @@
.LP
If you don't specify a required password option on a command line, you will be prompted for it.
.LP
-.RE
.SS
Warning Regarding Certificate Conformance
.LP
-.RS 3
-
-.LP
.LP
The Internet standard
.na
@@ -2117,39 +1687,31 @@
.fi
http://tools.ietf.org/rfc/rfc5280.txt has defined a profile on conforming X.509 certificates, which includes what values and value combinations are valid for certificate fields and extensions. \f3keytool\fP has not enforced all these rules so it can generate certificates which do not conform to the standard, and these certificates might be rejected by JRE or other applications. Users should make sure that they provide the correct options for \f2\-dname\fP, \f2\-ext\fP, etc.
.LP
-.RE
.SH "SEE ALSO"
.LP
-
-.LP
.RS 3
.TP 2
o
-.LP
-jar(1) tool documentation
+jar(1) tool documentation
.TP 2
o
-.LP
-jarsigner(1) tool documentation
+jarsigner(1) tool documentation
.TP 2
o
-.LP
the
.na
\f4Security\fP @
.fi
-http://java.sun.com/docs/books/tutorial/security/index.html trail of the
+http://download.oracle.com/javase/tutorial/security/index.html trail of the
.na
\f4Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial for examples of the use of \f3keytool\fP
+http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP
.RE
.LP
.SH "CHANGES"
.LP
-
-.LP
.LP
The command interface for keytool changed in Java SE 6.
.LP
@@ -2184,19 +1746,19 @@
.na
\f2\-keyclone\fP @
.fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#keycloneCmd
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd
.TP 2
o
.na
\f2\-identitydb\fP @
.fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#identitydbCmd
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd
.TP 2
o
.na
\f2\-selfcert\fP @
.fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#selfcertCmd
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd
.RE
.LP
--- a/jdk/src/linux/doc/man/native2ascii.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/native2ascii.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH native2ascii 1 "02 Jun 2010"
+.TH native2ascii 1 "10 May 2011"
.LP
.SH "Name"
native2ascii \- Native\-to\-ASCII Converter
.LP
-.RS 3
-
-.LP
.LP
-Converts a file with native\-encoded characters (characters which are non\-Latin 1 and non\-Unicode) to one with Unicode\-encoded characters.
+Converts a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes, or visa versa.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -46,31 +40,29 @@
.LP
.SH "DESCRIPTION"
.LP
-
.LP
-.LP
-The Java compiler and other Java tools can only process files which contain Latin\-1 and/or Unicode\-encoded (\\udddd notation) characters. \f2native2ascii\fP converts files which contain other character encodings into files containing Latin\-1 and/or Unicode\-encoded charaters.
+\f2native2ascii\fP converts files that are encoded to any character encoding that is supported by the Java runtime environment to files encoded in ASCII, using Unicode escapes ("\\uxxxx" notation) for all characters that are not part of the ASCII character set. This process is required for properties files containing characters not in ISO\-8859\-1 character sets. The tool can also perform the reverse conversion.
.LP
.LP
If \f2outputfile\fP is omitted, standard output is used for output. If, in addition, \f2inputfile\fP is omitted, standard input is used for input.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-reverse
-Perform the reverse operation: convert a file with Latin\-1 and/or Unicode encoded characters to one with native\-encoded characters.
+Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment.
.br
.br
.TP 3
\-encoding encoding_name
-Specify the encoding name which is used by the conversion procedure. The default encoding is taken from System property \f2file.encoding\fP. The \f2encoding_name\fP string must be taken from the first column of the table of supported encodings in the
+Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the
.na
\f4Supported Encodings\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/intl/encoding.doc.html document.
+http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document.
+.br
+.br
.TP 3
\-Joption
Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
--- a/jdk/src/linux/doc/man/orbd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/orbd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,15 +19,12 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH orbd 1 "02 Jun 2010"
+.TH orbd 1 "10 May 2011"
.LP
.SH "Name"
orbd \- The Object Request Broker Daemon
.LP
-.RS 3
-
-.LP
.LP
\f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment.
.LP
@@ -36,13 +33,10 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -54,8 +48,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The Server Manager included with the \f3orbd\fP tool is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. The persistent servers, while publishing the persistent object references in the Naming Service, include the port number of the ORBD in the object reference instead of the port number of the Server. The inclusion of an ORBD port number in the object reference for persistent object references has the following advantages:
.LP
@@ -77,7 +69,7 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
.LP
.SH "OPTIONS"
.LP
@@ -141,11 +133,11 @@
.na
\f2CORBA objects\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The
.na
\f2name binding\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
.LP
.LP
Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service.
@@ -224,7 +216,7 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
.LP
.SH "Server Manager"
.LP
@@ -239,7 +231,7 @@
.na
\f2sample tutorial\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
.LP
.LP
Start \f2orbd\fP.
@@ -362,7 +354,7 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
.br
.TP 2
o
--- a/jdk/src/linux/doc/man/pack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/pack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH pack200 1 "02 Jun 2010"
+.TH pack200 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.LP
\f4pack200\fP\f2 [ \fP\f2options\fP ] \f2output\-file\fP \f2JAR\-file\fP
.LP
@@ -36,9 +34,6 @@
Options may be in any order. The last option on the command line or in a properties file supersedes all previously specified options.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options.
@@ -51,11 +46,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f2pack200\fP tool is a Java application that transforms a JAR file into a compressed \f2pack200\fP file using the Java \f2gzip\fP compressor. The \f2pack200\fP files are highly compressed files that can be directly deployed, saving bandwidth and reducing download time.
.LP
@@ -65,83 +57,56 @@
.SS
Typical usage:
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 myarchive.pack.gz myarchive.jar\fP
.LP
-.RE
.LP
In this example, \f2myarchive.pack.gz\fP is produced using the default \f2pack200\fP settings.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
\f4\-r \-\-repack\fP
.LP
-.RS 3
-
-.LP
.LP
Produces a JAR file by packing the file \f2myarchive.jar\fP and unpacking it. The resulting file can be used as an input to the \f2jarsigner(1)\fP tool.
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 \-\-repack myarchive\-packer.jar myarchive.jar\fP
.LP
.LP
\f2% pack200 \-\-repack myarchive.jar\fP
.LP
-.RE
-.RE
.LP
\f4\-g \-\-no\-gzip\fP
.LP
-.RS 3
-
-.LP
.LP
Produces a \f2pack200\fP file. With this option a suitable compressor must be used, and the target system must use a corresponding decompresser.
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 \-\-no\-gzip myarchive.pack myarchive.jar\fP
.LP
-.RE
-.RE
.LP
\f4\-G \-\-strip\-debug\fP
.LP
-.RS 3
-
-.LP
.LP
Strips attributes used for debugging from the output. These include \f2SourceFile\fP, \f2LineNumberTable\fP, \f2LocalVariableTable\fP and \f2LocalVariableTypeTable\fP. Removing these attributes reduces the size of both downloads and installations but reduces the usefulness of debuggers.
.LP
-.RE
+.LP
+\f4\-\-keep\-file\-order\fP
+.LP
+.LP
+Preserve the order of files in the input file; this is the default behavior.
+.LP
.LP
\f4\-O \-\-no\-keep\-file\-order\fP
.LP
-.RS 3
-
-.LP
.LP
The packer will reorder and transmit all elements. Additionally, the packer may remove JAR directory names. This will reduce the download size; however, certain JAR file optimizations, such as indexing, may not work correctly.
.LP
-.RE
.LP
\f4\-Svalue \-\-segment\-limit=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
The value is the estimated target size N (in bytes) of each archive segment. If a single input file requires
.br
@@ -151,31 +116,23 @@
The size of each segment is estimated by counting the size of each input file to be transmitted in the segment, along with the size of its name and other transmitted properties.
.LP
.LP
-The default is \f21000000\fP (a million bytes). This allows input JAR files of moderate size to be transmitted in one segment. It also puts a limit on memory requirements for packers and unpackers.
+The default is \-1, which means the packer will always create a single segment output file. In cases where extremely large output files are generated, users are strongly encouraged to use segmenting or break up the input file into smaller JARs.
.LP
.LP
A 10MB JAR packed without this limit will typically pack about 10% smaller, but the packer may require a larger Java heap (about ten times the segment limit).
.LP
-.RE
.LP
\f4\-Evalue \-\-effort=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
If the value is set to a single decimal digit, the packer will use the indicated amount of effort in compressing the archive. Level \f21\fP may produce somewhat larger size and faster compression speed, while level \f29\fP will take much longer but may produce better compression. The special value \f20\fP instructs the packer to copy through the original JAR file directly with no compression. The JSR 200 standard requires any unpacker to understand this special case as a pass\-through of the entire archive.
.LP
.LP
The default is \f25\fP, investing a modest amount of time to produce reasonable compression.
.LP
-.RE
.LP
\f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
Overrides the default, which preserves the input information, but may cause the transmitted archive to be larger. The possible values are:
.LP
@@ -195,13 +152,9 @@
.RE
.LP
-.RE
.LP
\f4\-mvalue \-\-modification\-time=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
The possible values are:
.LP
@@ -215,23 +168,15 @@
.RE
.LP
-.RE
.LP
\f4\-Pfile \-\-pass\-file=\fP\f2file\fP
.LP
-.RS 3
-
-.LP
.LP
Indicates that a file should be passed through bytewise with no compression. By repeating the option, multiple files may be specified. There is no pathname transformation, except that the system file separator is replaced by the JAR file separator "\f2/\fP". The resulting file names must match exactly as strings with their occurrences in the JAR file. If file is a directory name, all files under that directory will be passed.
.LP
-.RE
.LP
\f4\-Uaction \-\-unknown\-attribute=\fP\f2action\fP
.LP
-.RS 3
-
-.LP
.LP
Overrides the default behavior; i.e., the classfile containing the unknown attribute will be passed through with the specified action. The possible values for actions are:
.LP
@@ -248,7 +193,6 @@
.RE
.LP
-.RE
.LP
\f4\-Cattribute\-name=\fP\f2layout\fP \f3\-\-class\-attribute=\fP\f2attribute\-name=action\fP
.br
@@ -258,9 +202,6 @@
.br
\f4\-Dattribute\-name=\fP\f2layout\fP \f3\-\-code\-attribute=\fP\f2attribute\-name=action\fP
.LP
-.RS 3
-
-.LP
.LP
With the above four options, the attribute layout can be specified for a class entity, such as Class attribute, Field attribute, Method attribute, and Code attribute. The attribute\-name is the name of the attribute for which the layout or action is being defined. The possible values for action are:
.LP
@@ -282,19 +223,12 @@
.LP
Example: \f2\-\-class\-attribute=CompilationID=pass\fP will cause the class file containing this attribute to be passed through without further action by the packer.
.LP
-.RE
.LP
\f4\-f\fP\f2 \fP\f2pack.properties\fP \f3\-\-config\-file=\fP\f2pack.properties\fP
.LP
-.RS 3
-
-.LP
.LP
A configuration file, containing Java properties to initialize the packer, may be specified on the command line.
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 \-f pack.properties myarchive.pack.gz myarchive.jar\fP
.br
@@ -318,69 +252,53 @@
.br
\f2segment.limit=\-1\fP
.LP
-.RE
-.RE
-.RS 3
-
-.LP
.LP
\f4\-v \-\-verbose\fP
.LP
-.RS 3
-
-.LP
.LP
Outputs minimal messages. Multiple specification of this option will output more verbose messages.
.LP
-.RE
.LP
\f4\-q \-\-quiet\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies quiet operation with no messages.
.LP
-.RE
.LP
\f4\-lfilename \-\-log\-file=\fP\f2filename\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies a log file to output messages.
.LP
-.RE
+.LP
+\f4\-? \-h \-\-help\fP
+.LP
.LP
-\f4\-Joption\fP
+Prints help information about this command.
.LP
-.RS 3
-
+.LP
+\f4\-V \-\-version\fP
.LP
.LP
-Passes option to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java.
+Prints version information about this command.
+.LP
+.LP
+\f4\-J\fP\f2option\fP
.LP
-.RE
-.RE
+.LP
+Passes \f2option\fP to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java.
+.LP
.SH "EXIT STATUS"
.LP
-
-.LP
.LP
The following exit values are returned:
.LP
-.RS 3
-
-.LP
.LP
\f2\ 0\fP for successful completion;
.LP
.LP
\f2>0\fP if an error occurs.
.LP
-.RE
.SH "SEE ALSO"
.LP
.RS 3
@@ -392,13 +310,13 @@
.na
\f2Java SE Documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/index.html
+http://download.oracle.com/javase/7/docs/index.html
.TP 2
o
.na
\f2Java Deployment Guide \- Pack200\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html
+http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
.TP 2
o
jar(1) \- Java Archive Tool
@@ -413,8 +331,6 @@
.LP
.SH "NOTES"
.LP
-
-.LP
.LP
This command should not be confused with \f2pack(1)\fP. They are distinctly separate products.
.LP
--- a/jdk/src/linux/doc/man/policytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/policytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH policytool 1 "02 Jun 2010"
+.TH policytool 1 "10 May 2011"
.LP
.SH "Name"
@@ -28,8 +28,6 @@
\f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI.
.SH "SYNOPSIS"
.LP
-
-.LP
.RS 3
.TP 3
\
@@ -57,7 +55,7 @@
.na
\f2the Policytool Users Guide\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html.
.SH "OPTIONS"
.RS 3
.TP 3
@@ -67,22 +65,22 @@
.na
\f2Default Policy Implementation and Syntax\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
.br
.na
\f2Policy Tool Users' Guide\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
.br
.na
\f2Security Permissions\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
.br
.na
\f2Security Overview\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
.br
.RE
.RE
--- a/jdk/src/linux/doc/man/rmic.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/rmic.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmic 1 "02 Jun 2010"
+.TH rmic 1 "10 May 2011"
.LP
.SH "Name"
rmic \- The Java RMI Compiler
.LP
-.RS 3
-
-.LP
.LP
\f3rmic\fP generates stub, skeleton, and tie classes for remote objects using either the JRMP or IIOP protocols. Also generates OMG IDL.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +41,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3rmic\fP compiler generates stub and skeleton class files (JRMP protocol) and stub and tie class files (IIOP protocol) for remote objects. These classes files are generated from compiled Java programming language classes that are remote object implementation classes. A remote implementation class is a class that implements the interface \f2java.rmi.Remote\fP. The class names in the \f3rmic\fP command must be for classes that have been compiled successfully with the \f3javac\fP command and must be fully package qualified. For example, running \f3rmic\fP on the class file name \f2HelloImpl\fP as shown here:
.LP
@@ -81,8 +73,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-bootclasspath path
@@ -90,9 +80,6 @@
.TP 3
\-classpath path
Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -100,11 +87,7 @@
.fl
\fP
.fi
-.RE
For example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -112,13 +95,9 @@
.fl
\fP
.fi
-.RE
.TP 3
\-d directory
Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -126,7 +105,6 @@
.fl
\fP
.fi
-.RE
would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.)
.br
\
@@ -136,16 +114,16 @@
.TP 3
\-g
Enables generation of all debugging information, including local variables. By default, only line number information is generated.
-.LP
.TP 3
\-idl
Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the
.na
\f2Java Language to IDL Mapping\fP @
.fi
-http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description.
-.LP
-When the \f2\-idl\fP option is used, other options also include:
+http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description.
+.br
+.br
+When the \f2\-idl\fP option is used, other options also include:
.RS 3
.TP 3
\-always or \-alwaysgenerate
@@ -160,31 +138,22 @@
\-idlFile\ fromJavaPackage[.class]\ toIDLFile
Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\
.RE
-.LP
.TP 3
\-iiop
-Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class.
-.LP
+Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class.
+.br
+.br
Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention:
-.RS 3
-
-.LP
.nf
\f3
.fl
_<implementationName>_stub.class
.fl
-\fP
-.br
-\f3
-.fl
_<interfaceName>_tie.class
.fl
\fP
.fi
-.RE
-.LP
-When the \f2\-iiop\fP option is used, other options also include:
+When the \f2\-iiop\fP option is used, other options also include:
.RS 3
.TP 3
\-always or \-alwaysgenerate
@@ -197,13 +166,11 @@
Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option.
.TP 3
\-poa
-Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP.
-.LP
-The \f2PortableServer\fP module for the
+Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the
.na
\f2Portable Object Adapter\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf.
.RE
.TP 3
\-J
@@ -214,18 +181,18 @@
.TP 3
\-nowarn
Turns off warnings. If used the compiler does not print out any warnings.
-.LP
+.TP 3
+\-nowrite
+Does not write compiled classes to the file system.
.TP 3
\-vcompat
Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation.
.TP 3
\-verbose
Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded.
-.LP
.TP 3
\-v1.1
Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used).
-.LP
.TP 3
\-v1.2
(default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine.
@@ -234,15 +201,10 @@
.LP
.SH "ENVIRONMENT VARIABLES"
.LP
-
-.LP
.RS 3
.TP 3
CLASSPATH
Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example,
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -251,18 +213,15 @@
\fP
.fi
.RE
-.RE
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
java(1), javac(1),
.na
\f2CLASSPATH\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
.LP
--- a/jdk/src/linux/doc/man/rmid.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/rmid.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmid 1 "02 Jun 2010"
+.TH rmid 1 "10 May 2011"
.LP
.SH "Name"
rmid \- The Java RMI Activation System Daemon
.LP
-.RS 3
-
-.LP
.LP
\f3rmid\fP starts the activation system daemon that allows objects to be registered and activated in a virtual machine (VM).
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,18 +41,16 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the
.na
\f2Java RMI Specification\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/rmi/spec/rmiTOC.html and
+http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and
.na
\f2Activation tutorials\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
+http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
.LP
.LP
The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows:
@@ -133,8 +125,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-C<someCommandLineOption>
@@ -169,7 +159,6 @@
.TP 3
\-J\-Dsun.rmi.activation.execPolicy=<policy>
Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP:
-.LP
.RS 3
.TP 2
o
@@ -255,17 +244,9 @@
The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups.
.LP
To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example:
-.RS 3
-
.LP
-.LP
-\f2rmid \-J\-Djava.security.policy=rmid.policy\fP
-.LP
+\f2rmid \-J\-Djava.security.policy=rmid.policy\fP
.RE
-.RE
-.TP 2
-o
-.LP
.TP 2
o
\f4<policyClassName>\fP
@@ -285,7 +266,6 @@
\fP
.fi
Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object.
-.LP
.TP 2
o
\f3none\fP
@@ -318,9 +298,9 @@
\-stop
Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098.
.RE
-.SH "ENVIRONMENT VARIABLES"
+
.LP
-
+.SH "ENVIRONMENT VARIABLES"
.LP
.RS 3
.TP 3
@@ -338,13 +318,11 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
rmic(1),
.na
\f2CLASSPATH\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath, java(1)
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1)
.LP
--- a/jdk/src/linux/doc/man/rmiregistry.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/rmiregistry.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,19 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmiregistry 1 "02 Jun 2010"
+.TH rmiregistry 1 "10 May 2011"
.LP
.SH "Name"
rmiregistry \- The Java Remote Object Registry
.LP
.RS 3
+The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host.
+.RE
.LP
-.LP
-The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host.
-.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +43,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3rmiregistry\fP command creates and starts a remote object registry on the specified \f2port\fP on the current host. If \f2port\fP is omitted, the registry is started on port 1099. The \f3rmiregistry\fP command produces no output and is typically run in the background. For example:
.LP
@@ -69,8 +63,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-J
@@ -80,17 +72,12 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
-.LP
java(1),
.na
\f2java.rmi.registry.LocateRegistry\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/rmi/registry/LocateRegistry.html and
+http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and
.na
\f2java.rmi.Naming\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/rmi/Naming.html
-.LP
-
+http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html
--- a/jdk/src/linux/doc/man/schemagen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/schemagen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH schemagen 1 "02 Jun 2010"
+.TH schemagen 1 "10 May 2011"
.LP
.SH "Name"
@@ -30,8 +30,7 @@
.br
\f3Implementation Version:\fP 2.1.3
.LP
-.SS
-Launching schemagen
+.SH "Launching schemagen"
.LP
.LP
The schema generator can be launched using the appropriate \f2schemagen\fP shell script in the \f2bin\fP directory for your platform.
@@ -46,9 +45,6 @@
.fi
https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -58,19 +54,13 @@
.fl
\fP
.fi
-.RE
.LP
.LP
If your java sources/classes reference other classes, they must be accessable on your system CLASSPATH environment variable, or they need to be given to the tool by using the \f2\-classpath\fP/\f2\-cp\fP options. Otherwise you will see errors when generating your schema.
.LP
-.RS 3
-
-.LP
-\f3Command Line Options\fP
-.LP
-.RS 3
-
+.SS
+Command Line Options
.LP
.nf
\f3
@@ -79,24 +69,29 @@
.fl
.fl
-Options:
+Options:
+.fl
+ \-d <path> : specify where to place processor and javac generated class files
.fl
- \-d <path> : Specify where to place processor and javac generated class files
+ \-cp <path> : specify where to find user specified files
+.fl
+ \-classpath <path> : specify where to find user specified files
.fl
- \-cp <path> : Specify where to find user specified files
+ \-encoding <encoding> : specify encoding to be used for apt/javac invocation
+.fl
+
.fl
- \-classpath <path> : Specify where to find user specified files
+ \-episode <file> : generate episode file for separate compilation
.fl
- \-help : Display this usage message
+ \-version : display version information
+.fl
+ \-help : display this usage message
.fl
\fP
.fi
-.RE
.LP
-.RE
-.SS
-Generated Resource Files
+.SH "Generated Resource Files"
.LP
.LP
The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use
@@ -105,7 +100,8 @@
.fi
https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html.
.LP
-.SH "See Also"
+.SH "Name"
+See Also
.LP
.RS 3
.TP 2
@@ -124,7 +120,7 @@
.na
\f2Java Architecture for XML Binding (JAXB)\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
.RE
.LP
--- a/jdk/src/linux/doc/man/serialver.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/serialver.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH serialver 1 "02 Jun 2010"
+.TH serialver 1 "10 May 2011"
.LP
.SH "Name"
serialver \- The Serial Version Command
.LP
-.RS 3
-
-.LP
.LP
The \f3serialver\fP command returns the \f2serialVersionUID\fP.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -45,9 +39,6 @@
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options, as specified in this document.
@@ -57,18 +48,13 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3serialver\fP returns the \f2serialVersionUID\fP for one or more classes in a form suitable for copying into an evolving class. When invoked with no arguments it prints a usage line.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-classpath <directories and zip/jar files separated by :>
@@ -88,36 +74,24 @@
.LP
.SH "NOTES"
.LP
-
-.LP
.LP
The \f3serialver\fP command loads and initializes the specified classes in its virtual machine, and by default, it does not set a security manager. If \f3serialver\fP is to be run with untrusted classes, a security manager can be set with the following option:
.LP
-.RS 3
-
-.LP
.LP
\f2\-J\-Djava.security.manager\fP
.LP
-.RE
.LP
and, if necessary, a security policy can be specified with the following option:
.LP
-.RS 3
-
-.LP
.LP
\f2\-J\-Djava.security.policy=<policy file>\fP
.LP
-.RE
.SH "SEE ALSO"
.LP
-
-.LP
.LP
.na
\f2java.io.ObjectStreamClass\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/io/ObjectStreamClass.html
+http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
.LP
--- a/jdk/src/linux/doc/man/servertool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/servertool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH servertool 1 "02 Jun 2010"
+.TH servertool 1 "10 May 2011"
.LP
.SH "Name"
servertool \- The Java(TM) IDL Server Tool
.LP
-.RS 3
-
-.LP
-\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server.
-.RE
+\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server.
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -54,15 +48,11 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f2servertool\fP provides the command\-line interface for the application programmers to register, unregister, startup, and shutdown a persistent server. Other commands are provided to obtain various statistical information about the server.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-ORBInitialHost nameserverhost
@@ -75,8 +65,6 @@
.LP
.SH "COMMANDS"
.LP
-
-.LP
.RS 3
.TP 3
register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ]
@@ -122,6 +110,4 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
orbd(1)
--- a/jdk/src/linux/doc/man/tnameserv.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/tnameserv.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH tnameserv 1 "02 Jun 2010"
+.TH tnameserv 1 "10 May 2011"
.LP
.SH "Name"
@@ -30,7 +30,7 @@
.na
\f2Java IDL Naming Service Included with ORBD\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html topic.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic.
.LP
.LP
Topics in this section include:
@@ -120,11 +120,11 @@
.na
\f2The Hello World Example Using RMI\-IIOP\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service.
+http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service.
.na
\f2Java IDL: Running the Hello World Example on TWO Machines\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
.LP
.LP
For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP.
@@ -170,16 +170,12 @@
.LP
This command\-line option is available for use with \f2tnameserve\fP:
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Joption
Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
.RE
.LP
-.RE
.SH "Stopping the Java\ IDL Transient Naming Service"
.LP
.LP
@@ -190,28 +186,27 @@
.LP
The following sample program illustrates how to add names to the namespace. It is a self\-contained Transient Naming Service client that creates the following simple tree.
.LP
-.nf
-\f3
-.fl
-\fP\f3
-.fl
- \fP\f4Initial\fP\f3
-.fl
- \fP\f4Naming Context\fP\f3
-.fl
- / \\
-.fl
- / \\
-.fl
- plans \fP\f4Personal\fP\f3
-.fl
- / \\
-.fl
- / \\
-.fl
- calendar schedule\fP
-.fl
-.fi
+.RS 3
+.TP 2
+o
+\f4Initial Naming Context\fP
+.RS 3
+.TP 2
+*
+\f3plans\fP
+.TP 2
+*
+\f4Personal\fP
+.RS 3
+.TP 2
+-
+\f3calendar\fP
+.TP 2
+-
+\f3schedule\fP
+.RE
+.RE
+.RE
.LP
.LP
--- a/jdk/src/linux/doc/man/unpack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/unpack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH unpack200 1 "02 Jun 2010"
+.TH unpack200 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.LP
\f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP
.LP
@@ -36,9 +34,6 @@
Options may be in any order. The last option on the command line supersedes all previously specified options.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
input\-file
Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker.
@@ -48,107 +43,78 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f2unpack200\fP is a native implementation that transforms a packed file produced by \f2pack200\fP(1) into a JAR file. Typical usage:
.LP
-.RS 3
-
-.LP
.LP
\f2% unpack200 myarchive.pack.gz myarchive.jar\fP
.LP
-.RE
.LP
In this example, the \f2myarchive.jar\fP is produced from \f2myarchive.pack.gz\fP using the default \f2unpack200\fP settings.
.LP
.SH "OPTIONS"
.LP
-.SS
-Standard Options
-.LP
-.RS 3
-
-.LP
.LP
\f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
Sets the deflation to be \f2true\fP, \f2false\fP, or \f2keep\fP on all entries within a JAR file. The default mode is \f2keep\fP. If \f2true\fP or \f2false\fP, overrides the default behavior and sets the deflation mode on all entries within the output JAR file.
.LP
-.RE
-.RE
-.SS
-Non\-Standard Options
-.LP
-.RS 3
-
-.LP
.LP
\f4\-r \-\-remove\-pack\-file\fP
.LP
-.RS 3
-
-.LP
.LP
Removes the input packed file.
.LP
-.RE
.LP
\f4\-v \-\-verbose\fP
.LP
-.RS 3
-
-.LP
.LP
Outputs minimal messages. Multiple specification of this option will output more verbose messages.
.LP
-.RE
.LP
\f4\-q \-\-quiet\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies quiet operation with no messages.
.LP
-.RE
.LP
\f4\-lfilename \-\-log\-file=\fP\f2filename\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies a log file to output messages.
.LP
-.RE
-.RE
+.LP
+\f4\-? \-h \-\-help\fP
+.LP
+.LP
+Prints help information about this command.
+.LP
+.LP
+\f4\-V \-\-version\fP
+.LP
+.LP
+Prints version information about this command.
+.LP
+.LP
+\f4\-J\fP\f2option\fP
+.LP
+.LP
+Passes \f2option\fP to the Java launcher called by \f2unpack200\fP.
+.LP
.SH "EXIT STATUS"
.LP
-
-.LP
.LP
The following exit values are returned:
.LP
-.RS 3
-
-.LP
.LP
\f2\ 0\fP if successful completion;
.LP
.LP
\f2>0\fP if an error occurred.
.LP
-.RE
.SH "SEE ALSO"
.LP
.RS 3
@@ -160,13 +126,13 @@
.na
\f2Java SE Documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/index.html
+http://download.oracle.com/javase/7/docs/index.html
.TP 2
o
.na
\f2Java Deployment Guide \- Pack200\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html
+http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
.TP 2
o
jar(1) \- Java Archive Tool
@@ -181,8 +147,6 @@
.LP
.SH "NOTES"
.LP
-
-.LP
.LP
This command should not be confused with \f2unpack(1)\fP. They are distinctly separate products.
.LP
--- a/jdk/src/linux/doc/man/wsgen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/wsgen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsgen 1 "02 Jun 2010"
+.TH wsgen 1 "10 May 2011"
.SH "Name"
wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
-.RS 3
-
-.LP
.LP
\f3Specification Version:\fP 2.1
.br
\f3Implementation Version:\fP 2.1.1
.LP
-.LP
The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint implementation class (SEI) and generates all the required artifacts for web service deployment, and invocation
-.LP
-.RE
.SH "Overview"
.LP
The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see
@@ -83,7 +77,6 @@
The following table lists the \f2wsgen\fP options.
.br
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -354,7 +347,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 139 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 133 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -571,7 +564,6 @@
.rm i+
.rm j+
.rm k+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-53
.LP
--- a/jdk/src/linux/doc/man/wsimport.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/wsimport.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsimport 1 "02 Jun 2010"
+.TH wsimport 1 "10 May 2011"
.SH "Name"
wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
.LP
@@ -88,7 +88,6 @@
.LP
The following table lists the \f2wsimport\fP options.
.LP
-.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
.ps \n(.s
@@ -676,7 +675,6 @@
.rm l+
.rm m+
.rm n+
-.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-66
.LP
Multiple JAX\-WS and JAXB binding files can be specified using \f2\-b\fP option and they can be used to customize various things like package names, bean names, etc. More information on JAX\-WS and JAXB binding files can be found in the
@@ -685,14 +683,293 @@
.fi
https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html.
.LP
+The following table lists \f2wsimport\fP non\-standard options:
+.LP
+.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
+.de 35
+.ps \n(.s
+.vs \n(.vu
+.in \n(.iu
+.if \n(.u .fi
+.if \n(.j .ad
+.if \n(.j=0 .na
+..
+.nf
+.nr #~ 0
+.if n .nr #~ 0.6n
+.ds #d .d
+.if \(ts\n(.z\(ts\(ts .ds #d nl
+.fc
+.nr 33 \n(.s
+.rm 80 81
+.nr 34 \n(.lu
+.eo
+.am 81
+.br
+.di a+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Map headers not bound to request or response message to Java method parameters.
+.br
+.di
+.nr a| \n(dn
+.nr a- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di b+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+WSDL URI that specifies the file that contains authorization information; this URI is in the following format: http://\f2<user name>\fP:\f2<password>\fP@\f2<host name>\fP/\f2<Web service name>\fP?wsdl
+.br
+.di
+.nr b| \n(dn
+.nr b- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di c+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Print debugging information.
+.br
+.di
+.nr c| \n(dn
+.nr c- \n(dl
+..
+.ec \
+.eo
+.am 80
+.br
+.di d+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(80 .ll \n(80u
+.in 0
+\f3\-Xno\-addressing\-databinding\fP
+.br
+.di
+.nr d| \n(dn
+.nr d- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di e+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Enable binding of W3C \f2EndpointReferenceType\fP to Java.
+.br
+.di
+.nr e| \n(dn
+.nr e- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di f+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Do not compile generated Java files.
+.br
+.di
+.nr f| \n(dn
+.nr f- \n(dl
+..
+.ec \
+.35
+.nf
+.ll \n(34u
+.nr 80 0
+.nr 38 \w\f3Option\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-XadditionalHeaders\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-Xauthfile <file>\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-Xdebug\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-Xnocompile\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.80
+.rm 80
+.nr 38 \n(d-
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 81 0
+.nr 38 \w\f3Description\fP
+.if \n(81<\n(38 .nr 81 \n(38
+.81
+.rm 81
+.nr 38 \n(a-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(b-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(c-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(e-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(f-
+.if \n(81<\n(38 .nr 81 \n(38
+.35
+.nf
+.ll \n(34u
+.nr 38 1n
+.nr 79 0
+.nr 40 \n(79+(0*\n(38)
+.nr 80 +\n(40
+.nr 41 \n(80+(3*\n(38)
+.nr 81 +\n(41
+.nr TW \n(81
+.if t .if \n(TW>\n(.li .tm Table at line 193 file Input is too wide - \n(TW units
+.fc
+.nr #T 0-1
+.nr #a 0-1
+.eo
+.de T#
+.ds #d .d
+.if \(ts\n(.z\(ts\(ts .ds #d nl
+.mk ##
+.nr ## -1v
+.ls 1
+.ls
+..
+.ec
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP
+.ne \n(a|u+\n(.Vu
+.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.a+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(b|u+\n(.Vu
+.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.b+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(c|u+\n(.Vu
+.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.c+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(d|u+\n(.Vu
+.ne \n(e|u+\n(.Vu
+.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
+.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(40u
+.in +\n(37u
+.d+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.e+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(f|u+\n(.Vu
+.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.f+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.fc
+.nr T. 1
+.T# 1
+.35
+.rm a+
+.rm b+
+.rm c+
+.rm d+
+.rm e+
+.rm f+
+.if \n-(b.=0 .nr c. \n(.c-\n(d.-26
+
+.LP
.SH "Example"
.nf
\f3
.fl
-\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP
+\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP
.fl
.fi
.LP
-This will generate the Java artifacts and compile them by importing the \f2http://stockquote.xyz/quote?wsdl\fP.
+This will generate the Java artifacts and compile them by importing the \f2http://stockquote.example.com/quote?wsdl\fP.
.br
--- a/jdk/src/linux/doc/man/xjc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/linux/doc/man/xjc.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,19 +19,18 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH xjc 1 "02 Jun 2010"
+.TH xjc 1 "10 May 2011"
.LP
-.ad c
.SH "Name"
xjc \- Java(TM) Architecture for XML Binding
.br
-Binding Compiler
+Binding Compiler
+.LP
.LP
\f3Specification Version:\fP 2.1
.br
-\f3Reference Implementation (RI) Version:\fP 2.1.3 .ad l
-
+\f3Reference Implementation (RI) Version:\fP 2.1.3
.LP
.SH "Launching xjc"
.LP
@@ -42,84 +41,87 @@
.fi
https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html.
.LP
-.RS 3
-
-.LP
.LP
\f2% xjc \-help\fP
.LP
-.RE
-\f3Output\fP
-.LP
-.RS 3
-
+.SS
+Output
.LP
.nf
\f3
.fl
-Usage: xjc [\-options ...] <schema_file/URL/dir> ... [\-b <bindinfo>] ...
+Usage: xjc [\-options ...] <schema file/URL/dir/jar> ... [\-b <bindinfo>] ...
+.fl
+If dir is specified, all schema files in it will be compiled.
+.fl
+If jar is specified, /META\-INF/sun\-jaxb.episode binding file will be compiled.
.fl
Options:
.fl
- \-nv : do not perform strict validation of the input schema(s)
+ \-nv : do not perform strict validation of the input schema(s)
.fl
- \-extension : allow vendor extensions \- do not strictly follow the
+ \-extension : allow vendor extensions \- do not strictly follow the Compatibility Rules and App E.2 from the JAXB Spec
.fl
- Compatibility Rules and App E.2 from the JAXB Spec
+ \-b <file/dir> : specify external bindings files (each <file> must have its own \-b); if a directory is given, **/*.xjb is searched
.fl
- \-b <file/dir> : specify external bindings files (each <file> must have its own \-b)
+ \-d <dir> : generated files will go into this directory
+.fl
+ \-p <pkg> : specifies the target package
.fl
- If a directory is given, **/*.xjb is searched
+ \-httpproxy <proxy> : set HTTP/HTTPS proxy; format is [user[:password]@]proxyHost:proxyPort
.fl
- \-d <dir> : generated files will go into this directory
+ \-httpproxyfile <f> : works like \-httpproxy but takes the argument in a file to protect password
.fl
- \-p <pkg> : specifies the target package
+ \-classpath <arg> : specify where to find user class files
.fl
- \-httpproxy <proxy> : set HTTP/HTTPS proxy. Format is [user[:password]@]proxyHost:proxyPort
+ \-catalog <file> : specify catalog files to resolve external entity references; support TR9401, XCatalog, and OASIS XML Catalog format
.fl
- \-httpproxyfile <file>: set the proxy string (same format as above).
+ \-readOnly : generated files will be in read\-only mode
.fl
- \-classpath <arg> : specify where to find user class files
+ \-npa : suppress generation of package level annotations (**/package\-info.java)
+.fl
+ \-no\-header : suppress generation of a file header with timestamp
.fl
- \-catalog <file> : specify catalog files to resolve external entity references
+ \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features
.fl
- support TR9401, XCatalog, and OASIS XML Catalog format.
+ \-xmlschema : treat input as W3C XML Schema (default)
.fl
- \-readOnly : generated files will be in read\-only mode
+ \-relaxng : treat input as RELAX NG (experimental,unsupported)
.fl
- \-npa : suppress generation of package level annotations (**/package\-info.java)
+ \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported)
.fl
- \-no\-header : suppress generation of a file header with timestamp
+ \-dtd : treat input as XML DTD (experimental,unsupported)
.fl
- \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features.
+ \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported)
+.fl
+ \-verbose : be extra verbose
.fl
- \-xmlschema : treat input as W3C XML Schema (default)
+ \-quiet : suppress compiler output
.fl
- \-relaxng : treat input as RELAX NG (experimental,unsupported)
+ \-help : display this help message
.fl
- \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported)
+ \-version : display version information
+.fl
+
.fl
- \-dtd : treat input as XML DTD (experimental,unsupported)
+
.fl
- \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported)
+Extensions:
.fl
- \-verbose : be extra verbose
+ \-Xlocator : enable source location support for generated code
.fl
- \-quiet : suppress compiler output
+ \-Xsync\-methods : generate accessor methods with the 'synchronized' keyword
.fl
- \-help : display this help message
+ \-mark\-generated : mark the generated code as @javax.annotation.Generated
.fl
- \-version : display version information
+ \-episode <FILE> : generate the episode file for separate compilation
.fl
\fP
.fi
-.RE
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-nv
@@ -129,15 +131,9 @@
By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions
.TP 3
\-b <file>
-Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files:
-.RS 3
-
-.LP
-\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP
+Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP
.br
-\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP
-.RE
-In addition, the ordering of the schema files and binding files on the command line does not matter.
+\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter.
.TP 3
\-d <dir>
By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you.
@@ -199,12 +195,30 @@
<schema file/URL/dir>
Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them.
.RE
+
+.LP
.SS
-Summary of Deprecated and Removed Command Line Options
+Non\-Standard Command Line Options
.LP
.RS 3
+.TP 3
+\-Xlocator
+Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling.
+.TP 3
+\-Xsync\-methods
+Causes all of the generated method signatures to include the \f2synchronized\fP keyword.
+.TP 3
+\-mark\-generated
+Mark the generated code with the annotation \f2@javax.annotation.Generated\fP.
+.TP 3
+\-episode <file>
+Generate the specified episode file for separate compilation.
+.RE
.LP
+.SS
+Deprecated and Removed Command Line Options
+.LP
.RS 3
.TP 3
\-host & \-port
@@ -215,13 +229,9 @@
.TP 3
\-source
The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase.
-.TP 3
-\-Xlocator & \-Xsync\-methods
-These switches have been disabled for now. We plan on releasing this functionality as a separate download in the future.
.RE
.LP
-.RE
.SS
Compiler Restrictions
.LP
@@ -280,7 +290,7 @@
.na
\f2Java Architecture for XML Binding (JAXB)\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
.RE
.LP
--- a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Sat May 14 11:24:26 2011 -0700
@@ -131,7 +131,7 @@
# accessible states
#
managesDescendants=gestiona descendientes
-indeterminate=indeterminado
+indeterminate=indeterminada
truncated=truncado
# new for J2SE 1.6.0
--- a/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Sat May 14 11:24:26 2011 -0700
@@ -92,4 +92,39 @@
* @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/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Sat May 14 11:24:26 2011 -0700
@@ -144,7 +144,7 @@
OptionPane.yesButtonMnemonic=83
OptionPane.noButtonText=No
OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=Aceptar
OptionPane.okButtonMnemonic=O
OptionPane.cancelButtonText=Cancelar
OptionPane.cancelButtonMnemonic=C
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Sat May 14 11:24:26 2011 -0700
@@ -144,7 +144,7 @@
OptionPane.yesButtonMnemonic=89
OptionPane.noButtonText=\uC544\uB2C8\uC624(N)
OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=\uD655\uC778
OptionPane.okButtonMnemonic=O
OptionPane.cancelButtonText=\uCDE8\uC18C
OptionPane.cancelButtonMnemonic=0
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Sat May 14 11:24:26 2011 -0700
@@ -144,7 +144,7 @@
OptionPane.yesButtonMnemonic=89
OptionPane.noButtonText=\u5426(N)
OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=\u786E\u5B9A
OptionPane.okButtonMnemonic=O
OptionPane.cancelButtonText=\u53D6\u6D88
OptionPane.cancelButtonMnemonic=0
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Sat May 14 11:24:26 2011 -0700
@@ -144,7 +144,7 @@
OptionPane.yesButtonMnemonic=89
OptionPane.noButtonText=\u5426(N)
OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=\u78BA\u5B9A
OptionPane.okButtonMnemonic=O
OptionPane.cancelButtonText=\u53D6\u6D88
OptionPane.cancelButtonMnemonic=0
--- a/jdk/src/share/classes/java/security/spec/EllipticCurve.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/java/security/spec/EllipticCurve.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -165,8 +165,7 @@
* specified object.
* @param obj the object to be compared.
* @return true if <code>obj</code> is an instance of
- * EllipticCurve and the field, A, B, and seeding bytes
- * match, false otherwise.
+ * EllipticCurve and the field, A, and B match, false otherwise.
*/
public boolean equals(Object obj) {
if (this == obj) return true;
@@ -174,9 +173,8 @@
EllipticCurve curve = (EllipticCurve) obj;
if ((field.equals(curve.field)) &&
(a.equals(curve.a)) &&
- (b.equals(curve.b)) &&
- (Arrays.equals(seed, curve.seed))) {
- return true;
+ (b.equals(curve.b))) {
+ return true;
}
}
return false;
@@ -184,12 +182,15 @@
/**
* Returns a hash code value for this elliptic curve.
- * @return a hash code value.
+ * @return a hash code value computed from the hash codes of the field, A,
+ * and B, as follows:
+ * <code>
+ * (field.hashCode() << 6) + (a.hashCode() << 4) + (b.hashCode() << 2)
+ * </code>
*/
public int hashCode() {
return (field.hashCode() << 6 +
(a.hashCode() << 4) +
- (b.hashCode() << 2) +
- (seed==null? 0:seed.length));
+ (b.hashCode() << 2));
}
}
--- a/jdk/src/share/classes/sun/awt/resources/awt_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/awt/resources/awt_es.properties Sat May 14 11:24:26 2011 -0700
@@ -175,7 +175,7 @@
AWT.HostInputMethodDisplayName=M\u00E9todos de Entrada del Sistema
AWT.InputMethodLanguage.ja=Japon\u00E9s
AWT.InputMethodLanguage.ko=Coreano
-AWT.InputMethodLanguage.zh=Chino
+AWT.InputMethodLanguage.zh=chino
AWT.InputMethodLanguage.zh_CN=Chino Simplificado
AWT.InputMethodLanguage.zh_TW=Chino Tradicional
AWT.InputMethodCreationFailed=No se ha podido crear {0}. Motivo: {1}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_fr.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_it.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_ja.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_ko.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_sv.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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,20 +24,20 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = Syntax: {0} [-options] class [args...]\n\ (f\u00F6r att k\u00F6ra en klass)\n eller {0} [-options] -jar jarfile [args...]\n\ (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n
+java.launcher.opt.header = Syntax: {0} [-alternativ] class [argument...]\n\ (f\u00F6r att k\u00F6ra en klass)\n eller {0} [-alternativ] -jar jarfile [argument...]\n\ (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n
java.launcher.opt.datamodel =\ -d{0}\t anv\u00E4nd en {0}-bitsdatamodell om det finns\n
java.launcher.opt.vmselect =\ {0}\t f\u00F6r att v\u00E4lja "{1}" VM\n
-java.launcher.opt.hotspot =\ {0}\t \u00E4r en synonym f\u00F6r "{1}" VM [deprecated]\n
+java.launcher.opt.hotspot =\ {0}\t \u00E4r en synonym f\u00F6r "{1}" VM [inaktuell]\n
java.launcher.ergo.message1 =\ Standard-VM \u00E4r {0}
java.launcher.ergo.message2 =\ eftersom du k\u00F6r en serverklassmaskin.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ En {0}-separerad lista med kataloger, JAR-arkiv,\n\ och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\ -D<name>=<value>\n\ ange en systemegenskap\n\ -verbose[:class|gc|jni]\n\ aktivera utf\u00F6rliga utdata\n\ -version skriv ut produktversionen och avsluta\n\ -version:<value>\n\ beg\u00E4r den specifika versionen som ska k\u00F6ras\n\ -showversion skriv ut produktversionen och forts\u00E4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\ -? -help skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\ -X skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ aktivera verifiering med angiven detaljgrad\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ avaktivera verifiering med angiven detaljgrad\n\ -esa | -enablesystemassertions\n\ aktivera systemverifieringar\n\ -dsa | -disablesystemassertions\n\ avaktivera systemverifieringar\n\ -agentlib:<libname>[=<options>]\n\ ladda ursprungligt agentbibliotek <libname>, e.g. -agentlib:hprof\n\ se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\ -javaagent:<jarpath>[=<options>]\n\ ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\ -splash:<imagepath>\n\ visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference.
+java.launcher.opt.footer =\ -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ En {0}-avgr\u00E4nsad lista med kataloger, JAR-arkiv,\n\ och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\ -D<namn>=<v\u00E4rde>\n\ ange en systemegenskap\n\ -verbose[:class|gc|jni]\n\ aktivera utf\u00F6rliga utdata\n\ -version skriv ut produktversionen och avsluta\n\ -version:<v\u00E4rde>\n\ beg\u00E4r den specifika versionen som ska k\u00F6ras\n\ -showversion skriv ut produktversionen och forts\u00E4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\ -? -help skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\ -X skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\ -ea[:<paket>...|:<klass>]\n\ -enableassertions[:<paket>...|:<klass>]\n\ aktivera verifiering med angiven detaljgrad\n\ -da[:<packagename>...|:<klass>]\n\ -disableassertions[:<paket>...|:<klass>]\n\ avaktivera verifiering med angiven detaljgrad\n\ -esa | -enablesystemassertions\n\ aktivera systemverifieringar\n\ -dsa | -disablesystemassertions\n\ avaktivera systemverifieringar\n\ -agentlib:<bibliotek>[=<alternativ>]\n\ ladda ursprungligt agentbibliotek <bibliotek>, e.g. -agentlib:hprof\n\ se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<s\u00F6kv\u00E4g>[=<alternativ>]\n\ ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\ -javaagent:<jar-s\u00F6kv\u00E4g>[=<alternativ>]\n\ ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\ -splash:<bilds\u00F6kv\u00E4g>\n\ visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed k\u00F6rning i blandat l\u00E4ge (standard)\n\ -Xint endast k\u00F6rning i tolkat l\u00E4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer separeras med {0}>\n\ ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xdiag visa ytterligare diagnostiska meddelanden\n\ -Xnoclassgc avaktivera klassens skr\u00E4pinsamling\n\ -Xincgc aktivera inkrementell skr\u00E4pinsamling\n\ -Xloggc:<file> logga GC-status till en fil med tidsst\u00E4mplar\n\ -Xbatch avaktivera bakgrundskompilering\n\ -Xms<size> ange initial storlek f\u00F6r Java-heap\n\ -Xmx<size> ange maximal storlek f\u00F6r Java-heap\n\ -Xss<size> ange storlek f\u00F6r java-tr\u00E5dsstack\n\ -Xprof utdata f\u00F6r processorprofilering\n\ -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\ -Xrs minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\ -Xcheck:jni utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\ -Xshare:off anv\u00E4nd inte delad klassdata\n\ -Xshare:auto anv\u00E4nd delad klassdata om det g\u00E5r (standard)\n\ -Xshare:on kr\u00E4v att delad klassdata anv\u00E4nds, annars slutf\u00F6rs inte.\n\ -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:all\n\ visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:properties\n\ visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:locale\n\ visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n
+java.launcher.X.usage=\ -Xmixed k\u00F6rning i blandat l\u00E4ge (standard)\n\ -Xint endast k\u00F6rning i tolkat l\u00E4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xdiag visa ytterligare diagnostiska meddelanden\n\ -Xnoclassgc avaktivera klassens skr\u00E4pinsamling\n\ -Xincgc aktivera inkrementell skr\u00E4pinsamling\n\ -Xloggc:<fil> logga GC-status till en fil med tidsst\u00E4mplar\n\ -Xbatch avaktivera bakgrundskompilering\n\ -Xms<storlek> ange ursprunglig storlek f\u00F6r Java-heap\n\ -Xmx<storlek> ange maximal storlek f\u00F6r Java-heap\n\ -Xss<storlek> ange storlek f\u00F6r java-tr\u00E5dsstack\n\ -Xprof utdata f\u00F6r processorprofilering\n\ -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\ -Xrs minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\ -Xcheck:jni utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\ -Xshare:off anv\u00E4nd inte delade klassdata\n\ -Xshare:auto anv\u00E4nd delade klassdata om det g\u00E5r (standard)\n\ -Xshare:on kr\u00E4v att delade klassdata anv\u00E4nds, annars slutf\u00F6r inte.\n\ -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:all\n\ visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:properties\n\ visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:locale\n\ visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n
java.launcher.cls.error1=Fel: Hittar inte eller kan inte ladda huvudklassen {0}
java.launcher.cls.error2=Fel: Huvudmetoden \u00E4r inte {0} i klassen {1}, definiera huvudmetoden som:\n\ public static void main(String[] args)
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
# 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/src/share/classes/sun/print/resources/serviceui_de.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_de.properties Sat May 14 11:24:26 2011 -0700
@@ -18,11 +18,11 @@
button.properties.mnemonic=I
#
checkbox.collate=Sortieren
-checkbox.collate.mnemonic=S
+checkbox.collate.mnemonic=R
checkbox.jobsheets=Bannerseite
checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Ausgabe in Datei
-checkbox.printtofile.mnemonic=D
+checkbox.printtofile.mnemonic=U
#
dialog.printtitle=Drucken
dialog.pstitle=Seite einrichten
@@ -44,18 +44,18 @@
label.pstype=Typ:
label.rangeto=Bis
label.size=Gr\u00F6\u00DFe:
-label.size.mnemonic=R
+label.size.mnemonic=E
label.source=Quelle:
-label.source.mnemonic=Q
+label.source.mnemonic=U
label.status=Status:
label.username=Benutzername:
-label.username.mnemonic=B
+label.username.mnemonic=U
label.millimetres=(mm)
label.inches=(Zoll)
label.topmargin=oben
label.topmargin.mnemonic=O
label.bottommargin=unten
-label.bottommargin.mnemonic=U
+label.bottommargin.mnemonic=N
label.leftmargin=links
label.leftmargin.mnemonic=L
label.rightmargin=rechts
@@ -66,7 +66,7 @@
radiobutton.draftq=Entwurf
radiobutton.draftq.mnemonic=W
radiobutton.duplex=Duplex
-radiobutton.duplex.mnemonic=D
+radiobutton.duplex.mnemonic=P
radiobutton.highq=Hoch
radiobutton.highq.mnemonic=H
radiobutton.landscape=Querformat
@@ -78,15 +78,15 @@
radiobutton.oneside=Einseitig
radiobutton.oneside.mnemonic=E
radiobutton.portrait=Hochformat
-radiobutton.portrait.mnemonic=M
+radiobutton.portrait.mnemonic=H
radiobutton.rangeall=Alle
radiobutton.rangeall.mnemonic=L
radiobutton.rangepages=Seiten
radiobutton.rangepages.mnemonic=E
radiobutton.revlandscape=Umgekehrtes Querformat
-radiobutton.revlandscape.mnemonic=U
+radiobutton.revlandscape.mnemonic=M
radiobutton.revportrait=Umgekehrtes Hochformat
-radiobutton.revportrait.mnemonic=H
+radiobutton.revportrait.mnemonic=K
radiobutton.tumble=Kalenderdruck
radiobutton.tumble.mnemonic=K
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
@@ -96,7 +96,7 @@
tab.general=Allgemein
tab.general.vkMnemonic=65
tab.pagesetup=Seite einrichten
-tab.pagesetup.vkMnemonic=69
+tab.pagesetup.vkMnemonic=83
#
error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10)
error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang
--- a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Sat May 14 11:24:26 2011 -0700
@@ -20,7 +20,7 @@
checkbox.collate=Intercalar
checkbox.collate.mnemonic=C
checkbox.jobsheets=P\u00E1gina de R\u00F3tulo
-checkbox.jobsheets.mnemonic=L
+checkbox.jobsheets.mnemonic=E
checkbox.printtofile=Imprimir en Archivo
checkbox.printtofile.mnemonic=M
#
@@ -34,7 +34,7 @@
#
label.info=Informaci\u00F3n:
label.jobname=Nombre del Trabajo:
-label.jobname.mnemonic=N
+label.jobname.mnemonic=T
label.numcopies=N\u00FAmero de Copias:
label.numcopies.mnemonic=O
label.priority=Prioridad:
@@ -44,12 +44,12 @@
label.pstype=Tipo:
label.rangeto=A
label.size=Tama\u00F1o:
-label.size.mnemonic=\
+label.size.mnemonic=T
label.source=Origen:
-label.source.mnemonic=G
+label.source.mnemonic=O
label.status=Estado:
label.username=Usuario:
-label.username.mnemonic=U
+label.username.mnemonic=S
label.millimetres=(mm)
label.inches=(pulg.)
label.topmargin=superior
@@ -68,7 +68,7 @@
radiobutton.duplex=D\u00FAplex
radiobutton.duplex.mnemonic=D
radiobutton.highq=Alta
-radiobutton.highq.mnemonic=A
+radiobutton.highq.mnemonic=L
radiobutton.landscape=Horizontal
radiobutton.landscape.mnemonic=Z
radiobutton.monochrome=Monocromo
@@ -76,7 +76,7 @@
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
radiobutton.oneside=Una Cara
-radiobutton.oneside.mnemonic=R
+radiobutton.oneside.mnemonic=U
radiobutton.portrait=Vertical
radiobutton.portrait.mnemonic=V
radiobutton.rangeall=Todo
@@ -86,7 +86,7 @@
radiobutton.revlandscape=Horizontal Inverso
radiobutton.revlandscape.mnemonic=H
radiobutton.revportrait=Vertical Inverso
-radiobutton.revportrait.mnemonic=S
+radiobutton.revportrait.mnemonic=R
radiobutton.tumble=Cambio de Cara
radiobutton.tumble.mnemonic=B
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
--- a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Sat May 14 11:24:26 2011 -0700
@@ -20,7 +20,7 @@
checkbox.collate=Fascicola
checkbox.collate.mnemonic=L
checkbox.jobsheets=Pagina banner
-checkbox.jobsheets.mnemonic=B
+checkbox.jobsheets.mnemonic=P
checkbox.printtofile=Stampa su file
checkbox.printtofile.mnemonic=F
#
@@ -38,7 +38,7 @@
label.numcopies=Numero di copie:
label.numcopies.mnemonic=O
label.priority=Priorit\u00E0:
-label.priority.mnemonic=R
+label.priority.mnemonic=I
label.psname=Nome:
label.psname.mnemonic=N
label.pstype=Tipo:
@@ -72,7 +72,7 @@
radiobutton.landscape=Orizzontale
radiobutton.landscape.mnemonic=L
radiobutton.monochrome=Monocromatico
-radiobutton.monochrome.mnemonic=A
+radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normale
radiobutton.normalq.mnemonic=N
radiobutton.oneside=Un lato
--- a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Sat May 14 11:24:26 2011 -0700
@@ -15,14 +15,14 @@
button.ok=OK
button.print=Skriv ut
button.properties=Egenskaper...
-button.properties.mnemonic=E
+button.properties.mnemonic=R
#
checkbox.collate=Sortera
-checkbox.collate.mnemonic=S
+checkbox.collate.mnemonic=T
checkbox.jobsheets=F\u00F6rs\u00E4ttsblad
-checkbox.jobsheets.mnemonic=F
+checkbox.jobsheets.mnemonic=R
checkbox.printtofile=Skriv ut till fil
-checkbox.printtofile.mnemonic=F
+checkbox.printtofile.mnemonic=K
#
dialog.printtitle=Skriv ut
dialog.pstitle=Utskriftsformat
@@ -33,38 +33,38 @@
dialog.writeerror=Kan inte skriva till filen:
#
label.info=Information:
-label.jobname=Jobbnamn
-label.jobname.mnemonic=J
-label.numcopies=Antal exemplar
+label.jobname=Utskrift:
+label.jobname.mnemonic=U
+label.numcopies=Antal exemplar:
label.numcopies.mnemonic=E
-label.priority=Prioritet
+label.priority=Prioritet:
label.priority.mnemonic=R
label.psname=Namn:
label.psname.mnemonic=N
label.pstype=Typ:
label.rangeto=Till
label.size=Storlek:
-label.size.mnemonic=L
-label.source=K\u00E4lla
-label.source.mnemonic=L
+label.size.mnemonic=O
+label.source=K\u00E4lla:
+label.source.mnemonic=K
label.status=Status:
label.username=Anv\u00E4ndarnamn:
label.username.mnemonic=N
label.millimetres=(mm)
label.inches=(tum)
label.topmargin=\u00F6verkant
-label.topmargin.mnemonic=\
+label.topmargin.mnemonic=R
label.bottommargin=nederkant
label.bottommargin.mnemonic=N
label.leftmargin=v\u00E4nster
-label.leftmargin.mnemonic=\
+label.leftmargin.mnemonic=V
label.rightmargin=h\u00F6ger
label.rightmargin.mnemonic=H
#
radiobutton.color=F\u00E4rg
-radiobutton.color.mnemonic=F
+radiobutton.color.mnemonic=G
radiobutton.draftq=Utkast
-radiobutton.draftq.mnemonic=S
+radiobutton.draftq.mnemonic=K
radiobutton.duplex=Dubbelsidig
radiobutton.duplex.mnemonic=D
radiobutton.highq=H\u00F6g
@@ -74,19 +74,19 @@
radiobutton.monochrome=Monokrom
radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
-radiobutton.normalq.mnemonic=N
+radiobutton.normalq.mnemonic=O
radiobutton.oneside=Ensidig
radiobutton.oneside.mnemonic=E
radiobutton.portrait=St\u00E5ende
-radiobutton.portrait.mnemonic=S
+radiobutton.portrait.mnemonic=D
radiobutton.rangeall=Alla
radiobutton.rangeall.mnemonic=L
radiobutton.rangepages=Sidor
-radiobutton.rangepages.mnemonic=O
+radiobutton.rangepages.mnemonic=D
radiobutton.revlandscape=Omv\u00E4nt liggande
radiobutton.revlandscape.mnemonic=G
radiobutton.revportrait=Omv\u00E4nt st\u00E5ende
-radiobutton.revportrait.mnemonic=D
+radiobutton.revportrait.mnemonic=M
radiobutton.tumble=V\u00E4nd
radiobutton.tumble.mnemonic=V
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
@@ -96,7 +96,7 @@
tab.general=Allm\u00E4nt
tab.general.vkMnemonic=65
tab.pagesetup=Utskriftsformat
-tab.pagesetup.vkMnemonic=70
+tab.pagesetup.vkMnemonic=83
#
error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10)
error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen.
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties Sat May 14 11:24:26 2011 -0700
@@ -93,4 +93,4 @@
rmid.log.snapshot.warning=\nrmid: (GRAVE) la instant\u00E1nea del log indica:
# "rmid" should not be translated
-rmid.log.recover.warning=\nrmid: (ADVERTENCIA) {0}: saltando el registro del log durante la recuperaci\u00F3n:
+rmid.log.recover.warning=\nrmid: (ADVERTENCIA) {0}: se omitir\u00E1 el registro del log durante la recuperaci\u00F3n:
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Sat May 14 11:24:26 2011 -0700
@@ -74,8 +74,6 @@
"[-digestalg <algorithm>] \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
{".sigalg.algorithm.name.of.signature.algorithm",
"[-sigalg <algorithm>] \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
- {".crl.auto.file.include.CRL.in.signed.jar",
- "[-crl[:auto| <file>] \u7F72\u540D\u4ED8\u304Djar\u306BCRL\u3092\u542B\u3081\u308B"},
{".verify.verify.a.signed.JAR.file",
"[-verify] \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"},
{".verbose.suboptions.verbose.output.when.signing.verifying.",
@@ -183,17 +181,13 @@
{"TSA.location.", "TSA\u306E\u5834\u6240: "},
{"TSA.certificate.", "TSA\u8A3C\u660E\u66F8: "},
{"no.response.from.the.Timestamping.Authority.",
- "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u304B\u3089\u306E\u30EC\u30B9\u30DD\u30F3\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002 "},
- {"When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.",
- "\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u4ECB\u3057\u3066\u63A5\u7D9A\u3059\u308B\u3068\u304D\u306F\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066HTTP\u30D7\u30ED\u30AD\u30B7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 "},
- {"Supply.the.following.options.to.jarsigner.",
- "jarsigner\u306B\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u304B\u3089\u306E\u30EC\u30B9\u30DD\u30F3\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u4ECB\u3057\u3066\u63A5\u7D9A\u3059\u308B\u3068\u304D\u306F\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066HTTP\u307E\u305F\u306FHTTPS\u30D7\u30ED\u30AD\u30B7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002jarsigner\u306B\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044:"},
+ {"or", "\u307E\u305F\u306F"},
{"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
"\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}\u3002{1}\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u306EX.509\u516C\u958B\u9375\u8A3C\u660E\u66F8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u6709\u52B9\u306AKeyStore\u30A8\u30F3\u30C8\u30EA\u3092\u53C2\u7167\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
{"using.an.alternative.signing.mechanism",
"\u4EE3\u66FF\u7F72\u540D\u30E1\u30AB\u30CB\u30BA\u30E0\u306E\u4F7F\u7528"},
{"entry.was.signed.on", "\u30A8\u30F3\u30C8\u30EA\u306F{0}\u306B\u7F72\u540D\u3055\u308C\u307E\u3057\u305F"},
- {"with.a.CRL.including.d.entries", "%d\u500B\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u542B\u3080CRL\u3092\u4F7F\u7528"},
{"Warning.", "\u8B66\u544A: "},
{"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
"\u3053\u306Ejar\u306B\u306F\u3001\u6574\u5408\u6027\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u3044\u306A\u3044\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Sat May 14 11:24:26 2011 -0700
@@ -53,9 +53,9 @@
{"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
"\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"},
{"Usage.jarsigner.options.jar.file.alias",
- "\u7528\u6CD5: jarsigner [\u9009\u9879] jar \u6587\u4EF6\u522B\u540D"},
+ "\u7528\u6CD5: jarsigner [\u9009\u9879] jar\u6587\u4EF6 \u522B\u540D"},
{".jarsigner.verify.options.jar.file.alias.",
- " jarsigner -verify [options] jar-file [alias...]"},
+ " jarsigner -verify [\u9009\u9879] jar\u6587\u4EF6 [\u522B\u540D...]"},
{".keystore.url.keystore.location",
"[-keystore <url>] \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
{".storepass.password.password.for.keystore.integrity",
@@ -65,7 +65,7 @@
{".keypass.password.password.for.private.key.if.different.",
"[-keypass <\u53E3\u4EE4>] \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"},
{".certchain.file.name.of.alternative.certchain.file",
- "[-certchain <file>] \u66FF\u4EE3 certchain \u6587\u4EF6\u7684\u540D\u79F0"},
+ "[-certchain <\u6587\u4EF6>] \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"},
{".sigfile.file.name.of.SF.DSA.file",
"[-sigfile <\u6587\u4EF6>] .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"},
{".signedjar.file.name.of.signed.JAR.file",
@@ -74,12 +74,10 @@
"[-digestalg <\u7B97\u6CD5>] \u6458\u8981\u7B97\u6CD5\u7684\u540D\u79F0"},
{".sigalg.algorithm.name.of.signature.algorithm",
"[-sigalg <\u7B97\u6CD5>] \u7B7E\u540D\u7B97\u6CD5\u7684\u540D\u79F0"},
- {".crl.auto.file.include.CRL.in.signed.jar",
- "[-crl[:auto| <file>] \u5728\u5DF2\u7B7E\u540D\u7684 jar \u4E2D\u5305\u542B CRL"},
{".verify.verify.a.signed.JAR.file",
"[-verify] \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"},
{".verbose.suboptions.verbose.output.when.signing.verifying.",
- "[-verbose[:suboptions]] \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
+ "[-verbose[:\u5B50\u9009\u9879]] \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
{".suboptions.can.be.all.grouped.or.summary",
" \u5B50\u9009\u9879\u53EF\u4EE5\u662F all, grouped \u6216 summary"},
{".certs.display.certificates.when.verbose.and.verifying",
@@ -108,7 +106,7 @@
"[-strict] \u5C06\u8B66\u544A\u89C6\u4E3A\u9519\u8BEF"},
{"Option.lacks.argument", "\u9009\u9879\u7F3A\u5C11\u53C2\u6570"},
{"Please.type.jarsigner.help.for.usage", "\u8BF7\u952E\u5165 jarsigner -help \u4EE5\u4E86\u89E3\u7528\u6CD5"},
- {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jarfile \u540D\u79F0"},
+ {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jar \u6587\u4EF6\u7684\u540D\u79F0"},
{"Please.specify.alias.name", "\u8BF7\u6307\u5B9A\u522B\u540D"},
{"Only.one.alias.can.be.specified", "\u53EA\u80FD\u6307\u5B9A\u4E00\u4E2A\u522B\u540D"},
{"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
@@ -159,7 +157,7 @@
{"File.specified.by.certchain.does.not.exist",
"\u7531 -certchain \u6307\u5B9A\u7684\u6587\u4EF6\u4E0D\u5B58\u5728"},
{"Cannot.restore.certchain.from.file.specified",
- "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F certchain"},
+ "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F\u8BC1\u4E66\u94FE"},
{"Certificate.chain.not.found.in.the.file.specified.",
"\u5728\u6307\u5B9A\u7684\u6587\u4EF6\u4E2D\u627E\u4E0D\u5230\u8BC1\u4E66\u94FE\u3002"},
{"found.non.X.509.certificate.in.signer.s.chain",
@@ -183,17 +181,13 @@
{"TSA.location.", "TSA \u4F4D\u7F6E: "},
{"TSA.certificate.", "TSA \u8BC1\u4E66: "},
{"no.response.from.the.Timestamping.Authority.",
- "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002"},
- {"When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.",
- "\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u4EE3\u7406\u3002 "},
- {"Supply.the.following.options.to.jarsigner.",
- "\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "},
+ "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u6216 HTTPS \u4EE3\u7406\u3002\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "},
+ {"or", "\u6216"},
{"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
"\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548 KeyStore \u6761\u76EE\u3002"},
{"using.an.alternative.signing.mechanism",
"\u6B63\u5728\u4F7F\u7528\u66FF\u4EE3\u7684\u7B7E\u540D\u673A\u5236"},
{"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"},
- {"with.a.CRL.including.d.entries", "\u5177\u6709\u5305\u542B %d \u4E2A\u6761\u76EE\u7684 CRL"},
{"Warning.", "\u8B66\u544A: "},
{"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
"\u6B64 jar \u5305\u542B\u5C1A\u672A\u8FDB\u884C\u5B8C\u6574\u6027\u68C0\u67E5\u7684\u672A\u7B7E\u540D\u6761\u76EE\u3002 "},
--- a/jdk/src/share/classes/sun/security/util/AuthResources_de.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_de.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "Keystore-Typ erwartet"},
- {"can.not.specify.Principal.with.a.",
- "Principal kann nicht mit einer "},
- {"wildcard.class.without.a.wildcard.name",
- "Platzhalterklasse ohne Platzhalternamen angegeben werden"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "Principal kann nicht mit einer Platzhalterklasse ohne Platzhalternamen angegeben werden"},
{"expected.codeBase.or.SignedBy", "codeBase oder SignedBy erwartet"},
{"only.Principal.based.grant.entries.permitted",
"Nur Principal-basierte Berechtigungseintr\u00E4ge zul\u00E4ssig"},
{"expected.permission.entry", "Berechtigungseintrag erwartet"},
{"number.", "Nummer "},
- {"expected.", "erwartet "},
- {".read.end.of.file", ", Dateiende gelesen"},
+ {"expected.expect.read.end.of.file.",
+ "{0} erwartet, Dateiende gelesen"},
{"expected.read.end.of.file", "\";\" erwartet, Dateiende gelesen"},
{"line.", "Zeile "},
{".expected.", ": erwartet: \""},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "Nullname angegeben"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_es.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_es.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "se esperaba un tipo de almac\u00E9n de claves"},
- {"can.not.specify.Principal.with.a.",
- "no se puede especificar Principal con una "},
- {"wildcard.class.without.a.wildcard.name",
- "clase comod\u00EDn sin nombre de comod\u00EDn"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "no se puede especificar Principal con una clase de comod\u00EDn sin un nombre de comod\u00EDn"},
{"expected.codeBase.or.SignedBy", "se esperaba codeBase o SignedBy"},
{"only.Principal.based.grant.entries.permitted",
"s\u00F3lo se permite otorgar entradas basadas en Principal"},
{"expected.permission.entry", "se esperaba un permiso de entrada"},
{"number.", "n\u00FAmero "},
- {"expected.", "se esperaba "},
- {".read.end.of.file", ", se ha le\u00EDdo el final de archivo"},
+ {"expected.expect.read.end.of.file.",
+ "se esperaba [{0}], se ha le\u00EDdo final de archivo"},
{"expected.read.end.of.file", "se esperaba ';', se ha le\u00EDdo el final de archivo"},
{"line.", "l\u00EDnea "},
{".expected.", ": se esperaba '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "se ha proporcionado un nombre nulo"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_fr.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_fr.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "type de fichier de cl\u00E9s attendu"},
- {"can.not.specify.Principal.with.a.",
- "impossible de sp\u00E9cifier le principal avec une "},
- {"wildcard.class.without.a.wildcard.name",
- "classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "impossible de sp\u00E9cifier le principal avec une classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"},
{"expected.codeBase.or.SignedBy", "codeBase ou SignedBy attendu"},
{"only.Principal.based.grant.entries.permitted",
"seules les entr\u00E9es bas\u00E9es sur Principal sont autoris\u00E9es"},
{"expected.permission.entry", "entr\u00E9e de droit attendue"},
{"number.", "nombre "},
- {"expected.", "attendu "},
- {".read.end.of.file", ", lecture de fin de fichier"},
+ {"expected.expect.read.end.of.file.",
+ "attendu {0}, lecture de fin de fichier"},
{"expected.read.end.of.file", "attendu ';', lecture de fin de fichier"},
{"line.", "ligne "},
{".expected.", ": attendu '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal : "},
{"SolarisPrincipal.", "SolarisPrincipal : "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "nom NULL fourni"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_it.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_it.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "tipo keystore previsto"},
- {"can.not.specify.Principal.with.a.",
- "impossibile specificare il principal con una "},
- {"wildcard.class.without.a.wildcard.name",
- "classe carattere jolly senza un nome carattere jolly"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "impossibile specificare un principal con una classe carattere jolly senza un nome carattere jolly"},
{"expected.codeBase.or.SignedBy", "previsto codeBase o SignedBy"},
{"only.Principal.based.grant.entries.permitted",
"sono consentiti solo valori garantiti basati sul principal"},
{"expected.permission.entry", "prevista voce di autorizzazione"},
{"number.", "numero "},
- {"expected.", "previsto "},
- {".read.end.of.file", ", letto end of file"},
+ {"expected.expect.read.end.of.file.",
+ "previsto {0}, letto end of file"},
{"expected.read.end.of.file", "previsto ';', letto end of file"},
{"line.", "riga "},
{".expected.", ": previsto '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "il nome fornito \u00E8 nullo"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_ja.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_ja.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "\u4E88\u60F3\u3055\u308C\u305F\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30BF\u30A4\u30D7"},
- {"can.not.specify.Principal.with.a.",
- "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306F\u3001\u6B21\u306E\u3082\u306E\u3092\u4F7F\u7528\u3057\u3066\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093 "},
- {"wildcard.class.without.a.wildcard.name",
- "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u3001\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
{"expected.codeBase.or.SignedBy", "\u4E88\u60F3\u3055\u308C\u305FcodeBase\u307E\u305F\u306FSignedBy"},
{"only.Principal.based.grant.entries.permitted",
"\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u30FB\u30D9\u30FC\u30B9\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u307F\u304C\u8A31\u53EF\u3055\u308C\u307E\u3059\u3002"},
{"expected.permission.entry", "\u4E88\u60F3\u3055\u308C\u305F\u30A2\u30AF\u30BB\u30B9\u6A29\u30A8\u30F3\u30C8\u30EA"},
{"number.", "\u6570 "},
- {"expected.", "\u4E88\u60F3\u5024 "},
- {".read.end.of.file", ", \u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F\u3002"},
+ {"expected.expect.read.end.of.file.",
+ "{0}\u3067\u306F\u306A\u304F\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"},
{"expected.read.end.of.file", "\u4E88\u60F3\u5024\u306F';'\u3067\u3059\u304C\u3001\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"},
{"line.", "\u884C\u756A\u53F7 "},
{".expected.", ": \u4E88\u60F3\u5024'"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "null\u306E\u540D\u524D\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_ko.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_ko.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
- {"can.not.specify.Principal.with.a.",
- "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294"},
- {"wildcard.class.without.a.wildcard.name",
- "\uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
{"expected.codeBase.or.SignedBy", "codeBase \uB610\uB294 SignedBy\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."},
{"only.Principal.based.grant.entries.permitted",
"\uC8FC\uCCB4 \uAE30\uBC18 \uAD8C\uD55C \uBD80\uC5EC \uD56D\uBAA9\uB9CC \uD5C8\uC6A9\uB429\uB2C8\uB2E4."},
{"expected.permission.entry", "\uAD8C\uD55C \uD56D\uBAA9\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
{"number.", "\uC22B\uC790 "},
- {"expected.", "\uD544\uC694\uD55C \uD56D\uBAA9: "},
- {".read.end.of.file", ", \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."},
+ {"expected.expect.read.end.of.file.",
+ "{0}\uC774(\uAC00) \uD544\uC694\uD558\uC9C0\uB9CC \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."},
{"expected.read.end.of.file", "';'\uC774 \uD544\uC694\uD558\uC9C0\uB9CC \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."},
{"line.", "\uD589 "},
{".expected.", ": \uD544\uC694\uD55C \uD56D\uBAA9: '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "\uB110 \uC774\uB984\uC744 \uC81C\uACF5\uD588\uC2B5\uB2C8\uB2E4."}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "tipo de armazenamento de chaves esperado"},
- {"can.not.specify.Principal.with.a.",
- "n\u00E3o \u00E9 poss\u00EDvel especificar um Principal com uma "},
- {"wildcard.class.without.a.wildcard.name",
- "de curinga sem um nome de curinga"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "n\u00E3o \u00E9 poss\u00EDvel especificar um principal com uma classe curinga sem um nome curinga"},
{"expected.codeBase.or.SignedBy", "CodeBase ou SignedBy esperado"},
{"only.Principal.based.grant.entries.permitted",
"somente \u00E9 permitido conceder entradas com base no Principal"},
{"expected.permission.entry", "entrada de permiss\u00E3o esperada"},
{"number.", "n\u00FAmero "},
- {"expected.", "esperado "},
- {".read.end.of.file", ", fim de arquivo lido"},
+ {"expected.expect.read.end.of.file.",
+ "esperado {0}, ler fim do arquivo"},
{"expected.read.end.of.file", "esperado ';', fim de arquivo lido"},
{"line.", "linha "},
{".expected.", ": esperado '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "nome nulo fornecido"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_sv.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_sv.java Sat May 14 11:24:26 2011 -0700
@@ -70,11 +70,11 @@
{"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
"Konfigurationsfel:\n\tKan inte ange flera poster f\u00F6r {0}"},
{"Configuration.Error.expected.expect.read.end.of.file.",
- "Konfigurationsfel:\n\tf\u00F6rv\u00E4ntade [{0}], l\u00E4ste [end of file]"},
+ "Konfigurationsfel:\n\tf\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"},
{"Configuration.Error.Line.line.expected.expect.found.value.",
- "Konfigurationsfel:\n\tLine {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"},
+ "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"},
{"Configuration.Error.Line.line.expected.expect.",
- "Konfigurationsfel:\n\tLine {0}: f\u00F6rv\u00E4ntade [{1}]"},
+ "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}]"},
{"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
"Konfigurationsfel:\n\tRad {0}: systemegenskapen [{1}] ut\u00F6kad till tomt v\u00E4rde"},
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "f\u00F6rv\u00E4ntad nyckellagertyp"},
- {"can.not.specify.Principal.with.a.",
- "kan inte ange identitetshavare med "},
- {"wildcard.class.without.a.wildcard.name",
- "jokerteckenklass utan jokerteckennamn"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "kan inte ange identitetshavare med en jokerteckenklass utan ett jokerteckennamn"},
{"expected.codeBase.or.SignedBy", "f\u00F6rv\u00E4ntade codeBase eller SignedBy"},
{"only.Principal.based.grant.entries.permitted",
"endast identitetshavarbaserade poster till\u00E5ts"},
{"expected.permission.entry", "f\u00F6rv\u00E4ntade beh\u00F6righetspost"},
{"number.", "antal "},
- {"expected.", "f\u00F6rv\u00E4ntade "},
- {".read.end.of.file", ", l\u00E4ste filslut"},
+ {"expected.expect.read.end.of.file.",
+ "f\u00F6rv\u00E4ntade {0}, l\u00E4ste filslut"},
{"expected.read.end.of.file", "f\u00F6rv\u00E4ntade ';', l\u00E4ste filslut"},
{"line.", "rad "},
{".expected.", ": f\u00F6rv\u00E4ntade '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "angav null-namn"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "\u5E94\u4E3A\u5BC6\u94A5\u5E93\u7C7B\u578B"},
- {"can.not.specify.Principal.with.a.",
- "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528"},
- {"wildcard.class.without.a.wildcard.name",
- "\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"},
{"expected.codeBase.or.SignedBy", "\u5E94\u4E3A codeBase \u6216 SignedBy"},
{"only.Principal.based.grant.entries.permitted",
"\u53EA\u5141\u8BB8\u57FA\u4E8E\u4E3B\u7528\u6237\u7684\u6388\u6743\u6761\u76EE"},
{"expected.permission.entry", "\u5E94\u4E3A\u6743\u9650\u6761\u76EE"},
{"number.", "\u7F16\u53F7 "},
- {"expected.", "\u5E94\u4E3A "},
- {".read.end.of.file", ", \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"},
+ {"expected.expect.read.end.of.file.",
+ "\u5E94\u4E3A{0}, \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"},
{"expected.read.end.of.file", "\u5E94\u4E3A ';', \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"},
{"line.", "\u884C "},
{".expected.", ": \u5E94\u4E3A '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "\u63D0\u4F9B\u7684\u540D\u79F0\u4E3A\u7A7A\u503C"}
};
--- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java Sat May 14 11:24:26 2011 -0700
@@ -111,17 +111,15 @@
// com.sun.security.auth.PolicyParser
{"expected.keystore.type", "\u9810\u671F\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"},
- {"can.not.specify.Principal.with.a.",
- "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A"},
- {"wildcard.class.without.a.wildcard.name",
- "\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
+ {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+ "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
{"expected.codeBase.or.SignedBy", "\u9810\u671F\u7684 codeBase \u6216 SignedBy"},
{"only.Principal.based.grant.entries.permitted",
"\u53EA\u5141\u8A31\u4EE5 Principal \u70BA\u57FA\u790E\u7684\u6388\u6B0A\u9805\u76EE"},
{"expected.permission.entry", "\u9810\u671F\u7684\u6B0A\u9650\u9805\u76EE"},
{"number.", "\u865F\u78BC "},
- {"expected.", "\u9810\u671F\u7684 "},
- {".read.end.of.file", "\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"},
+ {"expected.expect.read.end.of.file.",
+ "\u9810\u671F\u70BA {0}, \u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"},
{"expected.read.end.of.file", "\u9810\u671F\u7684 ';'\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"},
{"line.", "\u884C "},
{".expected.", ": \u9810\u671F '"},
@@ -136,6 +134,9 @@
{"SolarisNumericUserPrincipal.",
"SolarisNumericUserPrincipal: "},
{"SolarisPrincipal.", "SolarisPrincipal: "},
+ // provided.null.name is the NullPointerException message when a
+ // developer incorrectly passes a null name to the constructor of
+ // subclasses of java.security.Principal
{"provided.null.name", "\u63D0\u4F9B\u7A7A\u503C\u540D\u7A31"}
};
--- a/jdk/src/share/classes/sun/security/util/Resources_de.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_de.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [Option]..."},
{"Options.", "Optionen:"},
{"Use.keytool.help.for.all.available.commands",
"\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"},
@@ -67,6 +68,7 @@
"Exportiert ein Zertifikat"}, //-exportcert
{"Generates.a.key.pair",
"Generiert ein Schl\u00FCsselpaar"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"Generiert einen Secret Key"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "Zertifikatkettenl\u00E4nge: "},
{"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "Zertifikat-Fingerprint (SHA1): "},
- {"Entry.type.trustedCertEntry.", "Eintragstyp: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "Keystore-Typ: "},
{"Keystore.provider.", "Keystore-Provider: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -331,7 +331,7 @@
{"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
"M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]: "},
{"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]: "},
- {"YES", "JA"},
+ {"YES", "Ja"},
{"New.prompt.", "Neues {0}: "},
{"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"},
{"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "},
@@ -368,7 +368,7 @@
"Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Clonen von Private Key-Eintr\u00E4gen"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** Warnung Warnung Warnung *****************"},
{"Signer.d.", "Signaturgeber #%d:"},
{"Timestamp.", "Zeitstempel:"},
{"Signature.", "Signatur:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"Kein Zertifikat vom SSL-Server"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* Integrit\u00E4t der im Keystore gespeicherten Informationen *"},
+ "* Die Integrit\u00E4t der Informationen, die in Ihrem Keystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* Integrit\u00E4t der in srckeystore gespeicherten Informationen*"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* ist NICHT verifiziert worden. Damit die Integrit\u00E4t verifiziert werden kann, *"},
- {".you.must.provide.your.keystore.password.",
- "* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"},
- {".you.must.provide.the.srckeystore.password.",
- "* m\u00FCssen Sie das Kennwort f\u00FCr srckeystore angeben. *"},
-
+ "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben. *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
@@ -403,7 +393,7 @@
"Zertifikat der obersten Ebene in Antwort:\n"},
{".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
{"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]: "},
- {"NO", "NEIN"},
+ {"NO", "Nein"},
{"Public.keys.in.reply.and.keystore.don.t.match",
"Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"},
{"Certificate.reply.and.certificate.in.keystore.are.identical",
--- a/jdk/src/share/classes/sun/security/util/Resources_es.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_es.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [Opci\u00F3n]..."},
{"Options.", "Opciones:"},
{"Use.keytool.help.for.all.available.commands",
"Utilice\"keytool -help\" para todos los comandos disponibles"},
@@ -67,6 +68,7 @@
"Exporta el certificado"}, //-exportcert
{"Generates.a.key.pair",
"Genera un par de claves"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"Genera un clave secreta"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -112,7 +114,7 @@
{"destination.keystore.type",
"tipo de almac\u00E9n de claves de destino"}, //-deststoretype
{"distinguished.name",
- "nombre distinguido"}, //-dname
+ "nombre distintivo"}, //-dname
{"X.509.extension",
"extensi\u00F3n X.509"}, //-ext
{"output.file.name",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "Longitud de la Cadena de Certificado: "},
{"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "Huella Digital de Certificado (SHA1): "},
- {"Entry.type.trustedCertEntry.", "Tipo de Entrada: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "Tipo de Almac\u00E9n de Claves: "},
{"Keystore.provider.", "Proveedor de Almac\u00E9n de Claves: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -331,7 +331,7 @@
{"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
"\u00BFA\u00FAn desea agregarlo a su propio almac\u00E9n de claves? [no]: "},
{"Trust.this.certificate.no.", "\u00BFConfiar en este certificado? [no]: "},
- {"YES", "S\u00CD"},
+ {"YES", "S\u00ED"},
{"New.prompt.", "Nuevo {0}: "},
{"Passwords.must.differ", "Las contrase\u00F1as deben ser distintas"},
{"Re.enter.new.prompt.", "Vuelva a escribir el nuevo {0}: "},
@@ -368,7 +368,7 @@
"El alias <{0}> hace referencia a un tipo de entrada que no es una clave privada. El comando -keyclone s\u00F3lo permite la clonaci\u00F3n de entradas de claves privadas"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** Advertencia Advertencia Advertencia *****************"},
{"Signer.d.", "#%d de Firmante:"},
{"Timestamp.", "Registro de Hora:"},
{"Signature.", "Firma:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"Ning\u00FAn certificado del servidor SSL"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* La integridad de la informaci\u00F3n almacenada en su almac\u00E9n de claves *"},
+ "* La integridad de la informaci\u00F3n almacenada en el almac\u00E9n de claves *\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a del almac\u00E9n de claves. *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* La totalidad de la informaci\u00F3n almacenada en srckeystore*"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* NO se ha comprobado. Para comprobar dicha integridad, *"},
- {".you.must.provide.your.keystore.password.",
- "* deber\u00E1 proporcionar su contrase\u00F1a de almac\u00E9n de claves. *"},
- {".you.must.provide.the.srckeystore.password.",
- "* deber\u00E1 indicar la contrase\u00F1a de srckeystore. *"},
-
+ "* La integridad de la informaci\u00F3n almacenada en srckeystore*\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a de srckeystore. *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"La respuesta de certificado no contiene una clave p\u00FAblica para <{0}>"},
@@ -403,7 +393,7 @@
"Certificado de nivel superior en la respuesta:\n"},
{".is.not.trusted.", "... no es de confianza. "},
{"Install.reply.anyway.no.", "\u00BFInstalar respuesta de todos modos? [no]: "},
- {"NO", "NO"},
+ {"NO", "No"},
{"Public.keys.in.reply.and.keystore.don.t.match",
"Las claves p\u00FAblicas en la respuesta y en el almac\u00E9n de claves no coinciden"},
{"Certificate.reply.and.certificate.in.keystore.are.identical",
--- a/jdk/src/share/classes/sun/security/util/Resources_fr.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_fr.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [Option]..."},
{"Options.", "Options :"},
{"Use.keytool.help.for.all.available.commands",
"Utiliser \"keytool -help\" pour toutes les commandes disponibles"},
@@ -67,6 +68,7 @@
"Exporte le certificat"}, //-exportcert
{"Generates.a.key.pair",
"G\u00E9n\u00E8re une paire de cl\u00E9s"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"G\u00E9n\u00E8re une cl\u00E9 secr\u00E8te"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "Longueur de cha\u00EEne du certificat : "},
{"Certificate.i.1.", "Certificat[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "Empreinte du certificat (SHA1) : "},
- {"Entry.type.trustedCertEntry.", "Type d'entr\u00E9e : trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "Type de fichier de cl\u00E9s : "},
{"Keystore.provider.", "Fournisseur de fichier de cl\u00E9s : "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -331,7 +331,7 @@
{"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
"Voulez-vous toujours l'ajouter \u00E0 votre fichier de cl\u00E9s ? [non] : "},
{"Trust.this.certificate.no.", "Faire confiance \u00E0 ce certificat ? [non] : "},
- {"YES", "OUI"},
+ {"YES", "Oui"},
{"New.prompt.", "Nouveau {0} : "},
{"Passwords.must.differ", "Les mots de passe doivent diff\u00E9rer"},
{"Re.enter.new.prompt.", "Indiquez encore le nouveau {0} : "},
@@ -368,7 +368,7 @@
"L''entr\u00E9e \u00E0 laquelle l''alias <{0}> fait r\u00E9f\u00E9rence n''est pas une entr\u00E9e de type cl\u00E9 priv\u00E9e. La commande -keyclone prend uniquement en charge le clonage des cl\u00E9s priv\u00E9es"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** Avertissement Avertissement Avertissement *****************"},
{"Signer.d.", "Signataire n\u00B0%d :"},
{"Timestamp.", "Horodatage :"},
{"Signature.", "Signature :"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"Aucun certificat du serveur SSL"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *"},
+ "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *"},
- {".you.must.provide.your.keystore.password.",
- "* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"},
- {".you.must.provide.the.srckeystore.password.",
- "* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"},
-
+ "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"La r\u00E9ponse au certificat ne contient pas de cl\u00E9 publique pour <{0}>"},
@@ -403,7 +393,7 @@
"Certificat de niveau sup\u00E9rieur dans la r\u00E9ponse :\n"},
{".is.not.trusted.", "... non s\u00E9curis\u00E9. "},
{"Install.reply.anyway.no.", "Installer la r\u00E9ponse quand m\u00EAme ? [non] : "},
- {"NO", "NON"},
+ {"NO", "Non"},
{"Public.keys.in.reply.and.keystore.don.t.match",
"Les cl\u00E9s publiques de la r\u00E9ponse et du fichier de cl\u00E9s ne concordent pas"},
{"Certificate.reply.and.certificate.in.keystore.are.identical",
--- a/jdk/src/share/classes/sun/security/util/Resources_it.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_it.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [Opzione]..."},
{"Options.", "Opzioni:"},
{"Use.keytool.help.for.all.available.commands",
"Utilizzare \"keytool -help\" per visualizzare tutti i comandi disponibili"},
@@ -67,6 +68,7 @@
"Esporta il certificato"}, //-exportcert
{"Generates.a.key.pair",
"Genera una coppia di chiavi"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"Genera una chiave segreta"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "Lunghezza catena certificati: "},
{"Certificate.i.1.", "Certificato[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "Impronta digitale certificato (SHA1): "},
- {"Entry.type.trustedCertEntry.", "Tipo di voce: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "Tipo keystore: "},
{"Keystore.provider.", "Provider keystore: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -368,7 +368,7 @@
"L''alias <{0}> fa riferimento a un tipo di voce che non \u00E8 una voce di chiave privata. Il comando -keyclone supporta solo la copia delle voci di chiave private."},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** Avvertenza Avvertenza Avvertenza *****************"},
{"Signer.d.", "Firmatario #%d:"},
{"Timestamp.", "Indicatore orario:"},
{"Signature.", "Firma:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"Nessun certificato dal server SSL"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *"},
+ "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del keystore. *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* L'integrit\u00E0 delle informazioni salvate nel srckeystore*"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* NON \u00E8 stata verificata. A tale scopo \u00E8 necessario fornire *"},
- {".you.must.provide.your.keystore.password.",
- "* la password del keystore. *"},
- {".you.must.provide.the.srckeystore.password.",
- "* \u00C8 necessario fornire la password per il srckeystore. *"},
-
+ "* L'integrit\u00E0 delle informazioni memorizzate nel srckeystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del srckeystore. *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"La risposta del certificato non contiene la chiave pubblica per <{0}>"},
@@ -403,7 +393,7 @@
"Certificato di primo livello nella risposta:\n"},
{".is.not.trusted.", "...non \u00E8 considerato sicuro. "},
{"Install.reply.anyway.no.", "Installare la risposta? [no]: "},
- {"NO", "NO"},
+ {"NO", "No"},
{"Public.keys.in.reply.and.keystore.don.t.match",
"Le chiavi pubbliche nella risposta e nel keystore non corrispondono"},
{"Certificate.reply.and.certificate.in.keystore.are.identical",
--- a/jdk/src/share/classes/sun/security/util/Resources_ja.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_ja.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [\u30AA\u30D7\u30B7\u30E7\u30F3]..."},
{"Options.", "\u30AA\u30D7\u30B7\u30E7\u30F3:"},
{"Use.keytool.help.for.all.available.commands",
"\u4F7F\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u306B\u3064\u3044\u3066\u306F\"keytool -help\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"},
@@ -67,6 +68,7 @@
"\u8A3C\u660E\u66F8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-exportcert
{"Generates.a.key.pair",
"\u9375\u30DA\u30A2\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"\u79D8\u5BC6\u9375\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306E\u9577\u3055: "},
{"Certificate.i.1.", "\u8A3C\u660E\u66F8[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8(SHA1): "},
- {"Entry.type.trustedCertEntry.", "\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30D7: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7: "},
{"Keystore.provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -368,7 +368,7 @@
"\u5225\u540D<{0}>\u304C\u53C2\u7167\u3057\u3066\u3044\u308B\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002-keyclone\u30B3\u30DE\u30F3\u30C9\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u4F5C\u6210\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "*****************\u8B66\u544A \u8B66\u544A \u8B66\u544A*****************"},
{"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"},
{"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"},
{"Signature.", "\u7F72\u540D:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"SSL\u30B5\u30FC\u30D0\u30FC\u304B\u3089\u306E\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* \u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027 *"},
+ "*\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* \u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u5B8C\u5168\u6027 *"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* \u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F *"},
- {".you.must.provide.your.keystore.password.",
- "* \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 *"},
- {".you.must.provide.the.srckeystore.password.",
- "* \u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 *"},
-
+ "*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"\u8A3C\u660E\u66F8\u5FDC\u7B54\u306B\u306F\u3001<{0}>\u306E\u516C\u958B\u9375\u306F\u542B\u307E\u308C\u307E\u305B\u3093"},
--- a/jdk/src/share/classes/sun/security/util/Resources_ko.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_ko.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [\uC635\uC158]..."},
{"Options.", "\uC635\uC158:"},
{"Use.keytool.help.for.all.available.commands",
"\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBAA8\uB4E0 \uBA85\uB839\uC5D0 \"keytool -help\" \uC0AC\uC6A9"},
@@ -67,6 +68,7 @@
"\uC778\uC99D\uC11C\uB97C \uC775\uC2A4\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-exportcert
{"Generates.a.key.pair",
"\uD0A4 \uC30D\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "\uC778\uC99D\uC11C \uCCB4\uC778 \uAE38\uC774: "},
{"Certificate.i.1.", "\uC778\uC99D\uC11C[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "\uC778\uC99D\uC11C \uC9C0\uBB38(SHA1): "},
- {"Entry.type.trustedCertEntry.", "\uD56D\uBAA9 \uC720\uD615: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615: "},
{"Keystore.provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -368,7 +368,7 @@
"<{0}> \uBCC4\uCE6D\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC774 \uC544\uB2CC \uD56D\uBAA9 \uC720\uD615\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4. -keyclone \uBA85\uB839\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC758 \uBCF5\uC81C\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4."},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** \uACBD\uACE0 \uACBD\uACE0 \uACBD\uACE0 *****************"},
{"Signer.d.", "\uC11C\uBA85\uC790 #%d:"},
{"Timestamp.", "\uC2DC\uAC04 \uAE30\uB85D:"},
{"Signature.", "\uC11C\uBA85:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"SSL \uC11C\uBC84\uC5D0\uC11C \uAC00\uC838\uC628 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *"},
+ "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774*"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74 *"},
- {".you.must.provide.your.keystore.password.",
- "* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
- {".you.must.provide.the.srckeystore.password.",
- "* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
-
+ "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"\uC778\uC99D\uC11C \uD68C\uC2E0\uC5D0 <{0}>\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
--- a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [Op\u00E7\u00E3o]..."},
{"Options.", "Op\u00E7\u00F5es:"},
{"Use.keytool.help.for.all.available.commands",
"Use \"keytool -help\" para todos os comandos dispon\u00EDveis"},
@@ -67,8 +68,9 @@
"Exporta o certificado"}, //-exportcert
{"Generates.a.key.pair",
"Gera um par de chaves"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
- "Gera uma chave secreta"}, //-genseckey
+ "Gera uma chave Secreta"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
"Gera um certificado de uma solicita\u00E7\u00E3o de certificado"}, //-gencert
{"Generates.CRL", "Gera CRL"}, //-gencrl
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "Comprimento da cadeia de certificados: "},
{"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "Fingerprint (MD5) do certificado: "},
- {"Entry.type.trustedCertEntry.", "Tipo de entrada: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "Tipo de \u00E1rea de armazenamento de chaves: "},
{"Keystore.provider.", "Fornecedor da \u00E1rea de armazenamento de chaves: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -331,7 +331,7 @@
{"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
"Ainda deseja adicion\u00E1-lo \u00E0 sua \u00E1rea de armazenamento de chaves? [n\u00E3o]: "},
{"Trust.this.certificate.no.", "Confiar neste certificado? [n\u00E3o]: "},
- {"YES", "SIM"},
+ {"YES", "Sim"},
{"New.prompt.", "Nova {0}: "},
{"Passwords.must.differ", "As senhas devem ser diferentes"},
{"Re.enter.new.prompt.", "Informe novamente a nova {0}: "},
@@ -368,7 +368,7 @@
"O alias <{0}> faz refer\u00EAncia a um tipo de entrada que n\u00E3o \u00E9 uma entrada de chave privada. O comando -keyclone oferece suporte somente \u00E0 clonagem de entradas de chave privada"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** Advert\u00EAncia Advert\u00EAncia Advert\u00EAncia *****************"},
{"Signer.d.", "Signat\u00E1rio #%d:"},
{"Timestamp.", "Timestamp:"},
{"Signature.", "Assinatura:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"N\u00E3o \u00E9 um certificado do servidor SSL"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *"},
+ "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha da \u00E1rea de armazenamento de chaves. *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore*"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* N\u00C3O foi verificada! Para verificar a integridade destas informa\u00E7\u00F5es, *"},
- {".you.must.provide.your.keystore.password.",
- "* voc\u00EA deve fornecer a senha da sua \u00E1rea de armazenamento de chaves. *"},
- {".you.must.provide.the.srckeystore.password.",
- "* voc\u00EA deve fornecer a senha do srckeystore. *"},
-
+ "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha do srckeystore. *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"A resposta do certificado n\u00E3o cont\u00E9m a chave p\u00FAblica de <{0}>"},
@@ -403,7 +393,7 @@
"Certificado de n\u00EDvel superior na resposta:\n"},
{".is.not.trusted.", "... n\u00E3o \u00E9 confi\u00E1vel. "},
{"Install.reply.anyway.no.", "Instalar resposta assim mesmo? [n\u00E3o]: "},
- {"NO", "N\u00C3O"},
+ {"NO", "N\u00E3o"},
{"Public.keys.in.reply.and.keystore.don.t.match",
"As chaves p\u00FAblicas da resposta e da \u00E1rea de armazenamento de chaves n\u00E3o correspondem"},
{"Certificate.reply.and.certificate.in.keystore.are.identical",
@@ -440,9 +430,9 @@
"Advert\u00EAncia: Argumento(s) inv\u00E1lido(s) para o construtor: {0}"},
{"Illegal.Principal.Type.type", "Tipo Principal Inv\u00E1lido: {0}"},
{"Illegal.option.option", "Op\u00E7\u00E3o inv\u00E1lida: {0}"},
- {"Usage.policytool.options.", "Uso: policytool [options]"},
+ {"Usage.policytool.options.", "Uso: policytool [op\u00E7\u00F5es]"},
{".file.file.policy.file.location",
- " [-file <file>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"},
+ " [-file <arquivo>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"},
{"New", "Novo"},
{"Open", "Abrir"},
{"Save", "Salvar"},
--- a/jdk/src/share/classes/sun/security/util/Resources_sv.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_sv.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [Alternativ]..."},
{"Options.", "Alternativ:"},
{"Use.keytool.help.for.all.available.commands",
"L\u00E4s \"Hj\u00E4lp - Nyckelverktyg\" f\u00F6r alla tillg\u00E4ngliga kommandon"},
@@ -67,6 +68,7 @@
"Exporterar certifikat"}, //-exportcert
{"Generates.a.key.pair",
"Genererar nyckelpar"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"Genererar hemlig nyckel"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "L\u00E4ngd p\u00E5 certifikatskedja: "},
{"Certificate.i.1.", "Certifikat[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "Certifikatets fingeravtryck (SHA1): "},
- {"Entry.type.trustedCertEntry.", "Posttyp: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "Nyckellagertyp: "},
{"Keystore.provider.", "Nyckellagerleverant\u00F6r: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -331,7 +331,7 @@
{"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
"Vill du fortfarande l\u00E4gga till det i ditt eget nyckellagret? [nej]: "},
{"Trust.this.certificate.no.", "Litar du p\u00E5 det h\u00E4r certifikatet? [nej]: "},
- {"YES", "JA"},
+ {"YES", "Ja"},
{"New.prompt.", "Nytt {0}: "},
{"Passwords.must.differ", "L\u00F6senorden m\u00E5ste vara olika"},
{"Re.enter.new.prompt.", "Ange nytt {0} igen: "},
@@ -368,7 +368,7 @@
"Aliaset <{0}> refererar till en posttyp som inte \u00E4r n\u00E5gon privat nyckelpost. Kommandot -keyclone har endast st\u00F6d f\u00F6r kloning av privata nyckelposter"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** Varning Varning Varning *****************"},
{"Signer.d.", "Signerare #%d:"},
{"Timestamp.", "Tidsst\u00E4mpel:"},
{"Signature.", "Underskrift:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"Inget certifikat fr\u00E5n SSL-servern"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *"},
+ "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r nyckellagret. *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* Integriteten f\u00F6r informationen som lagras i srckeystore*"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* har INTE verifierats! Om du vill verifiera dess integritet, *"},
- {".you.must.provide.your.keystore.password.",
- "* m\u00E5ste du ange nyckellagerl\u00F6senord. *"},
- {".you.must.provide.the.srckeystore.password.",
- "* du m\u00E5ste ange l\u00F6senordet f\u00F6r srckeystore. *"},
-
+ "* Integriteten f\u00F6r den information som lagras i srckeystore*\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r srckeystore. *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"Certifikatsvaret inneh\u00E5ller inte n\u00E5gon offentlig nyckel f\u00F6r <{0}>"},
@@ -403,7 +393,7 @@
"Toppniv\u00E5certifikatet i svaret:\n"},
{".is.not.trusted.", "... \u00E4r inte betrott. "},
{"Install.reply.anyway.no.", "Vill du installera svaret \u00E4nd\u00E5? [nej]: "},
- {"NO", "NEJ"},
+ {"NO", "Nej"},
{"Public.keys.in.reply.and.keystore.don.t.match",
"De offentliga nycklarna i svaret och nyckellagret matchar inte varandra"},
{"Certificate.reply.and.certificate.in.keystore.are.identical",
@@ -639,9 +629,9 @@
{"expected.permission.entry", "f\u00F6rv\u00E4ntade beh\u00F6righetspost"},
{"number.", "antal "},
{"expected.expect.read.end.of.file.",
- "f\u00F6rv\u00E4ntade [{0}], l\u00E4ste [end of file]"},
+ "f\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"},
{"expected.read.end.of.file.",
- "f\u00F6rv\u00E4ntade [;], l\u00E4ste [end of file]"},
+ "f\u00F6rv\u00E4ntade [;], l\u00E4ste [filslut]"},
{"line.number.msg", "rad {0}: {1}"},
{"line.number.expected.expect.found.actual.",
"rad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"},
--- a/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [\u9009\u9879]..."},
{"Options.", "\u9009\u9879:"},
{"Use.keytool.help.for.all.available.commands",
"\u4F7F\u7528 \"keytool -help\" \u83B7\u53D6\u6240\u6709\u53EF\u7528\u547D\u4EE4"},
@@ -67,8 +68,9 @@
"\u5BFC\u51FA\u8BC1\u4E66"}, //-exportcert
{"Generates.a.key.pair",
"\u751F\u6210\u5BC6\u94A5\u5BF9"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
- "\u751F\u6210\u5BC6\u94A5"}, //-genseckey
+ "\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
"\u6839\u636E\u8BC1\u4E66\u8BF7\u6C42\u751F\u6210\u8BC1\u4E66"}, //-gencert
{"Generates.CRL", "\u751F\u6210 CRL"}, //-gencrl
@@ -187,7 +189,7 @@
{"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "},
{"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"},
{"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "\u8B66\u544A: PKCS12 KeyStores \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"},
+ "\u8B66\u544A: PKCS12 KeyStore \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"},
{".keystore.must.be.NONE.if.storetype.is.{0}",
"\u5982\u679C -storetype \u4E3A {0}, \u5219 -keystore \u5FC5\u987B\u4E3A NONE"},
{"Too.many.retries.program.terminated",
@@ -208,13 +210,13 @@
"\u5982\u679C\u6E90\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
{"Illegal.startdate.value", "\u975E\u6CD5\u5F00\u59CB\u65E5\u671F\u503C"},
{"Validity.must.be.greater.than.zero",
- "\u6709\u6548\u6027\u5FC5\u987B\u5927\u4E8E\u96F6"},
+ "\u6709\u6548\u671F\u5FC5\u987B\u5927\u4E8E\u96F6"},
{"provName.not.a.provider", "{0}\u4E0D\u662F\u63D0\u4F9B\u65B9"},
{"Usage.error.no.command.provided", "\u7528\u6CD5\u9519\u8BEF: \u6CA1\u6709\u63D0\u4F9B\u547D\u4EE4"},
{"Source.keystore.file.exists.but.is.empty.", "\u6E90\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "},
{"Please.specify.srckeystore", "\u8BF7\u6307\u5B9A -srckeystore"},
{"Must.not.specify.both.v.and.rfc.with.list.command",
- "\u4E0D\u80FD\u4F7F\u7528 'list' \u547D\u4EE4\u6765\u6307\u5B9A -v \u53CA -rfc"},
+ "'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A -v \u53CA -rfc"},
{"Key.password.must.be.at.least.6.characters",
"\u5BC6\u94A5\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
{"New.password.must.be.at.least.6.characters",
@@ -244,7 +246,7 @@
{"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
"\u8B66\u544A: \u6B63\u5728\u8986\u76D6\u76EE\u6807\u5BC6\u94A5\u5E93\u4E2D\u7684\u73B0\u6709\u522B\u540D {0}"},
{"Existing.entry.alias.alias.exists.overwrite.no.",
- "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [\u5426]: "},
+ "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [no]: "},
{"Too.many.failures.try.later", "\u6545\u969C\u592A\u591A - \u8BF7\u7A0D\u540E\u518D\u8BD5"},
{"Certification.request.stored.in.file.filename.",
"\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BA4\u8BC1\u8BF7\u6C42"},
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "\u8BC1\u4E66\u94FE\u957F\u5EA6: "},
{"Certificate.i.1.", "\u8BC1\u4E66[{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "\u8BC1\u4E66\u6307\u7EB9 (SHA1): "},
- {"Entry.type.trustedCertEntry.", "\u6761\u76EE\u7C7B\u578B: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "\u5BC6\u94A5\u5E93\u7C7B\u578B: "},
{"Keystore.provider.", "\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -325,13 +325,13 @@
{"Certificate.already.exists.in.keystore.under.alias.trustalias.",
"\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u5BC6\u94A5\u5E93\u4E2D"},
{"Do.you.still.want.to.add.it.no.",
- "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [\u5426]: "},
+ "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [no]: "},
{"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
"\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u7CFB\u7EDF\u8303\u56F4\u7684 CA \u5BC6\u94A5\u5E93\u4E2D"},
{"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [\u5426]: "},
- {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [\u5426]: "},
- {"YES", "YES"},
+ "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [no]: "},
+ {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [no]: "},
+ {"YES", "\u662F"},
{"New.prompt.", "\u65B0{0}: "},
{"Passwords.must.differ", "\u53E3\u4EE4\u4E0D\u80FD\u76F8\u540C"},
{"Re.enter.new.prompt.", "\u91CD\u65B0\u8F93\u5165\u65B0{0}: "},
@@ -339,7 +339,7 @@
{"They.don.t.match.Try.again", "\u5B83\u4EEC\u4E0D\u5339\u914D\u3002\u8BF7\u91CD\u8BD5"},
{"Enter.prompt.alias.name.", "\u8F93\u5165{0}\u522B\u540D: "},
{"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "\u5BFC\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "},
+ "\u8F93\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "},
{"Enter.alias.name.", "\u8F93\u5165\u522B\u540D: "},
{".RETURN.if.same.as.for.otherAlias.",
"\t(\u5982\u679C\u548C <{0}> \u76F8\u540C, \u5219\u6309\u56DE\u8F66)"},
@@ -368,7 +368,7 @@
"\u522B\u540D <{0}> \u5F15\u7528\u4E86\u4E0D\u5C5E\u4E8E\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u6761\u76EE\u7C7B\u578B\u3002-keyclone \u547D\u4EE4\u4EC5\u652F\u6301\u5BF9\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u514B\u9686"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"},
{"Signer.d.", "\u7B7E\u540D\u8005 #%d:"},
{"Timestamp.", "\u65F6\u95F4\u6233:"},
{"Signature.", "\u7B7E\u540D:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"\u6CA1\u6709\u6765\u81EA SSL \u670D\u52A1\u5668\u7684\u8BC1\u4E66"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *"},
+ "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *"},
- {".you.must.provide.your.keystore.password.",
- "* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
- {".you.must.provide.the.srckeystore.password.",
- "* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
-
+ "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027*\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"\u8BC1\u4E66\u56DE\u590D\u4E2D\u4E0D\u5305\u542B <{0}> \u7684\u516C\u5171\u5BC6\u94A5"},
@@ -402,8 +392,8 @@
{"Top.level.certificate.in.reply.",
"\u56DE\u590D\u4E2D\u7684\u9876\u7EA7\u8BC1\u4E66:\n"},
{".is.not.trusted.", "... \u662F\u4E0D\u53EF\u4FE1\u7684\u3002"},
- {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [\u5426]: "},
- {"NO", "NO"},
+ {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [no]: "},
+ {"NO", "\u5426"},
{"Public.keys.in.reply.and.keystore.don.t.match",
"\u56DE\u590D\u4E2D\u7684\u516C\u5171\u5BC6\u94A5\u4E0E\u5BC6\u94A5\u5E93\u4E0D\u5339\u914D"},
{"Certificate.reply.and.certificate.in.keystore.are.identical",
@@ -415,7 +405,7 @@
{"Secret.key.not.generated.alias.alias.already.exists",
"\u6CA1\u6709\u751F\u6210\u5BC6\u94A5, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
{"Please.provide.keysize.for.secret.key.generation",
- "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BC6\u94A5"},
+ "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"},
{"Extensions.", "\u6269\u5C55: "},
{".Empty.value.", "(\u7A7A\u503C)"},
--- a/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java Sat May 14 11:24:26 2011 -0700
@@ -47,7 +47,8 @@
"*******************************************\n\n"},
// keytool: Help part
- {".OPTION.", " [OPTION]..."},
+// "Option" should be translated.
+ {".OPTION.", " [\u9078\u9805]..."},
{"Options.", "\u9078\u9805:"},
{"Use.keytool.help.for.all.available.commands",
"\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"},
@@ -67,6 +68,7 @@
"\u532F\u51FA\u6191\u8B49"}, //-exportcert
{"Generates.a.key.pair",
"\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
{"Generates.a.secret.key",
"\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey
{"Generates.certificate.from.a.certificate.request",
@@ -304,8 +306,6 @@
{"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "},
{"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"},
{"Certificate.fingerprint.SHA1.", "\u6191\u8B49\u6307\u7D0B (SHA1): "},
- {"Entry.type.trustedCertEntry.", "\u8F38\u5165\u985E\u578B: trustedCertEntry\n"},
- {"trustedCertEntry.", "trustedCertEntry,"},
{"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "},
{"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "},
{"Your.keystore.contains.keyStore.size.entry",
@@ -368,7 +368,7 @@
"\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"},
{".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
+ "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"},
{"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"},
{"Timestamp.", "\u6642\u6233:"},
{"Signature.", "\u7C3D\u7AE0:"},
@@ -378,20 +378,10 @@
{"No.certificate.from.the.SSL.server",
"\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"},
- // Translators of the following 5 pairs, ATTENTION:
- // the next 5 string pairs are meant to be combined into 2 paragraphs,
- // 1+3+4 and 2+3+5. make sure your translation also does.
{".The.integrity.of.the.information.stored.in.your.keystore.",
- "* \u8CC7\u8A0A\u7684\u5B8C\u6574\u6027\u5DF2\u5132\u5B58\u5728\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D *"},
+ "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002 *"},
{".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* \u8CC7\u8A0A\u7684\u5B8C\u6574\u6027\u5DF2\u5132\u5B58\u5728 srckeystore \u4E2D *"},
- {".has.NOT.been.verified.In.order.to.verify.its.integrity.",
- "* \u5C1A\u672A\u88AB\u9A57\u8B49\uFF01\u70BA\u4E86\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*"},
- {".you.must.provide.your.keystore.password.",
- "* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5BC6\u78BC\u3002 *"},
- {".you.must.provide.the.srckeystore.password.",
- "* \u60A8\u5FC5\u9808\u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"},
-
+ "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A*\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"},
{"Certificate.reply.does.not.contain.public.key.for.alias.",
"\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"},
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Sat May 14 11:24:26 2011 -0700
@@ -197,7 +197,7 @@
{"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"},
{"HelpMenu.About.title", "JConsole\u306B\u3064\u3044\u3066(A)"},
{"HelpMenu.About.title.mnemonic", 'A'},
- {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(U)"},
+ {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9"},
{"HelpMenu.UserGuide.title.mnemonic", 'U'},
{"HelpMenu.title", "\u30D8\u30EB\u30D7(H)"},
{"HelpMenu.title.mnemonic", 'H'},
@@ -308,7 +308,7 @@
{"Password: .mnemonic", 'P'},
{"Password.accessibleName", "\u30D1\u30B9\u30EF\u30FC\u30C9"},
{"Peak","\u30D4\u30FC\u30AF"},
- {"Perform GC", "GC\u306E\u5B9F\u884C(G)"},
+ {"Perform GC", "GC\u306E\u5B9F\u884C"},
{"Perform GC.mnemonic", 'G'},
{"Perform GC.toolTip", "\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u30EA\u30AF\u30A8\u30B9\u30C8"},
{"Plotter.accessibleName", "\u30C1\u30E3\u30FC\u30C8"},
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Sat May 14 11:24:26 2011 -0700
@@ -197,7 +197,7 @@
{"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"},
{"HelpMenu.About.title", "\u5173\u4E8E JConsole(A)"},
{"HelpMenu.About.title.mnemonic", 'A'},
- {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357(U)"},
+ {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357"},
{"HelpMenu.UserGuide.title.mnemonic", 'U'},
{"HelpMenu.title", "\u5E2E\u52A9(H)"},
{"HelpMenu.title.mnemonic", 'H'},
@@ -308,7 +308,7 @@
{"Password: .mnemonic", 'P'},
{"Password.accessibleName", "\u53E3\u4EE4"},
{"Peak","\u5CF0\u503C"},
- {"Perform GC", "\u6267\u884C GC(G)"},
+ {"Perform GC", "\u6267\u884C GC"},
{"Perform GC.mnemonic", 'G'},
{"Perform GC.toolTip", "\u8BF7\u6C42\u5783\u573E\u6536\u96C6"},
{"Plotter.accessibleName", "\u56FE\u8868"},
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=Alle
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=Schwerwiegend
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=Warnung
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=Information
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= Konfiguration
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=Fein
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=Feiner
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=Am feinsten
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=Deaktiviert
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=Todo
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=Grave
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=Advertencia
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=Informaci\u00F3n
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= Configurar
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=Detallado
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=Muy Detallado
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=M\u00E1s Detallado
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=Desactivado
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=Tout
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=Grave
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=Avertissement
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=Infos
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= Config
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=Pr\u00E9cis
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=Plus pr\u00E9cis
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=Le plus pr\u00E9cis
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=D\u00E9sactiv\u00E9
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=Tutto
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=Grave
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=Avvertenza
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=Informazioni
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= Configurazione
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=Buono
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=Migliore
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=Ottimale
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=Non attivo
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Sat May 14 11:24:26 2011 -0700
@@ -29,18 +29,18 @@
# The following ALL CAPS words should be translated.
ALL=\u3059\u3079\u3066
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=\u91CD\u5927
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=\u8B66\u544A
# The following ALL CAPS words should be translated.
INFO=\u60C5\u5831
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= \u69CB\u6210
# The following ALL CAPS words should be translated.
-FINE=\u8A73\u7D30\u30EC\u30D9\u30EB(\u4F4E)
+FINE=\u666E\u901A
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=\u8A73\u7D30
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=\u6700\u3082\u8A73\u7D30
# The following ALL CAPS words should be translated.
OFF=\u30AA\u30D5
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=\uBAA8\uB450
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=\uC2EC\uAC01
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=\uACBD\uACE0
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=\uC815\uBCF4
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= \uAD6C\uC131
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=\uBBF8\uC138
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=\uBCF4\uB2E4 \uBBF8\uC138
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=\uAC00\uC7A5 \uBBF8\uC138
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=\uD574\uC81C
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=Tudo
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=Grave
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=Advert\u00EAncia
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=Informa\u00E7\u00F5es
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= Configura\u00E7\u00E3o
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=Detalhado
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=Mais Detalhado
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=O Mais Detalhado
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=Desativado
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=Alla
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=Allvarlig
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=Varning
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=Info
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= Konfig
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=Fin
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=Finare
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=Finaste
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=Av
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=ALL
+ALL=\u5168\u90E8
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=\u4E25\u91CD
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=\u8B66\u544A
# The following ALL CAPS words should be translated.
-INFO=INFO
+INFO=\u4FE1\u606F
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= \u914D\u7F6E
# The following ALL CAPS words should be translated.
-FINE=FINE
+FINE=\u8BE6\u7EC6
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=\u8F83\u8BE6\u7EC6
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=\u975E\u5E38\u8BE6\u7EC6
# The following ALL CAPS words should be translated.
-OFF=OFF
+OFF=\u7981\u7528
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Sat May 14 11:24:26 2011 -0700
@@ -27,20 +27,20 @@
# these are the same as the non-localized level name.
# The following ALL CAPS words should be translated.
-ALL=\u6240\u6709
+ALL=\u5168\u90E8
# The following ALL CAPS words should be translated.
-SEVERE=SEVERE
+SEVERE=\u56B4\u91CD
# The following ALL CAPS words should be translated.
-WARNING=WARNING
+WARNING=\u8B66\u544A
# The following ALL CAPS words should be translated.
INFO=\u8CC7\u8A0A
# The following ALL CAPS words should be translated.
-CONFIG= CONFIG
+CONFIG= \u7D44\u614B
# The following ALL CAPS words should be translated.
-FINE=\u7D30\u7DFB
+FINE=\u8A73\u7D30
# The following ALL CAPS words should be translated.
-FINER=FINER
+FINER=\u8F03\u8A73\u7D30
# The following ALL CAPS words should be translated.
-FINEST=FINEST
+FINEST=\u6700\u8A73\u7D30
# The following ALL CAPS words should be translated.
OFF=\u95DC\u9589
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,6 +227,643 @@
zh=Chinesisch
zu=Zulu
+# key is ISO 639.2 language code
+aar=Afar
+abk=Abchasisch
+ace=Aceh-Sprache
+ach=Acholi-Sprache
+ada=Adangme
+ady=Adygeisch
+afa=Afro-Asiatisch
+afh=Afrihili
+afr=Afrikaans
+ain=Ainu-Sprache
+aka=Akan
+akk=Akkadisch
+alb=Albanisch
+ale=Aleutisch
+alg=Algonkin-Sprache
+alt=S\u00FCd-Altaisch
+amh=Amharisch
+ang=Altenglisch
+anp=Angika
+apa=Apache-Sprache
+ara=Arabisch
+arc=Aram\u00E4isch
+arg=Aragonisch
+arm=Armenisch
+arn=Araukanisch
+arp=Arapaho
+art=Kunstsprache
+arw=Arawak-Sprache
+asm=Assamesisch
+ast=Asturianisch
+ath=Athapaskisch
+aus=Australisch
+ava=Avarisch
+ave=Avestisch
+awa=Awadhi
+aym=Aymara
+aze=Aserbaidschanisch
+bad=Banda
+bai=Bamileke-Sprache
+bak=Baschkirisch
+bal=Belutschisch
+bam=Bambara
+ban=Balinesisch
+baq=Baskisch
+bas=Basaa-Sprache
+bat=Baltisch
+bej=Bedauye
+bel=Belorussisch
+bem=Bemba-Sprache
+ben=Bengalisch
+ber=Berber-Sprache
+bho=Bodschpuri
+bih=Biharisch
+bik=Bikol-Sprache
+bin=Bini-Sprache
+bis=Bislamisch
+bla=Blackfoot-Sprache
+bnt=Bantu-Sprache
+bos=Bosnisch
+bra=Braj-Bhakha
+bre=Bretonisch
+btk=Battakisch
+bua=Burjatisch
+bug=Buginesisch
+bul=Bulgarisch
+bur=Burmesisch
+byn=Blin
+cad=Caddo
+cai=Zentralamerikanische Indianersprache
+car=Karibisch
+cat=Katalanisch
+cau=Kaukasisch
+ceb=Cebuano
+cel=Keltisch
+cha=Chamorro
+chb=Chibcha-Sprache
+che=Tschetschenisch
+chg=Tschagataisch
+chi=Chinesisch
+chk=Trukesisch
+chm=Tscheremissisch
+chn=Chinook
+cho=Choctaw
+chp=Chipewyan
+chr=Cherokee
+chu=Kirchenslawisch
+chv=Chuvash
+chy=Cheyenne
+cmc=Cham-Sprache
+cop=Koptisch
+cor=Cornish
+cos=Korsisch
+cpe=Kreolisch-Englische Sprache
+cpf=Kreolisch-Franz\u00F6sische Sprache
+cpp=Kreolisch-Portugiesische Sprache
+cre=Cree
+crh=Krimtatarisch
+crp=Kreolische Sprache
+csb=Kaschubisch
+cus=Kuschitisch
+cze=Tschechisch
+dak=Dakota-Sprache
+dan=D\u00E4nisch
+dar=Darginisch
+day=Dajak
+del=Delaware-Sprache
+den=Slave
+dgr=Dogrib
+din=Dinka-Sprache
+div=Divehi
+doi=Dogri
+dra=Drawidisch
+dsb=Niedersorbisch
+dua=Duala
+dum=Mittelniederl\u00E4ndisch
+dut=Niederl\u00E4ndisch
+dyu=Dyula-Sprache
+dzo=Bhutani
+efi=Efik
+egy=\u00C4gyptisch
+eka=Ekajuk
+elx=Elamisch
+eng=Englisch
+enm=Mittelenglisch
+epo=Esperanto
+est=Estnisch
+ewe=Ewe
+ewo=Ewondo
+fan=Pangwe-Sprache
+fao=F\u00E4r\u00F6isch
+fat=Fanti-Sprache
+fij=Fidschi
+fil=Philippinisch
+fin=Finnisch
+fiu=Finnougrisch
+fon=Fon-Sprache
+fre=Franz\u00F6sisch
+frm=Mittelfranz\u00F6sisch
+fro=Altfranz\u00F6sisch
+frr=Nordfriesisch
+frs=Ostfriesisch
+fry=Westfriesisch
+ful=Fulah
+fur=Friulisch
+gaa=Ga-Sprache
+gay=Gayo
+gba=Gbaya-Sprache
+gem=Germanisch
+geo=Georgisch
+ger=Deutsch
+gez=Geez
+gil=Gilbertesisch
+gla=G\u00E4lisch
+gle=Irisch
+glg=Galizisch
+glv=Manx
+gmh=Mittelhochdeutsch
+goh=Althochdeutsch
+gon=Gondi-Sprache
+gor=Mongondou
+got=Gotisch
+grb=Grebo-Sprache
+grc=Altgriechisch
+gre=Modernes Griechisch (1453-)
+grn=Guarani
+gsw=Schweizerdeutsch
+guj=Gujaratisch
+gwi=Kutchin-Sprache
+hai=Haida-Sprache
+hat=Haitisch
+hau=Haussa
+haw=Hawaiisch
+heb=Hebr\u00E4isch
+her=Herero
+hil=Hiligaynon-Sprache
+him=Himachali
+hin=Hindi
+hit=Hethitisch
+hmn=Miao-Sprache
+hmo=Hiri Motu
+hrv=Kroatisch
+hsb=Obersorbisch
+hun=Ungarisch
+hup=Hupa
+iba=Iban
+ibo=Igbo
+ice=Isl\u00E4ndisch
+ido=Ido
+iii=Sichuan Yi
+ijo=Ijo-Sprache
+iku=Inuktitut
+ile=Interlingue
+ilo=Ilokano-Sprache
+ina=Interlingua (Internationale Hilfssprache, Vereinigung)
+inc=Indoarisch
+ind=Indonesisch
+ine=Indogermanisch
+inh=Inguschisch
+ipk=Inupiak
+ira=Iranische Sprache
+iro=Irokesische Sprache
+ita=Italienisch
+jav=Javanesisch
+jbo=Lojban
+jpn=Japanisch
+jpr=J\u00FCdisch-Persisch
+jrb=J\u00FCdisch-Arabisch
+kaa=Karakalpakisch
+kab=Kabylisch
+kac=Kachin-Sprache
+kal=Kalaallisut (Gr\u00F6nl\u00E4ndisch)
+kam=Kamba
+kan=Kannada
+kar=Karenisch
+kas=Kaschmirisch
+kau=Kanuri
+kaw=Kawi
+kaz=Kasachisch
+kbd=Kabardinisch
+kha=Khasi-Sprache
+khi=Khoisan-Sprache
+khm=Khmerisch, Zentral
+kho=Sakisch
+kik=Kikuyu
+kin=Kinyarwanda
+kir=Kirgisisch
+kmb=Kimbundu-Sprache
+kok=Konkani
+kom=Komi
+kon=Kongo
+kor=Koreanisch
+kos=Kosraeanisch
+kpe=Kpelle-Sprache
+krc=Karatschaiisch-Balkarisch
+krl=Karelisch
+kro=Kru-Sprache
+kru=Oraon-Sprache
+kua=Kuanyama
+kum=Kumykisch
+kur=Kurdisch
+kut=Kutenai-Sprache
+lad=Ladino
+lah=Lahnda
+lam=Lamba-Sprache
+lao=Laotisch
+lat=Lateinisch
+lav=Lettisch
+lez=Lesgisch
+lim=Limburgisch
+lin=Lingalisch
+lit=Litauisch
+lol=Mongo
+loz=Rotse-Sprache
+ltz=Luxemburgisch
+lua=Luba-Lulua
+lub=Luba-Katanga
+lug=Ganda
+lui=Luiseno-Sprache
+lun=Lunda-Sprache
+luo=Luo-Sprache
+lus=Lushai-Sprache
+mac=Mazedonisch
+mad=Maduresisch
+mag=Khotta
+mah=Marshall
+mai=Maithili
+mak=Makassarisch
+mal=Malaysisch
+man=Manding-Sprache
+mao=Maorisch
+map=Austronesisch
+mar=Marathi
+mas=Massai-Sprache
+may=Malay
+mdf=Moksha
+mdr=Mandaresisch
+men=Mende-Sprache
+mga=Mittelirisch (900-1200)
+mic=Micmac-Sprache
+min=Minangkabau-Sprache
+mis=(andere Sprache)
+mkh=Mon-Khmer-Sprache
+mlg=Malagasisch
+mlt=Maltesisch
+mnc=Mandschurisch
+mni=Meithei-Sprache
+mno=Manobo-Sprache
+moh=Mohawk-Sprache
+mon=Mongolisch
+mos=Mossi-Sprache
+mul=Mehrsprachig
+mun=Munda-Sprache
+mus=Muskogee-Sprache
+mwl=Mirandesisch
+mwr=Marwari
+myn=Maya-Sprache
+myv=Ersja-Mordwinisch
+nah=Nahuatl
+nai=Nordamerikanische Indianersprache
+nap=Neapolitanisch
+nau=Nauru
+nav=Navajo
+nbl=Ndebele, S\u00FCd
+nde=Ndebele, Nord
+ndo=Ndonga
+nds=Niederdeutsch
+nep=Nepalesisch
+new=Newan
+nia=Nias-Sprache
+nic=Cordoba
+niu=Niue-Sprache
+nno=Norwegisch, Nynorsk
+nob=Bokmal, Norwegisch
+nog=Nogai
+non=Altnordisch
+nor=Norwegisch
+nqo=N'Ko
+nso=Nord-Sotho-Sprache
+nub=Nubisch
+nwc=Alt-Newari
+nya=Chichewa
+nym=Nyamwezi-Sprache
+nyn=Nyankole
+nyo=Nyoro
+nzi=Nzima
+oci=Okzitanisch (nach 1500)
+oji=Ojibwa
+ori=Orija
+orm=Oromo (Afan)
+osa=Osage-Sprache
+oss=Ossetisch
+ota=Osmanisch
+oto=Otomangue-Sprache
+paa=Papuasprache
+pag=Pangasinan-Sprache
+pal=Mittelpersisch
+pam=Pampanggan-Sprache
+pan=Pundjabisch
+pap=Papiamento
+pau=Palau
+peo=Altpersisch
+per=Persisch
+phi=Philippinisch
+phn=Ph\u00F6nikisch
+pli=Pali
+pol=Polnisch
+pon=Ponapeanisch
+por=Portugiesisch
+pra=Prakrit
+pro=Altprovenzalisch
+pus=Paschtunisch
+que=Quechua
+raj=Rajasthani
+rap=Osterinsel-Sprache
+rar=Rarotonganisch
+roa=Romanische Sprache
+roh=Romantsch
+rom=Romani
+rum=Rum\u00E4nisch
+run=Kirundisch
+rup=Aromunisch
+rus=Russisch
+sad=Sandawe-Sprache
+sag=Sango
+sah=Jakutisch
+sai=S\u00FCdamerikanische Indianersprache
+sal=Salish-Sprache
+sam=Samaritanisch
+san=Sanskrit
+sas=Sasak
+sat=Santali
+scn=Sizilianisch
+sco=Schottisch
+sel=Selkupisch
+sem=Semitisch
+sga=Altirisch
+sgn=Geb\u00E4rdensprache
+shn=Schan-Sprache
+sid=Sidamo
+sin=Singhalesisch
+sio=Sioux-Sprache
+sit=Tolar
+sla=Slawisch
+slo=Slowakisch
+slv=Slowenisch
+sma=S\u00FCd-Samisch
+sme=Nord-Samisch
+smi=Lappisch
+smj=Lule-Lappisch
+smn=Inari-Lappisch
+smo=Samoanisch
+sms=Skolt-Lappisch
+sna=Schonisch
+snd=Zinti-Sprache
+snk=Soninke-Sprache
+sog=Sogdisch
+som=Somalisch
+son=Songhai-Sprache
+sot=S\u00FCd-Sotho
+spa=Spanisch
+srd=Sardisch
+srn=Srananisch
+srp=Serbisch
+srr=Serer-Sprache
+ssa=Nilosaharanisch
+ssw=Swasil\u00E4ndisch
+suk=Sukuma-Sprache
+sun=Sundanesisch
+sus=Susu
+sux=Sumerisch
+swa=Suaheli
+swe=Schwedisch
+syc=Altsyrisch
+syr=Syrisch
+tah=Tahitisch
+tai=Tai-Sprache
+tam=Tsongaisch
+tat=Tatarisch
+tel=Telugu
+tem=Temne
+ter=Tereno-Sprache
+tet=Tetum-Sprache
+tgk=Tadschikisch
+tgl=Tagalog
+tha=Thai
+tib=Tibetanisch
+tig=Tigre
+tir=Tigrinja
+tiv=Tiv-Sprache
+tkl=Tokelauanisch
+tlh=Klingonisch
+tli=Tlingit-Sprache
+tmh=Tamaseq
+tog=Tsonga-Sprache
+ton=Tonga (Tonga-Inseln)
+tpi=Neumelanesisch
+tsi=Tsimshian-Sprache
+tsn=Sezuan
+tso=Tsonga
+tuk=Turkmenisch
+tum=Tumbuka-Sprache
+tup=Tupi-Sprache
+tur=T\u00FCrkisch
+tut=Altaisch
+tvl=Elliceanisch
+twi=Twi
+tyv=Tuwinisch
+udm=Udmurtisch
+uga=Ugaritisch
+uig=Uigurisch
+ukr=Ukrainisch
+umb=Mbundu-Sprache
+und=Unbestimmte Sprache
+urd=Urdu
+uzb=Usbekisch
+vai=Vai-Sprache
+ven=Venda
+vie=Vietnamesisch
+vol=Volap\u00FCk
+vot=Wotisch
+wak=Wakashanisch
+wal=Walamo-Sprache
+war=Waray
+was=Washo-Sprache
+wel=Walisisch
+wen=Sorbisch
+wln=Wallonisch
+wol=Wolof
+xal=Kalm\u00FCckisch
+xho=Xhosa
+yao=Yao-Sprache
+yap=Yapesisch
+yid=Jiddish
+yor=Joruba
+ypk=Yupik-Sprache
+zap=Zapotekisch
+zbl=Bliss-Symbole
+zen=Zenaga
+zha=Zhuang
+znd=Zande-Sprache
+zul=Zulu
+zun=Zuni-Sprache
+zxx=Keine Sprachinhalte
+zza=Zaza
+
+# script names
+# key is ISO 15924 script code
+
+Arab=Arabisch
+Armi=Armi
+Armn=Armenisch
+Avst=Avestisch
+Bali=Balinesisch
+Bamu=Bamum
+Bass=Bassa VHA
+Batk=Battakisch
+Beng=Bengalisch
+Blis=Bliss-Symbole
+Bopo=Bopomofo
+Brah=Brahmi
+Brai=Blindenschrift
+Bugi=Buginesisch
+Buhd=Buhid
+Cakm=Cakm
+Cans=UCAS
+Cari=Karisch
+Cham=Cham
+Cher=Cherokee
+Cirt=Cirth
+Copt=Koptisch
+Cprt=Zypriotisch
+Cyrl=Kyrillisch
+Cyrs=Altkirchenslawisch
+Deva=Devanagari
+Dsrt=Deseret
+Dupl=Duployan Shorthand
+Egyd=\u00C4gyptisch - Demotisch
+Egyh=\u00C4gyptisch - Hieratisch
+Egyp=\u00C4gyptische Hieroglyphen
+Elba=Elbasan
+Ethi=\u00C4thiopisch
+Geok=Khutsuri
+Geor=Georgisch
+Glag=Glagolitisch
+Goth=Gotisch
+Gran=Grantha
+Grek=Griechisch
+Gujr=Gujaratisch
+Guru=Gurmukhi
+Hang=Hangul
+Hani=Chinesisch
+Hano=Hanunoo
+Hans=Vereinfachte Chinesische Schrift
+Hant=Traditionelle Chinesische Schrift
+Hebr=Hebr\u00E4isch
+Hira=Hiragana
+Hmng=Pahawh Hmong
+Hrkt=Katakana oder Hiragana
+Hung=Altungarisch
+Inds=Indus-Schrift
+Ital=Altitalienisch
+Java=Javanesisch
+Jpan=Japanisch
+Kali=Kayah Li
+Kana=Katakana
+Khar=Kharoshthi
+Khmr=Kambodschanisch
+Knda=Kannada
+Kore=Koreanisch
+Kpel=Kpelle-Sprache
+Kthi=Kthi
+Lana=Lanna
+Laoo=Laotisch
+Latf=Lateinisch - Fraktur-Variante
+Latg=Lateinisch - G\u00E4lische Variante
+Latn=Lateinisch
+Lepc=Lepcha
+Limb=Limbu
+Lina=Linear A
+Linb=Linear B
+Lisu=Lisu
+Loma=Loma
+Lyci=Lykisch
+Lydi=Lydisch
+Mand=Mand\u00E4isch
+Mani=Manich\u00E4nisch
+Maya=Maya-Hieroglyphen
+Mend=Mende-Sprache
+Merc=Meroitisch, kursiv
+Mero=Meroitisch
+Mlym=Malaysisch
+Mong=Mongolisch
+Moon=Moon
+Mtei=Meitei Mayek
+Mymr=Birmanisch
+Narb=Altes Nordarabisch
+Nbat=Nabat\u00E4isch
+Nkgb=Nakhi Geba
+Nkoo=N'Ko
+Ogam=Ogham
+Olck=Ol Chiki
+Orkh=Orchon-Runen
+Orya=Orija
+Osma=Osmanisch
+Palm=Palmyrenisch
+Perm=Altpermisch
+Phag=Phags-pa
+Phli=Phli
+Phlp=Phlp
+Phlv=Pahlavi
+Phnx=Ph\u00F6nizisch
+Plrd=Pollard Phonetisch
+Prti=Prti
+Rjng=Rejang
+Roro=Rongorongo
+Runr=Runenschrift
+Samr=Samaritanisch
+Sara=Sarati
+Sarb=Alts\u00FCdarabisch
+Saur=Saurashtra
+Sgnw=Geb\u00E4rdensprache
+Shaw=Shaw-Alphabet
+Sind=Zinti-Sprache
+Sinh=Sinhala
+Sund=Sundanesisch
+Sylo=Syloti Nagri
+Syrc=Syrisch
+Syre=Syrisch - Estrangelo-Variante
+Syrj=Westsyrisch
+Syrn=Ostsyrisch
+Tagb=Tagbanwa
+Tale=Tai Le
+Talu=Tai Lue
+Taml=Tsongaisch
+Tavt=Tavt
+Telu=Telugu
+Teng=Tengwar
+Tfng=Tifinagh
+Tglg=Tagalog
+Thaa=Thaana
+Thai=Thai
+Tibt=Tibetanisch
+Ugar=Ugaritisch
+Vaii=Vai-Sprache
+Visp=Sichtbare Sprache
+Wara=Warang Citi
+Xpeo=Altpersisch
+Xsux=Sumerisch-akkadische Keilschrift
+Yiii=Yi
+Zinh=Geerbter Schriftwert
+Zmth=Zmth
+Zsym=Zsym
+Zxxx=Schriftlos
+Zyyy=Unbestimmt
+Zzzz=Uncodierte Schrift
+
# country names
# key is ISO 3166 country code
@@ -472,3 +1109,37 @@
ZA=S\u00fcdafrika
ZM=Sambia
ZW=Simbabwe
+
+# territory names
+# key is UN M.49 country and area code
+
+001=Welt
+002=Afrika
+003=Nordamerika
+005=S\u00FCdamerika
+009=Ozeanien
+011=Westafrika
+013=Mittelamerika
+014=Ostafrika
+015=Nordafrika
+017=Zentralafrika
+018=S\u00FCdafrika
+019=Amerika
+021=N\u00F6rdliches Amerika
+029=Karibik
+030=Ostasien
+034=S\u00FCdasien
+035=S\u00FCdostasien
+039=S\u00FCdeuropa
+053=Australien und Neuseeland
+054=Melanesien
+057=Mikronesisches Inselgebiet
+061=Polynesien
+142=Asien
+143=Zentralasien
+145=Westasien
+150=Europa
+151=Osteuropa
+154=Nordeuropa
+155=Westeuropa
+419=Lateinamerika und Karibik
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,6 +227,643 @@
zh=chino
zu=zul\u00fa
+# key is ISO 639.2 language code
+aar=afar
+abk=Abjasio
+ace=acehn\u00E9s
+ach=acoli
+ada=adangme
+ady=adigeo
+afa=afgani (1927-2002)
+afh=afrihili
+afr=Afrikaans
+ain=ainu
+aka=Acano
+akk=acadio
+alb=Alban\u00E9s
+ale=aleutiano
+alg=lenguas algonquinas
+alt=alt\u00E1i meridional
+amh=Am\u00E1rico
+ang=florines de las Antillas Neerlandesas
+anp=angika
+apa=lenguas apache
+ara=australes argentinos
+arc=arameo
+arg=Aragon\u00E9s
+arm=Armenio
+arn=araucano
+arp=pesos argentinos (ARP)
+art=lengua artificial
+arw=arahuaco
+asm=Asam\u00E9s
+ast=asturiano
+ath=lenguas atabascas
+aus=lenguas australianas
+ava=\u00C1varo
+ave=Av\u00E9stico
+awa=avadhi
+aym=Aimara
+aze=Azerbaiyano
+bad=dinares bosnios
+bai=lenguas bamileke
+bak=Bashkir
+bal=baluchi
+bam=marcos convertibles de Bosnia-Herzegovina
+ban=balin\u00E9s
+baq=Vasco
+bas=basa
+bat=lengua b\u00E1ltica
+bej=beja
+bel=francos belgas (financieros)
+bem=bemba
+ben=Bengal\u00ED
+ber=bereber
+bho=bhojpuri
+bih=Bihar\u00ED
+bik=bicol
+bin=bini
+bis=Bislama
+bla=siksika
+bnt=bant\u00FA
+bos=Bosnio
+bra=braj
+bre=cruceiros brasile\u00F1os (BRE)
+btk=batak
+bua=buriat
+bug=Buguin\u00E9s
+bul=B\u00FAlgaro
+bur=Birmano
+byn=blin
+cad=d\u00F3lares canadienses
+cai=lengua india centroamericana
+car=caribe
+cat=Catal\u00E1n
+cau=lengua cauc\u00E1sica
+ceb=cebuano
+cel=lengua celta
+cha=Chamorro
+chb=chibcha
+che=euros WIR
+chg=chagat\u00E1i
+chi=Chino
+chk=truk\u00E9s
+chm=mar\u00ED
+chn=jerga chinuk
+cho=choctaw
+chp=chipewyan
+chr=cherokee
+chu=Eslavo Eclesi\u00E1stico
+chv=Chuvacho
+chy=cheyene
+cmc=lenguas ch\u00E1micas
+cop=pesos colombianos
+cor=C\u00F3rnico
+cos=corso
+cpe=lengua criolla o pidgin basada en el ingl\u00E9s
+cpf=lengua criolla o pidgin basada en el franc\u00E9s
+cpp=lengua criolla o pidgin basada en el portugu\u00E9s
+cre=cree
+crh=t\u00E1rtaro de Crimea
+crp=lengua criolla o pidgin
+csb=casubio
+cus=lengua cusita
+cze=checo
+dak=dakota
+dan=dan\u00E9s
+dar=dargva
+day=dayak
+del=delaware
+den=slave
+dgr=dogrib
+din=dinka
+div=Dhivehi
+doi=dogri
+dra=lengua drav\u00EDdica
+dsb=sorbio inferior
+dua=duala
+dum=neerland\u00E9s medieval
+dut=Holand\u00E9s
+dyu=diula
+dzo=Dzongkha
+efi=efik
+egy=egipcio antiguo
+eka=ekajuk
+elx=elamita
+eng=Ingl\u00E9s
+enm=ingl\u00E9s medieval
+epo=Esperanto
+est=Estonio
+ewe=Ef\u00E9
+ewo=ewondo
+fan=fang
+fao=Faro\u00E9s
+fat=fanti
+fij=fidjiano
+fil=filipino
+fin=Finland\u00E9s
+fiu=lengua fino\u00FAgria
+fon=fon
+fre=franc\u00E9s
+frm=franc\u00E9s medieval
+fro=franc\u00E9s antiguo
+frr=fris\u00F3n septentrional
+frs=fris\u00F3n oriental
+fry=Frisio del Oeste
+ful=Fula
+fur=friulano
+gaa=ga
+gay=gayo
+gba=gbaya
+gem=lengua germ\u00E1nica
+geo=Georgiano
+ger=Alem\u00E1n
+gez=geez
+gil=gilbert\u00E9s
+gla=Ga\u00E9lico
+gle=Irland\u00E9s
+glg=Gallego
+glv=Man\u00E9s
+gmh=alem\u00E1n de la alta edad media
+goh=alem\u00E1n de la alta edad antigua
+gon=gondi
+gor=gorontalo
+got=g\u00F3tico
+grb=grebo
+grc=griego antiguo
+gre=Griego moderno (1453-)
+grn=Guaran\u00ED
+gsw=alem\u00E1n suizo
+guj=Gujarati
+gwi=kutchin
+hai=haida
+hat=Haitiano
+hau=Hausa
+haw=hawaiano
+heb=hebreo
+her=herero
+hil=hiligaynon
+him=himachali
+hin=hindi
+hit=hitita
+hmn=hmong
+hmo=Hiri motu
+hrv=Croata
+hsb=sorbio superior
+hun=h\u00FAngaro
+hup=hupa
+iba=iban
+ibo=Ibo
+ice=Island\u00E9s
+ido=Ido
+iii=Yi de Sichu\u00E1n
+ijo=ijo
+iku=Inuktitut
+ile=Interling\u00FCe
+ilo=ilocano
+ina=Interlingua (IALA, del ingl\u00E9s International Auxiliary Language Association)
+inc=lengua \u00EDndica
+ind=Indonesio
+ine=lengua indoeuropea
+inh=ingush
+ipk=I\u00F1upiaq
+ira=lengua irania
+iro=lenguas iroquesas
+ita=Italiano
+jav=Javan\u00E9s
+jbo=lojban
+jpn=Japon\u00E9s
+jpr=judeo-persa
+jrb=judeo-\u00E1rabe
+kaa=karakalpako
+kab=cabila
+kac=kachin
+kal=Kalaallisut
+kam=kamba
+kan=Canar\u00E9s
+kar=karen
+kas=Cachemir\u00ED
+kau=Kanuri
+kaw=kawi
+kaz=Kazajo
+kbd=kabardiano
+kha=khasi
+khi=lengua joisana
+khm=Jemer Central
+kho=kotan\u00E9s
+kik=Kikuyu
+kin=Ruand\u00E9s
+kir=kirghiz
+kmb=kimbundu
+kok=konkani
+kom=Komi
+kon=Congo
+kor=Coreano
+kos=kosraeano
+kpe=kpelle
+krc=karachay-balkar
+krl=carelio
+kro=kru
+kru=kurukh
+kua=Kuanyama
+kum=kumyk
+kur=Curdo
+kut=kutenai
+lad=ladino
+lah=lahnda
+lam=lamba
+lao=Laosiano
+lat=lat\u00EDn
+lav=Let\u00F3n
+lez=lezgiano
+lim=Limburgu\u00E9s
+lin=Lingala
+lit=Lituano
+lol=mongo
+loz=lozi
+ltz=Luxemburgu\u00E9s
+lua=luba-lulua
+lub=Luba-katanga
+lug=Luganda
+lui=luise\u00F1o
+lun=lunda
+luo=luo
+lus=lushai
+mac=Macedonio
+mad=dirhams marroqu\u00EDes
+mag=magahi
+mah=marshal\u00E9s
+mai=maithili
+mak=macasar
+mal=Malayalam
+man=mandingo
+mao=Maor\u00ED
+map=lengua austronesia
+mar=Marathi
+mas=masai
+may=malayo
+mdf=moksha
+mdr=mandar
+men=mende
+mga=ariary malgache
+mic=micmac
+min=minangkabau
+mis=lenguas varias
+mkh=lengua mon-jemer
+mlg=Malgache
+mlt=Malt\u00E9s
+mnc=manch\u00FA
+mni=manipuri
+mno=lenguas manobo
+moh=mohawk
+mon=Mongol
+mos=mossi
+mul=lenguas m\u00FAltiples
+mun=lenguas munda
+mus=creek
+mwl=mirand\u00E9s
+mwr=marwari
+myn=maya
+myv=erzya
+nah=n\u00E1huatl
+nai=lengua india norteamericana
+nap=napolitano
+nau=Nauruano
+nav=Navajo
+nbl=Ndebele del Sur
+nde=ndebele septentrional
+ndo=Ndonga
+nds=bajo alem\u00E1n
+nep=Nepal\u00ED
+new=newari
+nia=nias
+nic=c\u00F3rdobas nicarag\u00FCenses
+niu=niueano
+nno=Noruego Nynorsk
+nob=Noruego Bokmal
+nog=nogai
+non=n\u00F3rdico antiguo
+nor=Noruego
+nqo=n'ko
+nso=sotho septentrional
+nub=lenguas nubias
+nwc=newari cl\u00E1sico
+nya=Chichewa
+nym=nyamwezi
+nyn=nyankole
+nyo=nyoro
+nzi=nzima
+oci=Occitano (posterior a 1500)
+oji=Ojibwa
+ori=oriya
+orm=Oromo
+osa=osage
+oss=Os\u00E9tico
+ota=turco otomano
+oto=lenguas otomanas
+paa=lengua pap\u00FA
+pag=pangasin\u00E1n
+pal=pahlavi
+pam=pampanga
+pan=Penyab\u00ED
+pap=papiamento
+pau=palauano
+peo=persa antiguo
+per=Persa
+phi=lengua filipina
+phn=fenicio
+pli=Pali
+pol=Polaco
+pon=pohnpeiano
+por=Portugu\u00E9s
+pra=lenguas pr\u00E1critas
+pro=provenzal antiguo
+pus=Pushto; Pashto
+que=Quechua
+raj=rajasthani
+rap=rapanui
+rar=rarotongano
+roa=lengua romance
+roh=Romansh
+rom=roman\u00ED
+rum=rumano
+run=Rund\u00ED
+rup=arrumano
+rus=Ruso
+sad=sandawe
+sag=Sango
+sah=yakut
+sai=lengua india sudamericana
+sal=lenguas salish
+sam=arameo samaritano
+san=S\u00E1nscrito
+sas=sasak
+sat=santali
+scn=siciliano
+sco=escoc\u00E9s
+sel=selkup
+sem=lengua sem\u00EDtica
+sga=irland\u00E9s antiguo
+sgn=lenguajes de signos
+shn=shan
+sid=sidamo
+sin=Cingal\u00E9s
+sio=lenguas sioux
+sit=t\u00F3lares eslovenos
+sla=lengua eslava
+slo=Eslovaco
+slv=Esloveno
+sma=sami meridional
+sme=Sami del Norte
+smi=lengua sami
+smj=sami lule
+smn=sami inari
+smo=Samoano
+sms=sami skolt
+sna=shona
+snd=Sindhi
+snk=sonink\u00E9
+sog=sogdiano
+som=Somal\u00ED
+son=songhai
+sot=Sotho del Sur
+spa=Espa\u00F1ol
+srd=d\u00F3lar surinam\u00E9s
+srn=sranan tongo
+srp=serbio
+srr=serer
+ssa=lengua nilo-sahariana
+ssw=Suazi
+suk=sukuma
+sun=sudan\u00E9s
+sus=sus\u00FA
+sux=sumerio
+swa=Swahili
+swe=Sueco
+syc=sir\u00EDaco cl\u00E1sico
+syr=siriaco
+tah=tahitiano
+tai=lengua tai
+tam=Tamil
+tat=Tatar
+tel=Telugu
+tem=temne
+ter=tereno
+tet=tet\u00FAn
+tgk=Tajik
+tgl=Tagalo
+tha=Tailand\u00E9s
+tib=Tibetano
+tig=tigr\u00E9
+tir=Tigrinya
+tiv=tiv
+tkl=tokelauano
+tlh=klingon
+tli=tlingit
+tmh=tamashek
+tog=tonga del Nyasa
+ton=Tongano (Islas Tonga)
+tpi=tok pisin
+tsi=tsimshiano
+tsn=Tswana
+tso=Tsonga
+tuk=Turcomano
+tum=tumbuka
+tup=lenguas tup\u00ED
+tur=Turco
+tut=lengua altaica
+tvl=tuvaluano
+twi=Tui
+tyv=tuviniano
+udm=udmurt
+uga=ugar\u00EDtico
+uig=Uiguro
+ukr=Ucraniano
+umb=umbundu
+und=indeterminada
+urd=Urdu
+uzb=Uzbeco
+vai=vai
+ven=Venda
+vie=vietnamita
+vol=Volapuk
+vot=v\u00F3tico
+wak=lenguas wakasha
+wal=walamo
+war=waray
+was=washo
+wel=Gal\u00E9s
+wen=lenguas sorbias
+wln=val\u00F3n
+wol=Uolof
+xal=kalmyk
+xho=Xhosa
+yao=yao
+yap=yap\u00E9s
+yid=Y\u00EDdish
+yor=Yoruba
+ypk=lenguas yupik
+zap=zapoteco
+zbl=s\u00EDmbolos bliss
+zen=zenaga
+zha=Zhuang
+znd=zande
+zul=Zul\u00FA
+zun=zun\u00ED
+zxx=sin contenido ling\u00FC\u00EDstico
+zza=zazaki
+
+# script names
+# key is ISO 15924 script code
+
+Arab=\u00E1rabe
+Armi=Arameo Imperial
+Armn=armenio
+Avst=av\u00E9stico
+Bali=balin\u00E9s
+Bamu=Bamum
+Bass=Bassa Vah
+Batk=batak
+Beng=bengal\u00ED
+Blis=s\u00EDmbolos bliss
+Bopo=bopomofo
+Brah=brahm\u00ED
+Brai=braille
+Bugi=bugin\u00E9s
+Buhd=buhid
+Cakm=Chakma
+Cans=s\u00EDmbolos abor\u00EDgenes canadienses unificados
+Cari=cario
+Cham=cham
+Cher=cherokee
+Cirt=cirth
+Copt=copto
+Cprt=chipriota
+Cyrl=cir\u00EDlico
+Cyrs=cir\u00EDlico del antiguo eslavo eclesi\u00E1stico
+Deva=devanagari
+Dsrt=deseret
+Dupl=Taquigraf\u00EDa Duploy\u00E9
+Egyd=egipcio dem\u00F3tico
+Egyh=egipcio hier\u00E1tico
+Egyp=jerogl\u00EDficos egipcios
+Elba=Elbasan
+Ethi=eti\u00F3pico
+Geok=georgiano eclesi\u00E1stico
+Geor=georgiano
+Glag=glagol\u00EDtico
+Goth=g\u00F3tico
+Gran=Grantha
+Grek=griego
+Gujr=gujarati
+Guru=gurmuji
+Hang=hangul
+Hani=han
+Hano=hanunoo
+Hans=han simplificado
+Hant=han tradicional
+Hebr=hebreo
+Hira=hiragana
+Hmng=pahawh hmong
+Hrkt=katakana o hiragana
+Hung=h\u00FAngaro antiguo
+Inds=Indio (harappan)
+Ital=antigua bastardilla
+Java=javan\u00E9s
+Jpan=japon\u00E9s
+Kali=kayah li
+Kana=katakana
+Khar=kharoshthi
+Khmr=jemer
+Knda=canar\u00E9s
+Kore=coreano
+Kpel=Kpelle
+Kthi=Kaithi
+Lana=lanna
+Laoo=lao
+Latf=latino fraktur
+Latg=latino ga\u00E9lico
+Latn=lat\u00EDn
+Lepc=lepcha
+Limb=limbu
+Lina=lineal A
+Linb=lineal B
+Lisu=Lisu
+Loma=Loma
+Lyci=licio
+Lydi=lidio
+Mand=mandeo
+Mani=Manique\u00EDsmo
+Maya=jerogl\u00EDficos mayas
+Mend=Mend\u00E9
+Merc=Mero\u00EDtico Cursivo
+Mero=mero\u00EDtico
+Mlym=malay\u00E1lam
+Mong=mongol
+Moon=Luna
+Mtei=manipuri
+Mymr=birmano
+Narb=\u00C1rabe del Norte Antiguo
+Nbat=Nabateo
+Nkgb=Nakhi Geba
+Nkoo=n'Ko
+Ogam=ogham
+Olck=ol chiki
+Orkh=orkhon
+Orya=oriya
+Osma=osmaniya
+Palm=Palmire\u00F1o
+Perm=permiano antiguo
+Phag=phags-pa
+Phli=Pahlavi, Inscripciones
+Phlp=Pahlavi, Salterio
+Phlv=Pahlavi, Libros
+Phnx=fenicio
+Plrd=Pollard Miao
+Prti=Parto, Inscripciones
+Rjng=Rejang
+Roro=Rongorongo
+Runr=r\u00FAnico
+Samr=Samaritano
+Sara=Sarati
+Sarb=\u00C1rabe del Sur Antiguo
+Saur=Saurashtra
+Sgnw=Escritura de Signos
+Shaw=shaviano
+Sind=Sindhi
+Sinh=binhala
+Sund=sudan\u00E9s
+Sylo=Syloti Nagri
+Syrc=siriaco
+Syre=siriaco estrangelo
+Syrj=siriaco occidental
+Syrn=siriaco oriental
+Tagb=tagban\u00FAa
+Tale=tai le
+Talu=Nuevo Tai Lue
+Taml=tamil
+Tavt=Tai Viet
+Telu=telugu
+Teng=tengwar
+Tfng=Tifinagh
+Tglg=tagalo
+Thaa=thaana
+Thai=tailand\u00E9s
+Tibt=tibetano
+Ugar=ugar\u00EDtico
+Vaii=Vai
+Visp=lenguaje visible
+Wara=Warang Citi
+Xpeo=persa antiguo
+Xsux=Sumerio-Acadio Cuneiforme
+Yiii=yi
+Zinh=heredado
+Zmth=Notaci\u00F3n Matem\u00E1tica
+Zsym=s\u00EDmbolos
+Zxxx=no escrito
+Zyyy=com\u00FAn
+Zzzz=escritura desconocida o no v\u00E1lida
+
# country names
# key is ISO 3166 country code
@@ -472,3 +1109,37 @@
ZA=Sud\u00e1frica
ZM=Zambia
ZW=Zimbabue
+
+# territory names
+# key is UN M.49 country and area code
+
+001=Mundo
+002=\u00C1frica
+003=Am\u00E9rica del Norte
+005=Suram\u00E9rica
+009=Ocean\u00EDa
+011=\u00C1frica occidental
+013=Centroam\u00E9rica
+014=\u00C1frica oriental
+015=\u00C1frica septentrional
+017=\u00C1frica central
+018=\u00C1frica meridional
+019=Am\u00E9ricas
+021=Norteam\u00E9rica
+029=Caribe
+030=Asia oriental
+034=Asia meridional
+035=Sudeste asi\u00E1tico
+039=Europa meridional
+053=Australia y Nueva Zelanda
+054=Melanesia
+057=Micronesia [057]
+061=Polinesia
+142=Asia
+143=Asia central
+145=Asia occidental
+150=Europa
+151=Europa oriental
+154=Europa septentrional
+155=Europa occidental
+419=Latinoam\u00E9rica y el Caribe
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,6 +227,643 @@
zh=chinois
zu=zoulou
+# key is ISO 639.2 language code
+aar=Afar
+abk=Abkhaze
+ace=Achinais
+ach=Acoli
+ada=Adangme
+ady=Adygh\u00E9en
+afa=Afro-asiatique
+afh=Afrihili
+afr=Afrikaans
+ain=A\u00EFnou
+aka=Akan
+akk=Akkadien
+alb=Albanais
+ale=Al\u00E9oute
+alg=Langue algonquienne
+alt=Alta\u00EF du Sud
+amh=Amharique
+ang=Vieil anglais (environ 450-1100)
+anp=Angika
+apa=Langue apache
+ara=Arabe
+arc=Aram\u00E9en officiel (700-300 av. J.-C.)
+arg=Aragonais
+arm=Arm\u00E9nien
+arn=Mapudungun
+arp=Arapaho
+art=Langue artificielle
+arw=Arawak
+asm=Assamais
+ast=Asturien
+ath=Langue athapascane
+aus=Langue australienne
+ava=Avar
+ave=Avestique
+awa=Awadhi
+aym=Aymara
+aze=Az\u00E9ri
+bad=Banda
+bai=Langue bamil\u00E9k\u00E9e
+bak=Bachkir
+bal=Baloutchi
+bam=Bambara
+ban=Balinais
+baq=Basque
+bas=Bassa
+bat=Langue balte
+bej=Bedja
+bel=Bi\u00E9lorusse
+bem=Bemba
+ben=Bengali
+ber=Berb\u00E8re
+bho=Bhojpuri
+bih=Bihari
+bik=Bikol
+bin=Bini
+bis=Bichlamar
+bla=Siksika
+bnt=Bantou
+bos=Bosniaque
+bra=Braj
+bre=Breton
+btk=Batak
+bua=Bouriate
+bug=Bouguinais
+bul=Bulgare
+bur=Birman
+byn=Blin
+cad=Caddo
+cai=Langue am\u00E9rindienne centrale
+car=Galibi Caribe
+cat=Catalan
+cau=Langue caucasienne
+ceb=Cebuano
+cel=Langue celtique
+cha=Chamorro
+chb=Chibcha
+che=Tch\u00E9tch\u00E8ne
+chg=Tchaghata\u00EF
+chi=Chinois
+chk=Chuuk
+chm=Mari
+chn=Jargon chinook
+cho=Choctaw
+chp=Chipewyan
+chr=Cherokee
+chu=Slavon liturgique
+chv=Tchouvache
+chy=Cheyenne
+cmc=Langue chame
+cop=Copte
+cor=Cornouaillais
+cos=Corse
+cpe=Cr\u00E9ole ou pidgin anglais
+cpf=Cr\u00E9ole ou pidgin fran\u00E7ais
+cpp=Cr\u00E9ole ou pidgin portugais
+cre=Cri
+crh=Turc de Crim\u00E9e
+crp=Cr\u00E9ole ou pidgin
+csb=Kachoube
+cus=Langue couchitique
+cze=Tch\u00E8que
+dak=Dakota
+dan=Danois
+dar=Dargwa
+day=Dayak
+del=Delaware
+den=Slave (Athapascan)
+dgr=Dogrib
+din=Dinka
+div=Divehi
+doi=Dogri
+dra=Langue dravidienne
+dsb=Bas-sorabe
+dua=Douala
+dum=Moyen n\u00E9erlandais
+dut=N\u00E9erlandais
+dyu=Dioula
+dzo=Dzongkha
+efi=Efik
+egy=Egyptien ancien
+eka=Ekajuk
+elx=Elamite
+eng=Anglais
+enm=Moyen anglais
+epo=Esp\u00E9ranto
+est=Estonien
+ewe=Ewe
+ewo=Ewondo
+fan=Fang
+fao=F\u00E9ro\u00EFen
+fat=Fanti
+fij=Fidjien
+fil=Filipino
+fin=Finnois
+fiu=Langue finno-ougrienne
+fon=Fon
+fre=Fran\u00E7ais
+frm=Moyen fran\u00E7ais
+fro=Ancien fran\u00E7ais
+frr=Frison du Nord
+frs=Frison oriental
+fry=Frison occidental
+ful=Peul
+fur=Frioulan
+gaa=Ga
+gay=Gayo
+gba=Gbaya
+gem=Langue germanique
+geo=G\u00E9orgien
+ger=Allemand
+gez=Gu\u00E8ze
+gil=Gilbertais
+gla=Gallois
+gle=Irlandais
+glg=Galicien
+glv=Mannois
+gmh=Moyen haut-allemand
+goh=Ancien haut-allemand
+gon=Gondi
+gor=Gorontalo
+got=Gothique
+grb=Grebo
+grc=Grec ancien
+gre=Grec, moderne (1453 -)
+grn=Guarani
+gsw=Al\u00E9manique
+guj=Goudjarati
+gwi=Gwich'in
+hai=Haida
+hat=Ha\u00EFtien
+hau=Haoussa
+haw=Hawa\u00EFen
+heb=H\u00E9breu
+her=Herero
+hil=Hiligaynon
+him=Himachali
+hin=Hindi
+hit=Hittite
+hmn=Hmong
+hmo=Hiri Motu
+hrv=Croate
+hsb=Haut-sorabe
+hun=Hongrois
+hup=Hupa
+iba=Iban
+ibo=Igbo
+ice=Islandais
+ido=Ido
+iii=Yi de Sichuan
+ijo=Ijo
+iku=Inuktitut
+ile=Interlingue
+ilo=Ilokano
+ina=Interlingua (International Auxiliary Language Association)
+inc=Langue indo-aryenne
+ind=Indon\u00E9sien
+ine=Langue indo-europ\u00E9enne
+inh=Ingouche
+ipk=Inupiaq
+ira=Langue iranienne
+iro=Langue iroquoienne
+ita=Italien
+jav=Javanais
+jbo=Lojban
+jpn=Japonais
+jpr=Jud\u00E9o-persan
+jrb=Jud\u00E9o-arabe
+kaa=Karakalpak
+kab=Kabyle
+kac=Kachin
+kal=Groenlandais
+kam=Kamba
+kan=Kannada
+kar=Karen
+kas=Kashmiri
+kau=Kanuri
+kaw=Kawi
+kaz=Kazakh
+kbd=Kabardin
+kha=Khasi
+khi=Langue kho\u00EFsan
+khm=Khmer central
+kho=Khotanais
+kik=Kikuyu
+kin=Kinyarwanda
+kir=Kirghize
+kmb=Kimbundu
+kok=Konkani
+kom=Komi
+kon=Kikongo
+kor=Cor\u00E9en
+kos=Kosrae
+kpe=Kpell\u00E9
+krc=Karatcha\u00EF balkar
+krl=Car\u00E9lien
+kro=Krou
+kru=Kurukh
+kua=Kwanyama
+kum=Koumyk
+kur=Kurde
+kut=Kutenai
+lad=Ladino
+lah=Lahnda
+lam=Lamba
+lao=Laotien
+lat=Latin
+lav=Letton
+lez=Lezghien
+lim=Limburgan
+lin=Lingala
+lit=Lituanien
+lol=Mongo
+loz=Lozi
+ltz=Luxembourgeois
+lua=Luba-Lulua
+lub=Luba-Katanga
+lug=Ganda
+lui=Luiseno
+lun=Lunda
+luo=Luo
+lus=Lushai
+mac=Mac\u00E9donien
+mad=Madurais
+mag=Magahi
+mah=Marshallais
+mai=Maithili
+mak=Makassar
+mal=Malayalam
+man=Mandingue
+mao=Maori
+map=Malayo-polyn\u00E9sien
+mar=Marathi
+mas=Masai
+may=Malais
+mdf=Moksa
+mdr=Mandar
+men=Mend\u00E9
+mga=Irlandais, moyen (900 - 1200)
+mic=Micmac
+min=Minangkabau
+mis=Non cod\u00E9
+mkh=Langue mon-khm\u00E8re
+mlg=Malgache
+mlt=Maltais
+mnc=Mandchou
+mni=Manipuri
+mno=Langue manobo
+moh=Mohawk
+mon=Mongol
+mos=Mor\u00E9
+mul=Multilingue
+mun=Langue mounda
+mus=Creek
+mwl=Mirandais
+mwr=Marwari
+myn=Langue maya
+myv=Erzya
+nah=Nahuatl
+nai=Langue am\u00E9rindienne du Nord
+nap=Napolitain
+nau=Nauruan
+nav=Navajo
+nbl=Ndebele, Sud
+nde=Ndebele, nord
+ndo=Ndonga
+nds=Bas-allemand
+nep=N\u00E9palais
+new=Newari
+nia=Nias
+nic=Niger-kordofanian
+niu=Niue
+nno=Norv\u00E9gien nynorsk
+nob=Bokmal, Norv\u00E9gien
+nog=Noga\u00EF
+non=Vieux norrois
+nor=Norv\u00E9gien
+nqo=N'Ko
+nso=Pedi
+nub=Langue nubienne
+nwc=Newari classique
+nya=Chichewa
+nym=Nyamwezi
+nyn=Nyankole
+nyo=Nyoro
+nzi=Nzema
+oci=Occitan (apr\u00E8s 1500)
+oji=Ojibwa
+ori=Oriya
+orm=Oromo
+osa=Osage
+oss=Oss\u00E8te
+ota=Turc ottoman
+oto=Langue otomangue
+paa=Langue papoue
+pag=Pangasinan
+pal=Pahlavi
+pam=Pampangan
+pan=Panjabi
+pap=Papiamento
+pau=Palau
+peo=Persan ancien
+per=Persan
+phi=Langue philippine
+phn=Ph\u00E9nicien
+pli=Pali
+pol=Polonais
+pon=Pohnpei
+por=Portugais
+pra=Langues pr\u00E2krit
+pro=Proven\u00E7al ancien
+pus=Pushto ; Pashto
+que=Quechua
+raj=Rajasthani
+rap=Rapanui
+rar=Rarotongien
+roa=Langue romane
+roh=Romanche
+rom=Romani
+rum=Roumain
+run=Rundi
+rup=Aroumain
+rus=Russe
+sad=Sandawe
+sag=Sango
+sah=Yakoute
+sai=Langue am\u00E9rindienne du Sud
+sal=Langue salishenne
+sam=Aram\u00E9en samaritain
+san=Sanscrit
+sas=Sasak
+sat=Santal
+scn=Sicilien
+sco=Ecossais
+sel=Selkoupe
+sem=Langue s\u00E9mitique
+sga=Ancien irlandais
+sgn=Langue des signes
+shn=Shan
+sid=Sidamo
+sin=Sinhala
+sio=Langue sioux
+sit=Sino-tib\u00E9tain
+sla=Langue slave
+slo=Slovaque
+slv=Slov\u00E8ne
+sma=Sami du sud
+sme=Sami du Nord
+smi=Langue samie
+smj=Sami de Lule
+smn=Sami d'Inari
+smo=Samoan
+sms=Sami skolt
+sna=Shona
+snd=Sindhi
+snk=Sonink\u00E9
+sog=Sogdien
+som=Somali
+son=Songhai
+sot=Sotho, sud
+spa=Espagnol
+srd=Sarde
+srn=Sranan Tongo
+srp=Serbe
+srr=S\u00E9r\u00E8re
+ssa=Langue nilo-saharienne
+ssw=Swati
+suk=Sukuma
+sun=Soundanais
+sus=Soussou
+sux=Sum\u00E9rien
+swa=Souah\u00E9li
+swe=Su\u00E9dois
+syc=Syriaque classique
+syr=Syriaque
+tah=Tahitien
+tai=Langue ta\u00EF
+tam=Tamoul
+tat=Tatar
+tel=T\u00E9lougou
+tem=Temne
+ter=Tereno
+tet=Tetum
+tgk=Tadjik
+tgl=Tagalog
+tha=Tha\u00EF
+tib=Tib\u00E9tain
+tig=Tigre
+tir=Tigrigna
+tiv=Tiv
+tkl=Tokelau
+tlh=Klingon
+tli=Tlingit
+tmh=Tamacheq
+tog=Tonga nyasa
+ton=Tonga (Iles Tonga)
+tpi=Tok Pisin
+tsi=Tsimshian
+tsn=Tswana
+tso=Tsonga
+tuk=Turkm\u00E8ne
+tum=Tumbuka
+tup=Langue tupi
+tur=Turc
+tut=Langue alta\u00EFque
+tvl=Tuvalu
+twi=Twi
+tyv=Touva
+udm=Oudmourte
+uga=Ougaritique
+uig=Ou\u00EFgour
+ukr=Ukrainien
+umb=Umbundu
+und=Ind\u00E9termin\u00E9
+urd=Ourdou
+uzb=Ouzbek
+vai=Va\u00EF
+ven=Venda
+vie=Vietnamien
+vol=Volapuk
+vot=Vote
+wak=Langues wakashennes
+wal=Wolaitta
+war=Waray
+was=Washo
+wel=Gallois
+wen=Langue sorabe
+wln=Wallon
+wol=Wolof
+xal=Kalmouk
+xho=Xhosa
+yao=Yao
+yap=Yap
+yid=Yiddish
+yor=Yoruba
+ypk=Langues yupik
+zap=Zapot\u00E8que
+zbl=Symboles Bliss
+zen=Zenaga
+zha=Zhuang
+znd=Zande
+zul=Zoulou
+zun=Zuni
+zxx=Sans contenu linguistique
+zza=Zazaki
+
+# script names
+# key is ISO 15924 script code
+
+Arab=Arabe
+Armi=Aram\u00E9en imp\u00E9rial
+Armn=Arm\u00E9nien
+Avst=Avestique
+Bali=Balinais
+Bamu=Bamoun
+Bass=Bassa Vah
+Batk=Batak
+Beng=Bengali
+Blis=Symboles Bliss
+Bopo=Bopomofo
+Brah=Brahmi
+Brai=Braille
+Bugi=Bouguis
+Buhd=Bouhide
+Cakm=Chakma
+Cans=Syllabaire autochtone canadien unifi\u00E9
+Cari=Carien
+Cham=Cham
+Cher=Cherokee
+Cirt=Cirth
+Copt=Copte
+Cprt=Syllabaire chypriote
+Cyrl=Cyrillique
+Cyrs=Cyrillique (variante slavonne)
+Deva=Devanagari
+Dsrt=Deseret
+Dupl=St\u00E9nographie Duploy\u00E9
+Egyd=D\u00E9motique \u00E9gyptien
+Egyh=Hi\u00E9ratique \u00E9gyptien
+Egyp=Hi\u00E9roglyphes \u00E9gyptiens
+Elba=Elbasan
+Ethi=Ethiopique
+Geok=G\u00E9orgien khoutsouri
+Geor=G\u00E9orgien
+Glag=Glagolitique
+Goth=Gothique
+Gran=Grantha
+Grek=Grec
+Gujr=Goudjarati
+Guru=Gourmoukh\u00EE
+Hang=Hangul
+Hani=Id\u00E9ogrammes han
+Hano=Hanunoo
+Hans=Id\u00E9ogrammes han simplifi\u00E9s
+Hant=Id\u00E9ogrammes han traditionnels
+Hebr=H\u00E9breu
+Hira=Hiragana
+Hmng=Pahawh Hmong
+Hrkt=Katakana ou Hiragana
+Hung=Ancien hongrois
+Inds=Indus
+Ital=Ancien italique
+Java=Javanais
+Jpan=Japonais
+Kali=Kayah Li
+Kana=Katakana
+Khar=Kharoshthi
+Khmr=Khmer
+Knda=Kannada
+Kore=Cor\u00E9en
+Kpel=Kpelle
+Kthi=Kaithi
+Lana=Tai Tham
+Laoo=Laotien
+Latf=Latin (variante bris\u00E9e)
+Latg=Latin (variante ga\u00E9lique)
+Latn=Latin
+Lepc=Lepcha
+Limb=Limbou
+Lina=Lin\u00E9aire A
+Linb=Lin\u00E9aire B
+Lisu=Lisu
+Loma=Loma
+Lyci=Lycien
+Lydi=Lydien
+Mand=Mand\u00E9en
+Mani=Manich\u00E9en
+Maya=Hi\u00E9roglyphes mayas
+Mend=Mend\u00E9
+Merc=Cursive m\u00E9ro\u00EFtique
+Mero=M\u00E9ro\u00EFtique
+Mlym=Malayalam
+Mong=Mongol
+Moon=Moon
+Mtei=Meitei Mayek
+Mymr=Myanmar
+Narb=Arabe ancien du Nord
+Nbat=Nabat\u00E9en
+Nkgb=Nakhi Geba
+Nkoo=N'Ko
+Ogam=Ogam
+Olck=Ol tchiki
+Orkh=Orkhon
+Orya=Oriya
+Osma=Osmanais
+Palm=Palmyr\u00E9en
+Perm=Ancien permien
+Phag=Phags pa
+Phli=Pehlevi des inscriptions
+Phlp=Pehlevi des psautiers
+Phlv=Pehlevi des livres
+Phnx=Ph\u00E9nicien
+Plrd=Miao
+Prti=Parthe des inscriptions
+Rjng=Rejang
+Roro=Rongorongo
+Runr=Runique
+Samr=Samaritain
+Sara=Sarati
+Sarb=Arabe ancien du Sud
+Saur=Saurashtra
+Sgnw=Ecriture des signes
+Shaw=Shavian
+Sind=Sindhi
+Sinh=Singhalais
+Sund=Soundanais
+Sylo=Syloti Nagri
+Syrc=Syriaque
+Syre=Syriaque estrangh\u00E9lo
+Syrj=Syriaque occidental
+Syrn=Syriaque oriental
+Tagb=Tagbanoua
+Tale=Ta\u00EF-le
+Talu=Nouveau ta\u00EF-lue
+Taml=Tamoul
+Tavt=Ta\u00EF Viet
+Telu=T\u00E9lougou
+Teng=Tengwar
+Tfng=Tifinagh
+Tglg=Tagalog
+Thaa=Th\u00E2na
+Thai=Tha\u00EF
+Tibt=Tib\u00E9tain
+Ugar=Ougaritique
+Vaii=Va\u00EF
+Visp=Langage visuel
+Wara=Warang Citi
+Xpeo=Cun\u00E9iforme pers\u00E9politain
+Xsux=Cun\u00E9iforme sum\u00E9ro-akkadien
+Yiii=Yi
+Zinh=H\u00E9rit\u00E9
+Zmth=Notation math\u00E9matique
+Zsym=Symboles
+Zxxx=Non \u00E9crit
+Zyyy=Script non d\u00E9termin\u00E9
+Zzzz=Ecriture inconnue ou non valide
+
# country names
# key is ISO 3166 country code
@@ -472,3 +1109,37 @@
ZA=Afrique du Sud
ZM=Zambie
ZW=Zimbabwe
+
+# territory names
+# key is UN M.49 country and area code
+
+001=Monde
+002=Afrique
+003=Am\u00E9rique du Nord
+005=Am\u00E9rique du Sud
+009=Oc\u00E9anie
+011=Afrique occidentale
+013=Am\u00E9rique centrale
+014=Afrique orientale
+015=Afrique septentrionale
+017=Afrique centrale
+018=Afrique australe
+019=Am\u00E9riques
+021=Am\u00E9rique septentrionale
+029=Cara\u00EFbes
+030=Asie orientale
+034=Asie du Sud
+035=Asie du Sud-Est
+039=Europe m\u00E9ridionale
+053=Australie et Nouvelle-Z\u00E9lande
+054=M\u00E9lan\u00E9sie
+057=R\u00E9gion micron\u00E9sienne
+061=Polyn\u00E9sie
+142=Asie
+143=Asie centrale
+145=Asie occidentale
+150=Europe
+151=Europe orientale
+154=Europe septentrionale
+155=Europe occidentale
+419=Am\u00E9rique latine et Cara\u00EFbes
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,6 +227,643 @@
zh=cinese
zu=zulu
+# key is ISO 639.2 language code
+aar=Afar
+abk=Abkhaso
+ace=Accinese
+ach=Acioli
+ada=Adangme
+ady=Adyghe
+afa=Lingua afroasiatica
+afh=Afrihili
+afr=Afrikaans
+ain=Ainu
+aka=Akan
+akk=Accado
+alb=Albanese
+ale=Aleuto
+alg=Lingue algonchine
+alt=Altai del sud
+amh=Amarico
+ang=Inglese antico (dal 450 al 1100 c.a.)
+anp=Angika
+apa=Lingue apache
+ara=Arabo
+arc=Aramaico ufficiale (dal 700 al 300 AC)
+arg=Aragonese
+arm=Armeno
+arn=Mapudungun
+arp=Arapaho
+art=Lingua artificiale
+arw=Aruaco
+asm=Assamese
+ast=Asturiano
+ath=Lingue Athapascan
+aus=Australiano
+ava=Avaro
+ave=Avestano
+awa=Awadhi
+aym=Aymara
+aze=Azero
+bad=Banda
+bai=Lingue bamileke
+bak=Baschiro
+bal=Beluci
+bam=Bambara
+ban=Balinese
+baq=Basco
+bas=Basa
+bat=Lingua baltica
+bej=Begia
+bel=Bielorusso
+bem=Wemba
+ben=Bengalese
+ber=Berbero
+bho=Bhojpuri
+bih=Bihari
+bik=Bicol
+bin=Bini
+bis=Bislama
+bla=Siksika
+bnt=Bantu
+bos=Bosniaco
+bra=Braj
+bre=Bretone
+btk=Batak
+bua=Buriat
+bug=Buginese
+bul=Bulgaro
+bur=Birmano
+byn=Blin
+cad=Caddo
+cai=Lingua indiana dell'America centrale
+car=Caribe (Galibi)
+cat=Catalano
+cau=Lingua caucasica
+ceb=Cebuano
+cel=Lingua celtica
+cha=Chamorro
+chb=Chibcha
+che=Ceceno
+chg=Chagataico
+chi=Cinese
+chk=Chuukese
+chm=Mari
+chn=Gergo chinook
+cho=Choctaw
+chp=Chipewyan
+chr=Cherokee
+chu=Slavo ecclesiastico
+chv=Chuvash
+chy=Cheyenne
+cmc=Lingue chamic
+cop=Copto
+cor=Cornico
+cos=Corso
+cpe=Creolo e pidgin basato sull'inglese
+cpf=Creolo e pidgin basato sul francese
+cpp=Creolo e pidgin basato sul portoghese
+cre=Cree
+crh=Turco crimeo
+crp=Creolo e pidgin
+csb=Kashubian
+cus=Lingua cuscitica
+cze=Ceco
+dak=Dakota
+dan=Danese
+dar=Dargwa
+day=Land Dayak
+del=Delaware
+den=Slave (Athapascan)
+dgr=Dogrib
+din=Dinca
+div=Divehi
+doi=Dogri
+dra=Lingua dravidica
+dsb=Basso sorabo
+dua=Duala
+dum=Olandese medio (dal 1050 al 1350 c.a.)
+dut=Olandese
+dyu=Diula
+dzo=Dzongkha
+efi=Efik
+egy=Egiziano antico
+eka=Ekajuka
+elx=Elamitico
+eng=Inglese
+enm=Inglese medio (dal 1100 al 1500)
+epo=Esperanto
+est=Estone
+ewe=Ewe
+ewo=Ewondo
+fan=Fang
+fao=Faroese
+fat=Fanti
+fij=Figiano
+fil=Filippino
+fin=Finlandese
+fiu=Lingua ungrofinnica
+fon=Fon
+fre=Francese
+frm=Francese medio (dal 1400 al 1600 c.a.)
+fro=Francese antico (dal 842 al 1400 c.a.)
+frr=Frisone settentrionale
+frs=Frisone orientale
+fry=Frisone occidentale
+ful=Fulah
+fur=Friulano
+gaa=Ga
+gay=Gayo
+gba=Gbaya
+gem=Lingua germanica
+geo=Georgiano
+ger=Tedesco
+gez=Geez
+gil=Gilbertese
+gla=Gaelico
+gle=Irlandese
+glg=Galiziano
+glv=Manx
+gmh=Tedesco medio alto (dal 1050 al 1500 c.a.)
+goh=Tedesco antico alto (dal 750 al 1050 c.a.)
+gon=Gondi
+gor=Gorontalo
+got=Gotico
+grb=Grebo
+grc=Greco antico (fino al 1453)
+gre=Greco moderno (dal 1453)
+grn=Guaran\u00EC
+gsw=Tedesco svizzero
+guj=Gujarati
+gwi=Gwich'in
+hai=Haida
+hat=Haitiano
+hau=Hausa
+haw=Hawaiano
+heb=Ebraico
+her=Herero
+hil=Hiligaynon
+him=Himachali
+hin=Hindi
+hit=Hittite
+hmn=Hmong
+hmo=Hiri Motu
+hrv=Croato
+hsb=Alto sorabo
+hun=Ungherese
+hup=Hupa
+iba=Iban
+ibo=Igbo
+ice=Islandese
+ido=Ido
+iii=Sichuan Yi
+ijo=Ijo
+iku=Inuktitut
+ile=Interlingue
+ilo=Ilocano
+ina=Interlingua (Associazione internazionale per la lingua ausiliaria)
+inc=Lingua indiana
+ind=Indonesiano
+ine=Lingua indoeuropea
+inh=Ingush
+ipk=Inupiaq
+ira=Iraniano
+iro=Lingue irochesi
+ita=Italiano
+jav=Giavanese
+jbo=Lojban
+jpn=Giapponese
+jpr=Giudeo persiano
+jrb=Giudeo arabo
+kaa=Kara-Kalpak
+kab=Kabyle
+kac=Kachin
+kal=Kalaallisut
+kam=Kamba
+kan=Kannada
+kar=Karen
+kas=Kashmiri
+kau=Kanuri
+kaw=Kawi
+kaz=Kazako
+kbd=Kabardia
+kha=Khasi
+khi=Lingua khoisan
+khm=Khmer centrale
+kho=Khotanese
+kik=Kikuyu
+kin=Kinyarwanda
+kir=Kirghiso
+kmb=Kimbundu
+kok=Konkani
+kom=Komi
+kon=Kongo
+kor=Coreano
+kos=Kosraean
+kpe=Kpelle
+krc=Karachay-Balkar
+krl=Careliano
+kro=Kru
+kru=Kurukh
+kua=Kuanyama
+kum=Kumyk
+kur=Curdo
+kut=Kutenai
+lad=Ladino
+lah=Lahnda
+lam=Lamba
+lao=Lao
+lat=Latino
+lav=Lettone
+lez=Lezghian
+lim=Limburgese
+lin=Lingala
+lit=Lituano
+lol=Mongo
+loz=Lozi
+ltz=Lussemburghese
+lua=Luba-Lulua
+lub=Luba-Katanga
+lug=Ganda
+lui=Luiseno
+lun=Lunda
+luo=Luo (Kenya e Tanzania)
+lus=Lushai
+mac=Macedone
+mad=Madurese
+mag=Magahi
+mah=Marshallese
+mai=Maithili
+mak=Makasar
+mal=Malayalam
+man=Mandingo
+mao=Maori
+map=Austronesiano
+mar=Marathi
+mas=Masai
+may=Malese
+mdf=Moksha
+mdr=Mandar
+men=Mende
+mga=Irlandese medio (dal 900 al 1200)
+mic=Mi'kmaq
+min=Minangkabau
+mis=Lingue non codificate
+mkh=Lingua mon-khmer
+mlg=Malgascio
+mlt=Maltese
+mnc=Manchu
+mni=Manipuri
+mno=Manobo
+moh=Mohawk
+mon=Mongolo
+mos=Mossi
+mul=Multilingua
+mun=Lingua munda
+mus=Creek
+mwl=Mirandese
+mwr=Marwari
+myn=Lingue maya
+myv=Erzya
+nah=Nahuatl
+nai=Lingua indiana del Nord America
+nap=Napoletano
+nau=Nauruano
+nav=Navajo
+nbl=Ndebele del sud
+nde=Ndebele del nord
+ndo=Ndonga
+nds=Basso tedesco
+nep=Nepalese
+new=Nepal Bhasa
+nia=Nias
+nic=Lingua niger-cordofan
+niu=Niue
+nno=Norvegese nynorsk
+nob=Norvegese bokm\u00E5l
+nog=Nogai
+non=Norse antico
+nor=Norvegese
+nqo=N'Ko
+nso=Pedi
+nub=Nubiano
+nwc=Newari classico
+nya=Chichewa
+nym=Nyamwezi
+nyn=Nyankole
+nyo=Nyoro
+nzi=Nzima
+oci=Occitano (dopo il 1500)
+oji=Ojibwa
+ori=Oriya
+orm=Oromo
+osa=Osage
+oss=Ossetico
+ota=Turco, ottomano (1500-1928)
+oto=Lingue otomi
+paa=Lingua papuana
+pag=Pangasinan
+pal=Pahlavi
+pam=Pampanga
+pan=Punjabi
+pap=Papiamento
+pau=Palau
+peo=Persiano antico (dal 600 al 400 AC)
+per=Persiano
+phi=Lingua filippina
+phn=Fenicio
+pli=Pali
+pol=Polacco
+pon=Pohnpeiano
+por=Portoghese
+pra=Pracrito
+pro=Provenzale antico (fino al 1500)
+pus=Pushto; Pashto
+que=Quechua
+raj=Rajasthani
+rap=Rapanui
+rar=Rarotonga
+roa=Lingua romanza
+roh=Romancio
+rom=Romani
+rum=Romeno
+run=Kirundi
+rup=Aromaniano
+rus=Russo
+sad=Sandawe
+sag=Sango
+sah=Yakut
+sai=Lingua indiana del Sud America
+sal=Lingue salish
+sam=Aramaico samaritano
+san=Sanscrito
+sas=Sasak
+sat=Santali
+scn=Siciliano
+sco=Scozzese
+sel=Selkup
+sem=Lingua semitica
+sga=Irlandese antico (fino al 900)
+sgn=Lingua dei segni
+shn=Shan
+sid=Sidamo
+sin=Singalese
+sio=Lingue sioux
+sit=Lingua sino-tibetana
+sla=Lingua slava
+slo=Slovacco
+slv=Sloveno
+sma=Sami del sud
+sme=Sami del nord
+smi=Sami
+smj=Sami lule
+smn=Sami inari
+smo=Samoano
+sms=Sami skolt
+sna=Shona
+snd=Sindhi
+snk=Soninke
+sog=Sogdiano
+som=Somalo
+son=Songhai
+sot=Sotho del sud
+spa=Spagnolo
+srd=Sardo
+srn=Sranan Tongo
+srp=Serbo
+srr=Serer
+ssa=Lingua nilo-sahariana
+ssw=Swati
+suk=Sukuma
+sun=Sundanese
+sus=Susu
+sux=Sumero
+swa=Swahili
+swe=Svedese
+syc=Siriaco classico
+syr=Siriaco
+tah=Taitiano
+tai=Tai
+tam=Tamil
+tat=Tataro
+tel=Telugu
+tem=Temne
+ter=Tereno
+tet=Tetum
+tgk=Tagiko
+tgl=Tagalog
+tha=Tailandese
+tib=Tibetano
+tig=Tigre
+tir=Tigrinya
+tiv=Tiv
+tkl=Tokelau
+tlh=Klingon
+tli=Tlingit
+tmh=Tamashek
+tog=Tonga (Nyasa)
+ton=Tonga (Isole Tonga)
+tpi=Tok pisin
+tsi=Tsimshian
+tsn=Tswana
+tso=Tsonga
+tuk=Turkmeno
+tum=Tumbuka
+tup=Lingue tupi
+tur=Turco
+tut=Lingua altaica
+tvl=Tuvalu
+twi=Twi
+tyv=Tuvinian
+udm=Udmurt
+uga=Ugaritico
+uig=Uiguro
+ukr=Ucraino
+umb=Umbundu
+und=Lingua imprecisata
+urd=Urdu
+uzb=Uzbeko
+vai=Vai
+ven=Venda
+vie=Vietnamita
+vol=Volapuk
+vot=Voto
+wak=Lingue wakash
+wal=Walamo
+war=Waray
+was=Washo
+wel=Gallese
+wen=Sorabo
+wln=Vallone
+wol=Wolof
+xal=Kalmyk
+xho=Xhosa
+yao=Yao
+yap=Yapese
+yid=Yiddish
+yor=Yoruba
+ypk=Lingue Yupik
+zap=Zapotec
+zbl=Simboli bliss
+zen=Zenaga
+zha=Zhuang
+znd=Zande
+zul=Zulu
+zun=Zuni
+zxx=Nessun contenuto linguistico
+zza=Zazaki
+
+# script names
+# key is ISO 15924 script code
+
+Arab=Arabo
+Armi=Aramaico imperiale
+Armn=Armeno
+Avst=Avestano
+Bali=Balinese
+Bamu=Bamum
+Bass=Bassa Vah
+Batk=Batak
+Beng=Bengalese
+Blis=Simboli bliss
+Bopo=Bopomofo
+Brah=Brahmi
+Brai=Braille
+Bugi=Buginese
+Buhd=Buhid
+Cakm=Chakma
+Cans=Simboli aborigeni canadesi unificati
+Cari=Cario
+Cham=Cham
+Cher=Cherokee
+Cirt=Cirth
+Copt=Copto
+Cprt=Cipriota
+Cyrl=Cirillico
+Cyrs=Cirillico (antico slavo ecclesiastico)
+Deva=Devanagari
+Dsrt=Deseret
+Dupl=Stenografia duployan
+Egyd=Egiziano demotico
+Egyh=Ieratico egiziano
+Egyp=Geroglifici egiziani
+Elba=Elbasan
+Ethi=Etiope
+Geok=Khutsuri
+Geor=Georgiano
+Glag=Glagolitico
+Goth=Gotico
+Gran=Grantha
+Grek=Greco
+Gujr=Gujarati
+Guru=Gurmukhi
+Hang=Hangul
+Hani=Han
+Hano=Hanunoo
+Hans=Han semplificato
+Hant=Han tradizionale
+Hebr=Ebraico
+Hira=Hiragana
+Hmng=Pahawh Hmong
+Hrkt=Katakana o Hiragana
+Hung=Ungherese antico
+Inds=Ind\u00F9
+Ital=Italico antico
+Java=Giavanese
+Jpan=Giapponese
+Kali=Kayah Li
+Kana=Katakana
+Khar=Kharoshthi
+Khmr=Khmer
+Knda=Kannada
+Kore=Coreano
+Kpel=Kpelle
+Kthi=Kaithi
+Lana=Tai Tham
+Laoo=Lao
+Latf=Variante fraktur del latino
+Latg=Latino gaelico
+Latn=Latino
+Lepc=Lepcha
+Limb=Limbu
+Lina=Lineare A
+Linb=Lineare B
+Lisu=Lisu
+Loma=Loma
+Lyci=Licio
+Lydi=Lidio
+Mand=Mandaico
+Mani=Manicheo
+Maya=Geroglifici maya
+Mend=Mende
+Merc=Corsivo meroitico
+Mero=Meoitico
+Mlym=Malayalam
+Mong=Mongolo
+Moon=Moon
+Mtei=Meitei Mayek
+Mymr=Myanmar
+Narb=Arabo antico del nord
+Nbat=Lingua nabatea
+Nkgb=Nakhi Geba
+Nkoo=N'Ko
+Ogam=Ogamico
+Olck=Ol Chiki
+Orkh=Orkhon
+Orya=Oriya
+Osma=Osmanya
+Palm=Palmyrene
+Perm=Permiano antico
+Phag=Phags-pa
+Phli=Pahlavi (Inscriptional)
+Phlp=Pahlavi (Psalter)
+Phlv=Pahlavi (Book)
+Phnx=Fenicio
+Plrd=Miao
+Prti=Partico (iscrizioni)
+Rjng=Rejang
+Roro=Rongorongo
+Runr=Runico
+Samr=Samaritano
+Sara=Sarati
+Sarb=Arabo antico del sud
+Saur=Saurashtra
+Sgnw=SignWriting
+Shaw=Shaviano
+Sind=Sindhi
+Sinh=Singalese
+Sund=Sundanese
+Sylo=Syloti Nagri
+Syrc=Siriaco
+Syre=Siriaco estrangelo
+Syrj=Siriaco occidentale
+Syrn=Siriaco orientale
+Tagb=Tagbanwa
+Tale=Tai Le
+Talu=Tai Lue semplificato
+Taml=Tamil
+Tavt=Tai Viet
+Telu=Telugu
+Teng=Tengwar
+Tfng=Tifinagh
+Tglg=Tagalog
+Thaa=Thaana
+Thai=Tailandese
+Tibt=Tibetano
+Ugar=Ugaritico
+Vaii=Vai
+Visp=Discorso visibile
+Wara=Warang Citi
+Xpeo=Persiano antico
+Xsux=Cuneiforme sumero-accadico
+Yiii=Yi
+Zinh=Script ereditato
+Zmth=Notazione matematica
+Zsym=Simboli
+Zxxx=Non scritto
+Zyyy=Script indeterminato
+Zzzz=Script non codificato
+
# country names
# key is ISO 3166 country code
@@ -472,3 +1109,37 @@
ZA=Sudafrica
ZM=Zambia
ZW=Zimbabwe
+
+# territory names
+# key is UN M.49 country and area code
+
+001=Mondo
+002=Africa
+003=America del Nord
+005=America del Sud
+009=Oceania
+011=Africa occidentale
+013=America centrale
+014=Africa orientale
+015=Africa settentrionale
+017=Africa centrale
+018=Africa meridionale
+019=Americhe
+021=America settentrionale
+029=Caraibi
+030=Asia orientale
+034=Asia meridionale
+035=Asia sudorientale
+039=Europa meridionale
+053=Australia e Nuova Zelanda
+054=Melanesia
+057=Regione Micronesiana
+061=Polinesia
+142=Asia
+143=Asia centrale
+145=Asia occidentale
+150=Europa
+151=Europa orientale
+154=Europa settentrionale
+155=Europa occidentale
+419=America Latina e Caraibi
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,6 +227,643 @@
zh=\u4e2d\u56fd\u8a9e
zu=\u30ba\u30fc\u30eb\u30fc\u8a9e
+# key is ISO 639.2 language code
+aar=\u30A2\u30D5\u30A1\u30EB\u8A9E
+abk=\u30A2\u30D6\u30CF\u30FC\u30BA\u8A9E
+ace=\u30A2\u30C1\u30A7\u30FC\u8A9E
+ach=\u30A2\u30C1\u30E7\u30EA\u8A9E
+ada=\u30A2\u30C0\u30F3\u30B0\u30E1\u8A9E
+ady=\u30A2\u30C7\u30A3\u30B2\u8A9E
+afa=\u30A2\u30D5\u30AC\u30CB\u30FC (1927-2002)
+afh=\u30A2\u30D5\u30EA\u30D2\u30EA\u8A9E
+afr=\u30A2\u30D5\u30EA\u30AB\u30FC\u30F3\u30B9\u8A9E
+ain=\u30A2\u30A4\u30CC\u8A9E
+aka=\u30A2\u30AB\u30F3\u8A9E
+akk=\u30A2\u30C3\u30AB\u30C9\u8A9E
+alb=\u30A2\u30EB\u30D0\u30CB\u30A2\u8A9E
+ale=\u30A2\u30EC\u30A6\u30C8\u8A9E
+alg=\u30A2\u30EB\u30B4\u30F3\u30AD\u30A2\u30F3\u8A9E\u65CF
+alt=\u5357\u30A2\u30EB\u30BF\u30A4\u8A9E
+amh=\u30A2\u30E0\u30CF\u30E9\u8A9E
+ang=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB \u30AE\u30EB\u30C0\u30FC
+anp=\u30A2\u30F3\u30AE\u30AB\u8A9E
+apa=\u30A2\u30D1\u30C3\u30C1\u8A9E\u65CF
+ara=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3 \u30A2\u30A5\u30B9\u30C8\u30E9\u30FC\u30EB
+arc=\u30A2\u30E9\u30E0\u8A9E
+arg=\u30A2\u30E9\u30B4\u30F3\u8A9E
+arm=\u30A2\u30EB\u30E1\u30CB\u30A2\u8A9E
+arn=\u30A2\u30E9\u30A6\u30AB\u30F3\u8A9E
+arp=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3 \u30DA\u30BD (1983-1985)
+art=\u4EBA\u5DE5\u8AF8\u8A9E
+arw=\u30A2\u30E9\u30EF\u30AF\u8A9E
+asm=\u30A2\u30C3\u30B5\u30E0\u8A9E
+ast=\u30A2\u30B9\u30C8\u30A5\u30EA\u30A2\u30B9\u8A9E
+ath=\u30A2\u30B5\u30D1\u30B9\u30AB\u30F3\u8A9E\u65CF
+aus=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u8A9E\u65CF
+ava=\u30A2\u30F4\u30A1\u30EB\u8A9E
+ave=\u30A2\u30F4\u30A7\u30B9\u30BF\u8A9E
+awa=\u30A2\u30EF\u30C7\u30A3\u30FC\u8A9E
+aym=\u30A2\u30A4\u30DE\u30E9\u8A9E
+aze=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u8A9E
+bad=\u30DC\u30B9\u30CB\u30A2 \u30C7\u30A3\u30CA\u30FC\u30EB
+bai=\u30D0\u30DF\u30EC\u30B1\u8A9E\u65CF
+bak=\u30D0\u30B7\u30AD\u30FC\u30EB\u8A9E
+bal=\u30D0\u30EB\u30FC\u30C1\u30FC\u8A9E
+bam=\u30DC\u30B9\u30CB\u30A2 \u30DE\u30EB\u30AF (BAM)
+ban=\u30D0\u30EA\u8A9E
+baq=\u30D0\u30B9\u30AF\u8A9E
+bas=\u30D0\u30B5\u8A9E
+bat=\u30D0\u30EB\u30C8\u8AF8\u8A9E
+bej=\u30D9\u30B8\u30E3\u8A9E
+bel=\u30D9\u30EB\u30AE\u30FC \u30D5\u30E9\u30F3 (BEL)
+bem=\u30D9\u30F3\u30D0\u8A9E
+ben=\u30D9\u30F3\u30AC\u30EB\u8A9E
+ber=\u30D9\u30EB\u30D9\u30EB\u8AF8\u8A9E
+bho=\u30DC\u30FC\u30B8\u30D7\u30EA\u30FC\u8A9E
+bih=\u30D3\u30CF\u30FC\u30EB\u8A9E
+bik=\u30D3\u30B3\u30EB\u8A9E
+bin=\u30D3\u30CB\u8A9E
+bis=\u30D3\u30B9\u30E9\u30DE\u8A9E
+bla=\u30B7\u30AF\u30B7\u30AB\u8A9E
+bnt=\u30D0\u30F3\u30C8\u30A5\u8AF8\u8A9E
+bos=\u30DC\u30B9\u30CB\u30A2\u8A9E
+bra=\u30D6\u30E9\u30B8\u8A9E
+bre=\u30D6\u30E9\u30B8\u30EB \u30AF\u30EB\u30BC\u30A4\u30ED (1990-1993)
+btk=\u30D0\u30BF\u30AF\u8A9E
+bua=\u30D6\u30EA\u30E4\u30FC\u30C8\u8A9E
+bug=\u30D6\u30AE\u8A9E
+bul=\u30D6\u30EB\u30AC\u30EA\u30A2\u8A9E
+bur=\u30D3\u30EB\u30DE\u8A9E
+byn=\u30D3\u30EA\u30F3\u8A9E
+cad=\u30AB\u30CA\u30C0 \u30C9\u30EB
+cai=\u4E2D\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E
+car=\u30AB\u30EA\u30D6\u8A9E
+cat=\u30AB\u30BF\u30ED\u30CB\u30A2\u8A9E
+cau=\u30B3\u30FC\u30AB\u30B5\u30B9\u8AF8\u8A9E
+ceb=\u30BB\u30D6\u30A2\u30CE\u8A9E
+cel=\u30B1\u30EB\u30C8\u8AF8\u8A9E
+cha=\u30C1\u30E3\u30E2\u30ED\u8A9E
+chb=\u30C1\u30D6\u30C1\u30E3\u8A9E
+che=\u30C1\u30A7\u30C1\u30A7\u30F3\u8A9E
+chg=\u30C1\u30E3\u30AC\u30BF\u30A4\u8A9E
+chi=\u4E2D\u56FD\u8A9E
+chk=\u30C1\u30E5\u30FC\u30AF\u8A9E
+chm=\u30DE\u30EA\u8A9E
+chn=\u30D3\u30FC\u30C1\u30FB\u30E9\u30FB\u30DE\u30FC \u7B49
+cho=\u30C1\u30E7\u30AF\u30C8\u30FC\u8A9E
+chp=\u30C1\u30DA\u30EF\u30A4\u30A2\u30F3\u8A9E
+chr=\u30C1\u30A7\u30ED\u30AD\u30FC\u8A9E
+chu=\u6559\u4F1A\u30B9\u30E9\u30D6\u8A9E
+chv=\u30C1\u30E5\u30F4\u30A1\u30B7\u30E5\u8A9E
+chy=\u30B7\u30E3\u30A4\u30A2\u30F3\u8A9E
+cmc=\u30C1\u30E3\u30E0\u8A9E\u65CF
+cop=\u30B3\u30ED\u30F3\u30D3\u30A2 \u30DA\u30BD
+cor=\u30B3\u30FC\u30F3\u30A6\u30A9\u30FC\u30EB\u8A9E
+cos=\u30B3\u30EB\u30B7\u30AB\u8A9E
+cpe=\u82F1\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E
+cpf=\u30D5\u30E9\u30F3\u30B9\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E
+cpp=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E
+cre=\u30AF\u30EA\u30FC\u8A9E
+crh=\u30AF\u30EA\u30DF\u30A2\u30FB\u30BF\u30BF\u30FC\u30EB\u8A9E
+crp=\u305D\u306E\u4ED6\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E
+csb=\u30AB\u30B7\u30E5\u30FC\u30D6\u8A9E
+cus=\u30AF\u30B7\u30E5\u8AF8\u8A9E
+cze=\u30C1\u30A7\u30B3\u8A9E
+dak=\u30C0\u30B3\u30BF\u8A9E
+dan=\u30C7\u30F3\u30DE\u30FC\u30AF\u8A9E
+dar=\u30C0\u30EB\u30AC\u30F3\u8A9E
+day=\u30C0\u30E4\u30AF\u8A9E
+del=\u30C7\u30E9\u30A6\u30A7\u30A2\u8A9E
+den=\u30B9\u30EC\u30A4\u30D3\u30FC\u8A9E
+dgr=\u30C9\u30B0\u30EA\u30D6\u8A9E
+din=\u30C7\u30A3\u30F3\u30AB\u8A9E
+div=\u30C7\u30A3\u30D9\u30D2\u8A9E
+doi=\u30C9\u30B0\u30EA\u8A9E
+dra=\u30C9\u30E9\u30F4\u30A3\u30C0\u8AF8\u8A9E
+dsb=\u4F4E\u30BD\u30EB\u30D3\u30A2\u8A9E
+dua=\u30C9\u30A5\u30A2\u30E9\u8A9E
+dum=\u4E2D\u4E16\u30AA\u30E9\u30F3\u30C0\u8A9E
+dut=\u30AA\u30E9\u30F3\u30C0\u8A9E
+dyu=\u30C7\u30A5\u30A6\u30E9\u8A9E
+dzo=\u30BE\u30F3\u30AB\u8A9E
+efi=\u30A8\u30D5\u30A3\u30C3\u30AF\u8A9E
+egy=\u53E4\u4EE3\u30A8\u30B8\u30D7\u30C8\u8A9E
+eka=\u30A8\u30AB\u30B8\u30E5\u30AF\u8A9E
+elx=\u30A8\u30E9\u30E0\u8A9E
+eng=\u82F1\u8A9E
+enm=\u4E2D\u4E16\u82F1\u8A9E
+epo=\u30A8\u30B9\u30DA\u30E9\u30F3\u30C8\u8A9E
+est=\u30A8\u30B9\u30C8\u30CB\u30A2\u8A9E
+ewe=\u30A8\u30A6\u30A7\u8A9E
+ewo=\u30A8\u30A6\u30A9\u30F3\u30C9\u8A9E
+fan=\u30D5\u30A1\u30F3\u30B0\u8A9E
+fao=\u30D5\u30A7\u30ED\u30FC\u8A9E
+fat=\u30D5\u30A1\u30F3\u30C6\u30A3\u30FC\u8A9E
+fij=\u30D5\u30A3\u30B8\u30FC\u8A9E
+fil=\u30D5\u30A3\u30EA\u30D4\u30CE\u8A9E
+fin=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u8A9E
+fiu=\u30D5\u30A3\u30F3\u30FB\u30A6\u30B4\u30EB\u8AF8\u8A9E
+fon=\u30D5\u30A9\u30F3\u8A9E
+fre=\u30D5\u30E9\u30F3\u30B9\u8A9E
+frm=\u4E2D\u671F\u30D5\u30E9\u30F3\u30B9\u8A9E
+fro=\u53E4\u30D5\u30E9\u30F3\u30B9\u8A9E
+frr=\u5317\u30D5\u30EA\u30B8\u30A2\u8A9E
+frs=\u6771\u30D5\u30EA\u30B8\u30A2\u8A9E
+fry=\u897F\u30D5\u30EA\u30B8\u30A2\u8A9E
+ful=\u30D5\u30E9\u8A9E
+fur=\u30D5\u30EA\u30A6\u30EA\u8A9E
+gaa=\u30AC\u8A9E
+gay=\u30AC\u30E8\u8A9E
+gba=\u30D0\u30E4\u8A9E
+gem=\u30B2\u30EB\u30DE\u30F3\u8AF8\u8A9E
+geo=\u30B0\u30EB\u30B8\u30A2\u8A9E
+ger=\u30C9\u30A4\u30C4\u8A9E
+gez=\u30B2\u30A8\u30BA\u8A9E
+gil=\u30AD\u30EA\u30D0\u30B9\u8A9E
+gla=\u30B2\u30FC\u30EB\u8A9E
+gle=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u8A9E
+glg=\u30AC\u30EA\u30B7\u30A2\u8A9E
+glv=\u30DE\u30F3\u5CF6\u8A9E
+gmh=\u4E2D\u9AD8\u30C9\u30A4\u30C4\u8A9E
+goh=\u53E4\u9AD8\u30C9\u30A4\u30C4\u8A9E
+gon=\u30B4\u30FC\u30F3\u30C7\u30A3\u30FC\u8A9E
+gor=\u30B4\u30ED\u30F3\u30BF\u30ED\u8A9E
+got=\u30B4\u30FC\u30C8\u8A9E
+grb=\u30B0\u30EC\u30DC\u8A9E
+grc=\u53E4\u4EE3\u30AE\u30EA\u30B7\u30E3\u8A9E
+gre=\u73FE\u4EE3\u30AE\u30EA\u30B7\u30E3\u8A9E(1453-)
+grn=\u30B0\u30A2\u30E9\u30CB\u30FC\u8A9E
+gsw=\u30B9\u30A4\u30B9\u30C9\u30A4\u30C4\u8A9E\uFF08\u30B9\u30A4\u30B9\uFF09
+guj=\u30B0\u30B8\u30E3\u30E9\u30C8\u8A9E
+gwi=\u30B0\u30A6\u30A3\u30C3\u30C1\u30F3\u8A9E
+hai=\u30CF\u30A4\u30C0\u8A9E
+hat=\u30CF\u30A4\u30C1\u8A9E
+hau=\u30CF\u30A6\u30B5\u8A9E
+haw=\u30CF\u30EF\u30A4\u8A9E
+heb=\u30D8\u30D6\u30E9\u30A4\u8A9E
+her=\u30D8\u30EC\u30ED\u8A9E
+hil=\u30D2\u30EA\u30AC\u30A4\u30CE\u30F3\u8A9E
+him=\u30D2\u30DE\u30C1\u30E3\u30EB\u8A9E
+hin=\u30D2\u30F3\u30C7\u30A3\u30FC\u8A9E
+hit=\u30D2\u30C3\u30BF\u30A4\u30C8\u8A9E
+hmn=\u30D5\u30E2\u30F3\u8A9E
+hmo=\u30D2\u30EA\u30E2\u30C8\u30A5\u8A9E
+hrv=\u30AF\u30ED\u30A2\u30C1\u30A2\u8A9E
+hsb=\u4E0A\u30BD\u30EB\u30D3\u30A2\u8A9E
+hun=\u30CF\u30F3\u30AC\u30EA\u30FC\u8A9E
+hup=\u30A2\u30BF\u30D1\u30B9\u30AB\u8A9E
+iba=\u30A4\u30D0\u30F3\u8A9E
+ibo=\u30A4\u30DC\u8A9E
+ice=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u8A9E
+ido=\u30A4\u30C9\u8A9E
+iii=\u56DB\u5DDD\u30A4(\u5F5D)\u8A9E
+ijo=\u30A4\u30B8\u30E7\u30FC\u8A9E
+iku=\u30A4\u30CC\u30AF\u30A6\u30C6\u30A3\u30C8\u30C3\u30C8\u8A9E
+ile=\u30A4\u30F3\u30BF\u30FC\u30EA\u30F3\u30B0
+ilo=\u30A4\u30ED\u30AB\u30CE\u8A9E
+ina=\u30A4\u30F3\u30BF\u30FC\u30EA\u30F3\u30B0\u30A2\u8A9E(\u56FD\u969B\u88DC\u52A9\u8A9E\u5354\u4F1A)
+inc=\u30A4\u30F3\u30C9\u8AF8\u8A9E
+ind=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u8A9E
+ine=\u5370\u6B27\u8AF8\u8A9E
+inh=\u30A4\u30F3\u30B0\u30B7\u8A9E
+ipk=\u30A4\u30CC\u30D4\u30A2\u30C3\u30AF\u8A9E
+ira=\u30A4\u30E9\u30F3\u8A9E
+iro=\u30A4\u30ED\u30B3\u30A4\u8A9E\u65CF
+ita=\u30A4\u30BF\u30EA\u30A2\u8A9E
+jav=\u30B8\u30E3\u30EF\u8A9E
+jbo=\u30ED\u30B8\u30D0\u30F3\u8A9E
+jpn=\u65E5\u672C\u8A9E
+jpr=\u30E6\u30C0\u30E4\u30FB\u30DA\u30EB\u30B7\u30A2\u8A9E
+jrb=\u30E6\u30C0\u30E4\u30FB\u30A2\u30E9\u30D3\u30A2\u8A9E
+kaa=\u30AB\u30E9\u30FB\u30AB\u30EB\u30D1\u30AF\u8A9E
+kab=\u30AB\u30D3\u30EB\u8A9E
+kac=\u30AB\u30C1\u30F3\u8A9E
+kal=\u30AB\u30E9\u30A2\u30EA\u30B9\u8A9E
+kam=\u30AB\u30F3\u30D0\u8A9E
+kan=\u30AB\u30F3\u30CA\u30C0\u8A9E
+kar=\u30AB\u30EC\u30F3\u8A9E
+kas=\u30AB\u30B7\u30DF\u30FC\u30EB\u8A9E
+kau=\u30AB\u30CC\u30EA\u8A9E
+kaw=\u30AB\u30A6\u30A3\u8A9E
+kaz=\u30AB\u30B6\u30D5\u8A9E
+kbd=\u30AB\u30D0\u30EB\u30C9\u8A9E
+kha=\u30AB\u30B7\u8A9E
+khi=\u30B3\u30A4\u30B5\u30F3\u8AF8\u8A9E
+khm=\u4E2D\u592E\u30AF\u30E1\u30FC\u30EB\u8A9E
+kho=\u30B3\u30FC\u30BF\u30F3\u8A9E
+kik=\u30AD\u30AF\u30E6\u8A9E
+kin=\u30AD\u30CB\u30E4\u30EB\u30EF\u30F3\u30C0\u8A9E
+kir=\u30AD\u30EB\u30AE\u30B9\u8A9E
+kmb=\u30AD\u30F3\u30D6\u30F3\u30C9\u30A5\u8A9E
+kok=\u30B3\u30F3\u30AB\u30CB\u8A9E
+kom=\u30B3\u30DF\u8A9E
+kon=\u30B3\u30F3\u30B4\u8A9E
+kor=\u97D3\u56FD\u8A9E
+kos=\u30B3\u30B7\u30E3\u30A8\u8A9E
+kpe=\u30AF\u30DA\u30EC\u8A9E
+krc=\u30AB\u30E9\u30C1\u30E3\u30A4\u8A9E
+krl=\u30AB\u30EC\u30EA\u30A2\u8A9E
+kro=\u30AF\u30EB\u30FC\u8A9E
+kru=\u30AF\u30EB\u30AF\u8A9E
+kua=\u30AF\u30A2\u30CB\u30E3\u30DE\u8A9E
+kum=\u30AF\u30E0\u30AF\u8A9E
+kur=\u30AF\u30EB\u30C9\u8A9E
+kut=\u30AF\u30C6\u30CA\u30A4\u8A9E
+lad=\u30E9\u30B8\u30CE\u8A9E
+lah=\u30E9\u30D5\u30F3\u30C0\u30FC\u8A9E
+lam=\u30E9\u30F3\u30D0\u8A9E
+lao=\u30E9\u30AA\u8A9E
+lat=\u30E9\u30C6\u30F3\u8A9E
+lav=\u30E9\u30C8\u30D3\u30A2\u8A9E
+lez=\u30EC\u30BA\u30AE\u8A9E
+lim=\u30EA\u30F3\u30D6\u30EB\u30D5\u8A9E
+lin=\u30EA\u30F3\u30AC\u30E9\u8A9E
+lit=\u30EA\u30C8\u30A2\u30CB\u30A2\u8A9E
+lol=\u30E2\u30F3\u30B4\u8A9E
+loz=\u30ED\u30BA\u30A3\u8A9E
+ltz=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30B0\u8A9E
+lua=\u30EB\u30D0\u30FB\u30EB\u30EB\u30A2\u8A9E
+lub=\u30EB\u30D0\u30FB\u30AB\u30BF\u30F3\u30AC\u8A9E
+lug=\u30AC\u30F3\u30C0\u8A9E
+lui=\u30EB\u30A4\u30BB\u30FC\u30CB\u30E7\u8A9E
+lun=\u30EB\u30F3\u30C0\u8A9E
+luo=\u30EB\u30AA\u8A9E
+lus=\u30EB\u30B7\u30E3\u30A4\u8A9E
+mac=\u30DE\u30B1\u30C9\u30CB\u30A2\u8A9E
+mad=\u30E2\u30ED\u30C3\u30B3 \u30C7\u30A3\u30EB\u30CF\u30E0
+mag=\u30DE\u30AC\u30D2\u30FC\u8A9E
+mah=\u30DE\u30FC\u30B7\u30E3\u30EB\u8A9E
+mai=\u30DE\u30A4\u30C6\u30A3\u30EA\u30FC\u8A9E
+mak=\u30DE\u30AB\u30C3\u30B5\u30EB\u8A9E
+mal=\u30DE\u30E9\u30E4\u30FC\u30E9\u30E0\u8A9E
+man=\u30DE\u30F3\u30C7\u30A3\u30F3\u30B4\u8A9E
+mao=\u30DE\u30AA\u30EA\u8A9E
+map=\u30AA\u30FC\u30B9\u30C8\u30ED\u30CD\u30B7\u30A2\u8AF8\u8A9E
+mar=\u30DE\u30E9\u30C6\u30A3\u30FC\u8A9E
+mas=\u30DE\u30B5\u30A4\u8A9E
+may=\u30DE\u30EC\u30FC\u8A9E
+mdf=\u30E2\u30AF\u30B7\u30E3\u8A9E
+mdr=\u30DE\u30F3\u30C0\u30EB\u8A9E
+men=\u30E1\u30F3\u30C7\u8A9E
+mga=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB \u30A2\u30EA\u30A2\u30EA
+mic=\u30DF\u30AF\u30DE\u30AF\u8A9E
+min=\u30DF\u30CA\u30F3\u30AB\u30D0\u30A6\u8A9E
+mis=\u305D\u306E\u4ED6\u306E\u8A00\u8A9E
+mkh=\u30E2\u30F3\u30FB\u30AF\u30E1\u30FC\u30EB\u8AF8\u8A9E
+mlg=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u8A9E
+mlt=\u30DE\u30EB\u30BF\u8A9E
+mnc=\u6E80\u5DDE\u8A9E
+mni=\u30DE\u30CB\u30D7\u30EB\u8A9E
+mno=\u30DE\u30CE\u30DC\u8A9E\u65CF
+moh=\u30E2\u30FC\u30DB\u30FC\u30AF\u8A9E
+mon=\u30E2\u30F3\u30B4\u30EB\u8A9E
+mos=\u30E2\u30B7\u8A9E
+mul=\u8907\u6570\u8A00\u8A9E
+mun=\u30E0\u30F3\u30C0\u8A9E\u65CF
+mus=\u30AF\u30EA\u30FC\u30AF\u8A9E
+mwl=\u30DF\u30E9\u30F3\u30C0\u8A9E
+mwr=\u30DE\u30FC\u30EB\u30EF\u30FC\u30EA\u30FC\u8A9E
+myn=\u30DE\u30E4\u8A9E\u65CF
+myv=\u30A8\u30EB\u30B8\u30E3\u8A9E
+nah=\u30CA\u30EF\u30C8\u30EB\u8A9E
+nai=\u5317\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E
+nap=\u30CA\u30DD\u30EA\u8A9E
+nau=\u30CA\u30A6\u30EB\u8A9E
+nav=\u30CA\u30D0\u30DB\u8A9E
+nbl=\u5357\u30F3\u30C7\u30D9\u30EC\u8A9E
+nde=\u5317\u30F3\u30C7\u30D9\u30EC\u8A9E
+ndo=\u30F3\u30C9\u30F3\u30AC\u8A9E
+nds=\u4F4E\u5730\u30C9\u30A4\u30C4\u8A9E\u3001\u4F4E\u5730\u30B5\u30AF\u30BD\u30F3\u8A9E
+nep=\u30CD\u30D1\u30FC\u30EB\u8A9E
+new=\u30CD\u30EF\u30FC\u30EB\u8A9E
+nia=\u30CB\u30A2\u30B9\u8A9E
+nic=\u30CB\u30AB\u30E9\u30B0\u30A2 \u30B3\u30EB\u30C9\u30D0
+niu=\u30CB\u30A6\u30FC\u30A8\u30A4\u8A9E
+nno=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30CB\u30FC\u30CE\u30B7\u30AF)
+nob=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30D6\u30FC\u30AF\u30E2\u30FC\u30EB)
+nog=\u30CE\u30AC\u30A4\u8A9E
+non=\u53E4\u30CE\u30EB\u30C9\u8A9E
+nor=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E
+nqo=\u30F3\u30B3\u8A9E
+nso=\u5317\u90E8\u30BD\u30C8\u8A9E
+nub=\u30CC\u30D3\u30A2\u8A9E\u65CF
+nwc=\u53E4\u5178\u30CD\u30EF\u30FC\u30EB\u8A9E
+nya=\u30C1\u30C1\u30A7\u30EF\u8A9E
+nym=\u30CB\u30E3\u30E0\u30A6\u30A7\u30B8\u8A9E
+nyn=\u30CB\u30E3\u30F3\u30B3\u30EC\u8A9E
+nyo=\u30CB\u30E7\u30ED\u8A9E
+nzi=\u30F3\u30BC\u30DE\u8A9E
+oci=\u30AA\u30C3\u30AF\u8A9E(1500\u4EE5\u5F8C)
+oji=\u30AA\u30B8\u30D6\u30EF\u8A9E
+ori=\u30AA\u30EA\u30E4\u30FC\u8A9E
+orm=\u30AA\u30ED\u30E2\u8A9E
+osa=\u30AA\u30BB\u30FC\u30B8\u8A9E
+oss=\u30AA\u30BB\u30C3\u30C8\u8A9E
+ota=\u30AA\u30B9\u30DE\u30F3\u30C8\u30EB\u30B3\u8A9E
+oto=\u30AA\u30C8\u30DF\u8A9E\u65CF
+paa=\u30D1\u30D7\u30A2\u8AF8\u8A9E
+pag=\u30D1\u30F3\u30AC\u30B7\u30CA\u30F3\u8A9E
+pal=\u30D1\u30D5\u30E9\u30F4\u30A3\u8A9E
+pam=\u30D1\u30F3\u30D1\u30F3\u30AC\u8A9E
+pan=\u30D1\u30F3\u30B8\u30E3\u30D6\u8A9E
+pap=\u30D1\u30D4\u30A2\u30E1\u30F3\u30C8\u8A9E
+pau=\u30D1\u30E9\u30AA\u8A9E
+peo=\u53E4\u4EE3\u30DA\u30EB\u30B7\u30A2\u8A9E
+per=\u30DA\u30EB\u30B7\u30A2\u8A9E
+phi=\u30D5\u30A3\u30EA\u30D4\u30F3\u8AF8\u8A9E
+phn=\u30D5\u30A7\u30CB\u30AD\u30A2\u8A9E
+pli=\u30D1\u30FC\u30EA\u8A9E
+pol=\u30DD\u30FC\u30E9\u30F3\u30C9\u8A9E
+pon=\u30DD\u30F3\u30DA\u30A4\u8A9E
+por=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E
+pra=\u30D7\u30E9\u30FC\u30AF\u30EA\u30C3\u30C8\u8A9E\u65CF
+pro=\u53E4\u671F\u30D7\u30ED\u30D0\u30F3\u30B9\u8A9E
+pus=\u30D7\u30B7\u30E5\u30C8\u30A5\u30FC\u8A9E\u3001\u30D1\u30B7\u30E5\u30C8\u30A5\u30FC\u8A9E
+que=\u30B1\u30C1\u30E5\u30A2\u8A9E
+raj=\u30E9\u30FC\u30B8\u30E3\u30B9\u30BF\u30FC\u30F3\u8A9E
+rap=\u30E9\u30D1\u30CC\u30A4\u8A9E
+rar=\u30E9\u30ED\u30C8\u30AC\u8A9E
+roa=\u30ED\u30DE\u30F3\u30B9\u8AF8\u8A9E
+roh=\u30ED\u30DE\u30F3\u30B7\u30E5\u8A9E
+rom=\u30ED\u30DE\u30FC\u30CB\u30FC\u8A9E
+rum=\u30EB\u30FC\u30DE\u30CB\u30A2\u8A9E
+run=\u30EB\u30F3\u30C7\u30A3\u8A9E
+rup=\u30A2\u30EB\u30FC\u30DE\u30CB\u30A2\u8A9E
+rus=\u30ED\u30B7\u30A2\u8A9E
+sad=\u30B5\u30F3\u30C0\u30A6\u30A7\u8A9E
+sag=\u30B5\u30F3\u30B4\u8A9E
+sah=\u30E4\u30AF\u30FC\u30C8\u8A9E
+sai=\u5357\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E
+sal=\u30BB\u30A4\u30EA\u30C3\u30B7\u30E5\u8A9E\u65CF
+sam=\u30B5\u30DE\u30EA\u30A2\u30FB\u30A2\u30E9\u30E0\u8A9E
+san=\u30B5\u30F3\u30B9\u30AF\u30EA\u30C3\u30C8\u8A9E
+sas=\u30B5\u30B5\u30AF\u8A9E
+sat=\u30B5\u30F3\u30BF\u30FC\u30EA\u30FC\u8A9E
+scn=\u30B7\u30C1\u30EA\u30A2\u8A9E
+sco=\u30B9\u30B3\u30C3\u30C8\u30E9\u30F3\u30C9\u8A9E
+sel=\u30BB\u30EA\u30AF\u30D7\u8A9E
+sem=\u30BB\u30E0\u8AF8\u8A9E
+sga=\u53E4\u671F\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u8A9E
+sgn=\u624B\u307E\u306D\u8A00\u8A9E
+shn=\u30B7\u30E3\u30F3\u8A9E
+sid=\u30B7\u30C0\u30E2\u8A9E
+sin=\u30B7\u30F3\u30CF\u30E9\u8A9E
+sio=\u30B9\u30FC\u8A9E\u65CF
+sit=\u30B9\u30ED\u30D9\u30CB\u30A2 \u30C8\u30E9\u30FC\u30EB
+sla=\u30B9\u30E9\u30D6\u8AF8\u8A9E
+slo=\u30B9\u30ED\u30D0\u30AD\u30A2\u8A9E
+slv=\u30B9\u30ED\u30D9\u30CB\u30A2\u8A9E
+sma=\u5357\u30B5\u30FC\u30DF\u8A9E
+sme=\u5317\u30B5\u30FC\u30DF\u8A9E
+smi=\u30B5\u30FC\u30DF\u8AF8\u8A9E
+smj=\u30EB\u30EC\u30FB\u30B5\u30FC\u30DF\u8A9E
+smn=\u30A4\u30CA\u30EA\u30FB\u30B5\u30FC\u30DF\u8A9E
+smo=\u30B5\u30E2\u30A2\u8A9E
+sms=\u30B9\u30B3\u30EB\u30C8\u30FB\u30B5\u30FC\u30DF\u8A9E
+sna=\u30B7\u30E7\u30CA\u8A9E
+snd=\u30B7\u30F3\u30C9\u8A9E
+snk=\u30BD\u30CB\u30F3\u30B1\u8A9E
+sog=\u30BD\u30B0\u30C9\u8A9E
+som=\u30BD\u30DE\u30EA\u8A9E
+son=\u30BD\u30F3\u30AC\u30A4\u8A9E
+sot=\u5357\u90E8\u30BD\u30C8\u8A9E
+spa=\u30B9\u30DA\u30A4\u30F3\u8A9E
+srd=\u30B9\u30EA\u30CA\u30E0 \u30C9\u30EB
+srn=\u30B9\u30EA\u30CA\u30E0\u8A9E
+srp=\u30BB\u30EB\u30D3\u30A2\u8A9E
+srr=\u30BB\u30EC\u30EB\u8A9E
+ssa=\u30CA\u30A4\u30EB\u30FB\u30B5\u30CF\u30E9\u8AF8\u8A9E
+ssw=\u30B7\u30B9\u30EF\u30C6\u30A3\u8A9E
+suk=\u30B9\u30AF\u30DE\u8A9E
+sun=\u30B9\u30F3\u30C0\u8A9E
+sus=\u30B9\u30B9\u8A9E
+sux=\u30B7\u30E5\u30E1\u30FC\u30EB\u8A9E
+swa=\u30B9\u30EF\u30D2\u30EA\u8A9E
+swe=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u8A9E
+syc=\u53E4\u5178\u30B7\u30EA\u30A2\u8A9E
+syr=\u30B7\u30EA\u30A2\u8A9E
+tah=\u30BF\u30D2\u30C1\u8A9E
+tai=\u30BF\u30A4\u8AF8\u8A9E
+tam=\u30BF\u30DF\u30EB\u8A9E
+tat=\u30BF\u30BF\u30FC\u30EB\u8A9E
+tel=\u30C6\u30EB\u30B0\u8A9E
+tem=\u30C6\u30E0\u30CD\u8A9E
+ter=\u30C6\u30EC\u30FC\u30CE\u8A9E
+tet=\u30C6\u30C8\u30A5\u30F3\u8A9E
+tgk=\u30BF\u30B8\u30AF\u8A9E
+tgl=\u30BF\u30AC\u30ED\u30B0\u8A9E
+tha=\u30BF\u30A4\u8A9E
+tib=\u30C1\u30D9\u30C3\u30C8\u8A9E
+tig=\u30C6\u30A3\u30B0\u30EC\u8A9E
+tir=\u30C6\u30A3\u30B0\u30EA\u30CB\u30E3\u8A9E
+tiv=\u30C6\u30A3\u30D6\u8A9E
+tkl=\u30C8\u30B1\u30E9\u30A6\u8A9E
+tlh=\u30AF\u30EA\u30F3\u30B4\u30F3\u8A9E
+tli=\u30C8\u30EA\u30F3\u30AE\u30C3\u30C8\u8A9E
+tmh=\u30BF\u30DE\u30B7\u30A7\u30AF\u8A9E
+tog=\u30C8\u30F3\u30AC\u8A9E (\u30CB\u30A2\u30B5)
+ton=\u30C8\u30F3\u30AC\u8A9E(\u30C8\u30F3\u30AC\u8AF8\u5CF6)
+tpi=\u30C8\u30AF\u30FB\u30D4\u30B7\u30F3\u8A9E
+tsi=\u30C1\u30E0\u30B7\u30E5\u8A9E
+tsn=\u30C4\u30EF\u30CA\u8A9E
+tso=\u30C4\u30A9\u30F3\u30AC\u8A9E
+tuk=\u30C8\u30EB\u30AF\u30E1\u30F3\u8A9E
+tum=\u30C8\u30A5\u30F3\u30D6\u30AB\u8A9E
+tup=\u30C8\u30A5\u30D4\u8A9E\u65CF
+tur=\u30C8\u30EB\u30B3\u8A9E
+tut=\u30A2\u30EB\u30BF\u30A4\u8AF8\u8A9E
+tvl=\u30C4\u30D0\u30EB\u8A9E
+twi=\u30C8\u30A6\u30A3\u8A9E
+tyv=\u30C8\u30A5\u30F4\u30A1\u8A9E
+udm=\u30A6\u30C9\u30E0\u30EB\u30C8\u8A9E
+uga=\u30A6\u30AC\u30EA\u30C8\u8A9E
+uig=\u30A6\u30A4\u30B0\u30EB\u8A9E
+ukr=\u30A6\u30AF\u30E9\u30A4\u30CA\u8A9E
+umb=\u30A6\u30F3\u30D6\u30F3\u30C9\u30A5\u8A9E
+und=\u975E\u78BA\u5B9A
+urd=\u30A6\u30EB\u30C9\u30A5\u30FC\u8A9E
+uzb=\u30A6\u30BA\u30D9\u30AF\u8A9E
+vai=\u30F4\u30A1\u30A4\u8A9E
+ven=\u30D9\u30F3\u30C0\u8A9E
+vie=\u30D9\u30C8\u30CA\u30E0\u8A9E
+vol=\u30F4\u30A9\u30E9\u30D4\u30E5\u30FC\u30AF\u8A9E
+vot=\u30DC\u30FC\u30C8\u8A9E
+wak=\u30EF\u30AB\u30B7\u8A9E\u65CF
+wal=\u30EF\u30C3\u30E9\u30E2\u8A9E
+war=\u30EF\u30E9\u30A4\u8A9E
+was=\u30EF\u30B7\u30E7\u8A9E
+wel=\u30A6\u30A7\u30FC\u30EB\u30BA\u8A9E
+wen=\u30BD\u30EB\u30D3\u30A2\u8A9E\u65CF
+wln=\u30EF\u30ED\u30F3\u8A9E
+wol=\u30A6\u30A9\u30ED\u30D5\u8A9E
+xal=\u30AB\u30EB\u30E0\u30A4\u30AF\u8A9E
+xho=\u30B3\u30FC\u30B5\u8A9E
+yao=\u30E4\u30AA\u8A9E
+yap=\u30E4\u30C3\u30D7\u8A9E
+yid=\u30A4\u30C7\u30A3\u30C3\u30B7\u30E5\u8A9E
+yor=\u30E8\u30EB\u30D0\u8A9E
+ypk=\u30E6\u30D4\u30C3\u30AF\u8A9E\u65CF
+zap=\u30B6\u30DD\u30C6\u30C3\u30AF\u8A9E
+zbl=\u30D6\u30EA\u30B9\u30B7\u30F3\u30DC\u30EB
+zen=\u30BC\u30CA\u30AC\u8A9E
+zha=\u30C1\u30E5\u30EF\u30F3\u8A9E
+znd=\u30B6\u30F3\u30C7\u8A9E
+zul=\u30BA\u30FC\u30EB\u30FC\u8A9E
+zun=\u30BA\u30CB\u8A9E
+zxx=\u8A00\u8A9E\u5185\u5BB9\u306A\u3057
+zza=\u30B6\u30B6\u8A9E
+
+# script names
+# key is ISO 15924 script code
+
+Arab=\u30A2\u30E9\u30D3\u30A2\u6587\u5B57
+Armi=\u5E1D\u56FD\u30A2\u30E9\u30E0\u8A9E
+Armn=\u30A2\u30EB\u30E1\u30CB\u30A2\u6587\u5B57
+Avst=\u30A2\u30F4\u30A7\u30B9\u30BF\u8A9E
+Bali=\u30D0\u30EA\u6587\u5B57
+Bamu=\u30D0\u30E0\u30F3\u8A9E
+Bass=\u30D0\u30B5\u8A9E(\u30D0\u30FC)
+Batk=\u30D0\u30BF\u30AF\u6587\u5B57
+Beng=\u30D9\u30F3\u30AC\u30EB\u6587\u5B57
+Blis=\u30D6\u30EA\u30B9\u30B7\u30F3\u30DC\u30EB
+Bopo=\u6CE8\u97F3\u5B57\u6BCD
+Brah=\u30D6\u30E9\u30FC\u30D5\u30DF\u30FC\u6587\u5B57
+Brai=\u30D6\u30E9\u30A4\u30E6\u70B9\u5B57
+Bugi=\u30D6\u30AE\u30B9\u6587\u5B57
+Buhd=\u30D6\u30D2\u30C3\u30C9\u6587\u5B57
+Cakm=\u30C1\u30E3\u30AF\u30DE\u8A9E
+Cans=\u7D71\u5408\u30AB\u30CA\u30C0\u5148\u4F4F\u6C11\u8A18\u53F7
+Cari=\u30AB\u30EA\u6587\u5B57
+Cham=\u30C1\u30E3\u30E0\u6587\u5B57
+Cher=\u30C1\u30A7\u30ED\u30AD\u30FC\u6587\u5B57
+Cirt=\u30AD\u30A2\u30B9\u6587\u5B57
+Copt=\u30B3\u30D7\u30C8\u6587\u5B57
+Cprt=\u30AD\u30D7\u30ED\u30B9\u6587\u5B57
+Cyrl=\u30AD\u30EA\u30EB\u6587\u5B57
+Cyrs=\u30AD\u30EA\u30EB\u6587\u5B57 (\u53E4\u4EE3\u6559\u4F1A\u30B9\u30E9\u30D6\u8A9E\u306E\u6587\u5B57)
+Deva=\u30C7\u30FC\u30D0\u30CA\u30FC\u30AC\u30EA\u30FC\u6587\u5B57
+Dsrt=\u30C7\u30BB\u30EC\u30C3\u30C8\u6587\u5B57
+Dupl=\u30C7\u30E5\u30D7\u30ED\u30EF\u30A8\u5F0F\u901F\u8A18
+Egyd=\u30A8\u30B8\u30D7\u30C8\u6C11\u8846\u6587\u5B57
+Egyh=\u30A8\u30B8\u30D7\u30C8\u795E\u5B98\u6587\u5B57
+Egyp=\u30A8\u30B8\u30D7\u30C8\u8056\u523B\u6587\u5B57
+Elba=\u30A8\u30EB\u30D0\u30B5\u30F3\u6587\u5B57
+Ethi=\u30A8\u30C1\u30AA\u30D4\u30A2\u6587\u5B57
+Geok=\u30B0\u30EB\u30B8\u30A2\u6587\u5B57\uFF08\u30D5\u30C4\u30EA\uFF09
+Geor=\u30B0\u30EB\u30B8\u30A2\u6587\u5B57
+Glag=\u30B0\u30E9\u30B4\u30FC\u30EB\u6587\u5B57
+Goth=\u30B4\u30FC\u30C8\u6587\u5B57
+Gran=\u30B0\u30E9\u30F3\u30BF\u6587\u5B57
+Grek=\u30AE\u30EA\u30B7\u30E3\u6587\u5B57
+Gujr=\u30B0\u30B8\u30E3\u30E9\u30FC\u30C8\u6587\u5B57
+Guru=\u30B0\u30EB\u30E0\u30AD\u30FC\u6587\u5B57
+Hang=\u30CF\u30F3\u30B0\u30EB
+Hani=\u6F22\u5B57
+Hano=\u30CF\u30CC\u30CE\u30AA\u6587\u5B57
+Hans=\u7C21\u4F53\u5B57
+Hant=\u7E41\u4F53\u5B57
+Hebr=\u30D8\u30D6\u30E9\u30A4\u6587\u5B57
+Hira=\u3072\u3089\u304C\u306A
+Hmng=\u30D1\u30CF\u30A6\u30FB\u30D5\u30E2\u30F3\u6587\u5B57
+Hrkt=\u30AB\u30BF\u30AB\u30CA\u3068\u3072\u3089\u304C\u306A
+Hung=\u53E4\u4EE3\u30CF\u30F3\u30AC\u30EA\u30FC\u6587\u5B57
+Inds=\u30A4\u30F3\u30C0\u30B9\u6587\u5B57 (\u30CF\u30E9\u30C3\u30D1\u6587\u5B57)
+Ital=\u53E4\u4EE3\u30A4\u30BF\u30EA\u30A2\u306E\u6587\u5B57
+Java=\u30B8\u30E3\u30EF\u6587\u5B57
+Jpan=\u65E5\u672C\u8A9E\u306E\u6587\u5B57
+Kali=\u30AB\u30E4\u30FC\u6587\u5B57
+Kana=\u30AB\u30BF\u30AB\u30CA
+Khar=\u30AB\u30ED\u30FC\u30B7\u30E5\u30C6\u30A3\u30FC\u6587\u5B57
+Khmr=\u30AF\u30E1\u30FC\u30EB\u6587\u5B57
+Knda=\u30AB\u30F3\u30CA\u30C0\u6587\u5B57
+Kore=\u97D3\u56FD\u8A9E\u306E\u6587\u5B57
+Kpel=\u30AF\u30DA\u30EC\u8A9E
+Kthi=\u30AB\u30A4\u30C6\u30A3\u30FC\u6587\u5B57
+Lana=\u30BF\u30A4\u30FB\u30BF\u30E0\u6587\u5B57
+Laoo=\u30E9\u30AA\u6587\u5B57
+Latf=\u30E9\u30C6\u30F3\u6587\u5B57 (\u30C9\u30A4\u30C4\u6587\u5B57)
+Latg=\u30E9\u30C6\u30F3\u6587\u5B57(\u30B2\u30FC\u30EB\u8A9E)
+Latn=\u30E9\u30C6\u30F3\u6587\u5B57
+Lepc=\u30EC\u30D7\u30C1\u30E3\u6587\u5B57 (\u30ED\u30F3\u6587\u5B57)
+Limb=\u30EA\u30F3\u30D6\u6587\u5B57
+Lina=\u7DDA\u6587\u5B57A
+Linb=\u7DDA\u6587\u5B57B
+Lisu=\u30EA\u30B9\u6587\u5B57
+Loma=\u30ED\u30DE\u6587\u5B57
+Lyci=\u30EA\u30E5\u30AD\u30A2\u6587\u5B57
+Lydi=\u30EA\u30C7\u30A3\u30A2\u6587\u5B57
+Mand=\u30DE\u30F3\u30C0\u6587\u5B57
+Mani=\u30DE\u30CB\u6587\u5B57
+Maya=\u30DE\u30E4\u8C61\u5F62\u6587\u5B57
+Mend=\u30E1\u30F3\u30C7\u8A9E
+Merc=\u30E1\u30ED\u30A8\u6587\u5B57\u8349\u66F8\u4F53
+Mero=\u30E1\u30ED\u30A8\u6587\u5B57
+Mlym=\u30DE\u30E9\u30E4\u30FC\u30E9\u30E0\u6587\u5B57
+Mong=\u30E2\u30F3\u30B4\u30EB\u6587\u5B57
+Moon=\u30E0\u30FC\u30F3\u6587\u5B57
+Mtei=\u30E1\u30A4\u30C6\u30A4\u6587\u5B57
+Mymr=\u30DF\u30E3\u30F3\u30DE\u30FC\u6587\u5B57
+Narb=\u53E4\u4EE3\u5317\u30A2\u30E9\u30D3\u30A2\u8A9E
+Nbat=\u30CA\u30D0\u30C6\u30A2\u8A9E
+Nkgb=Nakhi Geba\u6587\u5B57
+Nkoo=\u30F3\u30B3\u6587\u5B57
+Ogam=\u30AA\u30AC\u30E0\u6587\u5B57
+Olck=\u30AA\u30EB\u30C1\u30AD\u6587\u5B57
+Orkh=\u30AA\u30EB\u30DB\u30F3\u6587\u5B57
+Orya=\u30AA\u30EA\u30E4\u30FC\u6587\u5B57
+Osma=\u30AA\u30B9\u30DE\u30CB\u30A2\u6587\u5B57
+Palm=\u30D1\u30EB\u30DF\u30E9\u6587\u5B57
+Perm=\u53E4\u30DA\u30EB\u30DF\u30C3\u30AF\u6587\u5B57
+Phag=\u30D1\u30B9\u30D1\u6587\u5B57
+Phli=\u7891\u6587\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57
+Phlp=\u8A69\u7BC7\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57
+Phlv=\u66F8\u7C4D\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57
+Phnx=\u30D5\u30A7\u30CB\u30AD\u30A2\u6587\u5B57
+Plrd=\u30DD\u30E9\u30FC\u30C9\u97F3\u58F0\u8A18\u53F7
+Prti=\u7891\u6587\u306E\u30D1\u30EB\u30C6\u30A3\u30A2\u6587\u5B57
+Rjng=\u30EC\u30B8\u30E3\u30F3\u8A9E
+Roro=\u30ED\u30F3\u30B4\u30ED\u30F3\u30B4\u6587\u5B57
+Runr=\u30EB\u30FC\u30F3\u6587\u5B57
+Samr=\u30B5\u30DE\u30EA\u30A2\u8A9E
+Sara=\u30B5\u30E9\u30C6\u30A3\u6587\u5B57
+Sarb=\u53E4\u4EE3\u5357\u30A2\u30E9\u30D3\u30A2\u8A9E
+Saur=\u30B5\u30A4\u30E9\u30B7\u30E5\u30C8\u30E9\u8A9E
+Sgnw=\u624B\u8A71\u8A18\u8FF0
+Shaw=\u30B7\u30E7\u30FC\u6587\u5B57
+Sind=\u30B7\u30F3\u30C9\u8A9E
+Sinh=\u30B7\u30F3\u30CF\u30E9\u6587\u5B57
+Sund=\u30B9\u30F3\u30C0\u8A9E
+Sylo=\u30B7\u30ED\u30C6\u30A3\u30FB\u30CA\u30B0\u30EA\u6587\u5B57
+Syrc=\u30B7\u30EA\u30A2\u6587\u5B57
+Syre=\u30B7\u30EA\u30A2\u6587\u5B57 (\u30A8\u30B9\u30C8\u30E9\u30F3\u30B2\u30ED\u6587\u5B57)
+Syrj=\u30B7\u30EA\u30A2\u6587\u5B57 (\u897F\u65B9\u30B7\u30EA\u30A2\u6587\u5B57)
+Syrn=\u30B7\u30EA\u30A2\u6587\u5B57 (\u6771\u65B9\u30B7\u30EA\u30A2\u6587\u5B57)
+Tagb=\u30BF\u30B0\u30D0\u30F3\u30EF\u6587\u5B57
+Tale=\u30BF\u30A4\u30EC\u6587\u5B57
+Talu=\u65B0\u30BF\u30A4\u30FB\u30EB\u30FC\u6587\u5B57
+Taml=\u30BF\u30DF\u30FC\u30EB\u6587\u5B57
+Tavt=\u30BF\u30A4\u30FB\u30F4\u30A7\u30C8\u6587\u5B57
+Telu=\u30C6\u30EB\u30B0\u6587\u5B57
+Teng=\u30C6\u30F3\u30B0\u30EF\u30FC\u30EB\u6587\u5B57
+Tfng=\u30AF\u30E1\u30FC\u30EB\u8A9E
+Tglg=\u30BF\u30AC\u30ED\u30B0\u6587\u5B57
+Thaa=\u30BF\u30FC\u30CA\u6587\u5B57
+Thai=\u30BF\u30A4\u6587\u5B57
+Tibt=\u30C1\u30D9\u30C3\u30C8\u6587\u5B57
+Ugar=\u30A6\u30AC\u30EA\u30C8\u6587\u5B57
+Vaii=\u30F4\u30A1\u30A4\u6587\u5B57
+Visp=\u8996\u8A71\u6CD5
+Wara=\u30EF\u30E9\u30F3\u30B0\u30FB\u30AF\u30B7\u30C6\u30A3\u6587\u5B57
+Xpeo=\u53E4\u4EE3\u30DA\u30EB\u30B7\u30A2\u6587\u5B57
+Xsux=\u30B7\u30E5\u30E1\u30FC\u30EB\uFF1D\u30A2\u30C3\u30AB\u30C9\u8A9E\u6954\u5F62\u6587\u5B57
+Yiii=\u30A4\u6587\u5B57
+Zinh=\u7D99\u627F\u7528\u5B57
+Zmth=\u6570\u5B66\u8A18\u53F7
+Zsym=\u8A18\u53F7
+Zxxx=\u53E3\u627F\u8A00\u8A9E\u306E\u30B3\u30FC\u30C9
+Zyyy=\u5171\u901A\u30B3\u30FC\u30C9
+Zzzz=\u7528\u5B57\u672A\u30B3\u30FC\u30C9\u5316
+
# country names
# key is ISO 3166 country code
@@ -472,3 +1109,37 @@
ZA=\u5357\u30a2\u30d5\u30ea\u30ab
ZM=\u30b6\u30f3\u30d3\u30a2
ZW=\u30b8\u30f3\u30d0\u30d6\u30a8
+
+# territory names
+# key is UN M.49 country and area code
+
+001=\u4E16\u754C
+002=\u30A2\u30D5\u30EA\u30AB
+003=\u5317\u7C73
+005=\u5357\u30A2\u30E1\u30EA\u30AB
+009=\u30AA\u30BB\u30A2\u30CB\u30A2
+011=\u897F\u30A2\u30D5\u30EA\u30AB
+013=\u4E2D\u592E\u30A2\u30E1\u30EA\u30AB
+014=\u6771\u30A2\u30D5\u30EA\u30AB
+015=\u5317\u30A2\u30D5\u30EA\u30AB
+017=\u4E2D\u90E8\u30A2\u30D5\u30EA\u30AB
+018=\u5357\u90E8\u30A2\u30D5\u30EA\u30AB
+019=\u30A2\u30E1\u30EA\u30AB\u5927\u9678
+021=\u5317\u30A2\u30E1\u30EA\u30AB
+029=\u30AB\u30EA\u30D6\u6D77
+030=\u6771\u30A2\u30B8\u30A2
+034=\u5357\u30A2\u30B8\u30A2
+035=\u6771\u5357\u30A2\u30B8\u30A2
+039=\u5357\u30E8\u30FC\u30ED\u30C3\u30D1
+053=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u30FB\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9
+054=\u30E1\u30E9\u30CD\u30B7\u30A2
+057=\u30DF\u30AF\u30ED\u30CD\u30B7\u30A2\u5730\u57DF
+061=\u30DD\u30EA\u30CD\u30B7\u30A2
+142=\u30A2\u30B8\u30A2
+143=\u4E2D\u592E\u30A2\u30B8\u30A2
+145=\u897F\u30A2\u30B8\u30A2
+150=\u30E8\u30FC\u30ED\u30C3\u30D1
+151=\u6771\u30E8\u30FC\u30ED\u30C3\u30D1
+154=\u5317\u30E8\u30FC\u30ED\u30C3\u30D1
+155=\u897F\u30E8\u30FC\u30ED\u30C3\u30D1
+419=\u30E9\u30C6\u30F3\u30A2\u30E1\u30EA\u30AB\u30FB\u30AB\u30EA\u30D6\u5730\u57DF
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,6 +227,643 @@
zh=\uc911\uad6d\uc5b4
zu=\uc904\ub8e8\uc5b4
+# key is ISO 639.2 language code
+aar=\uC544\uD30C\uB974\uC5B4
+abk=\uC544\uBE0C\uD558\uC988\uC5B4
+ace=\uC544\uCCB4\uC5B4
+ach=\uC544\uCF5C\uB9AC\uC5B4
+ada=\uC544\uB2F9\uBA54\uC5B4
+ady=\uC544\uB2E5\uD5E4\uC5B4
+afa=\uC544\uD504\uAC00\uB2C8(1927-2002)
+afh=\uC544\uD504\uB9AC\uD788\uB9AC\uC5B4
+afr=\uB0A8\uC544\uACF5 \uACF5\uC6A9\uC5B4
+ain=\uC544\uC774\uB204\uC5B4
+aka=\uC544\uCE78\uC5B4
+akk=\uC544\uCE74\uB4DC\uC5B4
+alb=\uC54C\uBC14\uB2C8\uC544\uC5B4
+ale=\uC54C\uB958\uD2B8\uC5B4
+alg=\uC54C\uACF5\uD0A8\uC5B4\uC871
+alt=\uB0A8\uBD80 \uC54C\uD0C0\uC774\uC81C\uC5B4
+amh=\uC554\uD558\uB77C\uC5B4
+ang=\uB124\uB35C\uB780\uB4DC\uB839 \uC548\uD2F8\uB808\uC2A4 \uAE38\uB354
+anp=\uC559\uAC00\uC5B4
+apa=\uC544\uD30C\uCE58\uC5B4
+ara=\uC544\uB78D\uC5B4
+arc=\uC544\uB78C\uC5B4
+arg=\uC544\uB77C\uACE4\uC5B4
+arm=\uC544\uB974\uBA54\uB2C8\uC544\uC5B4
+arn=\uC544\uB77C\uC6B0\uCE78\uC5B4
+arp=\uC544\uB77C\uD30C\uD638\uC5B4
+art=\uAE30\uACC4\uC5B4(\uAE30\uD0C0)
+arw=\uC544\uB77C\uC640\uD06C\uC5B4
+asm=\uC544\uC0D8\uC5B4
+ast=\uC544\uC2A4\uD22C\uB9AC\uC544\uC5B4
+ath=\uC544\uD0C0\uD30C\uC2A4\uCE74\uC5B4\uAD70
+aus=\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544\uC5B4\uC871
+ava=\uC544\uBC14\uB974\uC5B4
+ave=\uC544\uBCA0\uC2A4\uD0C0\uC5B4
+awa=\uC544\uC640\uD788\uC5B4
+aym=\uC544\uC774\uB9C8\uB77C\uC5B4
+aze=\uC544\uC81C\uB974\uBC14\uC774\uC794\uC5B4
+bad=\uBCF4\uC2A4\uB2C8\uC544-\uD5E4\uB974\uCCB4\uACE0\uBE44\uB098 \uB514\uB098\uB974
+bai=\uBC14\uBC00\uB808\uCF00\uC5B4\uC871
+bak=\uBC14\uC288\uD0A4\uB974\uC5B4
+bal=\uBC1C\uB8E8\uCE58\uC5B4
+bam=\uBC24\uBC14\uB77C\uC5B4
+ban=\uBC1C\uB9AC\uC5B4
+baq=\uBC14\uC2A4\uD06C\uC5B4
+bas=\uBC14\uC0AC\uC5B4
+bat=\uBC1C\uD2B8\uC5B4(\uAE30\uD0C0)
+bej=\uBCA0\uC790\uC5B4
+bel=\uBCA8\uB77C\uB8E8\uC2A4\uC5B4
+bem=\uBCB0\uBC14\uC5B4
+ben=\uBCB5\uACE8\uC5B4
+ber=\uBCA0\uB974\uBCA0\uB974\uC5B4
+bho=\uD638\uC988\uD478\uB9AC\uC5B4
+bih=\uBE44\uD558\uB974\uC5B4
+bik=\uBE44\uCF5C\uC5B4
+bin=\uBE44\uB2C8\uC5B4
+bis=\uBE44\uC2AC\uB77C\uB9C8\uC5B4
+bla=\uC2DD\uC2DC\uCE74\uC5B4
+bnt=\uBC18\uD22C\uC5B4
+bos=\uBCF4\uC2A4\uB2C8\uC544\uC5B4
+bra=\uBE0C\uB77C\uC9C0\uC5B4
+bre=\uBE0C\uB77C\uC9C8 \uD06C\uB8E8\uC81C\uC774\uB8E8 (1990-1993)
+btk=\uBC14\uD0C0\uD06C\uC5B4
+bua=\uBD80\uB9AC\uC544\uD0C0
+bug=\uBD80\uAE30\uC5B4
+bul=\uBD88\uAC00\uB9AC\uC544\uC5B4
+bur=\uBC84\uB9C8\uC5B4
+byn=\uBE0C\uB9B0\uC5B4
+cad=\uCE74\uB3C4\uC5B4
+cai=\uC911\uC559 \uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC548\uC5B4(\uAE30\uD0C0)
+car=\uCE74\uB9AC\uBE0C\uC5B4
+cat=\uCE74\uD0C8\uB85C\uB2C8\uC544\uC5B4
+cau=\uCE74\uD504\uCE74\uC2A4\uC5B4(\uAE30\uD0C0)
+ceb=\uC138\uBD80\uC544\uB178\uC5B4
+cel=\uCF08\uD2B8\uC5B4(\uAE30\uD0C0)
+cha=\uCC28\uBAA8\uB85C\uC5B4
+chb=\uCE58\uBE0C\uCC28\uC5B4
+che=\uCCB4\uCCB8\uC5B4
+chg=\uCC28\uAC00\uD0C0\uC774\uC5B4
+chi=\uC911\uAD6D\uC5B4
+chk=\uCD94\uD06C\uC5B4
+chm=\uB9C8\uB9AC\uC5B4
+chn=\uCE58\uB204\uD06C\uC5B4\uC640 \uC601\uC5B4 \uD504\uB791\uC2A4\uC5B4\uC758 \uD63C\uC131\uC5B4
+cho=\uCD09\uD1A0\uC5B4
+chp=\uCE58\uD398\uC6B0\uC580
+chr=\uCCB4\uB85C\uD0A4 \uBB38\uC790
+chu=\uAD50\uD68C \uC2AC\uB77C\uBE0C\uC5B4
+chv=\uCD94\uBC14\uC26C\uC5B4
+chy=\uC0E4\uC774\uC5D4\uC5B4
+cmc=\uCC38\uC5B4\uAD70
+cop=\uCF65\uD2B8 \uBB38\uC790
+cor=\uCF58\uC6D4\uC5B4
+cos=\uCF54\uB974\uC2DC\uCE74\uC5B4
+cpe=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uC601\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0)
+cpf=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uD504\uB791\uC2A4\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0)
+cpp=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uD3EC\uB974\uD22C\uCE7C\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0)
+cre=\uD06C\uB9AC\uC5B4
+crh=\uD06C\uB9AC\uBBFC \uD130\uD0A4\uC5B4; \uD06C\uB9AC\uBBFC \uD0C0\uD0C0\uB974\uC5B4
+crp=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4 (\uAE30\uD0C0)
+csb=\uCE74\uC288\uBE44\uC544\uC5B4
+cus=\uCFE0\uC2DC\uC5B4\uC871
+cze=\uCCB4\uCF54\uC5B4
+dak=\uB2E4\uCF54\uD0C0\uC5B4
+dan=\uB374\uB9C8\uD06C\uC5B4
+dar=\uB2E4\uB974\uADF8\uC640\uC5B4
+day=\uB2E4\uC57C\uD06C\uC5B4
+del=\uB378\uB77C\uC6E8\uC5B4\uC5B4
+den=\uC2AC\uB77C\uBE0C\uC5B4
+dgr=\uB3C4\uADF8\uB9AC\uBE0C\uC5B4
+din=\uB529\uCE74\uC5B4
+div=\uB514\uBCA0\uD788\uC5B4
+doi=\uB3C4\uADF8\uB9AC\uC5B4
+dra=\uB4DC\uB77C\uBE44\uB2E4\uC5B4 (\uAE30\uD0C0)
+dsb=\uC800\uC9C0 \uC18C\uB974\uBE44\uC544\uC5B4
+dua=\uB4DC\uC640\uB77C\uC5B4
+dum=\uC911\uC138 \uB124\uB35C\uB780\uB4DC\uC5B4
+dut=\uB124\uB35C\uB780\uB4DC\uC5B4
+dyu=\uB4DC\uC728\uB77C\uC5B4
+dzo=\uBD80\uD0C4\uC5B4
+efi=\uC774\uD53D\uC5B4
+egy=\uC774\uC9D1\uD2B8\uC5B4 (\uACE0\uB300)
+eka=\uC774\uCE74\uC8FD\uC5B4
+elx=\uC5D8\uB78C\uC5B4
+eng=\uC601\uC5B4
+enm=\uC601\uC5B4, \uC911\uC138(1100 - 1500)
+epo=\uC5D0\uC2A4\uD398\uB780\uD1A0\uC5B4
+est=\uC5D0\uC2A4\uD1A0\uB2C8\uC544\uC5B4
+ewe=\uC5D0\uC6E8\uC5B4
+ewo=\uC774\uC6D0\uB3C4\uC5B4
+fan=\uD321\uADF8\uC5B4
+fao=\uD398\uB85C\uC2A4\uC5B4
+fat=\uD310\uD2F0\uC5B4
+fij=\uD53C\uC9C0\uC5B4
+fil=\uD544\uB9AC\uD540\uC5B4
+fin=\uD540\uB780\uB4DC\uC5B4
+fiu=\uD53C\uB178\uC6B0\uADF8\uB9AC\uC544\uC5B4(\uAE30\uD0C0)
+fon=\uD3F0\uC5B4
+fre=\uD504\uB791\uC2A4\uC5B4
+frm=\uC911\uC138 \uD504\uB791\uC2A4\uC5B4
+fro=\uACE0\uB300 \uD504\uB791\uC2A4\uC5B4
+frr=\uBD81\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4
+frs=\uB3D9\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4
+fry=\uC11C\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4
+ful=\uD480\uB77C\uB2C8\uC5B4
+fur=\uD504\uB9AC\uC6B0\uB9AC\uC548\uC5B4
+gaa=\uAC00\uC5B4
+gay=\uAC00\uC694\uC5B4
+gba=\uADF8\uBC14\uC57C\uC5B4
+gem=\uB3C5\uC77C\uC5B4(\uAE30\uD0C0)
+geo=\uADF8\uB8E8\uC9C0\uC57C\uC5B4
+ger=\uB3C5\uC77C\uC5B4
+gez=\uAC8C\uC774\uC988\uC5B4
+gil=\uD0A4\uB9AC\uBC14\uC2DC\uC5B4
+gla=\uAC8C\uC77C\uC5B4
+gle=\uC544\uC77C\uB79C\uB4DC\uC5B4
+glg=\uAC08\uB9AC\uC2DC\uC544\uC5B4
+glv=\uB9F9\uD06C\uC2A4\uC5B4
+gmh=\uC911\uC138 \uACE0\uC9C0 \uB3C5\uC77C\uC5B4
+goh=\uACE0\uB300 \uACE0\uC9C0 \uB3C5\uC77C\uC5B4
+gon=\uACE4\uB514\uC5B4
+gor=\uACE0\uB860\uD0C8\uB85C\uC5B4
+got=\uACE0\uD2B8\uC5B4
+grb=\uAC8C\uB974\uBCF4\uC5B4
+grc=\uADF8\uB9AC\uC2A4\uC5B4, \uACE0\uB300 (1453\uB144\uAE4C\uC9C0)
+gre=\uADF8\uB9AC\uC2A4\uC5B4, \uADFC\uC138(1453\uB144\uBD80\uD130)
+grn=\uAD6C\uC544\uB77C\uB2C8\uC5B4
+gsw=\uB3C5\uC77C\uC5B4(\uC2A4\uC704\uC2A4)
+guj=\uAD6C\uC790\uB77C\uD2B8\uC5B4
+gwi=\uADF8\uC704\uCE5C\uC5B4
+hai=\uD558\uC774\uB2E4\uC5B4
+hat=\uC544\uC774\uD2F0\uC5B4
+hau=\uD558\uC6B0\uC790\uC5B4
+haw=\uD558\uC640\uC774\uC5B4
+heb=\uD788\uBE0C\uB9AC \uBB38\uC790
+her=\uD5E4\uB808\uB85C\uC5B4
+hil=\uD5E4\uB9AC\uAC00\uB1EC\uC5B4
+him=\uD788\uB9C8\uCC28\uB9AC\uC5B4
+hin=\uD78C\uB514\uC5B4
+hit=\uD558\uD0C0\uC774\uD2B8\uC5B4
+hmn=\uD788\uBAB8\uC5B4
+hmo=\uD788\uB9AC\uBAA8\uD22C\uC5B4
+hrv=\uD06C\uB85C\uC544\uD2F0\uC544\uC5B4
+hsb=\uACE0\uC9C0 \uC18C\uB974\uBE44\uC544\uC5B4
+hun=\uD5DD\uAC00\uB9AC\uC5B4
+hup=\uD6C4\uD30C\uC5B4
+iba=\uC774\uBC18\uC5B4
+ibo=\uC774\uADF8\uBCF4\uC5B4
+ice=\uC544\uC774\uC2AC\uB780\uB4DC\uC5B4
+ido=\uC774\uB3C4\uC5B4
+iii=\uC4F0\uCD28 \uC774\uC5B4
+ijo=\uC774\uC870\uC5B4
+iku=\uC774\uB205\uD2F0\uD22C\uD2B8\uC5B4
+ile=\uC778\uD130\uB9C1\uAC8C\uC5B4
+ilo=\uC774\uB85C\uCF54\uC5B4
+ina=\uC778\uD130\uB9C1\uAC70(\uAD6D\uC81C \uBCF4\uC870 \uC5B8\uC5B4 \uD611\uD68C)
+inc=\uC778\uB3C4\uC5B4(\uAE30\uD0C0)
+ind=\uC778\uB3C4\uB124\uC2DC\uC544\uC5B4
+ine=\uC778\uB3C4\uC720\uB7FD\uC5B4(\uAE30\uD0C0)
+inh=\uC778\uADC0\uC2DC\uC5B4
+ipk=\uC774\uB204\uD53C\uC544\uD06C\uC5B4
+ira=\uC774\uB780\uC5B4 [ira]
+iro=\uC774\uB7EC\uCFFC\uC774\uC5B4
+ita=\uC774\uD0C8\uB9AC\uC544\uC5B4
+jav=\uC790\uBC14\uC5B4
+jbo=\uB85C\uBC18\uC5B4
+jpn=\uC77C\uBCF8\uC5B4
+jpr=\uC720\uB300-\uD398\uB974\uC2DC\uC544\uC5B4
+jrb=\uC720\uB300-\uC544\uB77C\uBE44\uC544\uC5B4
+kaa=\uCE74\uB77C\uCE7C\uD30C\uD06C\uC5B4
+kab=\uCEE4\uBC14\uC77C\uC5B4
+kac=\uCE74\uCE5C\uC5B4
+kal=\uCE7C\uB784\uB9AC\uC218\uD2B8
+kam=\uCE84\uBC14\uC5B4
+kan=\uCE78\uB098\uB2E4 \uBB38\uC790
+kar=\uCE74\uB80C\uC5B4
+kas=\uCE74\uC288\uBBF8\uB974\uC5B4
+kau=\uCE74\uB204\uB9AC\uC5B4
+kaw=\uCE74\uC704\uC5B4
+kaz=\uCE74\uC790\uD750\uC5B4
+kbd=\uCE74\uBC14\uB974\uB514\uC5B4
+kha=\uCE74\uC2DC\uC5B4
+khi=\uCF54\uC774\uC0B0\uC5B4
+khm=\uC911\uC559 \uD06C\uBA54\uB974 \uBB38\uC790
+kho=\uD638\uD0C4\uC5B4
+kik=\uD0A4\uCFE0\uC720\uC5B4
+kin=\uBC18\uD22C\uC5B4(\uB8E8\uC644\uB2E4)
+kir=\uD0A4\uB974\uAE30\uC2A4\uC5B4
+kmb=\uD0B4\uBD84\uB450\uC5B4
+kok=\uCF54\uCE74\uB2C8\uC5B4
+kom=\uCF54\uBBF8\uC5B4
+kon=\uCF69\uACE0\uC5B4
+kor=\uD55C\uAD6D\uC5B4
+kos=\uCF54\uC2A4\uB77C\uC774\uC5D4\uC5B4
+kpe=\uD06C\uD3A0\uB808\uC5B4
+krc=\uCE74\uB77C\uCC60\uC774-\uBC1C\uCE74\uB974\uC5B4
+krl=\uCE74\uB810\uB9AC\uC57C\uC5B4
+kro=\uD06C\uB8E8\uC5B4
+kru=\uCFE0\uB974\uD06C\uC5B4
+kua=\uCFE0\uC548\uC57C\uB9C8\uC5B4
+kum=\uCFE0\uBBF9\uC5B4
+kur=\uD06C\uB974\uB4DC\uC5B4
+kut=\uCFE0\uD14C\uB124\uC5B4
+lad=\uB77C\uB514\uB178\uC5B4
+lah=\uB77C\uD55C\uB2E4\uC5B4
+lam=\uB78C\uBC14\uC5B4
+lao=\uB77C\uC624\uC5B4
+lat=\uB77C\uD2F4\uC5B4
+lav=\uB77C\uD2B8\uBE44\uC544\uC5B4
+lez=\uB808\uC988\uAE30\uC548\uC5B4
+lim=\uB9BC\uBC84\uADF8\uC5B4
+lin=\uB9C1\uAC08\uB77C\uC5B4
+lit=\uB9AC\uD22C\uC544\uB2C8\uC544\uC5B4
+lol=\uBABD\uAD6C\uC5B4
+loz=\uB85C\uC9C0\uC5B4
+ltz=\uB8E9\uC148\uBD80\uB974\uD06C\uC5B4
+lua=\uB8E8\uBC14-\uB8F0\uB8E8\uC544\uC5B4
+lub=\uB8E8\uBC14\uC5B4(\uCE74\uD0D5\uAC00)
+lug=\uAC04\uB2E4\uC5B4
+lui=\uB8E8\uC774\uC138\uB178\uC5B4
+lun=\uB8EC\uB2E4\uC5B4
+luo=\uB8E8\uC624\uC5B4
+lus=\uB8E8\uC0E4\uC774\uC5B4
+mac=\uB9C8\uCF00\uB3C4\uB2C8\uC544\uC5B4
+mad=\uBAA8\uB85C\uCF54 \uB514\uB818
+mag=\uB9C8\uAC00\uD788
+mah=\uB9D0\uC0B4\uB808\uC2A4\uC5B4
+mai=\uB9C8\uC774\uD2F8\uB9AC
+mak=\uB9C8\uCE74\uC0AC\uC5B4
+mal=\uB9D0\uB77C\uC584\uB78C\uC5B4
+man=\uB9CC\uB529\uACE0\uC5B4
+mao=\uB9C8\uC624\uB9AC\uC5B4
+map=\uB0A8\uB3C4\uC5B4
+mar=\uB9C8\uB77C\uD2F0\uC5B4
+mas=\uB9C8\uC0AC\uC774\uC5B4
+may=\uB9D0\uB808\uC774\uC5B4
+mdf=\uBAA8\uD06C\uC0E4\uC5B4
+mdr=\uB9CC\uB2E4\uB974\uC5B4
+men=\uBA58\uB370\uC5B4
+mga=\uC544\uC77C\uB79C\uB4DC\uC5B4, \uC911\uC138(900 - 1200\uB144)
+mic=\uBBF8\uD06C\uB9E5\uC5B4
+min=\uBBF8\uB0AD\uCE74\uBC14\uC6B0
+mis=\uAE30\uD0C0 \uC5B8\uC5B4
+mkh=\uBAAC\uD06C\uBA54\uB974\uC5B4 (\uAE30\uD0C0)
+mlg=\uB9C8\uB2E4\uAC00\uC2A4\uCE74\uB974\uC5B4
+mlt=\uBAB0\uD0C0\uC5B4
+mnc=\uB9CC\uC8FC\uC5B4
+mni=\uB9C8\uB2C8\uD478\uB9AC\uC5B4
+mno=\uB9C8\uB178\uBCF4\uC5B4
+moh=\uBAA8\uD638\uD06C\uC5B4
+mon=\uBABD\uACE8\uC5B4
+mos=\uBAA8\uC2DC\uC5B4
+mul=\uB2E4\uC911 \uC5B8\uC5B4
+mun=\uBB38\uB2E4\uC5B4
+mus=\uD06C\uB9AC\uD06C\uC5B4
+mwl=\uBBF8\uB780\uB370\uC5B4
+mwr=\uB9C8\uB974\uC640\uB9AC\uC5B4
+myn=\uB9C8\uC57C\uC5B4
+myv=\uC5D8\uC988\uC57C\uC5B4
+nah=\uB098\uC6B0\uC544\uD2C0\uC5B4
+nai=\uBD81\uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC5B8\uC5B4 (\uAE30\uD0C0)
+nap=\uB098\uD3F4\uB9AC\uC5B4
+nau=\uB098\uC6B0\uB8E8\uC5B4
+nav=\uB098\uBC14\uD638\uC5B4
+nbl=\uB370\uBCA0\uB808\uC5B4, \uB0A8\uBD80
+nde=\uB370\uBCA0\uB808\uC5B4, \uBD81\uBD80
+ndo=\uC740\uB3D9\uAC00\uC5B4
+nds=\uC800\uC9C0 \uB3C5\uC77C\uC5B4
+nep=\uB124\uD314\uC5B4
+new=\uB124\uC640\uB974\uC5B4
+nia=\uB2C8\uC544\uC2A4\uC5B4
+nic=\uB2C8\uCE74\uB77C\uACFC \uCF54\uB974\uB3C4\uBC14
+niu=\uB2C8\uC6E8\uC5B8\uC5B4
+nno=\uB178\uB974\uC6E8\uC774\uC5B4(\uB2C8\uB178\uB974\uC2A4\uD06C)
+nob=\uB178\uB974\uC6E8\uC774\uC5B4(\uBD81\uBAB0)
+nog=\uB178\uAC00\uC774\uC5B4
+non=\uB178\uB974\uC6E8\uC774, \uACE0\uB300
+nor=\uB178\uB974\uC6E8\uC774\uC5B4
+nqo=\uC751\uCF54\uC5B4
+nso=\uC18C\uD1A0\uC5B4(\uBD81\uBD80)
+nub=\uB204\uBE44\uC548\uC5B4
+nwc=\uB124\uC640\uB974\uC5B4 (\uACE0\uC804)
+nya=\uCE58\uCCB4\uC640\uC5B4
+nym=\uB2C8\uC554\uC6E8\uC9C0\uC5B4
+nyn=\uB2C8\uC548\uCF5C\uC5B4
+nyo=\uB274\uB85C\uC5B4
+nzi=\uB290\uC9C0\uB9C8\uC5B4
+oci=\uC625\uC2DC\uD2B8\uC5B4(1500\uB144 \uC774\uD6C4)
+oji=\uC624\uC9C0\uBE0C\uC640\uC5B4
+ori=\uC624\uB9AC\uC57C\uC5B4
+orm=\uC624\uB85C\uBAA8\uC5B4
+osa=\uC624\uC138\uC774\uC9C0\uC5B4
+oss=\uC624\uC138\uD2F0\uC548\uC5B4
+ota=\uD130\uD0A4\uC5B4, \uC624\uC2A4\uB9CC(1500-1928)
+oto=\uC624\uD1A0\uBBF8\uC548\uC5B4
+paa=\uD30C\uD478\uC544\uC5B4(\uAE30\uD0C0)
+pag=\uD310\uAC00\uC2DC\uB09C\uC5B4
+pal=\uD314\uB808\uBE44\uC5B4
+pam=\uD31C\uD321\uAC00\uC5B4
+pan=\uD380\uC7A1\uC5B4
+pap=\uD30C\uD53C\uC544\uBA3C\uD1A0\uC5B4
+pau=\uD30C\uB77C\uC6B0\uC548\uC5B4
+peo=\uACE0\uB300 \uD398\uB974\uC2DC\uC544\uC5B4
+per=\uD398\uB974\uC2DC\uC544\uC5B4
+phi=\uD544\uB9AC\uD540\uC5B4(\uAE30\uD0C0)
+phn=\uD398\uB2C8\uD0A4\uC544\uC5B4
+pli=\uD314\uB9AC\uC5B4
+pol=\uD3F4\uB780\uB4DC\uC5B4
+pon=\uD3FC\uD398\uC774\uC5B4
+por=\uD3EC\uB974\uD22C\uCE7C\uC5B4
+pra=\uD504\uB77C\uD06C\uB9AC\uD2B8\uC5B4
+pro=\uACE0\uB300 \uD504\uB85C\uBC29\uC2A4\uC5B4
+pus=\uD30C\uC288\uD1A0(\uD30C\uC288\uD1A0\uC5B4)
+que=\uCF00\uCD94\uC544\uC5B4
+raj=\uB77C\uC790\uC2A4\uD0C4\uC5B4
+rap=\uB77C\uD30C\uB274\uC774
+rar=\uB77C\uB85C\uD1B5\uAC00\uC5B4
+roa=\uB85C\uB9DD\uC2A4\uC5B4(\uAE30\uD0C0)
+roh=\uB85C\uB9DD\uC288\uC5B4
+rom=\uC9D1\uC2DC\uC5B4
+rum=\uB8E8\uB9C8\uB2C8\uC544\uC5B4
+run=\uB8EC\uB514\uC5B4
+rup=\uC544\uB85C\uB9C8\uB2C8\uC544\uC5B4
+rus=\uB7EC\uC2DC\uC544\uC5B4
+sad=\uC0B0\uB2E4\uC6E8\uC5B4
+sag=\uC0B0\uACE0\uC5B4
+sah=\uC57C\uD050\uD2B8\uC5B4
+sai=\uB0A8\uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC5B8\uC5B4 (\uAE30\uD0C0)
+sal=\uC0D0\uB9AC\uC2DC\uC5B4\uC5B4
+sam=\uC0AC\uB9C8\uB9AC\uC544 \uC544\uB78D\uC5B4
+san=\uC0B0\uC2A4\uD06C\uB9AC\uD2B8\uC5B4
+sas=\uC0AC\uC0AC\uD06C\uC5B4
+sat=\uC0B0\uD0C8\uB9AC\uC5B4
+scn=\uC2DC\uCE60\uB9AC\uC544\uC5B4
+sco=\uC2A4\uCF54\uD2C0\uB79C\uB4DC\uC5B4
+sel=\uC140\uCFE0\uD504\uC5B4
+sem=\uC148\uC5B4(\uAE30\uD0C0)
+sga=\uC544\uC77C\uB79C\uB4DC, \uACE0\uB300 (900\uB144\uAE4C\uC9C0)
+sgn=\uC218\uD654
+shn=\uC0E8\uC5B4
+sid=\uC2DC\uB2E4\uBAA8\uC5B4
+sin=\uC2A4\uB9AC\uB791\uCE74\uC5B4
+sio=\uC218\uC871\uC5B4
+sit=\uC2AC\uB85C\uBCA0\uB2C8\uC544 \uD1A8\uB77C\uB974
+sla=\uC2AC\uB77C\uBE0C\uC5B4
+slo=\uC2AC\uB85C\uBC14\uD0A4\uC544\uC5B4
+slv=\uC2AC\uB85C\uBCA0\uB2C8\uC544\uC5B4
+sma=\uB0A8\uBD80 \uC0AC\uBBF8\uC5B4
+sme=\uBD81\uBD80 \uC0AC\uBBF8\uC5B4
+smi=\uC0AC\uBBF8\uC5B4 (\uAE30\uD0C0)
+smj=\uB8F0\uB808 \uC0AC\uBBF8\uC5B4
+smn=\uC774\uB098\uB9AC \uC0AC\uBBF8\uC5B4
+smo=\uC0AC\uBAA8\uC544\uC5B4
+sms=\uC2A4\uCF5C\uD2B8 \uC0AC\uBBF8\uC5B4
+sna=\uC1FC\uB098\uC5B4
+snd=\uC2E0\uB514\uC5B4
+snk=\uC18C\uB2CC\uCF00\uC5B4
+sog=\uC18C\uADF8\uB514\uC5D4\uC5B4
+som=\uC18C\uB9D0\uB9AC\uC544\uC5B4
+son=\uC1A1\uAC00\uC774\uC871\uC5B4
+sot=\uC18C\uD1A0\uC5B4, \uB0A8\uBD80
+spa=\uC2A4\uD398\uC778\uC5B4
+srd=\uC0AC\uB974\uB514\uB2C8\uC544\uC5B4
+srn=\uC2A4\uB77C\uB09C \uD1B5\uAC00\uC5B4
+srp=\uC138\uB974\uBE44\uC544\uC5B4
+srr=\uC138\uB808\uB974\uC5B4
+ssa=\uB2C8\uB85C-\uC0AC\uD558\uB78C\uC5B4 (\uAE30\uD0C0)
+ssw=\uC2DC\uC2A4\uC640\uD2F0\uC5B4
+suk=\uC218\uCFE0\uB9C8\uC871\uC5B4
+sun=\uC21C\uB2E8\uC5B4
+sus=\uC218\uC218\uC5B4
+sux=\uC218\uBA54\uB974\uC5B4
+swa=\uC2A4\uC640\uD790\uB9AC\uC5B4
+swe=\uC2A4\uC6E8\uB374\uC5B4
+syc=\uC2DC\uB9AC\uC544\uC5B4(\uACE0\uC804)
+syr=\uC2DC\uB9AC\uC544\uC5B4
+tah=\uD0C0\uD788\uD2F0\uC548\uC5B4
+tai=\uD0DC\uAD6D\uC5B4(\uAE30\uD0C0)
+tam=\uD0C0\uBC00\uC5B4
+tat=\uD0C0\uD0C0\uB974\uC5B4
+tel=\uD154\uB8E8\uAD6C\uC5B4
+tem=\uD300\uB2C8\uC5B4
+ter=\uD14C\uB808\uB178\uC5B4
+tet=\uD14C\uD23C\uC5B4
+tgk=\uD0C0\uC9C0\uD0A4\uC2A4\uD0C4\uC5B4
+tgl=\uD0C0\uAC08\uB85C\uADF8\uC5B4
+tha=\uD0DC\uAD6D\uC5B4
+tib=\uD2F0\uBCA0\uD2B8\uC5B4
+tig=\uD2F0\uADF8\uB808\uC5B4
+tir=\uD2F0\uADF8\uB9AC\uB0D0\uC5B4
+tiv=\uD2F0\uBE44\uC5B4
+tkl=\uD1A0\uCF08\uB77C\uC6B0\uC81C\uB3C4
+tlh=\uD074\uB9C1\uC628\uC5B4
+tli=\uD2C0\uB9C1\uAE43\uC871\uC5B4
+tmh=\uD0C0\uB9C8\uC139\uC5B4
+tog=\uD1B5\uAC00\uC5B4(\uB2C8\uC544\uC0B4\uB79C\uB4DC)
+ton=\uD1B5\uAC00\uC5B4(\uD1B5\uAC00 \uC12C)
+tpi=\uD1A0\uD06C \uD53C\uC2E0\uC5B4
+tsi=\uD2B8\uC2EC\uC2DC\uC548\uC5B4
+tsn=\uC138\uCE20\uC640\uB098\uC5B4
+tso=\uD1B5\uAC00\uC5B4
+tuk=\uD22C\uB974\uD06C\uBA58\uC5B4
+tum=\uD23C\uBD80\uCE74\uC5B4
+tup=\uD22C\uD53C\uC5B4
+tur=\uD130\uD0A4\uC5B4
+tut=\uC54C\uD0C0\uC774\uC81C\uC5B4 (\uAE30\uD0C0)
+tvl=\uD22C\uBC1C\uB8E8\uC5B4
+twi=\uD2B8\uC704\uC5B4
+tyv=\uD22C\uBE44\uB2C8\uC548\uC5B4
+udm=\uC6B0\uB4DC\uB9D0\uD2B8\uC5B4
+uga=\uC6B0\uAC00\uB9AC\uD2B8 \uBB38\uC790
+uig=\uC704\uAD6C\uB974\uC5B4
+ukr=\uC6B0\uD06C\uB77C\uC774\uB098\uC5B4
+umb=\uC724\uBC88\uB450\uC5B4
+und=\uACB0\uC815\uB418\uC9C0\uC54A\uC74C
+urd=\uC6B0\uB974\uB450\uC5B4
+uzb=\uC6B0\uC988\uBCA0\uD06C\uC5B4
+vai=\uBC14\uC774 \uBB38\uC790
+ven=\uBCA4\uB2E4\uC5B4
+vie=\uBCA0\uD2B8\uB0A8\uC5B4
+vol=\uBCFC\uB77C\uD4CC\uD06C\uC5B4
+vot=\uBCF4\uD2F1\uC5B4
+wak=\uC640\uCE74\uC0E8\uC5B4
+wal=\uC640\uB77C\uBAA8\uC5B4
+war=\uC640\uB77C\uC774\uC5B4
+was=\uC640\uC1FC\uC5B4
+wel=\uC6E8\uC77C\uC2A4\uC5B4
+wen=\uC18C\uB974\uBE0C\uC5B4
+wln=\uC648\uB8EC\uC5B4
+wol=\uC62C\uB85C\uD504\uC5B4
+xal=\uCE7C\uBBF8\uD06C\uC5B4
+xho=\uBC18\uD22C\uC5B4(\uB0A8\uC544\uD504\uB9AC\uCE74)
+yao=\uC57C\uC624\uC871\uC5B4
+yap=\uC58D\uD398\uC138\uC5B4
+yid=\uC774\uB514\uC2DC\uC5B4
+yor=\uC694\uB8E8\uBC14\uC5B4
+ypk=\uC57C\uD53D\uC5B4
+zap=\uC0AC\uD3EC\uD14C\uD06C\uC5B4
+zbl=\uBE14\uB9AC\uC2A4\uAE30\uD638 \uBB38\uC790
+zen=\uC81C\uB098\uAC00\uC5B4
+zha=\uC8FC\uC559\uC5B4
+znd=\uC544\uC794\uB370\uC871\uC5B4
+zul=\uC904\uB8E8\uC5B4
+zun=\uC8FC\uB2C8\uC5B4
+zxx=\uC5B8\uC5B4 \uCF58\uD150\uCE20 \uC5C6\uC74C
+zza=\uC790\uC790\uC5B4
+
+# script names
+# key is ISO 15924 script code
+
+Arab=\uC544\uB78D \uBB38\uC790
+Armi=\uC81C\uAD6D \uC544\uB78C\uC5B4
+Armn=\uC544\uB974\uBA54\uB2C8\uC544 \uBB38\uC790
+Avst=\uC544\uBCA0\uC2A4\uD0C0\uC5B4
+Bali=\uBC1C\uB9AC \uBB38\uC790
+Bamu=\uBC14\uBB44\uC5B4
+Bass=\uBC14\uC0AC\uC5B4
+Batk=\uBC14\uD0C0\uD06C \uBB38\uC790
+Beng=\uBCB5\uACE8 \uBB38\uC790
+Blis=\uBE14\uB9AC\uC2A4\uAE30\uD638 \uBB38\uC790
+Bopo=\uC8FC\uC74C\uBD80\uD638
+Brah=\uBE0C\uB77C\uBBF8
+Brai=\uBE0C\uB77C\uC720 \uC810\uC790
+Bugi=\uBD80\uAE30 \uBB38\uC790
+Buhd=\uBD80\uD788\uB4DC \uBB38\uC790
+Cakm=\uCC28\uD06C\uB9C8\uC5B4
+Cans=\uD1B5\uD569 \uCE90\uB098\uB2E4 \uD1A0\uCC29\uC5B4
+Cari=\uCE74\uB9AC \uBB38\uC790
+Cham=\uCE78 \uACE0\uC5B4
+Cher=\uCCB4\uB85C\uD0A4 \uBB38\uC790
+Cirt=\uD0A4\uB974\uC4F0
+Copt=\uCF65\uD2B8 \uBB38\uC790
+Cprt=\uD0A4\uD504\uB85C\uC2A4 \uBB38\uC790
+Cyrl=\uD0A4\uB9B4 \uBB38\uC790
+Cyrs=\uACE0\uB300\uAD50\uD68C\uC2AC\uB77C\uBE0C\uC5B4 \uD0A4\uB9B4\uBB38\uC790
+Deva=\uB370\uBC14\uB098\uAC00\uB9AC \uBB38\uC790
+Dsrt=\uB514\uC800\uB81B \uBB38\uC790
+Dupl=\uB4C0\uD50C\uB85C\uC774\uC548 \uC18D\uAE30
+Egyd=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uBBFC\uC911\uBB38\uC790
+Egyh=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uC2E0\uAD00\uBB38\uC790
+Egyp=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uC2E0\uC131\uBB38\uC790
+Elba=\uC5D8\uBC14\uC0B0\uC5B4
+Ethi=\uC5D0\uD2F0\uC624\uD53C\uC544 \uBB38\uC790
+Geok=\uCFE0\uCD94\uB9AC\uC5B4
+Geor=\uADF8\uB8E8\uC9C0\uC57C \uBB38\uC790
+Glag=\uAE00\uB77C\uACE8 \uBB38\uC790
+Goth=\uACE0\uD2B8 \uBB38\uC790
+Gran=\uADF8\uB780\uD0C0\uC5B4
+Grek=\uADF8\uB9AC\uC2A4 \uBB38\uC790
+Gujr=\uAD6C\uC790\uB77C\uD2B8 \uBB38\uC790
+Guru=\uAD6C\uB974\uBB34\uD0A4 \uBB38\uC790
+Hang=\uD55C\uAE00
+Hani=\uD55C\uC790
+Hano=\uD558\uB204\uB204 \uBB38\uC790
+Hans=\uD55C\uC790(\uAC04\uCCB4)
+Hant=\uD55C\uC790(\uBC88\uCCB4)
+Hebr=\uD788\uBE0C\uB9AC \uBB38\uC790
+Hira=\uD788\uB77C\uAC00\uB098
+Hmng=\uD30C\uD654 \uD750\uBABD
+Hrkt=\uAC00\uD0C0\uCE74\uB098/\uD788\uB77C\uAC00\uB098
+Hung=\uACE0\uB300 \uD5DD\uAC00\uB9AC \uBB38\uC790
+Inds=\uC778\uB354\uC2A4 \uBB38\uC790
+Ital=\uACE0\uB300 \uC774\uD0C8\uB9AC\uC544 \uBB38\uC790
+Java=\uC790\uBC14 \uBB38\uC790
+Jpan=\uC77C\uBCF8 \uBB38\uC790
+Kali=\uCE74\uC57C \uB9AC \uBB38\uC790
+Kana=\uAC00\uD0C0\uCE74\uB098
+Khar=\uCE74\uB85C\uC288\uD2F0 \uBB38\uC790
+Khmr=\uD06C\uBA54\uB974 \uBB38\uC790
+Knda=\uCE78\uB098\uB2E4 \uBB38\uC790
+Kore=\uD55C\uAD6D\uC5B4
+Kpel=\uD06C\uD3A0\uB808\uC5B4
+Kthi=\uCE74\uC774\uD2F0\uC5B4
+Lana=\uB780\uB098 \uBB38\uC790
+Laoo=\uB77C\uC624 \uBB38\uC790
+Latf=\uB3C5\uC77C\uC2DD \uB85C\uB9C8\uC790
+Latg=\uC544\uC77C\uB79C\uB4DC\uC2DD \uB85C\uB9C8\uC790
+Latn=\uB85C\uB9C8\uC790
+Lepc=\uB819\uCC28 \uBB38\uC790
+Limb=\uB9BC\uBD80 \uBB38\uC790
+Lina=\uC120\uD615 \uBB38\uC790 A
+Linb=\uC120\uD615 \uBB38\uC790 B
+Lisu=\uB9AC\uC218\uC5B4
+Loma=\uB85C\uB9C8\uC5B4
+Lyci=\uB9AC\uD0A4\uC544 \uBB38\uC790
+Lydi=\uB9AC\uB514\uC544 \uBB38\uC790
+Mand=\uB9CC\uB2E4\uC774\uC544 \uBB38\uC790
+Mani=\uB9C8\uB2C8\uC5B4
+Maya=\uB9C8\uC57C \uC0C1\uD615 \uBB38\uC790
+Mend=\uBA58\uB370\uC5B4
+Merc=\uBA54\uB85C\uC5D0 \uBB38\uC790 \uD758\uB9BC
+Mero=\uBA54\uB85C\uC5D0 \uBB38\uC790
+Mlym=\uB9D0\uB77C\uC584\uB78C \uBB38\uC790
+Mong=\uBABD\uACE8 \uBB38\uC790
+Moon=\uBB38\uC2DD \uC120\uBB38\uC790
+Mtei=\uBA54\uC774\uD14C\uC774\uC5B4
+Mymr=\uBBF8\uC580\uB9C8 \uBB38\uC790
+Narb=\uACE0\uB300 \uBD81\uC544\uB77C\uBE44\uC544\uC5B4
+Nbat=\uB098\uBC14\uD2F0\uC544\uC5B4
+Nkgb=\uB098\uC2DC \uAC8C\uBC14\uC5B4
+Nkoo=\uC751\uCF54\uC5B4
+Ogam=\uC624\uAC80 \uBB38\uC790
+Olck=\uC62C\uCE58\uD0A4\uC5B4
+Orkh=\uC624\uB974\uD63C\uC5B4
+Orya=\uC624\uB9AC\uC57C \uBB38\uC790
+Osma=\uC624\uC2A4\uB9C8\uB2C8\uC544 \uBB38\uC790
+Palm=\uD314\uBBF8\uB77C\uC5B4
+Perm=\uACE0\uB300 \uD398\uB984 \uBB38\uC790
+Phag=\uD30C\uC2A4\uD30C\uC5B4
+Phli=\uCD08\uAE30 \uD314\uB808\uBE44\uC5B4
+Phlp=\uC911\uAE30 \uD314\uB808\uBE44\uC5B4
+Phlv=\uD6C4\uAE30 \uD314\uB808\uBE44\uC5B4
+Phnx=\uD398\uB2C8\uD0A4\uC544\uC5B4
+Plrd=\uBA00\uC624\uC5B4
+Prti=\uD30C\uB974\uD2F0\uC544 \uBB38\uC790
+Rjng=\uB808\uC7A5\uC5B4
+Roro=\uB871\uACE0\uB871\uACE0\uC5B4
+Runr=\uB8EC \uBB38\uC790
+Samr=\uC0AC\uB9C8\uB9AC\uC544\uC5B4
+Sara=\uC0AC\uB77C\uD2F0\uC5B4
+Sarb=\uACE0\uB300 \uB0A8\uC544\uB77C\uBE44\uC544\uC5B4
+Saur=\uC0AC\uC6B0\uB77C\uC288\uD2B8\uB77C\uC5B4
+Sgnw=\uC218\uD654 \uBB38\uC790
+Shaw=\uC0E4\uBE44\uC548 \uBB38\uC790
+Sind=\uC2E0\uB514\uC5B4
+Sinh=\uC2A4\uB9AC\uB791\uCE74\uC5B4
+Sund=\uC21C\uB2E8\uC5B4
+Sylo=\uC2E4\uD5E4\uD2F0 \uB098\uAC00\uB9AC
+Syrc=\uC2DC\uB9AC\uC544 \uBB38\uC790
+Syre=\uC5D0\uC2A4\uD2B8\uB791\uAC94\uB85C\uC2DD \uC2DC\uB9AC\uC544 \uBB38\uC790
+Syrj=\uC11C\uBD80 \uC2DC\uB9AC\uC544 \uBB38\uC790
+Syrn=\uB3D9\uBD80 \uC2DC\uB9AC\uC544 \uBB38\uC790
+Tagb=\uD0C0\uADF8\uBC18\uC640 \uBB38\uC790
+Tale=\uD0C0\uC774 \uB808 \uBB38\uC790
+Talu=\uC2E0 \uD0C0\uC774 \uB8E8\uC5D0
+Taml=\uD0C0\uBC00 \uBB38\uC790
+Tavt=\uD0C0\uC774 \uBE44\uC5E3\uC5B4
+Telu=\uD154\uB8E8\uAD6C \uBB38\uC790
+Teng=\uD161\uACFC\uB974 \uBB38\uC790
+Tfng=\uD2F0\uD53C\uB098\uADF8 \uBB38\uC790
+Tglg=\uD0C0\uAC08\uB85C\uADF8 \uBB38\uC790
+Thaa=\uD0C0\uB098 \uBB38\uC790
+Thai=\uD0C0\uC774 \uBB38\uC790
+Tibt=\uD2F0\uBCA0\uD2B8 \uBB38\uC790
+Ugar=\uC6B0\uAC00\uB9AC\uD2B8 \uBB38\uC790
+Vaii=\uBC14\uC774 \uBB38\uC790
+Visp=\uC2DC\uD654 \uBB38\uC790
+Wara=\uC640\uB8FD \uC2DC\uD2F0\uC5B4
+Xpeo=\uACE0\uB300 \uD398\uB974\uC2DC\uC544 \uBB38\uC790
+Xsux=\uC218\uBA54\uB974-\uC544\uCE74\uB4DC \uC124\uD615 \uBB38\uC790
+Yiii=\uC774 \uBB38\uC790
+Zinh=\uC0C1\uC18D \uBB38\uC790
+Zmth=\uC218\uD559 \uD45C\uAE30
+Zsym=\uAE30\uD638
+Zxxx=\uC791\uC131\uB418\uC9C0 \uC54A\uC74C
+Zyyy=\uC77C\uBC18 \uBB38\uC790
+Zzzz=\uAE30\uB85D\uB418\uC9C0 \uC54A\uC740 \uBB38\uC790(\uAD6C\uC804)
+
# country names
# key is ISO 3166 country code
@@ -472,3 +1109,37 @@
ZA=\ub0a8\uc544\ud504\ub9ac\uce74
ZM=\uc7a0\ube44\uc544
ZW=\uc9d0\ubc14\ube0c\uc6e8
+
+# territory names
+# key is UN M.49 country and area code
+
+001=\uC138\uACC4
+002=\uC544\uD504\uB9AC\uCE74
+003=\uBD81\uC544\uBA54\uB9AC\uCE74
+005=\uB0A8\uC544\uBA54\uB9AC\uCE74[\uB0A8\uBBF8]
+009=\uC624\uC138\uC544\uB2C8\uC544, \uB300\uC591\uC8FC
+011=\uC11C\uC544\uD504\uB9AC\uCE74
+013=\uC911\uC559 \uC544\uBA54\uB9AC\uCE74
+014=\uB3D9\uBD80 \uC544\uD504\uB9AC\uCE74
+015=\uBD81\uBD80 \uC544\uD504\uB9AC\uCE74
+017=\uC911\uBD80 \uC544\uD504\uB9AC\uCE74
+018=\uB0A8\uBD80 \uC544\uD504\uB9AC\uCE74
+019=\uC544\uBA54\uB9AC\uCE74 \uB300\uB959
+021=\uBD81\uBD80 \uC544\uBA54\uB9AC\uCE74
+029=\uCE74\uB9AC\uBE0C \uD574 \uC81C\uB3C4
+030=\uB3D9\uC544\uC2DC\uC544
+034=\uB0A8\uC544\uC2DC\uC544
+035=\uB3D9\uB0A8 \uC544\uC2DC\uC544
+039=\uB0A8\uC720\uB7FD
+053=\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544\uC640 \uB274\uC9C8\uB79C\uB4DC
+054=\uBA5C\uB77C\uB124\uC2DC\uC544
+057=\uB9C8\uC774\uD06C\uB85C\uB124\uC2DC\uC544 \uC9C0\uC5ED
+061=\uD3F4\uB9AC\uB124\uC2DC\uC544
+142=\uC544\uC2DC\uC544
+143=\uC911\uC559 \uC544\uC2DC\uC544
+145=\uC11C\uC544\uC2DC\uC544
+150=\uC720\uB7FD
+151=\uB3D9\uC720\uB7FD
+154=\uBD81\uC720\uB7FD
+155=\uC11C\uC720\uB7FD
+419=\uB77C\uD2F4 \uC544\uBA54\uB9AC\uCE74 \uBC0F \uCE74\uB9AC\uBE0C \uD574 \uC81C\uB3C4
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,6 +227,643 @@
zh=kinesiska
zu=zulu
+# key is ISO 639.2 language code
+aar=Afar
+abk=Abchasiska
+ace=Acehnesiska
+ach=Acoli
+ada=Adangme
+ady=Adygeiska
+afa=Afroasiatiskt spr\u00E5k
+afh=Afrihili
+afr=Afrikaans
+ain=Ainu
+aka=Akan
+akk=Akkadiska
+alb=Albanska
+ale=Aleutiska
+alg=Algonkinska
+alt=Sydaltaiska
+amh=Amhariska
+ang=Fornengelska (ca.450-1100)
+anp=Angika
+apa=Apache
+ara=Arabiska
+arc=Officiell arameiska (700-300 f.Kr.)
+arg=Aragonsk spanska
+arm=Armeniska
+arn=Mapudungun
+arp=Arapaho
+art=Artificiellt
+arw=Arawakiska
+asm=Assamesiska
+ast=Asturiska
+ath=Athabaskiska
+aus=Australiska
+ava=Avariskt spr\u00E5k
+ave=Avestiska
+awa=Awadhi
+aym=Aymara
+aze=Azerbajdzjanska
+bad=Banda
+bai=Bamileke
+bak=Basjkiriska
+bal=Baluchi
+bam=Bambara
+ban=Balinesiska
+baq=Baskiska
+bas=Basa
+bat=Baltiskt spr\u00E5k
+bej=Beyja
+bel=Vitryska
+bem=Bemba
+ben=Bengali
+ber=Berberspr\u00E5k
+bho=Bhojpuri
+bih=Bihari
+bik=Bikol
+bin=(Edo) Bini
+bis=Bislama
+bla=Svartfotindianernas spr\u00E5k (Siksika)
+bnt=Bantuspr\u00E5k
+bos=Bosniska
+bra=Braj
+bre=Bretonska
+btk=Batak
+bua=Burjatiska
+bug=Buginesiska
+bul=Bulgariska
+bur=Burmesiska
+byn=Blin
+cad=Caddo
+cai=Centralamerikanskt indianspr\u00E5k
+car=Galibi Carib
+cat=Katalanska
+cau=Kaukasiskt spr\u00E5k
+ceb=Cebuano
+cel=Keltiskt spr\u00E5k
+cha=Chamorro
+chb=Chibcha
+che=Tjetjenska
+chg=Chagatai
+chi=Kinesiska
+chk=Truk
+chm=Mari (Tjeremissiska)
+chn=Chinook
+cho=Choctaw
+chp=Chopi
+chr=Cherokesiska
+chu=Kyrkoslaviska
+chv=Tjuvasjiska
+chy=Cheyenne
+cmc=Chamic
+cop=Koptiska
+cor=Korniska
+cos=Korsikanska
+cpe=Kreol-/Pidginspr\u00E5k, engelskbaserade
+cpf=Kreol-/Pidginspr\u00E5k, franskbaserade
+cpp=Kreol-/Pidginspr\u00E5k, portugisiskbaserade
+cre=Cree
+crh=Krimtatariska
+crp=Kreol-/Pidginspr\u00E5k
+csb=Kashubiska
+cus=Kusjitiskt spr\u00E5k
+cze=Tjeckiska
+dak=Dakota
+dan=Danska
+dar=Darginska
+day=Land Dayak
+del=Delaware
+den=Slave (Athapaskiska)
+dgr=Dogrib
+din=Dinka
+div=Divehi
+doi=Dogri
+dra=Dravidiskt spr\u00E5k
+dsb=L\u00E5gsorbiska
+dua=Duala
+dum=Medelnederl\u00E4ndska (ca.1050-1350)
+dut=Nederl\u00E4ndska
+dyu=Dyula
+dzo=Bhutanesiska (Dzongkha)
+efi=Efik
+egy=Fornegyptiska
+eka=Ekajuk
+elx=Elamitiska
+eng=Engelska
+enm=Medelengelska (1100-1500)
+epo=Esperanto
+est=Estniska
+ewe=Ewe
+ewo=Ewondo
+fan=Fang
+fao=F\u00E4r\u00F6iska
+fat=Fanti
+fij=Fidjianska
+fil=Filipino
+fin=Finska
+fiu=Finsk-ugriskt spr\u00E5k
+fon=Fon
+fre=Franska
+frm=Medelfranska (ca.1400-1600)
+fro=Fornfranska (842-ca.1400)
+frr=Nordfrisiska
+frs=\u00D6stfrisiska
+fry=V\u00E4stfrisiska
+ful=Fulani
+fur=Friuliska
+gaa=Ga
+gay=Gayo
+gba=Gbaya
+gem=Germanska
+geo=Georgiska
+ger=Tyska
+gez=Geez
+gil=Gilbertesiska
+gla=Gaeliska
+gle=Iriska
+glg=Galiciska
+glv=Manx
+gmh=Medelh\u00F6gtyska (ca.1050-1500)
+goh=Fornh\u00F6gtyska (ca.750-1050)
+gon=Gondi
+gor=Gorontalo
+got=Gotiska
+grb=Grebo
+grc=Grekiska, klassisk (-1453)
+gre=Nygrekiska (1453-)
+grn=Guarani
+gsw=Schweizertyska
+guj=Gujarati
+gwi=Gwichin
+hai=Haida
+hat=Haitiska
+hau=Haussa
+haw=Hawaiian
+heb=Hebreiska
+her=Herero
+hil=Hiligaynon
+him=Pahari (Himachali)
+hin=Hindi
+hit=Hettitiskt spr\u00E5k
+hmn=Hmongspr\u00E5k
+hmo=Hirimotu
+hrv=Kroatiska
+hsb=H\u00F6gsorbiska
+hun=Ungerska
+hup=Hupa
+iba=Iban
+ibo=Ibo (Igbo)
+ice=Isl\u00E4ndska
+ido=Ido
+iii=Sichuan Yi
+ijo=Ijo
+iku=Inuktitut
+ile=Interlingue
+ilo=Iloko
+ina=Interlingua (International Auxiliary Language Association)
+inc=Indo-ariskt spr\u00E5k
+ind=Indonesiska
+ine=Indoeuropeiskt spr\u00E5k
+inh=Ingusj
+ipk=Inupiaq
+ira=Iranska
+iro=Irokesiska spr\u00E5k
+ita=Italienska
+jav=Javanesiska
+jbo=Lojban
+jpn=Japanska
+jpr=Judepersiska
+jrb=Judearabiska
+kaa=Karakalpakiska
+kab=Kabyliska
+kac=Kachin
+kal=Kalaallisut
+kam=Kamba
+kan=Kannada
+kar=Karen
+kas=Kashmiri
+kau=Kanuri
+kaw=Fornjavanska (Kawi)
+kaz=Kazakiska
+kbd=Kabardinska (\u00D6sttjerkessiska)
+kha=Khasi
+khi=Khoisanspr\u00E5k
+khm=Central-Khmer
+kho=Sakiska (Khotanesiska)
+kik=Kikuyu
+kin=Rwanda
+kir=Kirgisiska
+kmb=Mbundu (Kimbundu)
+kok=Konkani
+kom=Komi
+kon=Kikongo
+kor=Koreanska
+kos=Kusaie
+kpe=Kpelle
+krc=Karachay-Balkar
+krl=Karelska
+kro=Kru-spr\u00E5k
+kru=Kurukh
+kua=Ovambo
+kum=Kumyk
+kur=Kurdiska
+kut=Kutenai
+lad=Ladino
+lah=Lahnda
+lam=Lamba
+lao=Laotiska
+lat=Latin
+lav=Lettiska
+lez=Lezginska
+lim=Limburgisch
+lin=Lingala
+lit=Litauiska
+lol=Lolo (Mongo)
+loz=Lozi
+ltz=Luxemburgiska
+lua=Luba-Lulua
+lub=Luba-Katanga
+lug=Luganda
+lui=Luiseno
+lun=Lunda
+luo=Luo (Kenya och Tanzania)
+lus=Lushai
+mac=Makedonska
+mad=Madurese
+mag=Magahi
+mah=Marshallesiska
+mai=Maithili
+mak=Makasar
+mal=Malayalam
+man=Mande
+mao=Maori
+map=Austronesiskt spr\u00E5k
+mar=Marathi
+mas=Massajiska
+may=Malajiska
+mdf=Moksja
+mdr=Mandar
+men=Mende
+mga=Medeliriska (900-1200)
+mic=Mi'kmaq
+min=Minangkabau
+mis=Okodat
+mkh=Mon-khmerspr\u00E5k
+mlg=Malagassiska
+mlt=Maltesiska
+mnc=Manchu
+mni=Manipuri
+mno=Manobo
+moh=Mohawk
+mon=Mongoliska
+mos=Mossi
+mul=Flera
+mun=Munda
+mus=Muskogee
+mwl=Mirandesiska
+mwr=Marwari
+myn=Maya-spr\u00E5k
+myv=Erzya
+nah=Nahuatl
+nai=Nordamerikanskt indianspr\u00E5k
+nap=Neapolitansk italienska
+nau=Nauru
+nav=Navajo
+nbl=Ndebele (syd)
+nde=Ndebele (nord)
+ndo=Ndonga
+nds=L\u00E5gtyska
+nep=Nepali
+new=Newari
+nia=Nias
+nic=Niger-/Kongospr\u00E5k
+niu=Niuiska
+nno=Norska (Nynorska)
+nob=Bokm\u00E5l, norska
+nog=Nogaiska
+non=Fornisl\u00E4ndska
+nor=Norska
+nqo=N'Ko
+nso=Pedi
+nub=Nubiska
+nwc=Klassisk newari
+nya=Chichewa
+nym=Nyamwezi
+nyn=Nyankole
+nyo=Nyoro
+nzi=Nzima
+oci=Occitanska (efter 1500)
+oji=Odjibwa (Chippewa)
+ori=Oriya
+orm=Oromo
+osa=Osage
+oss=Ossetiska
+ota=Ottomanska (1500-1928)
+oto=Otomi
+paa=Papuanskt spr\u00E5k
+pag=Pangasinan
+pal=Pahlavi (Medelpersiska)
+pam=Pampanga
+pan=Panjabi
+pap=Papiamento
+pau=Palauan
+peo=Fornpersiska (ca.600-400 fK)
+per=Persiska
+phi=Filippinska
+phn=Feniciska
+pli=Pali
+pol=Polska
+pon=Pohnpeiska
+por=Portugisiska
+pra=Prakrit
+pro=Fornprovensalska (-1500)
+pus=Pashto
+que=Quechua
+raj=Rajasthani
+rap=Rapanui
+rar=Rarotongan
+roa=Romanska
+roh=R\u00E4toromanska
+rom=Romani
+rum=Rum\u00E4nska
+run=Rundi
+rup=Arumanska
+rus=Ryska
+sad=Sandawe
+sag=Sango
+sah=Jakutiska
+sai=Sydamerikanskt indianspr\u00E5k
+sal=Saliska
+sam=Samaritanska
+san=Sanskrit
+sas=Sasak
+sat=Santali
+scn=Sicilianska
+sco=Skotsk gaeliska
+sel=Selkup
+sem=Semitiskt spr\u00E5k
+sga=Forniriska (-900)
+sgn=Teckenspr\u00E5k
+shn=Shan
+sid=Sidami
+sin=Singalesiska
+sio=Sioux-spr\u00E5k
+sit=Sino-tibetanskt spr\u00E5k
+sla=Slaviskt spr\u00E5k
+slo=Slovakiska
+slv=Slovenska
+sma=Sydsamiska
+sme=Nordsamiska
+smi=Samiska
+smj=Lulesamiska
+smn=Enaresamiska
+smo=Samoanska
+sms=Skoltsamiska
+sna=Shona
+snd=Sindhi
+snk=Soninke
+sog=Sogdiska
+som=Somaliska
+son=Songhai
+sot=Sotho, syd-
+spa=Spanska
+srd=Sardiska
+srn=Sranan tongo
+srp=Serbiska
+srr=Serer
+ssa=Nilo-sahariskt spr\u00E5k
+ssw=Swazi
+suk=Sukuma
+sun=Sundanesiska
+sus=Susu
+sux=Sumeriska
+swa=Swahili
+swe=Svenska
+syc=Klassisk syriska
+syr=Syriska
+tah=Tahitiska
+tai=Thaispr\u00E5k
+tam=Tamil
+tat=Tatariska
+tel=Telugo
+tem=Temne
+ter=Tereno
+tet=Tetum
+tgk=Tadzjikiska
+tgl=Tagalog
+tha=Thail\u00E4ndska
+tib=Tibetanska
+tig=Tigr\u00E9
+tir=Tigrinja
+tiv=Tivi
+tkl=Tokelau\u00F6arna
+tlh=Klingon
+tli=Tlingit
+tmh=Tamashek
+tog=Tonga (Nyasa)
+ton=Tonga (Tonga\u00F6arna)
+tpi=Tok Pisin
+tsi=Tsimshian
+tsn=Tswana
+tso=Tsonga
+tuk=Turkmeniska
+tum=Tumbuka
+tup=Tupi
+tur=Turkiska
+tut=Altaiskt spr\u00E5k
+tvl=Tuvalu
+twi=Twi
+tyv=Tuvinska
+udm=Udmurtiska (Votjakiska)
+uga=Ugaritiska
+uig=Uiguriska
+ukr=Ukrainska
+umb=Umbundu
+und=Obest\u00E4md
+urd=Urdu
+uzb=Uzbekiska
+vai=Vai
+ven=Venda
+vie=Vietnamesiska
+vol=Volap\u00FCk
+vot=Votiska
+wak=Wakusjiska
+wal=Wolaitta
+war=Waray
+was=Washo
+wel=Kymriska
+wen=Sorbiska
+wln=Vallonska
+wol=Wolof
+xal=Kalmuckiska
+xho=Xhosa
+yao=Yao
+yap=Yap
+yid=Jiddisch
+yor=Yoruba
+ypk=Yupik
+zap=Zapotek
+zbl=Blissymboler
+zen=Zenaga
+zha=Zhuang
+znd=Zande
+zul=Zulu
+zun=Zuni
+zxx=Icke-spr\u00E5kligt medium
+zza=Zaza
+
+# script names
+# key is ISO 15924 script code
+
+Arab=Arabiska
+Armi=Riksarameiska
+Armn=Armeniska
+Avst=Avestiska
+Bali=Balinesiska
+Bamu=Bamum
+Bass=Bassa vah
+Batk=Batak
+Beng=Bengali
+Blis=Blissymboler
+Bopo=Bopomofo
+Brah=Brahmi
+Brai=Braille-skrift
+Bugi=Buginesiska
+Buhd=Buhid
+Cakm=Chakma
+Cans=Unified Canadian Aboriginal Syllabics
+Cari=Kariska
+Cham=Cham
+Cher=Cherokesiska
+Cirt=Cirth
+Copt=Koptiska
+Cprt=Cypriotiska
+Cyrl=Kyrilliska
+Cyrs=Fornkyrkoslaviska
+Deva=Devanagari
+Dsrt=Deseret
+Dupl=Duployan-stenografi
+Egyd=Egyptisk demotisk
+Egyh=Egyptisk hieratisk
+Egyp=Egyptiska hieroglyfer
+Elba=Elbasiska
+Ethi=Etiopiska
+Geok=Khutsuri
+Geor=Georgiska
+Glag=Glagolitiska
+Goth=Gotiska
+Gran=Grantha
+Grek=Grekiska
+Gujr=Gujarati
+Guru=Gurmukhi
+Hang=Hangul
+Hani=Han
+Hano=Hanunoo
+Hans=F\u00F6renklad han
+Hant=Traditionell han
+Hebr=Hebreiska
+Hira=Hiragana
+Hmng=Pahawh hmong
+Hrkt=Katakana eller hiragana
+Hung=Ungerska runor
+Inds=Indusskrift
+Ital=Etruskiska
+Java=Javanesiska
+Jpan=Japanska
+Kali=Kayah Li
+Kana=Katakana
+Khar=Kharoshthi
+Khmr=Kambodjanska (Khmer)
+Knda=Kannada
+Kore=Koreanska
+Kpel=Kpelle
+Kthi=Kaithi
+Lana=Tai tham
+Laoo=Laotiska
+Latf=Frakturlatin
+Latg=Gaelisk latin
+Latn=Latin
+Lepc=Lepcha
+Limb=Limbu
+Lina=Linear A
+Linb=Linear B
+Lisu=Lisu
+Loma=Loma
+Lyci=Lykiska
+Lydi=Lydiska
+Mand=Mandeiska
+Mani=Manikeiska
+Maya=Mayaskrift
+Mend=Mende
+Merc=Meroitisk skrift
+Mero=Meroitisk
+Mlym=Malayalam
+Mong=Mongoliska
+Moon=M\u00E5nspr\u00E5k
+Mtei=Meitei mayek
+Mymr=Myanmar
+Narb=Nordlig fornarabiska
+Nbat=Nabataeiska
+Nkgb=Nakhi geba
+Nkoo=N'Ko
+Ogam=Ogham
+Olck=Ol chiki
+Orkh=Orkhon
+Orya=Oriya
+Osma=Osmanya
+Palm=Palmyreniska
+Perm=Fornpermiska
+Phag=Phags-pa
+Phli=Pahlavi (Medelpersiska)
+Phlp=Psalter pahlavi
+Phlv=Bok-pahlavi
+Phnx=Feniciska
+Plrd=Miao
+Prti=Partiska
+Rjng=Rejang
+Roro=Rongorongo
+Runr=Runor
+Samr=Samaritanska
+Sara=Sarati
+Sarb=Sydlig fornarabiska
+Saur=Saurashtra
+Sgnw=Teckenskrift
+Shaw=Shavian
+Sind=Sindhi
+Sinh=Singalesiska
+Sund=Sundanesiska
+Sylo=Syloti nagri
+Syrc=Syriska
+Syre=Estrangelo-syriska
+Syrj=V\u00E4stsyriska
+Syrn=\u00D6stsyriska
+Tagb=Tagbanwa
+Tale=Tai le
+Talu=Ny tai l\u00FC
+Taml=Tamil
+Tavt=Tai viet
+Telu=Telugo
+Teng=Tengwar
+Tfng=Tifinagh
+Tglg=Tagalog
+Thaa=Thaana
+Thai=Thail\u00E4ndska
+Tibt=Tibetanska
+Ugar=Ugaritiska
+Vaii=Vai
+Visp=Visible speech
+Wara=Varang kshiti
+Xpeo=Fornpersiska
+Xsux=Sumerisk-akkadisk kilskrift
+Yiii=Yi
+Zinh=\u00C4rvd skrift
+Zmth=Matematisk notation
+Zsym=Symboler
+Zxxx=Oskrivna
+Zyyy=Inte fastst\u00E4lld skrift
+Zzzz=Okodad skrift
+
# country names
# key is ISO 3166 country code
@@ -472,3 +1109,37 @@
ZA=Sydafrika
ZM=Zambia
ZW=Zimbabwe
+
+# territory names
+# key is UN M.49 country and area code
+
+001=V\u00E4rlden
+002=Afrika
+003=Nordamerika
+005=Sydamerika
+009=Oceanien
+011=V\u00E4stafrika
+013=Centralamerika
+014=\u00D6stafrika
+015=Nordafrika
+017=Mellanafrika
+018=S\u00F6dra Afrika
+019=Nord-/Sydamerika
+021=Norra Amerika
+029=Karibiska \u00F6v\u00E4rlden
+030=\u00D6stra Asien
+034=S\u00F6dra Asien
+035=Syd\u00F6stra Asien
+039=S\u00F6dra Europa
+053=Australien och Nya Zeeland
+054=Melanesien
+057=Mikronesiska regionen
+061=Polynesien
+142=Asien
+143=Centralasien
+145=V\u00E4stra Asien
+150=Europa
+151=\u00D6stra Europa
+154=Norra Europa
+155=V\u00E4stra Europa
+419=Latinamerika och Karibien
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,11 +227,642 @@
zh=\u4e2d\u6587
zu=\u7956\u9c81\u6587
+# key is ISO 639.2 language code
+aar=\u963F\u6CD5\u5C14\u6587
+abk=\u963F\u5E03\u54C8\u897F\u4E9A\u6587
+ace=\u4E9A\u9F50\u6587
+ach=\u963F\u4E54\u5229\u6587
+ada=\u963F\u5F53\u6885\u6587
+ady=\u963F\u8FEA\u4F55\u6587
+afa=\u4E9A\u975E\u8BF8\u8BED\u8A00
+afh=\u963F\u5F17\u91CC\u5E0C\u5229\u6587
+afr=\u5357\u975E\u8377\u5170\u6587
+ain=\u963F\u4F0A\u52AA\u6587
+aka=\u5E93\u963F\u6587
+akk=\u963F\u5361\u5FB7\u6587
+alb=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u6587
+ale=\u963F\u7559\u7533\u6587
+alg=\u5176\u4ED6\u963F\u5C14\u8D21\u8BED\u7CFB
+alt=\u5357\u963F\u5C14\u6CF0\u6587
+amh=\u963F\u59C6\u54C8\u62C9\u6587
+ang=\u53E4\u82F1\u6587
+anp=\u6602\u52A0\u8BED
+apa=\u963F\u5E15\u5207\u6587
+ara=\u963F\u62C9\u4F2F\u6587
+arc=\u963F\u62C9\u7C73\u6587
+arg=\u963F\u62C9\u8D21\u6587
+arm=\u4E9A\u7F8E\u5C3C\u4E9A\u6587
+arn=\u9A6C\u666E\u5207\u6587
+arp=\u963F\u62C9\u5E15\u970D\u6587
+art=\u5176\u4ED6\u4EBA\u5DE5\u8BED\u7CFB
+arw=\u963F\u62C9\u74E6\u514B\u6587
+asm=\u963F\u8428\u59C6\u6587
+ast=\u963F\u65AF\u56FE\u91CC\u4E9A\u601D\u7279\u6587
+ath=\u963F\u8428\u5E15\u65AF\u574E\u8BED\u7CFB
+aus=\u6FB3\u5927\u5229\u4E9A\u8BED\u7CFB
+ava=\u963F\u74E6\u5C14\u6587
+ave=\u963F\u7EF4\u65AF\u9640\u6587
+awa=\u963F\u74E6\u4E54\u6587
+aym=\u827E\u9A6C\u62C9\u6587
+aze=\u963F\u585E\u62DC\u7586\u6587
+bad=\u73ED\u8FBE\u6587
+bai=\u5DF4\u7C73\u7D2F\u514B\u8BED\u7CFB
+bak=\u5DF4\u4EC0\u5BA2\u5C14\u6587
+bal=\u4FFE\u8DEF\u652F\u6587
+bam=\u73ED\u5DF4\u62C9\u6587
+ban=\u5DF4\u5398\u8BED
+baq=\u5DF4\u65AF\u514B\u6587
+bas=\u5DF4\u8428\u6587
+bat=\u5176\u4ED6\u6CE2\u7F57\u7684\u8BED\u7CFB
+bej=\u522B\u672D\u6587
+bel=\u767D\u4FC4\u7F57\u65AF\u6587
+bem=\u522B\u59C6\u5DF4\u6587
+ben=\u5B5F\u52A0\u62C9\u6587
+ber=\u67CF\u67CF\u5C14\u6587
+bho=\u535A\u6770\u666E\u5C14\u6587
+bih=\u6BD4\u54C8\u5C14\u6587
+bik=\u6BD5\u5E93\u5C14\u6587
+bin=\u6BD4\u5C3C\u6587
+bis=\u6BD4\u65AF\u62C9\u9A6C\u6587
+bla=\u53F8\u514B\u53F8\u5361\u6587
+bnt=\u73ED\u56FE\u6587
+bos=\u6CE2\u65AF\u5C3C\u4E9A\u6587
+bra=\u5E03\u62C9\u6770\u6587
+bre=\u5E03\u91CC\u591A\u5C3C\u6587
+btk=\u5DF4\u5854\u514B\u8BED
+bua=\u5E03\u91CC\u4E9A\u7279\u6587
+bug=\u5E03\u5409\u8BED
+bul=\u4FDD\u52A0\u5229\u4E9A\u6587
+bur=\u7F05\u7538\u6587
+byn=\u5E03\u6797\u6587
+cad=\u5361\u591A\u6587
+cai=\u5176\u4ED6\u4E2D\u7F8E\u5370\u7B2C\u5B89\u8BED\u7CFB
+car=\u5DF4\u52D2\u6BD4\u6587
+cat=\u52A0\u6CF0\u7F57\u5C3C\u4E9A\u6587
+cau=\u5176\u4ED6\u9AD8\u52A0\u7D22\u8BED\u7CFB
+ceb=\u5BBF\u52A1\u6587
+cel=\u5176\u4ED6\u51EF\u5C14\u7279\u8BED\u7CFB
+cha=\u67E5\u83AB\u7F57\u6587
+chb=\u5951\u5E03\u5361\u6587
+che=\u8F66\u81E3\u6587
+chg=\u67E5\u52A0\u6587
+chi=\u4E2D\u6587
+chk=\u695A\u543E\u514B\u6587
+chm=\u9A6C\u91CC\u6587
+chn=\u5951\u52AA\u514B\u6587
+cho=\u4E54\u514B\u6258\u6587
+chp=\u4F69\u74E6\u626C\u6587
+chr=\u5F7B\u7F57\u57FA\u6587
+chu=\u6559\u4F1A\u65AF\u62C9\u592B\u6587
+chv=\u695A\u74E6\u4EC0\u6587
+chy=\u590F\u5EF6\u6587
+cmc=\u67E5\u7C73\u514B\u6587
+cop=\u79D1\u666E\u7279\u6587
+cor=\u5EB7\u6C83\u5C14\u6587
+cos=\u79D1\u897F\u5609\u6587
+cpe=\u5176\u4ED6\u4EE5\u82F1\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB
+cpf=\u5176\u4ED6\u4EE5\u6CD5\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB
+cpp=\u5176\u4ED6\u4EE5\u8461\u8404\u7259\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB
+cre=\u514B\u91CC\u6587
+crh=\u514B\u91CC\u7C73\u4E9A\u5854\u5854\u6587
+crp=\u5176\u4ED6\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB
+csb=\u5361\u8212\u6587
+cus=\u5176\u4ED6\u5E93\u65BD\u7279\u8BED\u7CFB
+cze=\u6377\u514B\u6587
+dak=\u8FBE\u79D1\u4ED6\u6587
+dan=\u4E39\u9EA6\u6587
+dar=\u8FBE\u5C14\u683C\u74E6\u6587
+day=\u8FBE\u96C5\u514B\u6587
+del=\u7279\u62C9\u534E\u6587
+den=\u53F8\u96F7\u592B\u6587 (\u963F\u8428\u5E15\u65AF\u574E\u8BF8\u8BED\u8A00)
+dgr=\u591A\u683C\u91CC\u5E03\u6587
+din=\u4E01\u5361\u6587
+div=\u8FEA\u7EF4\u5E0C\u6587
+doi=\u591A\u683C\u62C9\u6587
+dra=\u5176\u4ED6\u5FB7\u62C9\u7EF4\u8BED\u7CFB
+dsb=\u4E0B\u7D22\u5E03\u6587
+dua=\u90FD\u963F\u62C9\u6587
+dum=\u4E2D\u53E4\u8377\u5170\u6587
+dut=\u8377\u5170\u6587
+dyu=\u8FEA\u5C24\u62C9\u6587
+dzo=\u4E0D\u4E39\u6587
+efi=\u57C3\u83F2\u514B\u6587
+egy=\u53E4\u57C3\u53CA\u6587
+eka=\u57C3\u514B\u4E18\u514B\u6587
+elx=\u827E\u62C9\u7C73\u7279\u6587
+eng=\u82F1\u6587
+enm=\u4E2D\u53E4\u82F1\u6587
+epo=\u4E16\u754C\u6587
+est=\u7231\u6C99\u5C3C\u4E9A\u6587
+ewe=\u57C3\u7EF4\u6587
+ewo=\u65FA\u675C\u6587
+fan=\u82B3\u683C\u6587
+fao=\u6CD5\u7F57\u6587
+fat=\u82B3\u8482\u6587
+fij=\u6590\u6D4E\u6587
+fil=\u83F2\u5F8B\u5BBE\u6587
+fin=\u82AC\u5170\u6587
+fiu=\u5176\u4ED6\u82AC\u5170\u4E4C\u6208\u5C14\u8BED\u7CFB
+fon=\u4E30\u6587
+fre=\u6CD5\u6587
+frm=\u4E2D\u53E4\u6CD5\u6587
+fro=\u53E4\u6CD5\u6587
+frr=\u5317\u5F17\u91CC\u897F\u4E9A\u8BED
+frs=\u4E1C\u5F17\u91CC\u897F\u4E9A\u6587
+fry=\u897F\u5F17\u91CC\u65AF\u5170\u8BED
+ful=\u5BCC\u62C9\u6587
+fur=\u5F17\u7559\u5229\u6587
+gaa=\u52A0\u6587
+gay=\u8FE6\u7EA6\u6587
+gba=\u845B\u5DF4\u4E9A\u6587
+gem=\u5176\u4ED6\u65E5\u5C14\u66FC\u8BED\u7CFB
+geo=\u683C\u9C81\u5409\u4E9A\u6587
+ger=\u5FB7\u6587
+gez=\u5409\u5179\u6587
+gil=\u5409\u5C14\u4F2F\u7279\u65AF\u6587
+gla=\u76D6\u5C14\u8BED
+gle=\u7231\u5C14\u5170\u6587
+glg=\u52A0\u5229\u897F\u4E9A\u6587
+glv=\u9A6C\u6069\u6587
+gmh=\u4E2D\u53E4\u9AD8\u5730\u5FB7\u6587
+goh=\u53E4\u9AD8\u5730\u5FB7\u6587
+gon=\u5C97\u5FB7\u6587
+gor=\u79D1\u6D1B\u6D85\u8FBE\u7F57\u6587
+got=\u54E5\u7279\u6587
+grb=\u683C\u5217\u535A\u6587
+grc=\u53E4\u5E0C\u814A\u6587
+gre=\u5E0C\u814A\u8BED, \u73B0\u4EE3 (1453-)
+grn=\u74DC\u62C9\u5C3C\u6587
+gsw=\u745E\u58EB\u5FB7\u6587
+guj=\u53E4\u52A0\u62C9\u63D0\u6587
+gwi=\u5409\u7EF4\u514B\u7434\u6587
+hai=\u6D77\u8FBE\u6587
+hat=\u6D77\u5730\u6587
+hau=\u8C6A\u6492\u6587
+haw=\u590F\u5A01\u5937\u6587
+heb=\u5E0C\u4F2F\u6765\u6587
+her=\u8D6B\u96F7\u7F57\u6587
+hil=\u5E0C\u5229\u76D6\u519C\u6587
+him=\u8D6B\u9A6C\u67E5\u5229\u6587
+hin=\u5370\u5730\u6587
+hit=\u8D6B\u68AF\u6587
+hmn=\u8D6B\u8499\u6587
+hmo=\u65B0\u91CC\u6728\u6258\u6587
+hrv=\u514B\u7F57\u5730\u4E9A\u6587
+hsb=\u4E0A\u7D22\u5E03\u6587
+hun=\u5308\u7259\u5229\u6587
+hup=\u80E1\u5E15\u6587
+iba=\u4F0A\u73ED\u6587
+ibo=\u4F0A\u535A\u6587
+ice=\u51B0\u5C9B\u6587
+ido=\u4F0A\u591A\u6587
+iii=\u56DB\u5DDD\u5F5D\u6587
+ijo=\u4F0A\u4E54\u6587
+iku=\u7231\u65AF\u57FA\u6469\u6587
+ile=\u62C9\u4E01\u56FD\u9645\u6587
+ilo=\u4F0A\u6D1B\u5E72\u8BFA\u6587
+ina=\u62C9\u4E01\u56FD\u9645\u8BED (\u56FD\u9645\u8F85\u52A9\u8BED\u8054\u76DF)
+inc=\u5176\u4ED6\u5370\u5EA6\u8BED\u7CFB
+ind=\u5370\u5EA6\u5C3C\u897F\u4E9A\u6587
+ine=\u5176\u4ED6\u5370\u6B27\u8BED\u7CFB
+inh=\u5370\u53E4\u4EC0\u6587
+ipk=\u4F9D\u5974\u76AE\u7EF4\u514B\u6587
+ira=\u4F0A\u6717\u6587
+iro=\u4F0A\u6D1B\u9B41\u8BED\u7CFB
+ita=\u610F\u5927\u5229\u6587
+jav=\u722A\u54C7\u6587
+jbo=\u903B\u8F91\u6587
+jpn=\u65E5\u6587
+jpr=\u72B9\u592A\u6CE2\u65AF\u6587
+jrb=\u72B9\u592A\u963F\u62C9\u4F2F\u6587
+kaa=\u5361\u62C9\u5361\u5C14\u5E15\u514B\u6587
+kab=\u5361\u6BD4\u5C14\u6587
+kac=\u5361\u7434\u6587
+kal=\u683C\u9675\u5170\u6587
+kam=\u5361\u59C6\u5DF4\u6587
+kan=\u5361\u7EB3\u5854\u514B\u8BED
+kar=\u5580\u4F26\u6587
+kas=\u514B\u4EC0\u7C73\u5C14\u6587
+kau=\u5361\u52AA\u91CC\u6587
+kaw=\u5361\u5A01\u6587
+kaz=\u54C8\u8428\u514B\u6587
+kbd=\u5361\u5DF4\u5C14\u8FBE\u6587
+kha=\u5361\u897F\u6587
+khi=\u5176\u4ED6\u79D1\u4F0A\u6851\u8BED\u7CFB
+khm=\u4E2D\u9AD8\u68C9\u8BED
+kho=\u548C\u7530\u6587
+kik=\u5409\u5E93\u5C24\u6587
+kin=\u5362\u65FA\u8FBE\u6587
+kir=\u5409\u5C14\u5409\u65AF\u6587
+kmb=\u91D1\u90A6\u675C\u6587
+kok=\u521A\u5361\u5C3C\u6587
+kom=\u79D1\u7C73\u6587
+kon=\u521A\u679C\u6587
+kor=\u671D\u9C9C\u6587
+kos=\u79D1\u65AF\u62C9\u4F0A\u6587
+kpe=\u514B\u4F69\u52D2\u8BED
+krc=\u5361\u62C9\u6070\u4F0A\u5DF4\u5C14\u5361\u5C14\u6587
+krl=\u5361\u7D2F\u5229\u963F\u6587
+kro=\u514B\u9C81\u6587
+kru=\u5E93\u9C81\u514B\u6587
+kua=\u5BBD\u4E9A\u739B\u8BED
+kum=\u5E93\u6885\u514B\u6587
+kur=\u5E93\u5C14\u5FB7\u6587
+kut=\u5E93\u7279\u5185\u6587
+lad=\u62C9\u8FEA\u8BFA\u6587
+lah=\u62C9\u4EA8\u8FBE\u6587
+lam=\u5170\u5DF4\u6587
+lao=\u8001\u631D\u6587
+lat=\u62C9\u4E01\u6587
+lav=\u62C9\u6258\u7EF4\u4E9A\u6587 (\u5217\u6258)
+lez=\u83B1\u5179\u4F9D\u6602\u6587
+lim=\u6797\u5821\u6587
+lin=\u6797\u52A0\u62C9\u6587
+lit=\u7ACB\u9676\u5B9B\u6587
+lol=\u8292\u6208\u6587
+loz=\u6D1B\u5179\u6587
+ltz=\u5362\u68EE\u5821\u6587
+lua=\u9C81\u5DF4\u9C81\u74E6\u6587
+lub=\u5362\u5DF4-\u52A0\u4E39\u52A0\u6587
+lug=\u5E72\u8FBE\u6587
+lui=\u8DEF\u6613\u585E\u8BFA\u6587
+lun=\u9686\u8FBE\u6587
+luo=\u5362\u5965\u6587
+lus=\u5362\u6652\u6587
+mac=\u9A6C\u5176\u987F\u6587
+mad=\u6469\u6D1B\u54E5\u8FEA\u62C9\u59C6
+mag=\u9A6C\u52A0\u4F0A\u6587
+mah=\u9A6C\u7ECD\u5C14\u6587
+mai=\u8FC8\u8482\u5229\u6587
+mak=\u671B\u52A0\u9521\u6587
+mal=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587
+man=\u66FC\u4E01\u54E5\u6587
+mao=\u6BDB\u5229\u6587
+map=\u6FB3\u65AF\u7279\u7F57\u5C3C\u897F\u4E9A\u8BED\u7CFB
+mar=\u9A6C\u62C9\u5730\u6587
+mas=\u8428\u4F0A\u8BED
+may=\u9A6C\u6765\u6587
+mdf=\u83AB\u514B\u6C99\u6587
+mdr=\u66FC\u8FBE\u5C14
+men=\u95E8\u8FEA\u6587
+mga=\u4E2D\u53E4\u7231\u5C14\u5170\u6587
+mic=\u7C73\u514B\u9A6C\u514B\u6587
+min=\u7C73\u5357\u5361\u4FDD\u6587
+mis=\u5404\u79CD\u4E0D\u540C\u8BED\u7CFB
+mkh=\u5176\u4ED6\u5B5F\u9AD8\u68C9\u8BED\u7CFB
+mlg=\u9A6C\u5C14\u52A0\u4EC0\u6587
+mlt=\u9A6C\u8033\u4ED6\u6587
+mnc=\u6EE1\u6587
+mni=\u66FC\u5C3C\u666E\u91CC\u6587
+mno=\u9A6C\u8BFA\u535A\u8BED\u7CFB
+moh=\u6469\u970D\u514B\u6587
+mon=\u8499\u53E4\u6587
+mos=\u83AB\u897F\u6587
+mul=\u591A\u79CD\u8BED\u7CFB
+mun=\u8499\u8FBE\u8BED\u7CFB
+mus=\u514B\u91CC\u514B\u6587
+mwl=\u7C73\u5170\u5FB7\u65AF\u6587
+mwr=\u9A6C\u5C14\u74E6\u5229\u6587
+myn=\u739B\u96C5\u8BED\u7CFB
+myv=\u4FC4\u65E5\u4E9A\u6587
+nah=\u7EB3\u74E6\u7279\u5C14\u6587
+nai=\u5176\u4ED6\u5317\u7F8E\u5370\u7B2C\u5B89\u8BED\u7CFB
+nap=\u62FF\u6CE2\u91CC\u6587
+nau=\u7459\u9C81\u6587
+nav=\u7EB3\u74E6\u970D\u6587
+nbl=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5357\u90E8
+nde=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5317\u90E8
+ndo=\u6069\u4E1C\u52A0\u6587
+nds=\u4F4E\u5730\u5FB7\u6587; \u4F4E\u5730\u6492\u514B\u900A\u6587
+nep=\u5C3C\u6CCA\u5C14\u6587
+new=\u5C3C\u74E6\u5C14\u6587
+nia=\u5C3C\u4E9A\u65AF\u6587
+nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
+niu=\u7EBD\u57C3\u6587
+nno=\u632A\u5A01\u5C3C\u8BFA\u65AF\u514B\u6587
+nob=\u632A\u5A01\u535A\u514B\u9A6C\u5C14\u8BED
+nog=\u8BFA\u76D6\u6587
+non=\u53E4\u8BFA\u5C14\u65AF\u6587
+nor=\u632A\u5A01\u6587
+nqo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00)
+nso=\u5317\u7D22\u6258\u6587
+nub=\u52AA\u6BD4\u4E9A\u8BED\u7CFB
+nwc=\u5C3C\u74E6\u5C14\u6587
+nya=\u9F50\u5207\u74E6\u8BED
+nym=\u5C3C\u4E9A\u59C6\u97E6\u9F50\u6587
+nyn=\u5C3C\u6602\u79D1\u52D2\u6587
+nyo=\u5C3C\u7EA6\u7F57\u6587
+nzi=\u6069\u6D4E\u9A6C\u6587
+oci=\u5965\u897F\u5766\u6587 (1500 \u540E)
+oji=\u5965\u5409\u5E03\u74E6\u6587
+ori=\u6B27\u91CC\u4E9A\u6587
+orm=\u963F\u66FC\u6587
+osa=\u5965\u8428\u683C\u8BED
+oss=\u5965\u585E\u68AF\u6587
+ota=\u5965\u6258\u66FC\u571F\u8033\u5176\u6587
+oto=\u5965\u6258\u7C73\u8BED\u7CFB
+paa=\u5176\u4ED6\u5DF4\u5E03\u4E9A\u6587
+pag=\u90A6\u963F\u897F\u6960\u8BED
+pal=\u5E15\u62C9\u7EF4\u6587
+pam=\u90A6\u677F\u7259\u6587
+pan=\u65C1\u906E\u666E\u6587
+pap=\u5E15\u76AE\u4E9A\u95E8\u6258\u6587
+pau=\u5E15\u52B3\u6587
+peo=\u53E4\u8001\u6CE2\u65AF\u8BED
+per=\u6CE2\u65AF\u6587
+phi=\u5176\u4ED6\u83F2\u5F8B\u5BBE\u8BED\u7CFB
+phn=\u8153\u5C3C\u57FA\u6587
+pli=\u5DF4\u5229\u6587
+pol=\u6CE2\u5170\u6587
+pon=\u6CE2\u7EB3\u4F69\u6587
+por=\u8461\u8404\u7259\u6587
+pra=\u666E\u62C9\u514B\u91CC\u7279\u8BF8\u8BED\u8A00
+pro=\u666E\u7F57\u6587\u65AF\u6587
+pus=\u666E\u4EC0\u56FE\u6587
+que=\u76D6\u4E18\u4E9A\u6587
+raj=\u62C9\u8D3E\u65AF\u5766\u6587
+rap=\u62C9\u5E15\u52AA\u4F0A\u6587
+rar=\u62C9\u7F57\u6C64\u52A0\u6587
+roa=\u5176\u4ED6\u62C9\u4E01\u8BED\u7CFB
+roh=\u7F57\u66FC\u4EC0\u8BED
+rom=\u5409\u666E\u8D5B\u6587
+rum=\u7F57\u9A6C\u5C3C\u4E9A\u6587
+run=\u57FA\u9686\u8FEA\u6587
+rup=\u4E9A\u7F8E\u5C3C\u4E9A\u6587
+rus=\u4FC4\u6587
+sad=\u6563\u8FBE\u7EF4\u6587
+sag=\u6851\u6208\u6587
+sah=\u96C5\u5E93\u7279\u6587
+sai=\u5176\u4ED6\u5357\u7F8E\u5370\u7B2C\u5B89\u6587
+sal=\u8428\u5229\u4EC0\u6587
+sam=\u8428\u739B\u5229\u4E9A\u6587
+san=\u68B5\u6587
+sas=\u8428\u8428\u514B\u6587
+sat=\u6851\u5854\u5229\u6587
+scn=\u897F\u897F\u91CC\u6587
+sco=\u82CF\u683C\u5170\u6587
+sel=\u585E\u5C14\u5E93\u666E\u6587
+sem=\u5176\u4ED6\u95EA\u65CF\u8BED\u7CFB
+sga=\u53E4\u7231\u5C14\u5170\u6587
+sgn=\u624B\u8BED
+shn=\u63B8\u6587
+sid=\u6089\u8FBE\u6469\u6587
+sin=\u8F9B\u54C8\u62C9\u8BED
+sio=\u82CF\u8BED\u8BF8\u8BED\u8A00
+sit=\u6C49\u85CF\u8BF8\u8BED\u8A00
+sla=\u5176\u4ED6\u65AF\u62C9\u592B\u8BED\u7CFB
+slo=\u65AF\u6D1B\u4F10\u514B\u6587
+slv=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6587
+sma=\u5357\u8428\u7C73\u6587
+sme=\u5317\u6C99\u5BC6\u6587
+smi=\u5176\u4ED6\u8428\u7C73\u6587
+smj=\u5F8B\u52D2\u6B27\u8428\u83AB\u65AF\u8BED
+smn=\u4F0A\u7EB3\u91CC\u8428\u7C73\u8BED
+smo=\u8428\u6469\u4E9A\u6587
+sms=\u65AF\u79D1\u7279\u8428\u7C73\u6587
+sna=\u4FEE\u7EB3\u6587
+snd=\u4FE1\u5FB7\u6587
+snk=\u7D22\u5C3C\u57FA\u6587
+sog=\u53E4\u7C9F\u7279\u8BED
+som=\u7D22\u9A6C\u91CC\u6587
+son=\u6851\u6D77\u6587
+sot=\u7D22\u6258\u8BED, \u5357\u90E8
+spa=\u897F\u73ED\u7259\u6587
+srd=\u6492\u4E01\u6587
+srn=Sranan Tongo (\u6E90\u4E8E\u514B\u91CC\u5965\u5C14\u8BED)
+srp=\u585E\u5C14\u7EF4\u4E9A\u6587
+srr=\u8C22\u5217\u5C14\u6587
+ssa=\u975E\u6D32\u6492\u54C8\u62C9\u6C99\u6F20\u8FB9\u7F18\u5730\u5E26\u8BED\u8A00
+ssw=\u65AF\u74E6\u7279\u6587
+suk=\u82CF\u5E93\u9A6C\u6587
+sun=\u5DFD\u4ED6\u6587
+sus=\u82CF\u82CF\u6587
+sux=\u82CF\u9A6C\u6587
+swa=\u65AF\u74E6\u5E0C\u91CC\u6587
+swe=\u745E\u5178\u6587
+syc=\u53E4\u5178\u53D9\u5229\u4E9A\u8BED
+syr=\u53D9\u5229\u4E9A\u8BED
+tah=\u5854\u5E0C\u63D0\u6587
+tai=\u50A3\u8BED\u8BF8\u8BED\u8A00 (\u5176\u4ED6)
+tam=\u6CF0\u7C73\u5C14\u6587
+tat=\u9791\u977C\u6587
+tel=\u6CF0\u5362\u56FA\u6587
+tem=\u6ED5\u5185\u8BED
+ter=\u7279\u5217\u7EB3\u6587
+tet=\u7279\u5854\u59C6\u6587
+tgk=\u5854\u5409\u514B\u6587
+tgl=\u5854\u52A0\u8DEF\u65CF\u6587
+tha=\u6CF0\u6587
+tib=\u897F\u85CF\u6587
+tig=\u63D0\u683C\u96F7\u6587
+tir=\u63D0\u683C\u91CC\u5C3C\u4E9A\u6587
+tiv=\u8482\u592B\u6587
+tkl=\u6258\u514B\u52B3\u6587
+tlh=\u514B\u6797\u8D21\u6587
+tli=\u7279\u6797\u5409\u7279\u6587
+tmh=\u5854\u9A6C\u5947\u514B\u6587
+tog=\u6C64\u52A0\u6587 (\u5C3C\u4E9A\u8428\u5730\u533A)
+ton=\u6C64\u52A0\u8BED (\u6C64\u52A0\u5C9B)
+tpi=\u6258\u514B\u76AE\u8F9B\u6587
+tsi=\u8482\u59C6\u897F\u4E9A\u6587
+tsn=\u7A81\u5C3C\u65AF\u6587
+tso=\u7279\u677E\u52A0\u6587
+tuk=\u571F\u5E93\u66FC\u6587
+tum=\u901A\u5E03\u5361\u6587
+tup=\u56FE\u76AE\u8BED\u7CFB
+tur=\u571F\u8033\u5176\u6587
+tut=\u963F\u5C14\u6CF0\u8BF8\u8BED\u8A00 (\u5176\u4ED6)
+tvl=\u56FE\u74E6\u5362\u6587
+twi=\u5951\u7EF4\u6587
+tyv=\u56FE\u74E6\u6587
+udm=\u4E4C\u5FB7\u7A46\u5C14\u7279\u6587
+uga=\u4E4C\u52A0\u91CC\u7279\u6587
+uig=\u7EF4\u543E\u5C14\u6587
+ukr=\u4E4C\u514B\u5170\u6587
+umb=\u7FC1\u672C\u675C\u6587
+und=\u672A\u5B9A\u8BED\u79CD
+urd=\u4E4C\u5C14\u90FD\u6587
+uzb=\u4E4C\u5179\u522B\u514B\u6587
+vai=\u74E6\u4F0A\u6587
+ven=\u6587\u8FBE\u6587
+vie=\u8D8A\u5357\u6587
+vol=\u6C83\u62C9\u666E\u514B\u6587
+vot=\u6C83\u63D0\u514B\u6587
+wak=\u74E6\u5361\u4EC0\u8BF8\u8BED\u8A00
+wal=\u74E6\u62C9\u83AB\u6587
+war=\u74E6\u8D56\u6587
+was=\u74E6\u7ECD\u6587
+wel=\u5A01\u5C14\u58EB\u6587
+wen=\u7D22\u5E03\u8BF8\u8BED\u8A00
+wln=\u74E6\u9F99\u6587
+wol=\u6C83\u5C14\u592B\u6587
+xal=\u5361\u5C14\u6885\u514B\u6587
+xho=\u73ED\u56FE\u6587
+yao=\u7476\u65CF\u6587
+yap=\u96C5\u6D66\u6587
+yid=\u4F9D\u5730\u6587
+yor=\u7EA6\u9C81\u5DF4\u6587
+ypk=\u5C24\u76AE\u514B\u8BF8\u8BED\u8A00
+zap=\u8428\u6CE2\u8482\u514B\u6587
+zbl=\u5E03\u5217\u65AF\u7B26\u53F7
+zen=\u6CFD\u7EB3\u52A0\u6587
+zha=\u58EE\u6587
+znd=\u8D5E\u5FB7\u6587
+zul=\u7956\u9C81\u6587
+zun=\u7956\u5C3C\u8BED
+zxx=\u65E0\u8BED\u8A00\u5185\u5BB9
+zza=\u624E\u624E\u8BED
+
# script names
# key is ISO 15924 script code
-Hans=\u7b80\u4f53\u4e2d\u6587
-Hant=\u7e41\u4f53\u4e2d\u6587
+Arab=\u963F\u62C9\u4F2F\u6587
+Armi=\u7687\u5BB6\u4E9A\u62C9\u59C6\u8BED
+Armn=\u4E9A\u7F8E\u5C3C\u4E9A\u6587
+Avst=\u963F\u7EF4\u65AF\u9640\u8BED
+Bali=\u5DF4\u91CC\u6587
+Bamu=\u5DF4\u59C6\u7A46\u8BED
+Bass=\u5DF4\u8428\u74E6\u8D6B\u8BED
+Batk=\u5DF4\u5854\u514B\u6587
+Beng=\u5B5F\u52A0\u62C9\u6587
+Blis=\u5E03\u5217\u65AF\u7B26\u53F7
+Bopo=\u6C49\u8BED\u62FC\u97F3
+Brah=\u5A46\u7F57\u7C73\u6587\u5B57
+Brai=\u5E03\u83B1\u53F6\u76F2\u6587
+Bugi=\u5E03\u5409\u6587
+Buhd=\u5E03\u5E0C\u5FB7\u8BED
+Cakm=\u67E5\u514B\u9A6C\u8BED
+Cans=\u52A0\u62FF\u5927\u571F\u8457\u7EDF\u4E00\u7B26\u53F7\u8BED
+Cari=\u5361\u91CC\u4E9A\u8BED
+Cham=\u5360\u8BED
+Cher=\u5F7B\u7F57\u57FA\u6587
+Cirt=\u8272\u65AF\u6587
+Copt=\u514B\u666E\u7279\u8BED
+Cprt=\u585E\u6D66\u8DEF\u65AF\u8BED
+Cyrl=\u897F\u91CC\u5C14\u8BED
+Cyrs=\u897F\u91CC\u5C14\u6587\u5B57 (\u53E4\u6559\u4F1A\u65AF\u62C9\u592B\u8BED\u7684\u53D8\u4F53)
+Deva=\u68B5\u6587
+Dsrt=\u5FB7\u585E\u83B1\u7279\u6587
+Dupl=Duployan \u901F\u8BB0
+Egyd=\u540E\u671F\u57C3\u53CA\u8BED
+Egyh=\u53E4\u57C3\u53CA\u50E7\u4FA3\u4E66\u5199\u4F53
+Egyp=\u53E4\u57C3\u53CA\u8C61\u5F62\u6587
+Elba=\u7231\u5C14\u5DF4\u6851
+Ethi=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u8BED
+Geok=\u52AA\u65AF\u514B\u80E1\u91CC\u6587
+Geor=\u683C\u9C81\u5409\u4E9A\u6587
+Glag=\u683C\u62C9\u54E5\u91CC\u8BED
+Goth=\u54E5\u7279\u6587
+Gran=\u5404\u5170\u7279\u54C8\u6587\u5B57
+Grek=\u5E0C\u814A\u6587
+Gujr=\u53E4\u52A0\u62C9\u63D0\u6587
+Guru=\u679C\u9C81\u7A46\u5947\u8BED
+Hang=\u97E9\u6587
+Hani=\u6C49\u8BED
+Hano=\u6C49\u5974\u7F57\u8BED
+Hans=\u7B80\u4F53\u4E2D\u6587
+Hant=\u7E41\u4F53\u4E2D\u6587
+Hebr=\u5E0C\u4F2F\u6765\u6587
+Hira=\u5E73\u5047\u540D
+Hmng=\u6768\u677E\u5F55\u82D7\u6587
+Hrkt=\u7247\u5047\u540D\u6216\u5E73\u5047\u540D
+Hung=\u53E4\u5308\u7259\u5229\u8BED
+Inds=\u5370\u5EA6\u6CB3\u6587\u5B57
+Ital=\u53E4\u610F\u5927\u5229\u8BED
+Java=\u722A\u54C7\u6587
+Jpan=\u65E5\u6587
+Kali=\u514B\u8036\u674E\u6587\u5B57
+Kana=\u7247\u5047\u540D
+Khar=\u5361\u7F57\u987B\u63D0\u6587
+Khmr=\u67EC\u57D4\u5BE8\u6587
+Knda=\u57C3\u7EB3\u5FB7\u6587
+Kore=\u97E9\u6587
+Kpel=\u514B\u4F69\u5217\u6587
+Kthi=\u5361\u7F57\u987B\u63D0\u8BED
+Lana=\u5170\u62FF\u8BED
+Laoo=\u8001\u631D\u8BED
+Latf=\u62C9\u4E01\u6587 (\u54E5\u7279\u5F0F\u5B57\u4F53\u53D8\u4F53)
+Latg=\u62C9\u4E01\u6587 (\u76D6\u5C14\u8BED\u53D8\u4F53)
+Latn=\u62C9\u4E01\u6587
+Lepc=\u96F7\u5E03\u67E5\u8BED
+Limb=\u6797\u5E03\u8BED
+Lina=\u7EBF\u5F62\u6587\u5B57 A
+Linb=\u7EBF\u5F62\u6587\u5B57 B
+Lisu=\u5088\u50F3\u8BED
+Loma=\u6D1B\u9A6C\u8BED
+Lyci=\u5229\u897F\u4E9A\u8BED
+Lydi=\u5415\u5E95\u4E9A\u8BED
+Mand=\u66FC\u8FBE\u6587
+Mani=\u6469\u5C3C\u6559\u6587
+Maya=\u739B\u96C5\u5723\u7B26\u6587
+Mend=\u95E8\u8FEA\u6587
+Merc=\u9EA6\u82E5\u63D0\u514B\u6587\u8349\u4F53
+Mero=\u9EA6\u82E5\u63D0\u514B\u6587
+Mlym=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587
+Mong=\u8499\u53E4\u6587
+Moon=\u6708\u4EAE\u4F53
+Mtei=\u66FC\u5C3C\u666E\u5C14\u8BED
+Mymr=\u7F05\u7538
+Narb=\u53E4\u5317\u963F\u62C9\u4F2F\u8BED
+Nbat=\u7EB3\u5DF4\u6CF0\u8BED
+Nkgb=\u7EB3\u897F\u54E5\u5DF4\u8BED
+Nkoo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00)
+Ogam=\u6B27\u7518\u8BED
+Olck=\u6851\u5854\u5229\u6587
+Orkh=\u9102\u5C14\u6D51\u6587
+Orya=\u5965\u8428\u683C\u6587
+Osma=\u5965\u65AF\u66FC\u4E9A\u8BED
+Palm=\u5E15\u5C14\u8FC8\u62C9\u8BED
+Perm=\u53E4\u5F7C\u5C14\u59C6\u8BF8\u8BED
+Phag=\u516B\u601D\u5DF4\u6587
+Phli=\u7891\u94ED\u4F53\u5DF4\u5217\u7EF4\u8BED
+Phlp=\u8BD7\u4F53\u5DF4\u5217\u7EF4\u8BED
+Phlv=\u4E66\u4F53\u5DF4\u5217\u7EF4\u8BED
+Phnx=\u8153\u5C3C\u57FA\u6587
+Plrd=\u82D7\u6587
+Prti=\u7891\u94ED\u4F53\u5E15\u63D0\u4E9A\u8BED
+Rjng=\u62C9\u8BA9\u8BED
+Roro=\u6717\u683C\u6717\u683C\u6587
+Runr=\u53E4\u4EE3\u5317\u6B27\u6587
+Samr=\u6492\u739B\u5229\u4E9A\u8BED
+Sara=\u6C99\u62C9\u5824\u6587
+Sarb=\u53E4\u5357\u963F\u62C9\u4F2F\u8BED
+Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u8BED
+Sgnw=\u4E66\u5199\u7B26\u53F7
+Shaw=\u8427\u4F2F\u7EB3\u5F0F\u8BED
+Sind=\u4FE1\u5FB7\u6587
+Sinh=\u8F9B\u54C8\u62C9\u8BED
+Sund=\u5DFD\u4ED6\u6587
+Sylo=Syloti Nagri \u4E66\u5199\u4F53
+Syrc=\u53D9\u5229\u4E9A\u6587
+Syre=\u798F\u97F3\u4F53\u53D9\u5229\u4E9A\u6587
+Syrj=\u897F\u53D9\u5229\u4E9A\u8BED
+Syrn=\u4E1C\u53D9\u5229\u4E9A\u8BED
+Tagb=\u5854\u683C\u73ED\u74E6\u8BED
+Tale=\u6CF0\u4E50\u8BED
+Talu=\u65B0\u50A3\u6587
+Taml=\u6CF0\u7C73\u5C14\u6587
+Tavt=\u8D8A\u5357\u50A3\u8BED
+Telu=\u6CF0\u5362\u56FA\u6587
+Teng=\u817E\u683C\u74E6\u6587\u5B57
+Tfng=\u63D0\u975E\u7EB3\u6587
+Tglg=\u5854\u52A0\u8DEF\u65CF\u6587
+Thaa=\u5854\u5B89\u5A1C\u8BED
+Thai=\u6CF0\u6587
+Tibt=\u897F\u85CF\u6587
+Ugar=\u4E4C\u52A0\u91CC\u7279\u6587
+Vaii=\u74E6\u4F9D\u8BED
+Visp=\u53EF\u89C1\u8BED\u8A00
+Wara=Warang Citi
+Xpeo=\u53E4\u6CE2\u65AF\u8BED
+Xsux=\u82CF\u7F8E\u5C14-\u963F\u5361\u5FB7\u6954\u5F62\u6587\u5B57
+Yiii=\u5F5D\u8BED
+Zinh=\u9057\u4F20\u5B66\u672F\u8BED
+Zmth=\u6570\u5B66\u8BB0\u53F7
+Zsym=\u7B26\u53F7
+Zxxx=\u64A4\u9500\u5199\u5165
+Zyyy=\u901A\u7528
+Zzzz=\u811A\u672C\u672A\u77E5\u6216\u8005\u65E0\u6548
# country names
# key is ISO 3166 country code
@@ -478,3 +1109,37 @@
ZA=\u5357\u975e
ZM=\u8d5e\u6bd4\u4e9a
ZW=\u6d25\u5df4\u5e03\u97e6
+
+# territory names
+# key is UN M.49 country and area code
+
+001=\u4E16\u754C
+002=\u975E\u6D32
+003=\u5317\u7F8E\u6D32
+005=\u5357\u7F8E\u6D32
+009=\u5927\u6D0B\u6D32
+011=\u897F\u975E
+013=\u4E2D\u7F8E\u6D32
+014=\u4E1C\u975E
+015=\u5317\u975E
+017=\u4E2D\u975E
+018=\u5357\u90E8\u975E\u6D32
+019=\u7F8E\u6D32
+021=\u7F8E\u6D32\u5317\u90E8
+029=\u52A0\u52D2\u6BD4\u6D77
+030=\u4E1C\u4E9A
+034=\u5357\u4E9A
+035=\u4E1C\u5357\u4E9A
+039=\u5357\u6B27
+053=\u6FB3\u5927\u5229\u4E9A\u548C\u65B0\u897F\u5170
+054=\u7F8E\u62C9\u5C3C\u897F\u4E9A
+057=\u5BC6\u514B\u7F57\u5C3C\u897F\u4E9A\u5730\u533A
+061=\u6CE2\u5229\u5C3C\u897F\u4E9A
+142=\u4E9A\u6D32
+143=\u4E2D\u4E9A
+145=\u897F\u4E9A
+150=\u6B27\u6D32
+151=\u4E1C\u6B27
+154=\u5317\u6B27
+155=\u897F\u6B27
+419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -227,11 +227,642 @@
zh=\u4e2d\u6587
zu=\u7956\u9b6f\u6587
+# key is ISO 639.2 language code
+aar=\u963F\u6CD5\u6587
+abk=\u963F\u5E03\u54C8\u897F\u4E9E\u6587
+ace=\u4E9E\u9F4A\u6587
+ach=\u963F\u50D1\u5229\u6587
+ada=\u963F\u7576\u83AB\u6587
+ady=\u963F\u8FEA\u5404\u6587
+afa=\u4E9E\u975E\u8A9E\u7CFB
+afh=\u963F\u5F17\u91CC\u5E0C\u5229\u6587
+afr=\u5357\u975E\u8377\u862D\u6587
+ain=\u963F\u4F0A\u52AA\u6587
+aka=\u963F\u5BD2\u6587
+akk=\u963F\u5361\u5FB7\u6587
+alb=\u963F\u723E\u5DF4\u5C3C\u4E9E\u6587
+ale=\u963F\u7559\u7533\u6587
+alg=\u963F\u723E\u5CA1\u6606\u8AF8\u8A9E\u8A00
+alt=\u5357\u963F\u723E\u6CF0\u6587
+amh=\u8863\u7D22\u6BD4\u4E9E\u6587
+ang=\u53E4\u82F1\u6587 (\u7D04\u897F\u5143 450-1100)
+anp=\u6602\u52A0\u6587
+apa=\u963F\u5E15\u5207\u8AF8\u8A9E\u8A00
+ara=\u963F\u62C9\u4F2F\u6587
+arc=\u963F\u62C9\u7C73\u6587 (700-300 BCE)
+arg=\u4E9E\u62C9\u5CA1\u6587
+arm=\u4E9E\u7F8E\u5C3C\u4E9E\u6587
+arn=\u963F\u52DE\u574E\u6587
+arp=\u963F\u62C9\u5E15\u970D\u6587
+art=\u4EBA\u5DE5\u8A9E\u8A00
+arw=\u963F\u62C9\u74E6\u514B\u6587
+asm=\u963F\u85A9\u59C6\u6587
+ast=\u963F\u65AF\u5716\u91CC\u4E9E\u6587
+ath=\u963F\u85A9\u5E15\u65AF\u574E\u8AF8\u8A9E\u8A00
+aus=\u6FB3\u6D32\u8AF8\u8A9E\u8A00
+ava=\u963F\u74E6\u96F7\u6587
+ave=\u963F\u672A\u65AF\u5854\u6587
+awa=\u963F\u74E6\u6587
+aym=\u4E9E\u6469\u62C9\u6587
+aze=\u4E9E\u585E\u62DC\u7136\u6587
+bad=\u73ED\u9054\u6587
+bai=\u5DF4\u7C73\u7D2F\u514B\u8AF8\u8A9E\u8A00
+bak=\u5DF4\u4EC0\u5580\u723E\u6587
+bal=\u4FFE\u8DEF\u652F\u6587
+bam=\u73ED\u5DF4\u62C9\u6587
+ban=\u5CC7\u91CC\u6587
+baq=\u5DF4\u65AF\u514B\u6587
+bas=\u5DF4\u85A9\u6587
+bat=\u6CE2\u7F85\u7684\u6D77\u8AF8\u8A9E\u8A00
+bej=\u8C9D\u624E\u6587
+bel=\u767D\u4FC4\u7F85\u65AF\u6587
+bem=\u5225\u59C6\u5DF4\u6587
+ben=\u5B5F\u52A0\u62C9\u6587
+ber=\u67CF\u67CF\u723E\u6587
+bho=\u535A\u5091\u666E\u723E\u6587
+bih=\u6BD4\u54C8\u723E\u6587
+bik=\u6BD4\u79D1\u723E\u6587
+bin=\u6BD4\u5C3C\u6587
+bis=\u6BD4\u65AF\u62C9\u99AC\u6587
+bla=\u932B\u514B\u932B\u5361\u6587
+bnt=\u73ED\u5716\u8AF8\u8A9E\u8A00
+bos=\u6CE2\u58EB\u5C3C\u4E9E\u6587
+bra=\u5E03\u62C9\u6770\u6587
+bre=\u4E0D\u5217\u5854\u5C3C\u6587
+btk=\u5DF4\u5854\u514B\u6587
+bua=\u5E03\u91CC\u963F\u7279\u6587
+bug=\u5E03\u5409\u65AF\u6587
+bul=\u4FDD\u52A0\u5229\u4E9E\u6587
+bur=\u7DEC\u7538\u6587
+byn=\u5E03\u6797\u6587
+cad=\u5361\u591A\u6587
+cai=\u4E2D\u7F8E\u5370\u7B2C\u5B89\u8AF8\u8A9E\u8A00
+car=\u5DF4\u52D2\u6BD4\u6587
+cat=\u5609\u6CF0\u7F85\u5C3C\u4E9E\u6587
+cau=\u9AD8\u52A0\u7D22\u8AF8\u8A9E\u8A00
+ceb=\u5BBF\u9727\u6587
+cel=\u51F1\u723E\u7279\u8AF8\u8A9E\u8A00
+cha=\u67E5\u6469\u6D1B\u6587
+chb=\u5947\u5E03\u67E5\u6587
+che=\u8ECA\u81E3\u6587
+chg=\u67E5\u52A0\u6587
+chi=\u4E2D\u6587
+chk=\u8655\u5947\u65AF\u6587
+chm=\u99AC\u91CC\u6587
+chn=\u5951\u5974\u514B\u6587
+cho=\u55AC\u514B\u6258\u6587
+chp=\u5947\u4F69\u74E6\u63DA\u6587
+chr=\u67F4\u7F85\u57FA\u6587
+chu=\u6559\u6703\u65AF\u62C9\u592B\u6587
+chv=\u695A\u74E6\u58EB\u6587
+chy=\u6C99\u4F0A\u5B89\u6587
+cmc=\u67E5\u7C73\u514B\u6587
+cop=\u79D1\u666E\u7279\u6587
+cor=\u5EB7\u74E6\u8033\u6587
+cos=\u79D1\u897F\u5609\u6587
+cpe=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u82F1\u6587\u7684(\u5176\u4ED6)
+cpf=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u6CD5\u6587\u7684(\u5176\u4ED6)
+cpp=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u8461\u8404\u7259\u6587\u7684(\u5176\u4ED6)
+cre=\u514B\u91CC\u6587
+crh=\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u571F\u8033\u5176\u6587\uFF1B\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u5854\u5854\u723E\u6587
+crp=\u5176\u4ED6\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E\u7CFB
+csb=\u5361\u8212\u5E03\u6587
+cus=\u5EAB\u65BD\u7279\u8AF8\u8A9E\u8A00
+cze=\u6377\u514B\u6587
+dak=\u9054\u79D1\u4ED6\u6587
+dan=\u4E39\u9EA5\u6587
+dar=\u9054\u723E\u683C\u74E6\u6587
+day=\u8FEA\u96C5\u514B\u6587
+del=\u5FB7\u62C9\u74E6\u6587
+den=\u65AF\u62C9\u592B
+dgr=\u591A\u683C\u91CC\u5E03\u6587
+din=\u4E01\u5361\u6587
+div=\u8FEA\u7DAD\u897F\u6587
+doi=\u591A\u683C\u4F86\u6587
+dra=\u5FB7\u62C9\u5A01\u8AF8\u8A9E\u8A00
+dsb=\u4E0B\u7D22\u5E03\u6587
+dua=\u675C\u4E9E\u62C9\u6587
+dum=\u4E2D\u53E4\u8377\u862D\u6587 (\u7D04 1050-1350)
+dut=\u8377\u862D\u6587
+dyu=\u8FEA\u5C24\u62C9\u6587
+dzo=\u4E0D\u4E39\u6587
+efi=\u57C3\u83F2\u514B\u6587
+egy=\u53E4\u57C3\u53CA\u6587
+eka=\u827E\u5361\u6731\u514B\u6587
+elx=\u827E\u62C9\u7C73\u7279\u6587
+eng=\u82F1\u6587
+enm=\u4E2D\u53E4\u82F1\u6587 (1100-1500)
+epo=\u4E16\u754C\u6587
+est=\u611B\u6C99\u5C3C\u4E9E\u6587
+ewe=\u57C3\u7DAD\u6587
+ewo=\u4F9D\u6C6A\u90FD\u6587
+fan=\u82B3\u65CF\u6587
+fao=\u6CD5\u7F85\u6587
+fat=\u82B3\u8482\u6587
+fij=\u6590\u6FDF\u6587
+fil=\u83F2\u5F8B\u8CD3\u6587
+fin=\u82AC\u862D\u6587
+fiu=\u82AC\u70CF\u8AF8\u8A9E\u8A00
+fon=\u8C50\u6587
+fre=\u6CD5\u6587
+frm=\u4E2D\u53E4\u6CD5\u6587 (\u7D04 1400-1600)
+fro=\u53E4\u6CD5\u6587 (842-\u7D04 1400)
+frr=\u5317\u5F17\u91CC\u897F\u4E9E\u6587
+frs=\u6771\u5F17\u91CC\u897F\u4E9E\u6587
+fry=\u897F\u5F17\u91CC\u897F\u4E9E\u6587
+ful=\u5BCC\u62C9\u6587
+fur=\u5F17\u7559\u5229\u6587
+gaa=\u52A0\u65CF\u6587
+gay=\u52A0\u7D04\u6587
+gba=\u845B\u5DF4\u4E9E\u6587
+gem=\u5176\u4ED6\u65E5\u8033\u66FC\u8A9E\u7CFB
+geo=\u55AC\u6CBB\u4E9E\u6587
+ger=\u5FB7\u6587
+gez=\u5409\u8332\u6587
+gil=\u5409\u723E\u4F2F\u7279\u7FA4\u5CF6\u6587
+gla=\u84CB\u723E\u6587
+gle=\u611B\u723E\u862D\u6587
+glg=\u52A0\u91CC\u897F\u4E9E\u6587
+glv=\u66FC\u5CF6\u6587
+gmh=\u4E2D\u53E4\u9AD8\u5730\u5FB7\u6587 (\u7D04 1050-1500)
+goh=\u53E4\u9AD8\u5730\u5FB7\u6587 (\u7D04 750-1050)
+gon=\u5CA1\u5FB7\u6587
+gor=\u79D1\u9686\u9054\u7F85\u6587
+got=\u54E5\u5FB7\u6587
+grb=\u683C\u5217\u535A\u6587
+grc=\u53E4\u5E0C\u81D8\u6587 (\u76F4\u5230 1453)
+gre=\u4E2D\u53E4\u5E0C\u81D8\u6587 (1453-)
+grn=\u74DC\u62C9\u5C3C\u6587
+gsw=\u5FB7\u6587 (\u745E\u58EB)
+guj=\u53E4\u5409\u62C9\u7279\u6587
+gwi=\u572D\u5951\u6587
+hai=\u6D77\u9054\u6587
+hat=\u6D77\u5730\u6587
+hau=\u8C6A\u85A9\u6587
+haw=\u590F\u5A01\u5937\u6587
+heb=\u5E0C\u4F2F\u4F86\u6587
+her=\u8D6B\u96F7\u7F85\u6587
+hil=\u5E0C\u5229\u84CB\u8FB2\u6587
+him=\u8D6B\u99AC\u67E5\u5229\u6587
+hin=\u5317\u5370\u5EA6\u6587
+hit=\u8D6B\u68AF\u6587
+hmn=\u5B5F\u6587
+hmo=\u65B0\u91CC\u6728\u6258\u6587
+hrv=\u514B\u7F85\u57C3\u897F\u4E9E\u6587
+hsb=\u4E0A\u7D22\u5E03\u6587
+hun=\u5308\u7259\u5229\u6587
+hup=\u80E1\u5E15\u6587
+iba=\u4F0A\u73ED\u6587
+ibo=\u4F0A\u5E03\u6587
+ice=\u51B0\u5CF6\u6587
+ido=\u4F0A\u591A\u6587
+iii=\u56DB\u5DDD\u5937\u6587
+ijo=\u4F0A\u55AC\u6587
+iku=\u4F0A\u52AA\u4F0A\u7279\u6587
+ile=\u4EBA\u5DE5\u570B\u969B\u6587
+ilo=\u4F0A\u6D1B\u95CA\u6587
+ina=\u4EBA\u5DE5\u570B\u969B\u6587 (\u570B\u969B\u8F14\u52A9\u8A9E\u8A00\u5354\u6703)
+inc=\u5370\u5EA6\u8AF8\u8A9E\u8A00
+ind=\u5370\u5C3C\u6587
+ine=\u5370\u6B50\u8AF8\u8A9E\u8A00
+inh=\u5370\u53E4\u4EC0\u6587
+ipk=\u4F9D\u5974\u76AE\u7DAD\u514B\u6587
+ira=\u4F0A\u6717\u8AF8\u8A9E\u8A00
+iro=\u6613\u6D1B\u9B41\u6587
+ita=\u7FA9\u5927\u5229\u6587
+jav=\u722A\u54C7\u6587
+jbo=\u908F\u8F2F\u6587
+jpn=\u65E5\u6587
+jpr=\u7336\u592A\u6559-\u6CE2\u65AF\u6587
+jrb=\u7336\u592A\u963F\u62C9\u4F2F\u6587
+kaa=\u5361\u62C9\u5361\u723E\u5E15\u514B\u6587
+kab=\u5361\u6BD4\u723E\u6587
+kac=\u5361\u7434\u6587
+kal=\u683C\u9675\u862D\u6587
+kam=\u5361\u59C6\u5DF4\u6587
+kan=\u574E\u90A3\u9054\u6587
+kar=\u514B\u502B\u6587
+kas=\u5580\u4EC0\u7C73\u723E\u6587
+kau=\u5361\u52AA\u91CC\u6587
+kaw=\u5361\u5A01\u6587
+kaz=\u54C8\u85A9\u514B\u6587
+kbd=\u5361\u5DF4\u723E\u9054\u6587
+kha=\u5361\u897F\u6587
+khi=\u79D1\u4F9D\u6851\u8AF8\u8A9E\u8A00
+khm=\u4E2D\u592E\u67EC\u57D4\u5BE8\u6587
+kho=\u548C\u95D0\u6587
+kik=\u57FA\u5EAB\u7336\u6587
+kin=\u91D1\u63DA\u842C\u7B54\u6587
+kir=\u5409\u723E\u5409\u65AF\u6587
+kmb=\u91D1\u90A6\u675C\u6587
+kok=\u8CA2\u6839\u6587
+kom=\u79D1\u5BC6\u6587
+kon=\u525B\u679C\u6587
+kor=\u97D3\u6587
+kos=\u79D1\u65AF\u96F7\u6069\u6587
+kpe=\u514B\u4F69\u5217\u6587
+krc=\u5361\u62C9\u67F4-\u5305\u723E\u5361\u723E\u6587
+krl=\u5361\u7D2F\u5229\u963F\u6587
+kro=\u514B\u9B6F\u6587
+kru=\u5EAB\u9B6F\u79D1\u6587
+kua=\u95DC\u4E9E\u99AC\u6587
+kum=\u5EAB\u5BC6\u514B\u6587
+kur=\u5EAB\u5FB7\u6587
+kut=\u5EAB\u7279\u5948\u6587
+lad=\u62C9\u8FEA\u8AFE\u6587
+lah=\u62C9\u4EA8\u9054\u6587
+lam=\u862D\u5DF4\u6587
+lao=\u5BEE\u6587
+lat=\u62C9\u4E01\u6587
+lav=\u62C9\u812B\u7DAD\u4E9E\u6587 (\u5217\u7279\u6587)
+lez=\u83DC\u8332\u4F9D\u6602\u6587
+lim=\u5229\u535A\u574E\u6587
+lin=\u9675\u52A0\u62C9\u6587
+lit=\u7ACB\u9676\u5B9B\u6587
+lol=\u8292\u6208\u6587
+loz=\u6D1B\u9F4A\u6587
+ltz=\u76E7\u68EE\u5821\u6587
+lua=\u9B6F\u5DF4\u9B6F\u9B6F\u4E9E\u6587
+lub=\u76E7\u5DF4-\u52A0\u4E39\u52A0\u6587
+lug=\u5E72\u9054\u6587
+lui=\u8DEF\u6613\u585E\u8AFE\u6587
+lun=\u76E7\u6069\u9054\u6587
+luo=\u76E7\u5967\u6587 (\u80AF\u4E9E\u8207\u5766\u5C1A\u5C3C\u4E9E)
+lus=\u76E7\u6652\u6587
+mac=\u99AC\u5176\u9813\u6587
+mad=\u99AC\u90FD\u62C9\u6587
+mag=\u99AC\u52A0\u4F0A\u6587
+mah=\u99AC\u7D39\u723E\u7FA4\u5CF6\u6587
+mai=\u9081\u8482\u5229\u6587
+mak=\u671B\u52A0\u932B\u6587
+mal=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587
+man=\u66FC\u4E01\u54E5\u6587
+mao=\u6BDB\u5229\u6587
+map=\u5357\u5CF6\u8AF8\u8A9E\u8A00
+mar=\u99AC\u62C9\u5730\u6587
+mas=\u99AC\u8CFD\u6587
+may=\u99AC\u4F86\u6587
+mdf=\u83AB\u514B\u6C99\u6587
+mdr=\u66FC\u9054\u6587
+men=\u9580\u5FB7\u6587
+mga=\u4E2D\u53E4\u611B\u723E\u862D\u6587 (900-1200)
+mic=\u7C73\u514B\u99AC\u514B\u6587
+min=\u7C73\u5357\u5361\u5821\u6587
+mis=\u6DF7\u96DC\u8A9E\u8AF8\u8A9E\u8A00
+mkh=\u5B5F\u9AD8\u68C9\u8AF8\u8A9E\u8A00
+mlg=\u99AC\u62C9\u52A0\u897F\u6587
+mlt=\u99AC\u723E\u4ED6\u6587
+mnc=\u6EFF\u65CF\u6587
+mni=\u66FC\u5C3C\u666E\u88E1\u6587
+mno=\u99AC\u8AFE\u535A\u8AF8\u8A9E\u8A00
+moh=\u83AB\u970D\u514B\u6587
+mon=\u8499\u53E4\u6587
+mos=\u83AB\u897F\u6587
+mul=\u591A\u7A2E\u8A9E\u8A00
+mun=\u8499\u9054\u8AF8\u8A9E\u8A00
+mus=\u514B\u91CC\u514B\u6587
+mwl=\u7C73\u862D\u5FB7\u65AF\u6587
+mwr=\u99AC\u723E\u5C3C\u88E1\u6587
+myn=\u99AC\u96C5\u8AF8\u8A9E\u8A00
+myv=\u5384\u723E\u8332\u4E9E\u6587
+nah=\u7D0D\u74E6\u7279\u6587
+nai=\u5317\u7F8E\u5370\u7B2C\u5B89\u8AF8\u8A9E\u8A00
+nap=\u62FF\u6CE2\u91CC\u6587
+nau=\u8AFE\u9B6F\u6587
+nav=\u7D0D\u74E6\u8377\u6587
+nbl=\u5357\u6069\u5FB7\u6BD4\u5229\u6587
+nde=\u5317\u6069\u5FB7\u6BD4\u5229\u6587
+ndo=\u6069\u6771\u52A0\u6587
+nds=\u4F4E\u5730\u5FB7\u6587; \u4F4E\u5730\u6492\u514B\u905C\u6587
+nep=\u5C3C\u6CCA\u723E\u6587
+new=\u5C3C\u74E6\u723E\u6587
+nia=\u5C3C\u4E9E\u65AF\u6587
+nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
+niu=\u7D10\u57C3\u6587
+nno=\u632A\u5A01\u8010\u8AFE\u65AF\u514B\u6587
+nob=\u535A\u514B\u99AC\u723E\u6587\uFF0C\u632A\u5A01
+nog=\u8AFE\u84CB\u6587
+non=\u53E4\u8AFE\u723E\u65AF\u6587
+nor=\u632A\u5A01\u6587
+nqo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko)
+nso=\u5317\u7D22\u6258\u6587
+nub=\u52AA\u6BD4\u4E9E\u8AF8\u8A9E\u8A00
+nwc=\u53E4\u5C3C\u74E6\u723E\u6587
+nya=\u9F4A\u5207\u74E6\u6587
+nym=\u5C3C\u63DA\u97CB\u9F4A\u6587
+nyn=\u5C3C\u63DA\u79D1\u840A\u6587
+nyo=\u5C3C\u5967\u56C9\u6587
+nzi=\u5C3C\u8332\u99AC\u6587
+oci=\u6B50\u897F\u5766\u6587 (\u524D 1500)
+oji=\u5967\u6770\u5E03\u97CB\u6587
+ori=\u6B50\u5229\u4E9E\u6587
+orm=\u5967\u7F85\u8499\u6587
+osa=\u6B50\u585E\u5947\u6587
+oss=\u5967\u585E\u68AF\u6587
+ota=\u9102\u5716\u66FC\u571F\u8033\u5176\u6587 (1500-1928)
+oto=\u5967\u6258\u7C73\u8AF8\u8A9E\u8A00
+paa=\u5DF4\u5E03\u4E9E\u8AF8\u8A9E\u8A00
+pag=\u6F58\u52A0\u8F9B\u6587
+pal=\u5DF4\u5217\u7DAD\u6587
+pam=\u6F58\u5E15\u5609\u6587
+pan=\u65C1\u906E\u666E\u6587
+pap=\u5E15\u76AE\u963F\u9580\u6258\u6587
+pau=\u5E1B\u7409\u6587
+peo=\u53E4\u6CE2\u65AF\u6587 (ca.600-400 B.C.)
+per=\u6CE2\u65AF\u6587
+phi=\u83F2\u5F8B\u8CD3\u8AF8\u8A9E\u8A00
+phn=\u8153\u5C3C\u57FA\u6587
+pli=\u5E15\u91CC\u6587
+pol=\u6CE2\u862D\u6587
+pon=\u6CE2\u90A3\u8C9D\u6587
+por=\u8461\u8404\u7259\u6587
+pra=\u666E\u62C9\u514B\u91CC\u7279\u8AF8\u8A9E\u8A00
+pro=\u53E4\u666E\u7F85\u6587\u65AF\u6587 (\u76F4\u5230 1500)
+pus=\u666E\u4EC0\u5716\u6587
+que=\u84CB\u695A\u74E6\u6587
+raj=\u62C9\u8CC8\u65AF\u5766\u8AF8\u6587
+rap=\u5FA9\u6D3B\u5CF6\u6587
+rar=\u62C9\u7F85\u901A\u52A0\u6587
+roa=\u7F85\u66FC\u8AF8\u8A9E\u8A00
+roh=\u7F85\u66FC\u4EC0\u6587
+rom=\u5409\u666E\u8CFD\u6587
+rum=\u7F85\u99AC\u5C3C\u4E9E\u6587
+run=\u79D1\u9686\u5730\u6587
+rup=\u7F85\u99AC\u5C3C\u4E9E\u8A9E\u7CFB
+rus=\u4FC4\u6587
+sad=\u6851\u9054\u97CB\u6587
+sag=\u6851\u6208\u8A9E
+sah=\u96C5\u5EAB\u7279\u6587
+sai=\u5176\u4ED6\u5357\u7F8E\u5370\u7B2C\u5B89\u6587
+sal=\u85A9\u5229\u4EC0\u8AF8\u8A9E\u8A00
+sam=\u85A9\u746A\u5229\u4E9E\u963F\u62C9\u59C6\u6587
+san=\u68B5\u6587\u5B57\u6BCD
+sas=\u6492\u6492\u514B\u6587
+sat=\u6563\u5854\u5229\u6587
+scn=\u897F\u897F\u91CC\u6587
+sco=\u8607\u683C\u862D\u6587
+sel=\u745F\u723E\u5361\u666E\u6587
+sem=\u9583\u8A9E\u8AF8\u8A9E\u8A00
+sga=\u53E4\u611B\u723E\u862D\u6587 (\u81F3 900)
+sgn=\u624B\u8A9E
+shn=\u64A3\u6587
+sid=\u5E0C\u9054\u6469\u6587
+sin=\u932B\u862D\u6587
+sio=\u8607\u8A9E\u8AF8\u8A9E\u8A00
+sit=\u6F22\u85CF\u8A9E\u7CFB
+sla=\u65AF\u62C9\u592B\u8AF8\u8A9E\u8A00
+slo=\u65AF\u6D1B\u4F10\u514B\u6587
+slv=\u65AF\u6D1B\u7DAD\u5C3C\u4E9E\u8A9E
+sma=\u5357\u85A9\u7C73\u6587
+sme=\u5317\u6C99\u5BC6\u6587
+smi=\u85A9\u7C73\u8AF8\u8A9E\u8A00
+smj=\u9B6F\u52D2\u85A9\u7C73\u6587
+smn=\u4F0A\u7D0D\u88E1\u85A9\u7C73\u6587
+smo=\u85A9\u6469\u4E9E\u6587
+sms=\u65AF\u79D1\u7279\u85A9\u7C73\u6587
+sna=\u980C\u54C8\u6587
+snd=\u4FE1\u5FB7\u6587
+snk=\u7D22\u5C3C\u57FA\u6587
+sog=\u7D22\u683C\u5E95\u4E9E\u7D0D\u6587
+som=\u7D22\u99AC\u5229\u6587
+son=\u6851\u6D77\u6587
+sot=\u7D22\u6258\u6587, \u5357\u90E8
+spa=\u897F\u73ED\u7259\u6587
+srd=\u85A9\u4E01\u5C3C\u4E9E\u6587
+srn=Sranan Tongo (\u6E90\u65BC\u514B\u91CC\u5967\u723E\u8A9E)
+srp=\u585E\u723E\u7DAD\u4E9E\u6587
+srr=\u585E\u96F7\u723E\u6587
+ssa=\u5C3C\u7F85\u6492\u54C8\u62C9\u8AF8\u8A9E\u8A00
+ssw=\u897F\u65AF\u74E6\u63D0\u6587
+suk=\u8607\u5EAB\u99AC\u6587
+sun=\u5DFD\u4E39\u6587
+sus=\u8607\u8607\u6587
+sux=\u8607\u7F8E\u6587
+swa=\u53F2\u74E6\u897F\u91CC\u6587
+swe=\u745E\u5178\u6587
+syc=\u53E4\u6558\u5229\u4E9E\u6587
+syr=\u6558\u5229\u4E9E\u6587
+tah=\u5927\u6EAA\u5730\u6587
+tai=\u50A3\u8A9E\u8AF8\u8A9E\u8A00
+tam=\u5766\u7C73\u723E\u6587
+tat=\u97C3\u977C\u6587
+tel=\u7279\u62C9\u53E4\u6587
+tem=\u63D0\u59C6\u6587
+ter=\u6CF0\u96F7\u8AFE\u6587
+tet=\u6CF0\u9813\u6587
+tgk=\u5854\u5409\u514B\u6587
+tgl=\u5854\u52A0\u62C9\u65CF\u6587
+tha=\u6CF0\u6587
+tib=\u897F\u85CF\u6587
+tig=\u8482\u683C\u96F7\u6587
+tir=\u63D0\u683C\u5229\u5C3C\u4E9E\u6587
+tiv=\u63D0\u592B\u6587
+tkl=\u6258\u514B\u52DE\u6587
+tlh=\u514B\u6797\u8CA2\u6587
+tli=\u7279\u6797\u57FA\u7279\u6587
+tmh=\u5854\u99AC\u5947\u514B\u6587
+tog=\u6771\u52A0\u6587(\u5C3C\u4E9E\u85A9\u6587)
+ton=\u6771\u52A0\u6587 (\u6771\u52A0\u7FA4\u5CF6)
+tpi=\u6258\u6BD4\u8F9B\u6587
+tsi=\u6B3D\u897F\u5B89\u6587
+tsn=\u585E\u8332\u74E6\u7D0D\u6587
+tso=\u980C\u52A0\u6587
+tuk=\u571F\u5EAB\u66FC\u6587
+tum=\u5716\u59C6\u5E03\u5361\u6587
+tup=\u5716\u76AE\u8AF8\u8A9E\u8A00
+tur=\u571F\u8033\u5176\u6587
+tut=\u963F\u723E\u6CF0\u8AF8\u8A9E\u8A00 (\u5176\u4ED6)
+tvl=\u5410\u74E6\u9B6F\u6587
+twi=\u5951\u7DAD\u6587
+tyv=\u571F\u51E1\u6587
+udm=\u6C83\u8482\u827E\u514B\u6587
+uga=\u70CF\u52A0\u5217\u6587
+uig=\u7DAD\u543E\u723E\u6587
+ukr=\u70CF\u514B\u862D\u6587
+umb=\u59C6\u672C\u675C\u6587
+und=\u672A\u78BA\u5B9A\u7684
+urd=\u70CF\u90FD\u6587
+uzb=\u70CF\u8332\u5225\u514B\u6587
+vai=\u8D8A\u5357\u6587 Vai
+ven=\u6587\u9054\u6587
+vie=\u8D8A\u5357\u6587
+vol=\u6C83\u62C9\u666E\u514B\u6587
+vot=\u6C83\u63D0\u514B\u6587
+wak=\u74E6\u5361\u4EC0\u8AF8\u8A9E\u8A00
+wal=\u74E6\u62C9\u83AB\u6587
+war=\u74E6\u745E\u6587
+was=\u74E6\u7D39\u6587
+wel=\u5A01\u723E\u65AF\u6587
+wen=\u7D22\u5E03\u8AF8\u8A9E\u8A00
+wln=\u83EF\u9686\u6587
+wol=\u6C83\u6D1B\u592B\u6587
+xal=\u5361\u723E\u6885\u514B\u6587
+xho=\u5ED3\u85A9\u6587
+yao=\u7464\u6587
+yap=\u96C5\u6D66\u6587
+yid=\u610F\u7B2C\u7DD2\u6587
+yor=\u512A\u9B6F\u5DF4\u6587
+ypk=\u5C24\u76AE\u514B\u8AF8\u8A9E\u8A00
+zap=\u85A9\u6CE2\u7279\u514B\u6587
+zbl=\u5E03\u5217\u65AF\u7B26\u865F
+zen=\u6FA4\u7D0D\u52A0\u6587
+zha=\u58EF\u6587
+znd=\u8D0A\u5FB7\u6587
+zul=\u7956\u9B6F\u6587
+zun=\u7956\u5C3C\u6587
+zxx=\u7121\u8A9E\u8A00\u5167\u5BB9
+zza=\u624E\u624E\u6587
+
# script names
# key is ISO 15924 script code
-Hans=\u7c21\u9ad4\u4e2d\u6587
-Hant=\u7e41\u9ad4\u4e2d\u6587
+Arab=\u963F\u62C9\u4F2F\u6587
+Armi=\u7687\u5BA4\u4E9E\u7F8E\u5C3C\u4E9E\u6587
+Armn=\u4E9E\u7F8E\u5C3C\u4E9E\u6587
+Avst=\u963F\u672A\u65AF\u5854\u6587
+Bali=\u5CC7\u91CC\u6587
+Bamu=\u5DF4\u66FC\u6587
+Bass=\u5DF4\u85A9\u4F10\u6587
+Batk=\u5DF4\u5854\u514B\u6587
+Beng=\u5B5F\u52A0\u62C9\u6587
+Blis=\u5E03\u5217\u65AF\u7B26\u865F
+Bopo=\u6CE8\u97F3\u7B26\u865F
+Brah=\u5A46\u7F85\u7C73\u6587
+Brai=\u76F2\u4EBA\u7528\u9EDE\u5B57\u6CD5
+Bugi=\u5E03\u5409\u65AF\u6587
+Buhd=\u5E03\u5E0C\u5FB7\u6587
+Cakm=\u67E5\u514B\u99AC\u6587
+Cans=\u52A0\u62FF\u5927\u539F\u4F4F\u6C11\u901A\u7528\u5B57\u7B26
+Cari=\u5361\u91CC\u4E9E\u6587
+Cham=\u5360\u6587
+Cher=\u67F4\u7F85\u57FA\u6587
+Cirt=\u8272\u65AF\u6587
+Copt=\u79D1\u666E\u7279\u6587
+Cprt=\u585E\u6D66\u8DEF\u65AF\u6587
+Cyrl=\u897F\u91CC\u4FC4\u8A9E
+Cyrs=\u897F\u91CC\u723E\u6587 (\u53E4\u6559\u6703\u65AF\u62C9\u592B\u6587\u8B8A\u9AD4)
+Deva=\u68B5\u6587
+Dsrt=\u5FB7\u745F\u96F7\u7279\u6587
+Dupl=Duployan \u901F\u8A18\u6CD5
+Egyd=\u53E4\u57C3\u53CA\u4E16\u4FD7\u9AD4
+Egyh=\u53E4\u57C3\u53CA\u50E7\u4FB6\u9AD4
+Egyp=\u53E4\u57C3\u53CA\u8C61\u5F62\u6587\u5B57
+Elba=\u611B\u723E\u5DF4\u6851\u6587
+Ethi=\u8863\u7D22\u5339\u4E9E\u6587
+Geok=\u683C\u9B6F\u5409\u4E9E\u8A9E\u7CFB (\u963F\u7D22\u4ED6\u8DEF\u91CC\u548C\u52AA\u65AF\u514B\u80E1\u91CC\u6587)
+Geor=\u55AC\u6CBB\u4E9E\u6587
+Glag=\u683C\u62C9\u54E5\u91CC\u6587
+Goth=\u54E5\u5FB7\u6587
+Gran=\u683C\u862D\u85A9\u6587
+Grek=\u5E0C\u81D8\u6587
+Gujr=\u53E4\u5409\u62C9\u7279\u6587
+Guru=\u53E4\u723E\u7A46\u5947\u6587
+Hang=\u8AFA\u6587
+Hani=\u6F22\u8A9E
+Hano=\u54C8\u52AA\u8AFE\u6587
+Hans=\u7C21\u9AD4\u4E2D\u6587
+Hant=\u7E41\u9AD4\u4E2D\u6587
+Hebr=\u5E0C\u4F2F\u4F86\u6587
+Hira=\u5E73\u5047\u540D
+Hmng=\u694A\u677E\u9304\u82D7\u6587
+Hrkt=\u7247\u5047\u540D\u6216\u5E73\u5047\u540D
+Hung=\u53E4\u5308\u7259\u5229\u6587
+Inds=\u5370\u5EA6\u6CB3\u6D41\u57DF (\u54C8\u62C9\u5E15\u6587)
+Ital=\u53E4\u610F\u5927\u5229\u6587
+Java=\u722A\u54C7\u6587
+Jpan=\u65E5\u6587
+Kali=\u514B\u8036\u674E\u6587
+Kana=\u7247\u5047\u540D
+Khar=\u5361\u7F85\u9808\u63D0\u6587
+Khmr=\u67EC\u57D4\u5BE8\u6587
+Knda=\u574E\u90A3\u9054\u6587
+Kore=\u97D3\u6587
+Kpel=\u514B\u4F69\u5217\u6587
+Kthi=\u5361\u5E1D\u6587
+Lana=\u85CD\u62FF\u6587
+Laoo=\u5BEE\u6587
+Latf=\u62C9\u4E01\u6587 (\u5C16\u89D2\u9AD4\u6D3B\u5B57\u8B8A\u9AD4)
+Latg=\u62C9\u4E01\u6587 (\u84CB\u723E\u8A9E\u8B8A\u9AD4)
+Latn=\u62C9\u4E01\u6587
+Lepc=\u96F7\u5E03\u67E5\u6587
+Limb=\u6797\u4F48\u6587
+Lina=\u7DDA\u6027\u6587\u5B57 A
+Linb=\u7DDA\u6027\u6587\u5B57 B
+Lisu=\u9ECE\u50F3\u6587
+Loma=\u6D1B\u99AC\u6587
+Lyci=\u5442\u897F\u4E9E\u8A9E
+Lydi=\u91CC\u5E95\u4E9E\u8A9E
+Mand=\u66FC\u5B89\u5E95\u6587
+Mani=\u6469\u5C3C\u6559\u6587
+Maya=\u746A\u96C5\u8C61\u5F62\u6587\u5B57
+Mend=\u9580\u8FEA\u8A9E
+Merc=\u9EA5\u7F85\u57C3\u6587\u884C\u8349
+Mero=\u9EA5\u7F85\u57C3\u6587
+Mlym=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587
+Mong=\u8499\u53E4\u6587
+Moon=\u7A46\u6069\u9AD4\u76F2\u6587
+Mtei=\u66FC\u5C3C\u666E\u723E\u6587
+Mymr=\u7DEC\u7538\u6587
+Narb=\u5317\u963F\u62C9\u4F2F\u53E4\u6587
+Nbat=\u7D0D\u5DF4\u6CF0\u6587
+Nkgb=\u7D0D\u897F\u8FE6\u5DF4\u6587
+Nkoo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko)
+Ogam=\u6B50\u7518\u6587
+Olck=\u6851\u5854\u5229\u6587
+Orkh=\u9102\u723E\u6E3E\u6587
+Orya=\u6B50\u5229\u4E9E\u6587
+Osma=\u6B50\u65AF\u66FC\u4E9E\u6587
+Palm=\u5E15\u7C73\u745E\u5C3C\u6587
+Perm=\u53E4\u5F7C\u723E\u59C6\u8AF8\u6587
+Phag=\u516B\u601D\u5DF4\u6587
+Phli=\u7891\u8A18\u6587\u6D3E\u9F8D\u7279\u6587
+Phlp=\u8A69\u7BC7\u96C6\u6D3E\u9F8D\u7279\u6587
+Phlv=\u66F8\u7C4D\u6D3E\u9F8D\u7279\u6587
+Phnx=\u8153\u5C3C\u57FA\u6587
+Plrd=\u67CF\u683C\u7406\u62FC\u97F3\u7B26
+Prti=\u7891\u8A18\u6587\u5DF4\u5E95\u4E9E\u6587
+Rjng=\u62C9\u8B93\u6587
+Roro=\u6717\u683C\u6717\u683C\u8C61\u5F62\u6587
+Runr=\u53E4\u5317\u6B50\u6587\u5B57
+Samr=\u6492\u99AC\u5229\u4E9E\u6587
+Sara=\u6C99\u62C9\u5824\u6587
+Sarb=\u5357\u963F\u62C9\u4F2F\u53E4\u6587
+Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u6587
+Sgnw=\u624B\u8A9E\u66F8\u5BEB\u7B26\u865F
+Shaw=\u7C2B\u67CF\u7D0D\u5B57\u7B26
+Sind=\u4FE1\u5FB7\u6587
+Sinh=\u932B\u862D\u6587
+Sund=\u5DFD\u4E39\u6587
+Sylo=\u5E0C\u6D1B\u5F1F\u7D0D\u683C\u91CC\u6587
+Syrc=\u6558\u5229\u4E9E\u6587
+Syre=\u6558\u5229\u4E9E\u6587 (\u798F\u97F3\u9AD4\u6587\u5B57\u8B8A\u9AD4)
+Syrj=\u6558\u5229\u4E9E\u6587 (\u897F\u65B9\u6587\u5B57\u8B8A\u9AD4)
+Syrn=\u6558\u5229\u4E9E\u6587 (\u6771\u65B9\u6587\u5B57\u8B8A\u9AD4)
+Tagb=\u5357\u5CF6\u6587
+Tale=\u50A3\u54EA\u6587
+Talu=\u65B0\u50A3\u6587
+Taml=\u5766\u7C73\u723E\u6587
+Tavt=\u50A3\u8D8A\u6587
+Telu=\u7279\u62C9\u53E4\u6587
+Teng=\u8AC7\u683C\u74E6\u6587
+Tfng=\u63D0\u975E\u7D0D (\u67CF\u67CF\u723E\u6587)
+Tglg=\u5854\u52A0\u62C9\u65CF\u6587
+Thaa=\u5854\u5B89\u90A3\u6587
+Thai=\u6CF0\u6587
+Tibt=\u897F\u85CF\u6587
+Ugar=\u70CF\u52A0\u5217\u6587
+Vaii=\u8D8A\u5357\u6587 Vai
+Visp=\u53EF\u898B\u8A9E\u8A00
+Wara=Warang Citi
+Xpeo=\u53E4\u6CE2\u65AF\u6587
+Xsux=\u8607\u7C73\u9B6F\u4E9E\u7532\u6587\u6954\u5F62\u6587\u5B57
+Yiii=\u5F5D\u6587
+Zinh=\u907A\u50B3\u5B78\u8853\u8A9E
+Zmth=\u6578\u5B78\u7B26\u865F
+Zsym=\u7B26\u865F
+Zxxx=\u64A4\u92B7\u5BEB\u5165
+Zyyy=\u4E00\u822C\u6587\u5B57
+Zzzz=\u8173\u672C\u672A\u77E5\u6216\u8005\u7121\u6548
# country names
# key is ISO 3166 country code
@@ -478,3 +1109,37 @@
ZA=\u5357\u975e
ZM=\u5c1a\u6bd4\u4e9e
ZW=\u8f9b\u5df4\u5a01
+
+# territory names
+# key is UN M.49 country and area code
+
+001=\u4E16\u754C
+002=\u975E\u6D32
+003=\u5317\u7F8E\u6D32
+005=\u5357\u7F8E\u6D32
+009=\u5927\u6D0B\u6D32
+011=\u897F\u975E
+013=\u4E2D\u7F8E\u6D32
+014=\u6771\u975E
+015=\u5317\u975E
+017=\u4E2D\u975E
+018=\u975E\u6D32\u5357\u90E8
+019=\u7F8E\u6D32
+021=\u7F8E\u6D32\u5317\u90E8
+029=\u52A0\u52D2\u6BD4\u6D77
+030=\u6771\u4E9E
+034=\u5357\u4E9E
+035=\u6771\u5357\u4E9E
+039=\u5357\u6B50
+053=\u6FB3\u6D32\u8207\u7D10\u897F\u862D
+054=\u7F8E\u62C9\u5C3C\u897F\u4E9E
+057=\u5BC6\u514B\u7F85\u5C3C\u897F\u4E9E
+061=\u73BB\u91CC\u5C3C\u897F\u4E9E
+142=\u4E9E\u6D32
+143=\u4E2D\u4E9E
+145=\u897F\u4E9E
+150=\u6B50\u6D32
+151=\u6771\u6B50
+154=\u5317\u6B50
+155=\u897F\u6B50
+419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77
--- a/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Sat May 14 11:24:26 2011 -0700
@@ -50,6 +50,8 @@
public native long getTotalPhysicalMemorySize();
public native long getOpenFileDescriptorCount();
public native long getMaxFileDescriptorCount();
+ public native double getSystemCpuLoad();
+ public native double getProcessCpuLoad();
static {
initialize();
--- a/jdk/src/solaris/doc/sun/man/man1/appletviewer.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/appletviewer.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,44 +19,34 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH appletviewer 1 "02 Jun 2010"
+.TH appletviewer 1 "10 May 2011"
.LP
.SH "Name"
appletviewer \- The Java Applet Viewer.
.LP
-.RS 3
-
-.LP
.LP
The \f3appletviewer\fP command allows you to run applets outside of a web browser.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.LP
\f4appletviewer\fP \f2[\fP \f2options\fP \f2] \fP\f2urls\fP ...
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3appletviewer\fP command connects to the documents or resources designated by \f2urls\fP and displays each applet referenced by the documents in its own window. Note: if the documents referred to by \f2urls\fP do not reference any applets with the \f2OBJECT\fP, \f2EMBED\fP, or \f2APPLET\fP tag, then \f3appletviewer\fP does nothing. For details on the HTML tags that \f3appletviewer\fP supports, see
.na
\f2AppletViewer Tags\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/appletviewertags.html.
+http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
.LP
.LP
\f3Note:\fP The \f3appletviewer\fP requires encoded URLs according to the escaping mechanism defined in RFC2396. Only encoded URLs are supported. However, file names must be unencoded, as specified in RFC2396.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-debug
--- a/jdk/src/solaris/doc/sun/man/man1/apt.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/apt.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH apt 1 "02 Jun 2010"
+.TH apt 1 "10 May 2011"
.LP
.SH "NAME"
@@ -50,21 +50,17 @@
.SH "DESCRIPTION"
.LP
.LP
-The tool \f2apt\fP, annotation processing tool, includes a set of new reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP.
+\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
+.LP
+.LP
+The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP.
.LP
.LP
A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in
.na
\f4Getting Started with \fP\f4apt\fP. @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html
-.LP
-.RS 3
-.TP 3
-Note:
-\f2The functionality of \fP\f2apt\fP has been subsumed by the annotation\-processing infrastructure that is now part of the \f2javac(1)\fP tool and standardized for use by all Java compilers. This new infrastructure relies on the language model and annotation\-processing APIs that are now part of the Java Platform. It is recommended that new annotation processor development be based on the new APIs and the \f2javac\fP tool.
-.RE
-
+http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
.LP
.SH "OPTIONS"
.LP
@@ -90,6 +86,12 @@
.TP 3
\-factory classname
Name of annotation processor factory to use; bypasses default discovery process
+.TP 3
+\-version
+Print version information.
+.TP 3
+\-X
+Display information about non\-standard options.
.RE
.LP
@@ -109,10 +111,35 @@
.LP
Consult the javac(1) man page for information on \f2javac\fP options.
.LP
+.SS
+Non\-Standard Options
+.LP
+.RS 3
+.TP 3
+\-XListAnnotationTypes
+List found annotation types.
+.TP 3
+\-XListDeclarations
+List specified and included declarations.
+.TP 3
+\-XPrintAptRounds
+Print information about initial and recursive \f2apt\fP rounds.
+.TP 3
+\-XPrintFactoryInfo
+Print information about which annotations a factory is asked to process.
+.TP 3
+\-XclassesAsDecls
+Treat both class and source files as declarations to process.
+.RE
+
+.LP
+.LP
+\f3Note\fP: Because these options are non\-standard, they are subject to change without notice.
+.LP
.SH "NOTES"
.LP
.LP
-The functionality of \f2apt\fP has been subsumed by the standard annotation\-processing infrastructure now offered by \f2javac\fP. Support for \f2apt\fP and its associated APIs may be discontinued in some future JDK release.
+The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
.LP
.SH "SEE ALSO"
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/extcheck.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/extcheck.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH extcheck 1 "02 Jun 2010"
+.TH extcheck 1 "10 May 2011"
.LP
.SH "Name"
extcheck \- A utility to detect jar conflicts
.LP
-.RS 3
-
-.LP
.LP
\f3extcheck\fP detects version conflicts between a target jar file and currently installed extension jar files.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +41,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3extcheck\fP utility checks a specified Jar file for title and version conflicts with any extensions installed in the Java(TM) SDK. Before installing an extension, you can use this utility to see if the same or a more recent version of the extension is already installed.
.LP
@@ -63,8 +55,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-verbose
@@ -77,8 +67,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
jar(1)
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/idlj.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/idlj.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH idlj 1 "02 Jun 2010"
+.TH idlj 1 "10 May 2011"
.LP
.SH "Name"
idlj \- The IDL\-to\-Java Compiler
.LP
-.RS 3
-
-.LP
-\f3idlj\fP generates Java bindings from a given IDL file.
-.RE
+\f3idlj\fP generates Java bindings from a given IDL file.
.SH "Synopsis"
.LP
-
-.LP
.nf
\f3
.fl
@@ -48,28 +42,62 @@
.LP
.SH "Description"
.LP
-
.LP
The IDL\-to\-Java Compiler generates the Java bindings for a given IDL file.\ For binding details, see the
.na
\f2OMG IDL to Java Language Language Mapping Specification\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
+.LP
.SS
Emitting Client and Server Bindings
.LP
-.RS 3
+.LP
+To generate Java bindings for an IDL file named My.idl:
+.LP
+.nf
+\f3
+.fl
+idlj My.idl
+.fl
+\fP
+.fi
+
+.LP
+.LP
+This generates the client\-side bindings and is equivalent to:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fclient\fP My.idl
+.fl
+.fi
.LP
-To generate Java bindings for an IDL file named My.idl: \f2idlj My.idl\fP
+.LP
+The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces:
.LP
-This generates the client\-side bindings and is equivalent to: \f2idlj \fP\f4\-fclient\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fserver\fP My.idl
+.fl
+.fi
+
+.LP
.LP
-The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: \f2idlj \fP\f4\-fserver\fP\f2 My.idl\fP
+Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands:
.LP
-Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: \f2idlj \fP\f4\-fclient \-fserver\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fclient \-fserver\fP My.idl
+.fl
+idlj \f3\-fall\fP My.idl
+.fl
+.fi
+
.LP
.LP
There are two possible server\-side models: the Inheritance Model and the Tie Delegation Model.
@@ -82,31 +110,47 @@
.na
\f2org.omg.PortableServer.Servant\fP @
.fi
-http://java.sun.com/javase/6/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
+http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
.LP
.LP
The \f2PortableServer\fP module for the
.na
\f2Portable Object Adapter (POA)\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
.LP
.LP
Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible:
.LP
-\f2idlj \fP\f4\-fclient \-fserver\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-fall\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fclient \-fserver\fP \f3\-oldImplBase\fP My.idl
+.fl
+idlj \f3\-fall\fP \f3\-oldImplBase\fP My.idl
+.fl
+.fi
+
.LP
-Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP.
+.LP
+Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP.
+.LP
.LP
The other server\-side model is called the Tie Model. This is a delegation model. Because it is not possible to generate ties and skeletons at the same time, they must be generated separately. The following commands generate the bindings for the Tie Model:
.LP
-\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-fallTIE\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-fall\fP My.idl
+.fl
+idlj \f3\-fallTIE\fP My.idl
+.fl
+.fi
+
.LP
-For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance:
+.LP
+For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance:
+.LP
.nf
\f3
.fl
@@ -144,13 +188,21 @@
.fi
.LP
-You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method.
+.LP
+You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method.
+.LP
.LP
To generate server\-side, Tie model bindings that are compatible with versions of the IDL to Java language mapping in versions prior to J2SE 1.4.
.LP
-\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fall\fP\f2 My.idl\fP
-.br
-\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fallTIE\fP\f2 My.idl\fP
+.nf
+\f3
+.fl
+idlj \fP\f3\-oldImplBase\fP \f3\-fall\fP My.idl
+.fl
+idlj \f3\-oldImplBase\fP \f3\-fallTIE\fP My.idl
+.fl
+.fi
+
.LP
.LP
For the interface \f2My\fP, this will generate \f2My_Tie.java\fP. The constructor to \f2My_Tie\fP takes a \f2impl\fP. You must provide the implementation for \f2impl\fP, but it does not have to inherit from any other class, only the interface \f2HelloOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2My_Tie\fP. For instance:
@@ -184,201 +236,383 @@
.fi
.LP
-.RE
.SS
Specifying Alternate Locations for Emitted Files
.LP
-.RS 3
+.LP
+If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-td /altdir\fP My.idl
+.fl
+.fi
.LP
-If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as:
-.RS 3
-
.LP
-\f2idlj \fP\f4\-td /altdir\fP\f2 My.idl\fP
-.RE
For the interface \f2My\fP, the bindings will be emitted to \f2/altdir/My.java\fP, etc., instead of \f2./My.java\fP.
-.RE
+.LP
.SS
Specifying Alternate Locations for Include Files
.LP
-.RS 3
+.LP
+If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-i /includes\fP My.idl
+.fl
+.fi
.LP
-If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes\fP\f2 My.idl\fP
+.LP
+If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-i /includes \-i /moreIncludes\fP My.idl
+.fl
+.fi
+
+.LP
.LP
-If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes \-i /moreIncludes\fP\f2 My.idl\fP
+Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form:
.LP
-Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: \f2includes=/includes;/moreIncludes\fP
+.nf
+\f3
+.fl
+includes=/includes;/moreIncludes
+.fl
+\fP
+.fi
+
+.LP
.LP
The compiler will find this file and read in the includes list. Note that in this example the separator character between the two directories is a semicolon (;). This separator character is platform dependent. On the Windows platform, use a semicolon, on the Unix platform, use a colon, etc. For more information on \f2includes\fP, see the
.na
\f2Setting the Classpath\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#general.
-.RE
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general.
+.LP
.SS
Emitting Bindings for Include Files
.LP
-.RS 3
+.LP
+By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files:
+.LP
+
+.LP
+.LP
+\f4My.idl\fP
+.LP
+.nf
+\f3
+.fl
+#include <MyOther.idl>
+.fl
+interface My
+.fl
+{
+.fl
+};
+.fl
+\fP
+.fi
+
+.LP
+
+.LP
+.LP
+\f4MyOther.idl\fP
+.LP
+.nf
+\f3
+.fl
+interface MyOther
+.fl
+{
+.fl
+};
+.fl
+\fP
+.fi
+
+.LP
+
+.LP
+.LP
+The following command will only generate the java bindings for \f2My\fP:
+.LP
+.nf
+\f3
+.fl
+idlj My.idl
+.fl
+\fP
+.fi
+
+.LP
+.LP
+To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-emitAll\fP My.idl
+.fl
+.fi
+
+.LP
+.LP
+There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example:
+.LP
.LP
-By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: \f4My.idl\fP
+.LP
+\f4My.idl\fP
.LP
-\f2#include <MyOther.idl>\fP
-.br
-\f2interface My\fP
-.br
-\f2{\fP
-.br
-\f2};\fP
-.br
-\f4MyOther.idl\fP
+.nf
+\f3
+.fl
+#include <MyOther.idl>
+.fl
+interface My
+.fl
+{
+.fl
+ #include <Embedded.idl>
+.fl
+};
+.fl
+\fP
+.fi
+
.LP
-\f2interface MyOther\fP
-.br
-\f2{\fP
-.br
-\f2};\fP\
+
+.LP
+.LP
+\f4MyOther.idl\fP
.LP
-The following command will only generate the java bindings for \f2My\fP: \f2idlj My.idl\fP
+.nf
+\f3
+.fl
+interface MyOther
+.fl
+{
+.fl
+};
+.fl
+\fP
+.fi
+
.LP
-To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: \f2idlj \fP\f4\-emitAll\fP\f2 My.idl\fP
+
.LP
-There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: \f4My.idl\fP
+.LP
+\f4Embedded.idl\fP
.LP
-\f2#include <MyOther.idl>\fP
-.br
-\f2interface My\fP
-.br
-\f2{\fP
-.br
-\f2\ #include <Embedded.idl>\fP
-.br
-\f2};\ \fP \f4MyOther.idl\fP
+.nf
+\f3
+.fl
+enum E {one, two, three};
+.fl
+\fP
+.fi
+
+.LP
+
+.LP
.LP
-\f2interface MyOther\fP
-.br
-\f2{\fP
-.br
-\f2};\ \fP \f4Embedded.idl\fP
+Running the following command:
.LP
-\f2enum E {one, two, three};\fP\
+.nf
+\f3
+.fl
+idlj My.idl
+.fl
+\fP
+.fi
+
+.LP
+.LP
+will generate the following list of Java files:
.LP
-Running the following command: \f2idlj My.idl\fP
+.nf
+\f3
+.fl
+./MyHolder.java
+.fl
+./MyHelper.java
+.fl
+./_MyStub.java
+.fl
+./MyPackage
+.fl
+./MyPackage/EHolder.java
+.fl
+./MyPackage/EHelper.java
+.fl
+./MyPackage/E.java
+.fl
+./My.java
+.fl
+\fP
+.fi
+
.LP
-will generate the following list of Java files: \f2./MyHolder.java\fP
-.br
-\f2./MyHelper.java\fP
-.br
-\f2./_MyStub.java\fP
-.br
-\f2./MyPackage\fP
-.br
-\f2./MyPackage/EHolder.java\fP
-.br
-\f2./MyPackage/EHelper.java\fP
-.br
-\f2./MyPackage/E.java\fP
-.br
-\f2./My.java\fP
.LP
-Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP).
+Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP).
+.LP
.LP
If the \f2\-emitAll\fP flag had been used in the previous example, then all types in all included files would be emitted.
.LP
-.RE
.SS
Inserting Package Prefixes
.LP
-.RS 3
+.LP
+Suppose that you work for a company named ABC that has constructed the following IDL file:
+.LP
.LP
-Suppose that you work for a company named ABC that has constructed the following IDL file:
-.br
-\f4Widgets.idl\fP
+.LP
+\f4Widgets.idl\fP
.LP
-\f2module Widgets\fP
-.br
-\f2{\fP
-.br
-\f2\ interface W1 {...};\fP
-.br
-\f2\ interface W2 {...};\fP
-.br
-\f2};\fP\
+.nf
+\f3
+.fl
+module Widgets
+.fl
+{
+.fl
+ interface W1 {...};
+.fl
+ interface W2 {...};
+.fl
+};
+.fl
+\fP
+.fi
+
.LP
-Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: \f2idlj \fP\f4\-pkgPrefix Widgets com.abc\fP\f2 Widgets.idl\fP
+
+.LP
+.LP
+Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following:
.LP
-If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package.
+.nf
+\f3
+.fl
+idlj \fP\f3\-pkgPrefix Widgets com.abc\fP Widgets.idl
+.fl
+.fi
+
+.LP
+.LP
+If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package.
+.LP
.LP
If you have a number of these packages that require prefixes, it might be easier to place them into the \f2idl.config\fP file described above. Each package prefix line should be of the form:
.LP
-\f2PkgPrefix.<type>=<prefix>\fP
+.nf
+\f3
+.fl
+PkgPrefix.<type>=<prefix>
+.fl
+\fP
+.fi
+
.LP
-So the line for the above example would be: \f2PkgPrefix.Widgets=com.abc\fP
+So the line for the above example would be:
+.nf
+\f3
+.fl
+PkgPrefix.Widgets=com.abc
+.fl
+\fP
+.fi
+
.LP
.LP
The use of this option does not affect the Repository ID.
.LP
-.RE
.SS
Defining Symbols Before Compilation
.LP
-.RS 3
+.LP
+You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-d\fP MYDEF My.idl
+.fl
+.fi
.LP
-You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command \f2idlj \fP\f4\-d\fP\f2 MYDEF My.idl\fP
.LP
is the equivalent of putting the line \f2#define MYDEF\fP inside \f2My.idl\fP.
-.RE
+.LP
.SS
Preserving Pre\-Existing Bindings
.LP
-.RS 3
+.LP
+If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-keep\fP My.idl
+.fl
+.fi
.LP
-If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command \f2idlj \fP\f4\-keep\fP\f2 My.idl\fP
.LP
-emit all client\-side bindings that do not already exist.
-.RE
+emits all client\-side bindings that do not already exist.
+.LP
.SS
Viewing Progress of Compilation
.LP
-.RS 3
+.LP
+The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode:
+.LP
+.nf
+\f3
+.fl
+idlj \fP\f3\-v\fP My.idl
+.fl
+.fi
.LP
-The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: \f2idlj \fP\f4\-v\fP\f2 My.idl\fP
.LP
By default the compiler does not operate in verbose mode.
-.RE
+.LP
.SS
Displaying Version Information
.LP
-.RS 3
-
-.LP
.LP
To display the build version of the IDL\-to\-Java compiler, specify the \f2\-version\fP option on the command\-line:
.LP
-.LP
-\f2idlj \-version\fP
+.nf
+\f3
+.fl
+idlj \-version
+.fl
+\fP
+.fi
+
.LP
.LP
Version information also appears within the bindings generated by the compiler. Any additional options appearing on the command\-line are ignored.
.LP
-.RE
.SH "Options"
.LP
-
-.LP
.RS 3
.TP 3
\-d symbol
This is equivalent to the following line in an IDL file:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -386,7 +620,6 @@
.fl
\fP
.fi
-.RE
.TP 3
\-emitAll
Emit all types, including those found in \f2#include\fP files.
@@ -410,8 +643,9 @@
Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module.
.TP 3
\-pkgTranslate type package
-Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly.
-.LP
+Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly.
+.br
+.br
If more than one translation matches an identifier, the longest match is chosen. For example, if the arguments include:
.nf
\f3
@@ -420,7 +654,6 @@
.fl
\fP
.fi
-.LP
The following translations would occur:
.nf
\f3
@@ -435,7 +668,6 @@
.fl
\fP
.fi
-.LP
The following package names cannot be translated:
.RS 3
.TP 2
@@ -445,8 +677,7 @@
o
\f2org.omg\fP or any subpackages of \f2org.omg\fP
.RE
-.LP
-Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error.
+Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error.
.TP 3
\-skeletonName xxx%yyy
Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are:
@@ -481,11 +712,11 @@
.RE
.LP
-See the Description section for more option information.
+.LP
+See the Description section for more option information.
+.LP
.SH "Restrictions:"
.LP
-
-.LP
.RS 3
.TP 2
o
@@ -498,8 +729,6 @@
.LP
.SH "Known Problems:"
.LP
-
-.LP
.RS 3
.TP 2
o
--- a/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH appletviewer 1 "14 Apr 2011"
+.TH appletviewer 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/apt.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/apt.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH apt 1 "14 Apr 2011"
+.TH apt 1 "07 May 2011"
.LP
.SH "NAME"
@@ -50,7 +50,10 @@
.SH "ÀâÌÀ"
.LP
.LP
-Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¿·¤·¤¤¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
+\f3Ãí\fP: \f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
+.LP
+.LP
+Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
.LP
.LP
¥Ä¡¼¥ë¤Îµ¡Ç½¤Ë´Ø¤¹¤ë¾ÜºÙ¤È¡¢\f2apt\fP ¤ò»ÈÍѤ·¤¿³«È¯ÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
@@ -59,13 +62,6 @@
.fi
http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
-.RS 3
-.TP 3
-Ãí:
-\f2apt\fP ¤Îµ¡Ç½¤Ï¡¢\f2javac(1)\fP ¥Ä¡¼¥ë¤Î°ìÉô¤È¤Ê¤Ã¤¿Ãí¼á½èÍý¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤ËÁȤ߹þ¤Þ¤ì¡¢¤¹¤Ù¤Æ¤Î Java ¥³¥ó¥Ñ¥¤¥é¤Ç»ÈÍѤǤ¤ë¤è¤¦¤Ëɸ½à²½¤µ¤ì¤Þ¤·¤¿¡£¤³¤Î¿·¤·¤¤¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤Ï¡¢¸À¸ì¥â¥Ç¥ë¤ª¤è¤Ó Java ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î°ìÉô¤È¤Ê¤Ã¤¿Ãí¼á½èÍý API ¤Ë°Í¸¤·¤Þ¤¹¡£Ãí¼á¥×¥í¥»¥Ã¥µ¤Î³«È¯¤Ï¡¢¿·¤·¤¤ API ¤ª¤è¤Ó \f2javac\fP ¥Ä¡¼¥ë¤Ë´ð¤Å¤¤¤Æ¹Ô¤¦¤è¤¦¤ª´«¤á¤·¤Þ¤¹¡£
-.RE
-
-.LP
.SH "¥ª¥×¥·¥ç¥ó"
.LP
.SS
@@ -143,7 +139,7 @@
.SH "Ãí"
.LP
.LP
-\f2apt\fP ¤Îµ¡Ç½¤Ï¡¢\f2javac\fP ¤Ë¤è¤êÄ󶡤µ¤ì¤ëɸ½àÃí¼á½èÍý¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤ËÁȤ߹þ¤Þ¤ì¤Þ¤·¤¿¡£º£¸å¤Î JDK ¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢\f2apt\fP ¤ª¤è¤Ó´ØÏ¢¤¹¤ë API ¤Î¥µ¥Ý¡¼¥È¤¬Ãæ»ß¤¹¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
+\f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.SH "´ØÏ¢¹àÌÜ"
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH extcheck 1 "14 Apr 2011"
+.TH extcheck 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH idlj 1 "14 Apr 2011"
+.TH idlj 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jar.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jar.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jar 1 "14 Apr 2011"
+.TH jar 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jarsigner 1 "14 Apr 2011"
+.TH jarsigner 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -110,16 +110,16 @@
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
- \-keypass dukekeypasswd MyJARFile.jar duke
+ \-keypass \fP\f4<Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 MyJARFile.jar duke
.fl
\fP
.fi
.LP
.LP
-¥¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É (¾å¤ÎÎã¤Ç¤Ï mypass) ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤Ç¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢Èó¸ø³«¸°¤â¥¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É (¾å¤ÎÎã¤Ç¤Ï dukekeypasswd) ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¥³¥Þ¥ó¥É¹Ô¤ÇÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¡¢¤Þ¤¿¡¢»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤È°ã¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
+¥¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤Ç¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢Èó¸ø³«¸°¤â¥¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤ÇÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¡¢¤Þ¤¿¡¢»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤È°ã¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
.LP
.SS
¥¡¼¥¹¥È¥¢¤Î¾ì½ê
@@ -500,7 +500,7 @@
.LP
\f2file\fP ¤Ë»ÈÍѤǤ¤ëʸ»ú¤Ï¡Öa\-zA\-Z0\-9_\-¡×¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢Ê¸»ú¡¢¿ô»ú¡¢²¼Àþ¡¢¤ª¤è¤Ó¥Ï¥¤¥Õ¥ó¤À¤±¤ò»ÈÍѤǤ¤Þ¤¹¡£Ãí: .SF ¤ª¤è¤Ó .DSA ¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¡¢¾®Ê¸»ú¤Ï¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
.LP
-\-sigfile \f2¥ª¥×¥·¥ç¥ó\fP ¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF ¥Õ¥¡¥¤¥ë¤È .DSA ¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¹Ô¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î 8 ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬ 8 ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»È¤ï¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ (_) ¤ËÃÖ¤´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
+\-sigfile \f2\-sigfile\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF ¥Õ¥¡¥¤¥ë¤È .DSA ¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¹Ô¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î 8 ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬ 8 ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»È¤ï¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ (_) ¤ËÃÖ¤´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
.TP 3
\-sigalg algorithm
JAR ¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë½ð̾¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
@@ -609,7 +609,7 @@
\fP
.fi
.TP 3
-\-Jjavaoption
+¤Ç¤¤Þ¤¹javaoption
»ØÄꤵ¤ì¤¿ \f2javaoption\fP ʸ»úÎó¤ò Java ¥¤¥ó¥¿¥×¥ê¥¿¤ËľÀÜÅϤ·¤Þ¤¹¡£\f3jarsigner\fP ¤Ï¡¢¼ÂºÝ¤Ë¤Ï Java ¥¤¥ó¥¿¥×¥ê¥¿¤ËÂФ¹¤ë¡Ö¥é¥Ã¥Ñ¡¼¡×¤Ç¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¼Â¹Ô´Ä¶¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤòÄ´À°¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£»ÈÍѲÄǽ¤Ê¥¤¥ó¥¿¥×¥ê¥¿¥ª¥×¥·¥ç¥ó¤Î°ìÍ÷¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢ \f2java \-h\fP ¤Þ¤¿¤Ï \f2java \-X\fP ¤È¥³¥Þ¥ó¥É¹Ô¤«¤éÆþÎϤ·¤Þ¤¹¡£
.LP
.TP 3
@@ -676,14 +676,14 @@
JAR ¥Õ¥¡¥¤¥ë¤Î½ð̾
.LP
.LP
-bundle.jar ¤È¤¤¤¦Ì¾Á°¤Î JAR ¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤¬ jane ¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈó¸ø³«¸°¤ò»È¤Ã¤Æ¡¢½ð̾¤òÉÕ¤±¤ë¤È¤·¤Þ¤¹¡£¥¡¼¥¹¥È¥¢¤Ï¡¢mystore ¤È¤¤¤¦Ì¾Á°¤Ç¡¢C ¥É¥é¥¤¥Ö¤Î working ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¡¢¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤Ï mypass¡¢\f2jane\fP ¤ÎÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ï j638klm ¤È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢JAR ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Æ sbundle.jar ¤È¤¤¤¦½ð̾ÉÕ¤ JAR ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤¤Þ¤¹¡£
+bundle.jar ¤È¤¤¤¦Ì¾Á°¤Î JAR ¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤¬ jane ¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈó¸ø³«¸°¤ò»È¤Ã¤Æ¡¢½ð̾¤òÉÕ¤±¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢JAR ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Æ sbundle.jar ¤È¤¤¤¦½ð̾ÉÕ¤ JAR ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤¤Þ¤¹¡£
.LP
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
- \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane
+ \-keypass \fP\f4<Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -800,7 +800,7 @@
¾ÚÌÀ½ñ¾ðÊó¤ò»È¤Ã¤¿¸¡¾Ú
.LP
.LP
-¸¡¾Ú»þ¤Ë \-verify ¤È \-verbose ¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¤Æ \f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢ JAR ¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤â½ÐÎϤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¼±ÊÌ̾¾ðÊó (X.509 ¾ÚÌÀ½ñ¤Î¾ì¹ç¤Î¤ß)¡¢¤ª¤è¤Ó JAR ¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ë°ìÃפ·¤¿¾ì¹ç¤Ë¤Ï¡¢³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿½ð̾¼Ô¤Î¥¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
+¸¡¾Ú»þ¤Ë \-verify ¤È \-verbose ¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¤Æ \f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢ ¤ª¤è¤Ó JAR ¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤â½ÐÎϤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¼±ÊÌ̾¾ðÊó (X.509 ¾ÚÌÀ½ñ¤Î¾ì¹ç¤Î¤ß)¡¢¤ª¤è¤Ó JAR ¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ë°ìÃפ·¤¿¾ì¹ç¤Ë¤Ï¡¢³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿½ð̾¼Ô¤Î¥¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
.LP
.nf
\f3
@@ -862,7 +862,7 @@
JAR ¥Õ¥¡¥¤¥ë¤¬¡¢JDK 1.1 ¤Î \f3javakey\fP ¥Ä¡¼¥ë¤ò»È¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢½ð̾¼Ô¤Ï¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ç¤¹¡£¤³¤Î¾ì¹ç¡¢¸¡¾Ú¤Î½ÐÎÏ¤Ë¤Ï i ¤È¤¤¤¦µ¹æ¤¬´Þ¤Þ¤ì¤Þ¤¹¡£JAR ¥Õ¥¡¥¤¥ë¤¬¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤È¥¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤ÎξÊý¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢k ¤È i ¤ÎξÊý¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
.LP
.LP
-\f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤ë¤Î¤ËÂФ·¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+\f2\-certs\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤ë¤Î¤ËÂФ·¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¼¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -978,7 +978,7 @@
.fl
¤³¤Î JAR ¤Ë¤Ï¡¢¤³¤Î¥¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤½ð̾ÉÕ¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹
.fl
-
+
.fl
\fP
.fi
@@ -993,7 +993,7 @@
.nf
\f3
.fl
-failure 1
+failure 1
.fl
\fP
.fi
@@ -1649,7 +1649,7 @@
.na
\f4jarsigner\fP\f2 ¥Ä¡¼¥ë¤Î»ÈÍÑÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢\fP @
.fi
-http://download.oracle.com/javase/tutorial/index.html
+http://download.oracle.com/javase/tutorial/security/index.html
.na
\f2¡ÖJava ¥Á¥å¡¼¥È¥ê¥¢¥ë¡×\fP\f4¤Î\fP @
.fi
--- a/jdk/src/solaris/doc/sun/man/man1/ja/java.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/java.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH java 1 "14 Apr 2011"
+.TH java 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javac.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javac.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javac 1 "14 Apr 2011"
+.TH javac 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -136,10 +136,6 @@
\f3\-sourcepath\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤â¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Ñ¥¹¤«¤é¸¡º÷¤µ¤ì¤Þ¤¹¡£
.LP
\f3\-processorpath\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢Ãí¼á¥×¥í¥»¥Ã¥µ¤â¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Ñ¥¹¤«¤é¸¡º÷¤µ¤ì¤Þ¤¹¡£
-.LP
-Êص¹¾å¡¢ \f2*\fP ¤Î¥Ù¡¼¥¹Ì¾¤ò´Þ¤à¥¯¥é¥¹¥Ñ¥¹Í×ÁǤϡ¢¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î³ÈÄ¥»Ò \f2.jar\fP ¤Þ¤¿¤Ï \f2.JAR\fP ¤ò»ý¤Ä¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò»ØÄꤹ¤ë¤Î¤ÈƱ¤¸¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£
-.LP
-¤¿¤È¤¨¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê \f2foo\fP ¤Ë \f2a.jar\fP ¤È \f2b.JAR\fP ¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹Í×ÁÇ \f2foo/*\fP ¤Ï \f2A.jar:b.JAR\fP ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢JAR ¥Õ¥¡¥¤¥ë¤Î½çÈ֤ϻØÄꤵ¤ì¤Þ¤»¤ó¡£¤³¤Î¥ê¥¹¥È¤Ë¤Ï¡¢±£¤·¥Õ¥¡¥¤¥ë¤â´Þ¤á¡¢»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î JAR ¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£ \f2*\fP ¤À¤±¤«¤éÀ®¤ë¥¯¥é¥¹¥Ñ¥¹¥¨¥ó¥È¥ê¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î JAR ¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ËŸ³«¤µ¤ì¤Þ¤¹¡£ \f2CLASSPATH\fP ´Ä¶ÊÑ¿ô¤â¡¢ÄêµÁ»þ¤Ë¤ÏƱÍͤËŸ³«¤µ¤ì¤Þ¤¹¡£\f3Ãí:\fP ¥³¥Þ¥ó¥É¹Ô´Ä¶¤Î¹½À®¤Ë¤è¤Ã¤Æ¤Ï¡¢ \f2javac \-cp "*.jar" MyClass.java\fP ¤Ê¤É¤Î¤è¤¦¤Ë¡¢¥ï¥¤¥ë¥É¥«¡¼¥Éʸ»ú¤ò°úÍÑÉä¤Ç°Ï¤à¤³¤È¤¬É¬Íפʾì¹ç¤â¤¢¤ê¤Þ¤¹¡£
.TP 3
\-Djava.ext.dirs=directories
¥¤¥ó¥¹¥È¡¼¥ë·¿³ÈÄ¥µ¡Ç½¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
@@ -315,7 +311,7 @@
¿ä¾©¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò͸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò͸ú¤Ë¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
.TP 3
\-Xlint:none
-Java ¸À¸ì»ÅÍͤǤϻØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
+¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
.TP 3
\-Xlint:name
·Ù¹ð \f2name\fP ¤ò͸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç͸ú¤Ë¤Ç¤¤ë·Ù¹ð¤Î¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢¡Ö\-Xlint ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ͸ú¤Þ¤¿¤Ï̵¸ú¤Ë¤Ç¤¤ë·Ù¹ð¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -617,7 +613,7 @@
¤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤Ë¤Ï¡¢¥¯¥é¥¹ \f2AnnosWithoutProcessors\fP ¤ÇÄêµÁ¤ª¤è¤Ó»ÈÍѤµ¤ì¤ëÃí¼á¤Î̾Á°¤ò \f2Anno\fP ¤«¤é \f2NotAnno\fP ¤ËÊѹ¹¤·¤Þ¤¹¡£
.TP 3
rawtypes
-raw ·¿¤ËÂФ¹¤ë̤¸¡ººÁàºî¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£Æäˤ³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢·¿°ú¿ô¤ò»ý¤¿¤Ê¤¤¥Ñ¥é¥á¡¼¥¿²½¤µ¤ì¤¿·¿¤ò»ÈÍѤ¹¤ë¥æ¡¼¥¶¡¼¤ËÂФ·¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤Îʸ¤Ç¤Ï¡¢ \f2rawtypes\fP ·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
+raw ·¿¤ËÂФ¹¤ë̤¸¡ººÁàºî¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤Îʸ¤Ç¤Ï¡¢ \f2rawtypes\fP ·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
.nf
\f3
.fl
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javadoc 1 "14 Apr 2011"
+.TH javadoc 1 "07 May 2011"
.SH "̾Á°"
javadoc \- Java API ¥É¥¥å¥á¥ó¥È¥¸¥§¥Í¥ì¡¼¥¿
.LP
@@ -38,11 +38,7 @@
¥¹¥Ú¡¼¥¹¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢ \f2java.lang\ java.lang.reflect\ java.awt ¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹\fP¡£¥É¥¥å¥á¥ó¥È²½¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¸ÄÊ̤˻ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥ï¥¤¥ë¥É¥«¡¼¥É¤Ï»ÈÍÑÉԲĤǤ¹¡£ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë¤Ï¡¢\-subpackages ¤ò»ÈÍѤ·¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢\f2\-sourcepath\fP ¤ò»ÈÍѤ·¤Æ¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¸¡º÷¤·¤Þ¤¹¡£¡Ö1 ¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.TP 3
sourcefilenames
-¥¹¥Ú¡¼¥¹¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£ ³Æ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥¹¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯ (*) ¤Ê¤É¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤¬¡Ö.java¡×¤È¤¤¤¦³ÈÄ¥»Ò¤Ç½ª¤ï¤ê¡¢¤½¤Î³ÈÄ¥»Ò¤ò½ü¤¤¤¿Ì¾Á°¤¬¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹ (
-.na
-\f2¡ÖIdentifiers¡×\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625¤ò»²¾È)¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ï¥¤¥Õ¥ó¤ò´Þ¤à̾Á° ( \f2X\-Buffer\fP ¤Ê¤É) ¤ä¡¢¤½¤Î¾¤Î̵¸ú¤Êʸ»ú¤ò´Þ¤à̾Á°¤òÉÕ¤±¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥É¥¥å¥á¥ó¥È²½¤ÎÂоݤ«¤é½ü³°¤Ç¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Æ¥¹¥ÈÍѤΥե¡¥¤¥ë¤ä¡¢¥Æ¥ó¥×¥ì¡¼¥È¤«¤éÀ¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ÎÁ°¤Ë»ØÄꤷ¤¿¥Ñ¥¹¤Ë¤è¤Ã¤Æ¡¢javadoc ¤¬¤½¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤¬·è¤Þ¤ê¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¤³¤ì¤é¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¸¡º÷¤¹¤ë¤È¤¤Ë¤Ï \f2\-sourcepath\fP ¤ò»ÈÍѤ·¤Þ¤»¤ó¡£ÁêÂХѥ¹¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òµ¯ÅÀ¤È¤¹¤ë¤¿¤á¡¢ \f2Button.java\fP ¤òÅϤ¹¤³¤È¤Ï¡¢ \f2./Button.java\fP ¤òÅϤ¹¤³¤È¤ÈƱ¤¸¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¥Õ¥ë¥Ñ¥¹¤Ç»ØÄꤹ¤ë¤È¡¢ \f2/home/src/java/awt/Graphics*.java ¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹\fP¡£ ¡Ö1 ¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢¡Ö¥Ñ¥Ã¥±¡¼¥¸¤È¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤Î¤è¤¦¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
+¥¹¥Ú¡¼¥¹¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£ ³Æ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥¹¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯ (*) ¤Ê¤É¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤¬¡Ö.java¡×¤È¤¤¤¦³ÈÄ¥»Ò¤Ç½ª¤ï¤ê¡¢¤½¤Î³ÈÄ¥»Ò¤ò½ü¤¤¤¿Ì¾Á°¤¬¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹ (Java ¸À¸ì»ÅÍͤò»²¾È)¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ï¥¤¥Õ¥ó¤ò´Þ¤à̾Á° ( \f2X\-Buffer\fP ¤Ê¤É) ¤ä¡¢¤½¤Î¾¤Î̵¸ú¤Êʸ»ú¤ò´Þ¤à̾Á°¤òÉÕ¤±¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥É¥¥å¥á¥ó¥È²½¤ÎÂоݤ«¤é½ü³°¤Ç¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Æ¥¹¥ÈÍѤΥե¡¥¤¥ë¤ä¡¢¥Æ¥ó¥×¥ì¡¼¥È¤«¤éÀ¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ÎÁ°¤Ë»ØÄꤷ¤¿¥Ñ¥¹¤Ë¤è¤Ã¤Æ¡¢javadoc ¤¬¤½¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤¬·è¤Þ¤ê¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¤³¤ì¤é¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¸¡º÷¤¹¤ë¤È¤¤Ë¤Ï \f2\-sourcepath\fP ¤ò»ÈÍѤ·¤Þ¤»¤ó¡£ÁêÂХѥ¹¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òµ¯ÅÀ¤È¤¹¤ë¤¿¤á¡¢ \f2Button.java\fP ¤òÅϤ¹¤³¤È¤Ï¡¢ \f2./Button.java\fP ¤òÅϤ¹¤³¤È¤ÈƱ¤¸¤Ç¤¹¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò¥Õ¥ë¥Ñ¥¹¤Ç»ØÄꤹ¤ë¤È¡¢ \f2/home/src/java/awt/Graphics*.java ¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹\fP¡£ ¡Ö1 ¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢¡Ö¥Ñ¥Ã¥±¡¼¥¸¤È¥¯¥é¥¹¤Î¥É¥¥å¥á¥ó¥È²½¡×¤ÎÎã¤Î¤è¤¦¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
.TP 3
\-subpackages pkg1:pkg2:...
¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤«¤é»ØÄꤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ª¤è¤Ó¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËºÆµ¢Åª¤Ë¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Þ¤¿¤Ï¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
@@ -62,11 +58,7 @@
.RS 3
.TP 2
o
-̾Á°¤«¤éÀÜÈø¼¡Ö\f2.java\fP¡×¤ò¼è¤ê½ü¤¯¤È¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ë¤Ê¤Ã¤Æ¤¤¤ë (͸ú¤Êʸ»ú¤Ë¤Ä¤¤¤Æ¤Ï
-.na
-\f2¡ÖIdentifiers¡×\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625¤ò»²¾È)
+̾Á°¤«¤éÀÜÈø¼¡Ö\f2.java\fP¡×¤ò¼è¤ê½ü¤¯¤È¡¢¼ÂºÝ¤Ë͸ú¤Ê¥¯¥é¥¹Ì¾¤Ë¤Ê¤Ã¤Æ¤¤¤ë (Java ¸À¸ì»ÅÍͤÎ͸ú¤Êʸ»ú¤ò»²¾È)
.TP 2
o
¥½¡¼¥¹¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤«¤éÁêÂÐŪ¤Ê¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹¤¬¡¢¶èÀÚ¤êʸ»ú¤ò¥É¥Ã¥È¤ËÊÑ´¹¤¹¤ë¤È¡¢¼ÂºÝ¤Ë͸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë¤Ê¤Ã¤Æ¤¤¤ë
@@ -111,11 +103,7 @@
.LP
¼ÂºÝ¤Ë¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥á¥½¥Ã¥ÉËÜÂΤò»ý¤¿¤Ê¤¤½ã¿è¤Ê¥¹¥¿¥Ö¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤è¤¦¤Ê \f2.java\fP ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤âÆ°ºî¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢API ¤ÎºîÀ®»þ¤Ë¤Ï¡¢¼ÂÁõ¤òµ½Ò¤¹¤ëÁ°¤ÎÀ߷פÎÁᤤÃʳ¬¤Ç¡¢¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤òµ½Ò¤·¤Æ javadoc ¥Ä¡¼¥ë¤ò¼Â¹Ô¤Ç¤¤Þ¤¹¡£
.LP
-¥³¥ó¥Ñ¥¤¥é¤Ë°Í¸¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢HTML ½ÐÎϤϡ¢¼ÂºÝ¤Î¼ÂÁõ¤ËÀµ³Î¤ËÂбþ¤·¤Þ¤¹¡£¼ÂºÝ¤Î¼ÂÁõ¤Ï¡¢ÌÀ¼¨Åª¤Ê¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ç¤Ï¤Ê¤¯¡¢°ÅÌۤΥ½¡¼¥¹¥³¡¼¥É¤Ë°Í¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢.class ¥Õ¥¡¥¤¥ë¤Ë¤Ï¸ºß¤¹¤ë¤¬¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ï¸ºß¤·¤Ê¤¤
-.na
-\f2¥Ç¥Õ¥©¥ë¥È¥³¥ó¥¹¥È¥é¥¯¥¿\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (Java ¸À¸ì»ÅÍͤΥ»¥¯¥·¥ç¥ó 8.6.7) \f2¤ò¥É¥¥å¥á¥ó¥È²½\fP ¤·¤Þ¤¹¡£
+¥³¥ó¥Ñ¥¤¥é¤Ë°Í¸¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢HTML ½ÐÎϤϡ¢¼ÂºÝ¤Î¼ÂÁõ¤ËÀµ³Î¤ËÂбþ¤·¤Þ¤¹¡£¼ÂºÝ¤Î¼ÂÁõ¤Ï¡¢ÌÀ¼¨Åª¤Ê¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ç¤Ï¤Ê¤¯¡¢°ÅÌۤΥ½¡¼¥¹¥³¡¼¥É¤Ë°Í¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢.class ¥Õ¥¡¥¤¥ë¤Ë¤Ï¸ºß¤¹¤ë¤¬¥½¡¼¥¹¥³¡¼¥É¤Ë¤Ï¸ºß¤·¤Ê¤¤¥Ç¥Õ¥©¥ë¥È¥³¥ó¥¹¥È¥é¥¯¥¿ (Java ¸À¸ì»ÅÍͤò»²¾È) \f2¤ò¥É¥¥å¥á¥ó¥È²½\fP ¤·¤Þ¤¹¡£
.LP
Ä̾Javadoc ¥Ä¡¼¥ë¤Ç¤Ï¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥³¡¼¥É¤¬ÉÔ´°Á´¤Þ¤¿¤Ï¥¨¥é¡¼¤ò´Þ¤ó¤Ç¤¤¤ë¾ì¹ç¤Ç¤â¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤Ç¤¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢¥Ç¥Ð¥Ã¥°¤ä¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤ò´°Î»¤¹¤ëÁ°¤Ë¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Java ¸À¸ì»ÅÍͤˤè¤ë¤È¡¢Ãê¾Ý¥á¥½¥Ã¥É¤ò´Þ¤à¥¯¥é¥¹¤Ï¡¢¤½¤ì¼«ÂÎÃê¾Ý¤È¤·¤ÆÀë¸À¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤Î¥¨¥é¡¼¤ò¸¡½Ð¤¹¤ë¤È¡¢javac ¥³¥ó¥Ñ¥¤¥é¤ÏÄä»ß¤·¤Þ¤¹¤¬¡¢Javadoc ¥Ä¡¼¥ë¤Ï·Ù¹ð¤ò½Ð¤µ¤º¤Ë½èÍý¤ò³¹Ô¤·¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤Î´ðËÜŪ¤Ê¥Á¥§¥Ã¥¯¤ò¹Ô¤¤¤Þ¤¹¡£¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¤è¤ê¾Ü¤·¤¯¥Á¥§¥Ã¥¯¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢DocCheck ¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
.LP
@@ -161,7 +149,7 @@
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html \- ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤Îµ½ÒÊýË¡¤Ë´Ø¤¹¤ë Sun ¤Îµ¬Ìó
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html \- ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤Îµ½ÒÊýË¡¤Ë´Ø¤¹¤ë Sun ¤Îµ¬Ìó
.TP 2
o
.na
@@ -179,13 +167,13 @@
.na
\f2DocCheck ¥É¥Ã¥¯¥ì¥Ã¥È\fP @
.fi
-http://java.sun.com/javadoc/doccheck \- ¥½¡¼¥¹¥Õ¥¡¥¤¥ëÆâ¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¥Á¥§¥Ã¥¯¤·¡¢¸¡½Ð¤µ¤ì¤¿¥¨¥é¡¼¤äÉÔÀµ¤Î¥ì¥Ý¡¼¥È¤òÀ¸À®¤·¤Þ¤¹¡£Doc Check ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤Î°ìÉô¤Ç¤¹¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- ¥½¡¼¥¹¥Õ¥¡¥¤¥ëÆâ¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¥Á¥§¥Ã¥¯¤·¡¢¸¡½Ð¤µ¤ì¤¿¥¨¥é¡¼¤äÉÔÀµ¤Î¥ì¥Ý¡¼¥È¤òÀ¸À®¤·¤Þ¤¹¡£Doc Check ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤Î°ìÉô¤Ç¤¹¡£
.TP 2
o
.na
\f2MIF ¥É¥Ã¥¯¥ì¥Ã¥È\fP @
.fi
-http://java.sun.com/javadoc/mifdoclet \- MIF¡¢FrameMaker¡¢PDF ¤Î½ñ¼°¤Ç API ¥É¥¥å¥á¥ó¥È¤ò¼«Æ°À¸À®¤·¤Þ¤¹¡£MIF ¤Ï Adobe FrameMaker ¤Î¸ò´¹½ñ¼°¤Ç¤¹¡£
+http://java.sun.com/j2se/javadoc/mifdoclet/ \- MIF¡¢FrameMaker¡¢PDF ¤Î½ñ¼°¤Ç API ¥É¥¥å¥á¥ó¥È¤ò¼«Æ°À¸À®¤·¤Þ¤¹¡£MIF ¤Ï Adobe FrameMaker ¤Î¸ò´¹½ñ¼°¤Ç¤¹¡£
.RE
.SS
ÍѸì
@@ -218,7 +206,7 @@
.na
\f21.3\fP @
.fi
-http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ¤«¤éÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£javadoc ¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤È¤¤Ï¡¢Javadoc ¤Î¥Ö¡¼¥È¥¯¥é¥¹¥Ñ¥¹¤ª¤è¤Ó¥¯¥é¥¹¥Ñ¥¹Æâ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î»²¾È¥¯¥é¥¹¤ò¥á¥â¥ê¡¼¤Ë¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö¥¯¥é¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡×¤È¤¤¤¦·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥¯¥é¥¹¤Î¸ºß¤È¤½¤Î¥á¥ó¥Ð¡¼¤Î´°Á´»ØÄê¤Î̾Á°¤òȽÊ̤¹¤ë¤Î¤ËɬÍפʤ¹¤Ù¤Æ¤Î¾ðÊó¤ò¡¢.class ¥Õ¥¡¥¤¥ë¤«¤é°ú¤½Ð¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
+http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ¤«¤éÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£javadoc ¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤È¤¤Ï¡¢Javadoc ¤Î¥Ö¡¼¥È¥¯¥é¥¹¥Ñ¥¹¤ª¤è¤Ó¥¯¥é¥¹¥Ñ¥¹Æâ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î»²¾È¥¯¥é¥¹¤ò¥á¥â¥ê¡¼¤Ë¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö¥¯¥é¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡×¤È¤¤¤¦·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥¯¥é¥¹¤Î¸ºß¤È¤½¤Î¥á¥ó¥Ð¡¼¤Î´°Á´»ØÄê¤Î̾Á°¤òȽÊ̤¹¤ë¤Î¤ËɬÍפʤ¹¤Ù¤Æ¤Î¾ðÊó¤ò¡¢.class ¥Õ¥¡¥¤¥ë¤«¤é°ú¤½Ð¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
.LP
.TP 3
³°Éô»²¾È¥¯¥é¥¹ (external referenced classes)
@@ -310,7 +298,7 @@
.na
\f2package.html\fP¤ÎÎã @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
\f3¥Ñ¥Ã¥±¡¼¥¸¥³¥á¥ó¥È¥Õ¥¡¥¤¥ë¤Î½èÍý\fP \- Javadoc ¥Ä¡¼¥ë¤Ï¡¢¼Â¹Ô»þ¤Ë¥Ñ¥Ã¥±¡¼¥¸¥³¥á¥ó¥È¥Õ¥¡¥¤¥ë¤ò¼«Æ°Åª¤Ë¸¡º÷¤·¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¼¡¤Î½èÍý¤ò¹Ô¤¤¤Þ¤¹¡£
.RS 3
@@ -350,7 +338,7 @@
.RS 3
.TP 2
o
-\f2<body>\fP ¥¿¥°¤È \f2</body>\fP ¥¿¥°¤Î´Ö¤Ë¤¢¤ë¤¹¤Ù¤Æ¤ÎÆâÍƤò½èÍýÂоݤȤ·¤Æ¥³¥Ô¡¼¤¹¤ë
+\f2<body>\fP ¤È \f2</body>\fP ¥¿¥°¤Î´Ö¤Ë¤¢¤ë¤¹¤Ù¤Æ¤ÎÆâÍƤò½èÍýÂоݤȤ·¤Æ¥³¥Ô¡¼¤¹¤ë
.TP 2
o
³µÍ×¥¿¥°¤¬¤¢¤ì¤Ð¡¢¤¹¤Ù¤Æ½èÍý¤¹¤ë
@@ -408,11 +396,7 @@
.LP
¥Æ¥¹¥È¥Õ¥¡¥¤¥ë¤Ë doc ¥³¥á¥ó¥È¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ë¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤ó¤À¥Æ¥¹¥È¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ÇÅϤ·¤Æ¥Æ¥¹¥È¥Õ¥¡¥¤¥ë¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ë¤è¤¦¤Ë¡¢Javadoc ¥Ä¡¼¥ë¤òÊ̸Ĥ˼¹ԤǤ¤ë¤è¤¦¤ËÀßÄê¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢ \f2com/package1/test\-files/*.java ¤Ê¤É¤Ç¤¹\fP¡£
.LP
-\f3¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È\fP \- ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡Ö.java¡×¤Ç½ª¤ï¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤¤Þ¤»¤ó¡£¥½¡¼¥¹¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÊÝ»ý¤·¤¿¤¤¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤¬¤¢¤ë¾ì¹ç¤Ï¡¢ \f2Buffer\-Template.java\fP ¤Î¤è¤¦¤Ë¥Ï¥¤¥Õ¥ó¤ä¤½¤Î¾¤Î̵¸ú¤Ê Java ʸ»ú¤ò̾Á°¤Ë´Þ¤á¤ë¤³¤È¤Ç¡¢¥Æ¥ó¥×¥ì¡¼¥È¤¬½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¡Ö.java¡×ÀÜÈø¼¤ò½ü¤¤¤¿Ì¾Á°¤¬ Àµµ¬¤Î¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤À¤±¤Ç¤¢¤ë¤¿¤á¤Ç¤¹ (
-.na
-\f2¡ÖIdentifiers¡×\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625»²¾È)¡£
+\f3¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È\fP \- ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡Ö.java¡×¤Ç½ª¤ï¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤¤Þ¤»¤ó¡£¥½¡¼¥¹¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÊÝ»ý¤·¤¿¤¤¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤¬¤¢¤ë¾ì¹ç¤Ï¡¢ \f2Buffer\-Template.java\fP ¤Î¤è¤¦¤Ë¥Ï¥¤¥Õ¥ó¤ä¤½¤Î¾¤Î̵¸ú¤Ê Java ʸ»ú¤ò̾Á°¤Ë´Þ¤á¤ë¤³¤È¤Ç¡¢¥Æ¥ó¥×¥ì¡¼¥È¤¬½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¡Ö.java¡×ÀÜÈø¼¤ò½ü¤¤¤¿Ì¾Á°¤¬ Àµµ¬¤Î¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤À¤±¤Ç¤¢¤ë¤¿¤á¤Ç¤¹ (Java ¸À¸ì»ÅÍͤΡÖIdentifiers¡×¤Ë´Ø¤¹¤ë¾ðÊó¤ò»²¾È)¡£
.SH "À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë"
.LP
¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢javadoc ¥Ä¡¼¥ë¤Ï¡¢HTML ·Á¼°¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ëɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤ò»È¤¤¤Þ¤¹¡£¤³¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤Ï¡¢°Ê²¼¤Î¼ïÎà¤Î¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î HTML ¥Ú¡¼¥¸¤Ï¡¢¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤ËÁêÅö¤·¤Þ¤¹¡£javadoc ¤¬À¸À®¤¹¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ë¤Ï¡¢¥¯¥é¥¹¤ä¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î̾Á°¤Ë¤Á¤Ê¤ó¤À¤â¤Î¤È¡¢¤½¤¦¤Ç¤Ê¤¤¤â¤Î ( \f2package\-summary.html ¤Ê¤É\fP) ¤Î 2 ¼ïÎब¤¢¤ê¤Þ¤¹¡£¸å¼Ô¤Î¥°¥ë¡¼¥×¤Î¥Õ¥¡¥¤¥ë̾¤Ë¤Ï¡¢Á°¼Ô¤Î¥°¥ë¡¼¥×¤È¥Õ¥¡¥¤¥ë̾¤¬¶¥¹ç¤·¤Ê¤¤¤è¤¦¤Ë¡¢¥Ï¥¤¥Õ¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -756,7 +740,7 @@
¤³¤ÎÆ°ºî¤Ï¥Ð¡¼¥¸¥ç¥ó 1.3 °ÊÁ°¤ÎÆ°ºî¤È¤ÏÂоÈŪ¤Ç¤¹¡£¤³¤ì¤Þ¤Ç¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¤¬Â¸ºß¤¹¤ì¤Ð¡¢¥³¥á¥ó¥È¤Ï°ìÀڷѾµ¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£
.TP 2
o
-\f3{@inheritDoc} ¥¿¥°¤ò´Þ¤à¥³¥á¥ó¥È¤òÌÀ¼¨Åª¤Ë·Ñ¾µ¤¹¤ë\fP \- ¥¤¥ó¥é¥¤¥ó¥¿¥° \f2{@inheritDoc}\fP ¤ò¡¢¥á¥½¥Ã¥É¤Î¼çÀâÌÀÆâ¤Þ¤¿¤Ï \f2@return\fP¡¢ \f2@param\fP ¡¢ \f2@throws\fP ¤Î¤¤¤º¤ì¤«¤Î¥¿¥°¥³¥á¥ó¥ÈÆâ¤ËÁÞÆþ¤·¤Þ¤¹¡£Âбþ¤¹¤ë·Ñ¾µ¤µ¤ì¤¿¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¥³¥á¥ó¥È¤¬¤½¤Î°ÌÃ֤˥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
+\f3{@inheritDoc} ¥¿¥°¤ò´Þ¤à¥³¥á¥ó¥È¤òÌÀ¼¨Åª¤Ë·Ñ¾µ¤¹¤ë\fP \- ¥¤¥ó¥é¥¤¥ó¥¿¥° \f2{@inheritDoc}\fP ¤ò¡¢¥á¥½¥Ã¥É¤Î¼çÀâÌÀÆâ¤Þ¤¿¤Ï \f2@return\fP ¥¿¥°¡¢ \f2@param\fP ¥¿¥°¡¢¤Þ¤¿¤Ï \f2@throws\fP ¤Î¤¤¤º¤ì¤«¤Î¥¿¥°¥³¥á¥ó¥ÈÆâ¤ËÁÞÆþ¤·¤Þ¤¹¡£Âбþ¤¹¤ë·Ñ¾µ¤µ¤ì¤¿¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¥³¥á¥ó¥È¤¬¤½¤Î°ÌÃ֤˥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
.RE
.LP
¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ò¼ÂºÝ¤Ë¥³¥Ô¡¼¤ËÍøÍѤ¹¤ë¤Ë¤Ï¡¢·Ñ¾µ¤·¤¿¥á¥½¥Ã¥É¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤¬ \-sourcepath ¤Ç»ØÄꤷ¤¿¥Ñ¥¹¤À¤±¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¤³¤È¤¬É¬Íפˤʤê¤Þ¤¹¡£¥³¥Þ¥ó¥É¹Ô¤Ç¡¢¥¯¥é¥¹¤â¥Ñ¥Ã¥±¡¼¥¸¤âÅϤ¹É¬ÍפϤ¢¤ê¤Þ¤»¤ó¡£¤³¤ÎÅÀ¤Ï¡¢¥¯¥é¥¹¤¬¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤«¤Ã¤¿ 1.3.x °ÊÁ°¤Î¥ê¥ê¡¼¥¹¤È°Û¤Ê¤ê¤Þ¤¹¡£
@@ -954,7 +938,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 867 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 851 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1079,7 +1063,7 @@
.na
\f2@author ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.RS 3
.TP 3
@@ -1094,11 +1078,11 @@
.na
\f2@deprecated ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.RS 3
.TP 2
o
-Javadoc 1.2 °Ê¹ß¤Ç¤Ï \f2{@link}\fP ¥¿¥°¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢É¬Íפʾì½ê¤Ë¥¤¥ó¥é¥¤¥ó¤Ç¥ê¥ó¥¯¤òºîÀ®¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+Javadoc 1.2 °Ê¹ß¤Ç¤Ï \f2{@link}\fP ¥¿¥°¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢É¬Íפʾì½ê¤Ë¥¤¥ó¥é¥¤¥ó¤Ç¥ê¥ó¥¯¤òºîÀ®¤Ç¤¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
.nf
\f3
.fl
@@ -1292,7 +1276,7 @@
.na
\f2{@link} ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
{@linkplain\ package.class#member\ label}
@@ -1386,7 +1370,7 @@
.na
\f2@param ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
@return\ description
@@ -1396,7 +1380,7 @@
.na
\f2@return ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
@see\ reference
@@ -1644,7 +1628,7 @@
.nr 40 \n(79+(0*\n(38)
.nr 80 +\n(40
.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1358 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1342 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1751,7 +1735,7 @@
.LP
\f3@see ¤Î¸¡º÷½ç½ø\fP \- Javadoc ¥Ä¡¼¥ë¤Ï¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë (.java)¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë (package.html ¤Þ¤¿¤Ï package\-info.java) ¤Þ¤¿¤Ï³µÍ×¥Õ¥¡¥¤¥ë (overview.html) ¤Ë´Þ¤Þ¤ì¤ë \f2@see\fP ¥¿¥°¤ò½èÍý¤·¤Þ¤¹¡£¸å¼Ô¤Î 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢´°Á´»ØÄê¤Î̾Á°¤ò \f2@see\fP ¥¿¥°¤Ë»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢´°Á´»ØÄê¤Î̾Á°¡¢¤Þ¤¿¤ÏÉôʬ»ØÄê¤Î̾Á°¤ò»ØÄê¤Ç¤¤Þ¤¹¡£
.LP
-Javadoc ¥Ä¡¼¥ë¤Ï¡¢´°Á´»ØÄê¤Ç¤Ê¤¤Ì¾Á°¤¬µ½Ò¤µ¤ì¤¿ \f2@see\fP ¥¿¥°¤ò \f2.java ¥Õ¥¡¥¤¥ëÆâ¤Ç¸«¤Ä¤±¤ë¤È¡¢\fP Java ¥³¥ó¥Ñ¥¤¥é¤ÈƱ¤¸½ç½ø¤Ç»ØÄꤵ¤ì¤¿Ì¾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£ ¤¿¤À¤·¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢ÆÃÄê¤Î̾Á°¶õ´Ö¤Î¤¢¤¤¤Þ¤¤¤µ¤ò¸¡½Ð¤·¤Þ¤»¤ó¡£ ¤³¤ì¤Ï¡¢¥½¡¼¥¹¥³¡¼¥É¤Ë¤³¤ì¤é¤Î¥¨¥é¡¼¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤ë¤¿¤á¤Ç¤¹¡£¤³¤Î¸¡º÷½ç½ø¤Ï¡¢Java ¸À¸ì»ÅÍÍÂè 2 ÈǤÎÂè 6 ¾Ï¡ÖNames¡×¤ÇÀµ¼°¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢´ØÏ¢¤¹¤ë¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¡¢¤ª¤è¤Ó¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¤Î¤¹¤Ù¤Æ¤«¤é̾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢¼¡¤Î½ç½ø¤Ç¸¡º÷¤·¤Þ¤¹¡£
+Javadoc ¥Ä¡¼¥ë¤Ï¡¢´°Á´»ØÄê¤Ç¤Ê¤¤Ì¾Á°¤¬µ½Ò¤µ¤ì¤¿ \f2@see\fP ¥¿¥°¤ò \f2.java ¥Õ¥¡¥¤¥ëÆâ¤Ç¸«¤Ä¤±¤ë¤È¡¢\fP Java ¥³¥ó¥Ñ¥¤¥é¤ÈƱ¤¸½ç½ø¤Ç»ØÄꤵ¤ì¤¿Ì¾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£ ¤¿¤À¤·¡¢Javadoc ¥Ä¡¼¥ë¤Ï¡¢ÆÃÄê¤Î̾Á°¶õ´Ö¤Î¤¢¤¤¤Þ¤¤¤µ¤ò¸¡½Ð¤·¤Þ¤»¤ó¡£ ¤³¤ì¤Ï¡¢¥½¡¼¥¹¥³¡¼¥É¤Ë¤³¤ì¤é¤Î¥¨¥é¡¼¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤ë¤¿¤á¤Ç¤¹¡£¤³¤Î¸¡º÷½ç½ø¤Ï¡¢\f2Java ¸À¸ì»ÅÍÍ\fP¤ÇÀµ¼°¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢´ØÏ¢¤¹¤ë¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¡¢¤ª¤è¤Ó¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¤Î¤¹¤Ù¤Æ¤«¤é̾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢¼¡¤Î½ç½ø¤Ç¸¡º÷¤·¤Þ¤¹¡£
.RS 3
.TP 3
1.
@@ -1990,7 +1974,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 1434 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1418 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2131,7 +2115,7 @@
.LP
\f3@see ¤ÎÎã\fP
.br
-±¦Â¦¤Î¥³¥á¥ó¥È¤Ï¡¢ \f2@see\fP ¥¿¥°¤¬ \f2java.applet.Applet\fP ¤Î¤è¤¦¤ÊÊ̤Υѥ屡¼¥¸¤Î¥¯¥é¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ë¡¢Ì¾Á°¤¬¤É¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
+±¦Â¦¤Î¥³¥á¥ó¥È¤Ï¡¢ \f2@see\fP ¥¿¥°¤¬ \f2java.applet.Applet\fP ¤Ê¤É¤ÎÊ̤Υѥ屡¼¥¸¤Î¥¯¥é¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ë¡¢Ì¾Á°¤¬¤É¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
.nf
\f3
.fl
@@ -2163,7 +2147,7 @@
.na
\f2@see ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.RE
.RE
.LP
@@ -2198,7 +2182,7 @@
.na
\f2¡ÖľÎ󲽤ΠFAQ¡×\fP @
.fi
-http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î FAQ ¤Ë¤Ï¡¢¡Ö\-private ¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤Ê¤¤¤Ç javadoc ¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¤Î¤Ë private ¥Õ¥£¡¼¥ë¥É¤Î @serial ¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¤È¤¤¤¦ javadoc ¤Î·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë¡×¤Ê¤É¤Î°ìÈÌŪ¤Ê¼ÁÌä¤Ø¤Î²óÅú¤¬µºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Ä¾Îó²½·Á¼°»ÅÍͤ˥¯¥é¥¹¤ò´Þ¤á¤ë¾ì¹ç¤Ë¤Ï¡¢
+http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î FAQ ¤Ë¤Ï¡¢¡Ö\-private ¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤Ê¤¤¤Ç javadoc ¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¤Î¤Ë private ¥Õ¥£¡¼¥ë¥É¤Î @serial ¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¤È¤¤¤¦ javadoc ¤Î·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë¡×¤Ê¤É¤Î°ìÈÌŪ¤Ê¼ÁÌä¤Ø¤Î²óÅú¤¬µºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Ä¾Îó²½·Á¼°»ÅÍͤ˥¯¥é¥¹¤ò´Þ¤á¤ë¾ì¹ç¤Ë¤Ï¡¢
.na
\f2¡ÖSun ¤Î»ÅÍÍ¡×\fP @
.fi
@@ -2241,7 +2225,7 @@
.na
\f2@throws ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.TP 3
{@value\ package.class#field}
@@ -2293,13 +2277,13 @@
@version\ version\-text
\-version ¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤ë¤È¡¢À¸À®¥É¥¥å¥á¥ó¥È¤Ë [¥Ð¡¼¥¸¥ç¥ó] ¾®¸«½Ð¤·¤òÄɲä·¡¢»ØÄꤵ¤ì¤¿ \f2version\-text\fP ¤ò½ñ¤¹þ¤ß¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¤³¤Î¥³¡¼¥É¤¬´Þ¤Þ¤ì¤ë¥½¥Õ¥È¥¦¥§¥¢¤Î¸½ºß¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÊÝ»ý¤¹¤ë¤è¤¦¤Ë°Õ¿Þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤ËÂФ·¡¢@since ¤Ï¡¢¤³¤Î¥³¡¼¥É¤¬Æ³Æþ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÊÝ»ý¤·¤Þ¤¹¡£ \f2version\-text\fP ¤Ë¤Ï¡¢ÆÃÊ̤ÊÆâÉô¹½Â¤¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥Ð¡¼¥¸¥ç¥ó¥¿¥°¤ò»ÈÍѤǤ¤ë¾ì½ê¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢¡Ö¥¿¥°¤ò»ÈÍѤǤ¤ë¾ì½ê¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
-1 ¤Ä¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ËÊ£¿ô¤Î \f2@version\fP ¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£°ÕÌ£¤¬¼º¤ï¤ì¤Ê¤¤ÈÏ°ÏÆâ¤Ç¡¢1 ¤Ä¤Î \f2@version\fP ¥¿¥°¤Ë 1 ¤Ä¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¡¢Ê£¿ô¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£Á°¼Ô¤Î¾ì¹ç¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ̾Á°¤È̾Á°¤Î´Ö¤Ë¥³¥ó¥Þ (\f2,\fP) ¤È¶õÇò¤¬Ì¾Á°¤Î´Ö¤ËÁÞÆþ¤µ¤ì¤Þ¤¹¡£¸å¼Ô¤Î¾ì¹ç¤Ï¡¢¥Æ¥¥¹¥ÈÁ´ÂΤ¬¡¢²òÀϤµ¤ì¤ë¤³¤È¤Ê¤¯¡¢À¸À®¥É¥¥å¥á¥ó¥È¤Ë¤½¤Î¤Þ¤Þ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥³¥ó¥Þ¤Ç¤Ï¤Ê¤¯¡¢³Æ¸À¸ì¤ËÂбþ¤·¤¿Ì¾Á°¶èÀÚ¤êʸ»ú¤ò»È¤¦É¬Íפ¬¤¢¤ë¤È¤¤Ï¡¢1 ¤Ä¤Î¥¿¥°¤ËÊ£¿ô¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+1 ¤Ä¤Î¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥³¥á¥ó¥È¤ËÊ£¿ô¤Î \f2@version\fP ¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£°ÕÌ£¤¬¼º¤ï¤ì¤Ê¤¤ÈÏ°ÏÆâ¤Ç¡¢1 ¤Ä¤Î \f2@version\fP ¥¿¥°¤Ë 1 ¤Ä¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¡¢Ê£¿ô¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£Á°¼Ô¤Î¾ì¹ç¤Ï¡¢Javadoc ¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ̾Á°¤È̾Á°¤Î´Ö¤Ë¥³¥ó¥Þ (\f2,\fP) ¤È¶õÇò¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹¡£¸å¼Ô¤Î¾ì¹ç¤Ï¡¢¥Æ¥¥¹¥ÈÁ´ÂΤ¬¡¢²òÀϤµ¤ì¤ë¤³¤È¤Ê¤¯¡¢À¸À®¥É¥¥å¥á¥ó¥È¤Ë¤½¤Î¤Þ¤Þ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥³¥ó¥Þ¤Ç¤Ï¤Ê¤¯¡¢³Æ¸À¸ì¤ËÂбþ¤·¤¿Ì¾Á°¶èÀÚ¤êʸ»ú¤ò»È¤¦É¬Íפ¬¤¢¤ë¤È¤¤Ï¡¢1 ¤Ä¤Î¥¿¥°¤ËÊ£¿ô¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
.LP
¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
.na
\f2@version ¥¿¥°¤Î¥É¥¥å¥á¥ó¥È\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.RE
.SS
¥¿¥°¤ò»ÈÍѤǤ¤ë¾ì½ê
@@ -2789,7 +2773,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 2009 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1993 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2982,7 +2966,7 @@
.LP
.TP 3
\-classpath\ classpathlist
-javadoc ¤¬»²¾È¥¯¥é¥¹ (\f2.class\fP ¥Õ¥¡¥¤¥ë) ¤Î¸¡º÷¤ò¹Ô¤¦¤È¤¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤È¤Ï¡¢¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤È¡¢¤½¤ì¤é¤Î¥¯¥é¥¹¤«¤é»²¾È¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤ò»Ø¤·¤Þ¤¹¡£\f2classpathlist\fP ¤Ë¤Ï¡¢¥³¥í¥ó (\f2:\fP) ¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¹¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ Javadoc ¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¤·¤Þ¤¹¡£classpathlist ¤ò»ØÄꤹ¤ë¤È¤¤Ï¡¢
+javadoc ¤¬»²¾È¥¯¥é¥¹ (\f2.class\fP ¥Õ¥¡¥¤¥ë) ¤Î¸¡º÷¤ò¹Ô¤¦¤È¤¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤È¤Ï¡¢¥É¥¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤È¡¢¤½¤ì¤é¤Î¥¯¥é¥¹¤«¤é»²¾È¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤ò»Ø¤·¤Þ¤¹¡£\f2classpathlist\fP ¤Ë¤Ï¡¢¥³¥í¥ó (\f2:\fP) ¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¹¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£Javadoc ¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¤·¤Þ¤¹¡£classpathlist ¤ò»ØÄꤹ¤ë¤È¤¤Ï¡¢
.na
\f2¥¯¥é¥¹¥Ñ¥¹\fP @
.fi
@@ -3243,13 +3227,13 @@
.LP
\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- \f2java.lang\fP¡¢ \f2java.io\fP ¡¢¤½¤Î¾¤Î Java ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸ (
.na
-\f2http://java.sun.com/javase/6/docs/api/\fP @
+\f2http://download.oracle.com/javase/7/docs/api/\fP @
.fi
-http://java.sun.com/javase/6/docs/api Æâ) ¤Ë¥ê¥ó¥¯¤¹¤ë¾ì¹ç¤ò¹Í¤¨¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤ä \f2\-d\fP ¤Ê¤É¡¢¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¼¨¤·¤Æ¤¤¤Þ¤»¤ó¡£
+http://download.oracle.com/javase/7/docs/api/ Æâ) ¤Ë¥ê¥ó¥¯¤·¤¿¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤ä \f2\-d\fP ¤Ê¤É¡¢¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¼¨¤·¤Æ¤¤¤Þ¤»¤ó¡£
.nf
\f3
.fl
- % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP
+ % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP
.fl
.fi
\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÁêÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- 2 ¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¡¢¤½¤Î¥É¥¥å¥á¥ó¥È¤¬ Javadoc ¥Ä¡¼¥ë¤òÊ£¿ô²ó¼Â¹Ô¤·¤¿·ë²ÌÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤È¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢¤³¤ì¤é¤Î¥É¥¥å¥á¥ó¥È¤¬ÁêÂХѥ¹¤Çʬ³ä¤µ¤ì¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£¤³¤ÎÎã¤Î¾ì¹ç¡¢¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢API ¤Ç¤¢¤ë \f2com.apipackage\fP ¤È¡¢SPI (¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¥¤¥ó¥¿¥Õ¥§¡¼¥¹) ¤Ç¤¢¤ë \f2com.spipackage\fP ¤Ç¤¹¡£¥É¥¥å¥á¥ó¥È¤Î³ÊǼÀè¤Ï¡¢ \f2docs/api/com/apipackage\fP ¤È \f2docs/spi/com/spipackage\fP ¤Ç¤¹¡£API ¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥¥å¥á¥ó¥È¤Ï¤¹¤Ç¤ËÀ¸À®ºÑ¤ß¤Ç¡¢ \f2docs\fP ¤¬¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È²¾Äꤹ¤ë¤È¡¢API ¥É¥¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤à SPI ¥Ñ¥Ã¥±¡¼¥¸¤ò¥É¥¥å¥á¥ó¥È²½¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
@@ -3294,9 +3278,9 @@
.LP
¤¿¤È¤¨¤Ð¡¢Java SE 6 API ¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤Ï
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list ¤Ë¤¢¤ê¡¢¼¡¤Î¤è¤¦¤ÊÆâÍƤǻϤޤäƤ¤¤Þ¤¹¡£
+http://download.oracle.com/javase/7/docs/api/package\-list ¤Ë¤¢¤ê¡¢¼¡¤Î¤è¤¦¤ÊÆâÍƤǻϤޤäƤ¤¤Þ¤¹¡£
.nf
\f3
.fl
@@ -3355,15 +3339,15 @@
.LP
1 ²ó¤Î javadoc ¼Â¹Ô¤ÇÊ£¿ô¤Î \f2\-linkoffline\fP ¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤¤Þ¤¹¡£1.2.2 ¤è¤êÁ°¤Ï¡¢Ê£¿ô¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£
.LP
-\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- http://java.sun.com/javase/6/docs/api Æâ¤Î \f2java.lang\fP¡¢ \f2java.io\fP ¡¢¤ª¤è¤Ó¤½¤Î¾¤Î Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸ \f2¤Ë¥ê¥ó¥¯¤·¤¿¤¯¤Æ¤â\fP Web ¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Ê¤¤¾ì¹ç¤ò¹Í¤¨¤Þ¤¹¡£¥Ö¥é¥¦¥¶¤Ç \f2¡¢\fP
+\f3³°Éô¥É¥¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- http://download.oracle.com/javase/7/docs/api/ Æâ¤Î \f2java.lang\fP¡¢ \f2java.io\fP ¡¢¤ª¤è¤Ó¤½¤Î¾¤Î Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸ \f2¤Ë¥ê¥ó¥¯¤·¤¿¤¯¤Æ¤â¡¢\fPWeb ¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Ê¤¤¾ì¹ç¤ò¹Í¤¨¤Þ¤¹¡£¥Ö¥é¥¦¥¶¤Ç \f2¡¢\fP
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list ¤Ë¤¢¤ë package\-list ¥Õ¥¡¥¤¥ë¤ò³«¤¡¢¤½¤ì¤ò¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¡¢Âè 2 °ú¿ô \f2packagelistLoc\fP ¤Ç¤³¤Î¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê "\f2.\fP" ¤ËÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤Ê¤É¡¢¤½¤Î¾¤ÎɬÍ×¥ª¥×¥·¥ç¥ó¤Ï¼¨¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
+http://download.oracle.com/javase/7/docs/api/package\-list ¤Ë¤¢¤ë package\-list ¥Õ¥¡¥¤¥ë¤ò³«¤¡¢¤½¤ì¤ò¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¡¢Âè 2 °ú¿ô \f2packagelistLoc\fP ¤Ç¤³¤Î¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê "\f2.\fP" ¤ËÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò´Þ¤ó¤À¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.mypackage\fP ¤Î¥É¥¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¥Ä¥ê¡¼Æâ¤Î \f2Object\fP ¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢ \f2\-sourcepath\fP ¤Ê¤É¡¢¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¼¨¤·¤Æ¤¤¤Þ¤»¤ó¡£
.nf
\f3
.fl
-% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP
+% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP
.fl
.fi
.LP
@@ -3694,7 +3678,7 @@
.na
\f2¡ÖComparing Annotations and Javadoc Tags¡×\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
\-taglet ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¤è¤êÊ£»¨¤Ê¥Ö¥í¥Ã¥¯¥¿¥°¤ä¥«¥¹¥¿¥à¥¤¥ó¥é¥¤¥ó¥¿¥°¤ò ºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
.LP
@@ -3890,13 +3874,13 @@
.fl
<font size="\-1">
.fl
- <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a><br/>
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
.fl
Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
.fl
Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
.fl
- Other names may be trademarks of their respective owners.</font>
+ ¤½¤Î¾¤Î̾¾Î¤Ï¡¢¤½¤ì¤¾¤ì¤Î½êͼԤξ¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</font>
.fl
\fP
.fi
@@ -3945,7 +3929,7 @@
.RS 3
.TP 2
o
-\f3¥±¡¼¥¹ 1 \- 1 ¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤«¤é¤Îµ¯Æ°¤òºÆµ¢Åª¤Ë¼Â¹Ô\fP \- ¤³¤ÎÎã¤Ç¤Ï javadoc ¤¬Ç¤°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼Â¹Ô¤Ç¤¤ë¤è¤¦¤Ë¡¢\-sourcepath ¤ò»ÈÍѤ·¡¢ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë \-subpackages (1.4 ¤Î¿·¥ª¥×¥·¥ç¥ó) ¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ï¡¢ \f2java\fP ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò¤¿¤É¤ê¤Þ¤¹¤¬¡¢¤½¤ÎºÝ¤Ë¡¢ \f2java.net\fP ¤È \f2java.lang\fP ¤ò¥ë¡¼¥È¤Ë»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤Ï½ü³°¤µ¤ì¤Þ¤¹¡£¤³¤Î¤È¤¡¢ \f2java.lang ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸\fP¤Ç¤¢¤ë java.lang.ref ¤â \f2½ü³°¤µ¤ì¤Þ¤¹\fP¡£
+\f3¥±¡¼¥¹ 1 \- 1 ¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤«¤é¤Îµ¯Æ°¤òºÆµ¢Åª¤Ë¼Â¹Ô\fP \- ¤³¤ÎÎã¤Ç¤Ï javadoc ¤¬Ç¤°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼Â¹Ô¤Ç¤¤ë¤è¤¦¤Ë¡¢\-sourcepath ¤ò»ÈÍѤ·¡¢ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë \-subpackages (1.4 ¤Î¿·¥ª¥×¥·¥ç¥ó) ¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ï¡¢ \f2java\fP ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò¤¿¤É¤ê¤Þ¤¹¤¬¡¢¤½¤ÎºÝ¤Ë¡¢ \f2java.net\fP ¤È \f2java.lang\fP ¤ò¥ë¡¼¥È¤Ë»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤¬½ü³°¤µ¤ì¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢ \f2java.lang\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¢¤ë \f2java.lang.ref\fP¡£
.nf
\f3
.fl
@@ -4068,13 +4052,13 @@
.fl
\-bottom '<font size="\-1">
.fl
- <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a><br/>
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
.fl
Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
.fl
Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
.fl
- Other names may be trademarks of their respective owners.</font>' \\
+ ¤½¤Î¾¤Î̾¾Î¤Ï¡¢¤½¤ì¤¾¤ì¤Î½êͼԤξ¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</font>' \\
.fl
\-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
.fl
@@ -4087,7 +4071,7 @@
\fP
.fi
.LP
-¾åµ¤Î¥³¥Þ¥ó¥É¤Ç¡¢ \f2packages\fP ¤Ï¡¢½èÍýÂоݤΥѥ屡¼¥¸Ì¾ ( \f2java.applet java.lang\fP ¤Ê¤É) ¤¬Æþ¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£³Æ¥ª¥×¥·¥ç¥ó¤Î¡¢Ã±°ì°úÍÑÉä¤Ç°Ï¤Þ¤ì¤¿°ú¿ô¤ÎÆ⦤ˤϡ¢²þ¹Ôʸ»ú¤òÁÞÆþ¤Ç¤¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢¤³¤ÎÎã¤ò¥³¥Ô¡¼¡õ¥Ú¡¼¥¹¥È¤¹¤ë¾ì¹ç¤Ï¡¢ \f2\-bottom\fP ¥ª¥×¥·¥ç¥ó¤«¤é²þ¹Ôʸ»ú¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£¤µ¤é¤Ë¡¢¤³¤Î¤¢¤È¤Î¡ÖÃí¡×¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+¤³¤³¤Ç¡¢ \f2packages\fP ¤Ï¡¢½èÍýÂоݤΥѥ屡¼¥¸Ì¾ ( \f2java.applet java.lang\fP ¤Ê¤É) ¤¬Æþ¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£³Æ¥ª¥×¥·¥ç¥ó¤Î¡¢Ã±°ì°úÍÑÉä¤Ç°Ï¤Þ¤ì¤¿°ú¿ô¤ÎÆ⦤ˤϡ¢²þ¹Ôʸ»ú¤òÁÞÆþ¤Ç¤¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢¤³¤ÎÎã¤ò¥³¥Ô¡¼¡õ¥Ú¡¼¥¹¥È¤¹¤ë¾ì¹ç¤Ï¡¢ \f2\-bottom\fP ¥ª¥×¥·¥ç¥ó¤«¤é²þ¹Ôʸ»ú¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£¤µ¤é¤Ë¡¢¤³¤Î¤¢¤È¤Î¡ÖÃí¡×¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.SS
Makefile ¤ÎÎã
.LP
@@ -4139,13 +4123,13 @@
.fl
BOTTOM = '<font size="\-1">
.fl
- <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a><br/>
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
.fl
Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
.fl
Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
.fl
- Other names may be trademarks of their respective owners.</font>'
+ ¤½¤Î¾¤Î̾¾Î¤Ï¡¢¤½¤ì¤¾¤ì¤Î½êͼԤξ¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</font>'
.fl
GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"'
.fl
@@ -4229,13 +4213,13 @@
.na
\f2Javadoc ¤Î¥Û¡¼¥à¥Ú¡¼¥¸\fP @
.fi
-http://java.sun.com/j2se/javadoc/index.jsp
+http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html
.TP 2
o
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html
.TP 2
o
.na
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javah.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javah.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javah 1 "14 Apr 2011"
+.TH javah 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javap 1 "14 Apr 2011"
+.TH javap 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -33,7 +33,7 @@
.nf
\f3
.fl
-javap [ \fP\f3options\fP\f3 ] class. . .
+javap [ \fP\f3options\fP\f3 ] classes
.fl
\fP
.fi
@@ -42,7 +42,20 @@
.SH "ÀâÌÀ"
.LP
.LP
-\f3javap\fP ¥³¥Þ¥ó¥É¤Ï¡¢¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òµÕ¥¢¥»¥ó¥Ö¥ë¤·¤Þ¤¹¡£¤½¤Î½ÐÎϤϻØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê°Û¤Ê¤ê¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\f3javap\fP ¤Ï¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¡¢ÅϤµ¤ì¤¿¥¯¥é¥¹¤Î protected ¤ª¤è¤Ó public ¤Î¥Õ¥£¡¼¥ë¥É¤È¥á¥½¥Ã¥É¤ò½ÐÎϤ·¤Þ¤¹¡£\f3javap\fP ¤Ï¤½¤Î½ÐÎϤòɸ½à½ÐÎϤËɽ¼¨¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥¯¥é¥¹Àë¸À¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤·¤Þ¤¹¡£
+\f3javap\fP ¥³¥Þ¥ó¥É¤Ï¡¢1 ¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òµÕ¥¢¥»¥ó¥Ö¥ë¤·¤Þ¤¹¡£¤½¤Î½ÐÎϤϻØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê°Û¤Ê¤ê¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\f3javap\fP ¤Ï¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¡¢ÅϤµ¤ì¤¿¥¯¥é¥¹¤Î protected ¤ª¤è¤Ó public ¤Î¥Õ¥£¡¼¥ë¥É¤È¥á¥½¥Ã¥É¤ò½ÐÎϤ·¤Þ¤¹¡£\f3javap\fP ¤Ï¤½¤Î½ÐÎϤòɸ½à½ÐÎϤËɽ¼¨¤·¤Þ¤¹¡£
+.LP
+.RS 3
+.TP 3
+options
+¥³¥Þ¥ó¥É¹Ô¥ª¥×¥·¥ç¥ó¡£
+.TP 3
+classes
+Ãí¼á¤Î½èÍýÂоݤȤʤë 1 ¤Ä°Ê¾å¤Î¥¯¥é¥¹ \f2DocFooter.class\fP ¤Ê¤É) ¤Î¥ê¥¹¥È (¶õÇò¶èÀÚ¤ê)¡£¥¯¥é¥¹¥Ñ¥¹¤Ç¸«¤Ä¤«¤ë¥¯¥é¥¹¤Ï¡¢¥Õ¥¡¥¤¥ë̾ ( \f2/home/user/myproject/src/DocFooter.class\fP ¤Ê¤É) ¤Þ¤¿¤Ï URL ( \f2file:///home/user/myproject/src/DocFooter.class\fP ¤Ê¤É) ¤Ç»ØÄê¤Ç¤¤Þ¤¹¡£
+.RE
+
+.LP
+.LP
+¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥¯¥é¥¹Àë¸À¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -88,24 +101,24 @@
.LP
.LP
-\f3javap DocFooter\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+\f3javap DocFooter.class\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
+ java.lang.String date;
.fl
- java.lang.String email;
+ java.lang.String email;
.fl
- public DocFooter();
+ public DocFooter();
.fl
- public void init();
+ public void init();
.fl
- public void paint(java.awt.Graphics);
+ public void paint(java.awt.Graphics);
.fl
}
.fl
@@ -114,114 +127,116 @@
.LP
.LP
-\f3javap \-c DocFooter\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+\f3javap \-c DocFooter.class\fP ¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
-.fl
- java.lang.String email;
-.fl
- public DocFooter();
+ java.lang.String date;
.fl
- public void init();
+
.fl
- public void paint(java.awt.Graphics);
-.fl
-}
+ java.lang.String email;
.fl
.fl
-Method DocFooter()
+ public DocFooter();
.fl
- 0 aload_0
+ Code:
.fl
- 1 invokespecial #1 <Method java.applet.Applet()>
+ 0: aload_0
.fl
- 4 return
+ 1: invokespecial #1 // Method java/applet/Applet."<init>":()V
+.fl
+ 4: return
.fl
.fl
-Method void init()
+ public void init();
.fl
- 0 aload_0
+ Code:
.fl
- 1 sipush 500
+ 0: aload_0
.fl
- 4 bipush 100
+ 1: sipush 500
.fl
- 6 invokevirtual #2 <Method void resize(int, int)>
+ 4: bipush 100
.fl
- 9 aload_0
+ 6: invokevirtual #2 // Method resize:(II)V
.fl
- 10 aload_0
+ 9: aload_0
.fl
- 11 ldc #3 <String "LAST_UPDATED">
+ 10: aload_0
.fl
- 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 11: ldc #3 // String LAST_UPDATED
.fl
- 16 putfield #5 <Field java.lang.String date>
+ 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 19 aload_0
+ 16: putfield #5 // Field date:Ljava/lang/String;
.fl
- 20 aload_0
+ 19: aload_0
.fl
- 21 ldc #6 <String "EMAIL">
+ 20: aload_0
.fl
- 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 21: ldc #6 // String EMAIL
.fl
- 26 putfield #7 <Field java.lang.String email>
+ 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 29 return
+ 26: putfield #7 // Field email:Ljava/lang/String;
+.fl
+ 29: return
.fl
.fl
-Method void paint(java.awt.Graphics)
+ public void paint(java.awt.Graphics);
.fl
- 0 aload_1
+ Code:
.fl
- 1 new #8 <Class java.lang.StringBuffer>
+ 0: aload_1
.fl
- 4 dup
+ 1: new #8 // class java/lang/StringBuilder
.fl
- 5 invokespecial #9 <Method java.lang.StringBuffer()>
+ 4: dup
.fl
- 8 aload_0
+ 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V
.fl
- 9 getfield #5 <Field java.lang.String date>
+ 8: aload_0
+.fl
+ 9: getfield #5 // Field date:Ljava/lang/String;
.fl
- 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 15 ldc #11 <String " by ">
+ 15: ldc #11 // String by
.fl
- 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 20 invokevirtual #12 <Method java.lang.String toString()>
+ 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String;
.fl
- 23 bipush 100
+ 23: bipush 100
+.fl
+ 25: bipush 15
.fl
- 25 bipush 15
+ 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 30: aload_1
.fl
- 30 aload_1
+ 31: aload_0
.fl
- 31 aload_0
+ 32: getfield #7 // Field email:Ljava/lang/String;
.fl
- 32 getfield #7 <Field java.lang.String email>
+ 35: sipush 290
.fl
- 35 sipush 290
+ 38: bipush 15
.fl
- 38 bipush 15
+ 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 43: return
.fl
- 43 return
+}
.fl
\fP
.fi
@@ -284,22 +299,7 @@
¥á¥½¥Ã¥É¤Î¥¹¥¿¥Ã¥¯¥µ¥¤¥º¡¢¤ª¤è¤Ó \f2locals\fP ¤È \f2args\fP ¤Î¿ô¤ò½ÐÎϤ·¤Þ¤¹¡£
.TP 3
\-classpath path
-\f3javap\fP ¤¬¥¯¥é¥¹¤òõ¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Þ¤¿¤Ï CLASSPATH ´Ä¶ÊÑ¿ôÀßÄê¤ò¾å½ñ¤¤·¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2path\fP ¤Î°ìÈÌ·Á¼°¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-.nf
-\f3
-.fl
- .:<your_path>
-.fl
-\fP
-.fi
-¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
+\f3javap\fP ¤¬¥¯¥é¥¹¤òõ¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Þ¤¿¤Ï CLASSPATH ´Ä¶ÊÑ¿ôÀßÄê¤ò¾å½ñ¤¤·¤Þ¤¹¡£
.TP 3
\-bootclasspath path
¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥¯¥é¥¹¤ò¥í¡¼¥É¤¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥¯¥é¥¹¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï \f2jre/lib/rt.jar\fP ¤ª¤è¤Ó¾¤Î¤¤¤¯¤Ä¤«¤Î JAR ¥Õ¥¡¥¤¥ë ¤Ë¤¢¤ë¡¢¥³¥¢ Java 2 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¤Ç¤¹¡£
@@ -309,22 +309,6 @@
.RE
.LP
-.SH "´Ä¶ÊÑ¿ô"
-.LP
-.RS 3
-.TP 3
-CLASSPATH
-¥æ¡¼¥¶¡¼ÄêµÁ¥¯¥é¥¹¤Ø¤Î¥Ñ¥¹¤ò¥·¥¹¥Æ¥à¤Ë»ØÄꤷ¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
-.RE
-
-.LP
.SH "´ØÏ¢¹àÌÜ"
.LP
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javaws 1 "14 Apr 2011"
+.TH javaws 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -81,7 +81,7 @@
\f2\-Xnosplash\fP
.LP
.LP
-ºÇ½é¤Î¥¹¥×¥é¥Ã¥·¥å²èÌ̤Îɽ¼¨¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
+½é´ü¥¹¥×¥é¥Ã¥·¥å²èÌ̤òɽ¼¨¤·¤Þ¤»¤ó¡£
.LP
.LP
\f2\-open <arguments>\fP
@@ -99,7 +99,7 @@
\f2\-online\fP
.LP
.LP
-¥ª¥ó¥é¥¤¥ó¥â¡¼¥É¤Ç¼Â¹Ô¤·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî)¡£
+¥ª¥ó¥é¥¤¥ó¥â¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî)¡£
.LP
.LP
\f2\-wait\fP
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jconsole 1 "14 Apr 2011"
+.TH jconsole 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jdb 1 "14 Apr 2011"
+.TH jdb 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jhat 1 "14 Apr 2011"
+.TH jhat 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jinfo 1 "14 Apr 2011"
+.TH jinfo 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jmap 1 "14 Apr 2011"
+.TH jmap 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jps.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jps.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jps 1 "14 Apr 2011"
+.TH jps 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 Sat May 14 11:24:26 2011 -0700
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jrunscript 1 "14 Apr 2011"
+.TH jrunscript 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jsadebugd 1 "14 Apr 2011"
+.TH jsadebugd 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstack 1 "14 Apr 2011"
+.TH jstack 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstat 1 "14 Apr 2011"
+.TH jstat 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstatd 1 "14 Apr 2011"
+.TH jstatd 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jvisualvm 1 "14 Apr 2011"
+.TH jvisualvm 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -110,7 +110,7 @@
.na
\f2Java VisualVM ³«È¯¼Ô¤Î¥µ¥¤¥È\fP @
.fi
-https://visualvm.dev.java.net
+http://visualvm.java.net
.TP 2
o
.na
--- a/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998-2010 keytool tool, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH keytool 1 "14 Apr 2011"
+.TH keytool 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -1087,9 +1087,9 @@
.fl
keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US"
.fl
- \-alias business \-keypass kpi135 \-keystore /working/mykeystore
+ \-alias business \-keypass \fP\f4<Èó¸ø³«¸°¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-keystore /working/mykeystore
.fl
- \-storepass ab987c \-validity 180
+ \-storepass \fP\f4<¥¡¼¥¹¥È¥¢¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-validity 180
.fl
\fP
.fi
@@ -1099,10 +1099,10 @@
Ãí: ¤³¤Î¥³¥Þ¥ó¥É¤Ï 1 ¹Ô¤ËÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Îã¤ÇÊ£¿ô¹Ô¤ËÆþÎϤ·¤Æ¤¤¤ë¤Î¤ÏÆɤߤ䤹¤¯¤¹¤ë¤¿¤á¤Ç¤¹¡£
.LP
.LP
-¤³¤ÎÎã¤Ç¤Ï¡¢working ¥Ç¥£¥ì¥¯¥È¥ê¤Ë mykeystore ¤È¤¤¤¦Ì¾Á°¤Î¥¡¼¥¹¥È¥¢¤òºîÀ®¤· (¥¡¼¥¹¥È¥¢¤Ï¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¤È²¾Äꤹ¤ë)¡¢ºîÀ®¤·¤¿¥¡¼¥¹¥È¥¢¤Ë¥Ñ¥¹¥ï¡¼¥É ab987c ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£À¸À®¤¹¤ë¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥Ú¥¢¤ËÂбþ¤¹¤ë¥¨¥ó¥Æ¥£¥Æ¥£¡¼¤Î¡Ö¼±ÊÌ̾¡×¤Ï¡¢Ä̾Τ¬¡ÖMark Jones¡×¡¢ÁÈ¿¥Ã±°Ì¤¬¡ÖJava¡×¡¢ÁÈ¿¥¤¬¡ÖOracle¡×¡¢2 ʸ»ú¤Î¹ñÈֹ椬¡ÖUS¡×¤Ç¤¹¡£¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥µ¥¤¥º¤Ï¤É¤Á¤é¤â 1024 ¥Ó¥Ã¥È¤Ç¡¢¸°¤ÎºîÀ®¤Ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Î DSA ¸°À¸À®¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£
+¤³¤ÎÎã¤Ç¤Ï¡¢working ¥Ç¥£¥ì¥¯¥È¥ê¤Ë mykeystore ¤È¤¤¤¦Ì¾Á°¤Î¥¡¼¥¹¥È¥¢¤òºîÀ®¤· (¥¡¼¥¹¥È¥¢¤Ï¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¤È²¾Äꤹ¤ë)¡¢ºîÀ®¤·¤¿¥¡¼¥¹¥È¥¢¤Ë¡¢\f2<¥¡¼¥¹¥È¥¢¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP ¤Ç»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥É ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£À¸À®¤¹¤ë¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥Ú¥¢¤ËÂбþ¤¹¤ë¥¨¥ó¥Æ¥£¥Æ¥£¡¼¤Î¡Ö¼±ÊÌ̾¡×¤Ï¡¢Ä̾Τ¬¡ÖMark Jones¡×¡¢ÁÈ¿¥Ã±°Ì¤¬¡ÖJava¡×¡¢ÁÈ¿¥¤¬¡ÖOracle¡×¡¢2 ʸ»ú¤Î¹ñÈֹ椬¡ÖUS¡×¤Ç¤¹¡£¸ø³«¸°¤ÈÈó¸ø³«¸°¤Î¥µ¥¤¥º¤Ï¤É¤Á¤é¤â 1024 ¥Ó¥Ã¥È¤Ç¡¢¸°¤ÎºîÀ®¤Ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Î DSA ¸°À¸À®¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£
.LP
.LP
-¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¸ø³«¸°¤È¼±ÊÌ̾¾ðÊó¤ò´Þ¤à¼«¸Ê½ð̾¾ÚÌÀ½ñ (¥Ç¥Õ¥©¥ë¥È¤Î SHA1withDSA ½ð̾¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ) ¤òºîÀ®¤·¤Þ¤¹¡£¾ÚÌÀ½ñ¤Î͸ú´ü´Ö¤Ï 180 Æü¤Ç¤¹¡£ ¾ÚÌÀ½ñ¤Ï¡¢ÊÌ̾¡Öbusiness¡×¤ÇÆÃÄꤵ¤ì¤ë¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥êÆâ¤ÎÈó¸ø³«¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Þ¤¹¡£Èó¸ø³«¸°¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¡Ökpi135¡×¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
+¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¸ø³«¸°¤È¼±ÊÌ̾¾ðÊó¤ò´Þ¤à¼«¸Ê½ð̾¾ÚÌÀ½ñ (¥Ç¥Õ¥©¥ë¥È¤Î SHA1withDSA ½ð̾¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ) ¤òºîÀ®¤·¤Þ¤¹¡£¾ÚÌÀ½ñ¤Î͸ú´ü´Ö¤Ï 180 Æü¤Ç¤¹¡£ ¾ÚÌÀ½ñ¤Ï¡¢ÊÌ̾¡Öbusiness¡×¤ÇÆÃÄꤵ¤ì¤ë¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥êÆâ¤ÎÈó¸ø³«¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Þ¤¹¡£Èó¸ø³«¸°¤Ë¤Ï¡¢\f2<Èó¸ø³«¸°¤Î¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É>\fP ¤Ç»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥É¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
.LP
.LP
¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò»È¤¦¾ì¹ç¤Ï¡¢¾å¤Ë¼¨¤·¤¿¥³¥Þ¥ó¥É¤òÂçÉý¤Ëû¤¯¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¼ÂºÝ¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò 1 ¤Ä¤â»ØÄꤻ¤º¤Ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£ ¥Ç¥Õ¥©¥ë¥ÈÃͤò»ý¤Ä¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»È¤ï¤ì¡¢É¬ÍפÊÃͤˤĤ¤¤Æ¤ÏÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Ã±¤Ë¼¡¤Î¤è¤¦¤ËÆþÎϤ¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
@@ -1120,7 +1120,7 @@
¤³¤Î¾ì¹ç¤Ï¡¢mykey ¤È¤¤¤¦ÊÌ̾¤Ç¥¡¼¥¹¥È¥¢¥¨¥ó¥È¥ê¤¬ºîÀ®¤µ¤ì¡¢¿·¤·¤¯À¸À®¤µ¤ì¤¿¸°¤Î¥Ú¥¢¡¢¤ª¤è¤Ó 90 Æü´Ö͸ú¤Ê¾ÚÌÀ½ñ¤¬¤³¤Î¥¨¥ó¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¨¥ó¥È¥ê¤Ï¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î .keystore ¤È¤¤¤¦Ì¾Á°¤Î¥¡¼¥¹¥È¥¢¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥¡¼¥¹¥È¥¢¤¬¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ºîÀ®¤µ¤ì¤Þ¤¹¡£¼±ÊÌ̾¾ðÊó¡¢¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¡¢¤ª¤è¤ÓÈó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤Ä¤¤¤Æ¤Ï¡¢ÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
.LP
.LP
-°Ê²¼¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤â¤Î¤È¤·¤ÆÎã¤ò¼¨¤·¤Þ¤¹¡£¾ðÊó¤ÎÆþÎϤòµá¤á¤é¤ì¤¿¾ì¹ç¤Ï¡¢ºÇ½é¤Ë¼¨¤·¤¿ \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ÎÃͤòÆþÎϤ·¤¿¤â¤Î¤È¤·¤Þ¤¹ (¤¿¤È¤¨¤Ð¡¢Èó¸ø³«¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤Ï kpi135 ¤È»ØÄê)¡£
+°Ê²¼¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤â¤Î¤È¤·¤ÆÎã¤ò¼¨¤·¤Þ¤¹¡£¾ðÊó¤ÎÆþÎϤòµá¤á¤é¤ì¤¿¾ì¹ç¤Ï¡¢ºÇ½é¤Ë¼¨¤·¤¿ \f2\-genkeypair\fP ¥³¥Þ¥ó¥É¤ÎÃͤòÆþÎϤ·¤¿¤â¤Î¤È¤·¤Þ¤¹ (¤¿¤È¤¨¤Ð¡¢¼±ÊÌ̾¤Ë¤Ï cn=Mark Jones, ou=Java, o=Oracle, c=US ¤È»ØÄê)¡£
.LP
.SS
¾ÚÌÀ½ñȯ¹Ô¶É¤ËÂФ¹¤ë½ð̾ÉÕ¤¾ÚÌÀ½ñ¤ÎÍ×µá
@@ -1240,14 +1240,14 @@
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<¥½¡¼¥¹¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-deststorepass \fP\f4<¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
\fP
.fi
.LP
.LP
-¤Þ¤¿¡¢importkeystore ¥³¥Þ¥ó¥É¤ò»È¤¨¤Ð¡¢¤¢¤ë¥½¡¼¥¹¥¡¼¥¹¥È¥¢Æâ¤Îñ°ì¤Î¥¨¥ó¥È¥ê¤ò¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¾åµ¤ÎÎã¤Ç¼¨¤·¤¿¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¡¢¥¤¥ó¥Ý¡¼¥ÈÂоݤȤʤëÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£srcalias ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¾ì¹ç¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤â¥³¥Þ¥ó¥É¹Ô¤«¤é»ØÄê¤Ç¤¤ë¤Û¤«¡¢ÈëÌ©/Èó¸ø³«¸°¤ÎÊݸîÍѥѥ¹¥ï¡¼¥É¤ä¥¿¡¼¥²¥Ã¥ÈÊݸîÍѥѥ¹¥ï¡¼¥É¤â»ØÄê¤Ç¤¤Þ¤¹¡£¤½¤¦¤¹¤ì¤Ð¡¢¥×¥í¥ó¥×¥È¤Î¤Þ¤Ã¤¿¤¯É½¼¨¤µ¤ì¤Ê¤¤ \f3keytool\fP ¥³¥Þ¥ó¥É¤òȯ¹Ô¤Ç¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f3keytool\fP ¥³¥Þ¥ó¥É¤ò¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤Ë´Þ¤á¤ëºÝ¤ËÈó¾ï¤ËÊØÍø¤Ç¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
+¤Þ¤¿¡¢importkeystore ¥³¥Þ¥ó¥É¤ò»È¤¨¤Ð¡¢¤¢¤ë¥½¡¼¥¹¥¡¼¥¹¥È¥¢Æâ¤Îñ°ì¤Î¥¨¥ó¥È¥ê¤ò¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¾åµ¤ÎÎã¤Ç¼¨¤·¤¿¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¡¢¥¤¥ó¥Ý¡¼¥ÈÂоݤȤʤëÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£srcalias ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¾ì¹ç¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤â¥³¥Þ¥ó¥É¹Ô¤«¤é»ØÄê¤Ç¤¤ë¤Û¤«¡¢ÈëÌ©/Èó¸ø³«¸°¤ÎÊݸîÍѥѥ¹¥ï¡¼¥É¤ä¥¿¡¼¥²¥Ã¥ÈÊݸîÍѥѥ¹¥ï¡¼¥É¤â»ØÄê¤Ç¤¤Þ¤¹¡£¤½¤ÎÊýË¡¤ò¼¨¤¹¥³¥Þ¥ó¥É¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -1258,11 +1258,11 @@
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<¥½¡¼¥¹¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-deststorepass \fP\f4<¥¿¡¼¥²¥Ã¥È¥¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
\-srcalias myprivatekey \-destalias myoldprivatekey
.fl
- \-srckeypass oldkeypass \-destkeypass mynewkeypass
+ \-srckeypass \fP\f4<¥½¡¼¥¹¥¨¥ó¥È¥ê¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3 \-destkeypass \fP\f4<¥¿¡¼¥²¥Ã¥È¥¨¥ó¥È¥ê¤Î¥Ñ¥¹¥ï¡¼¥É>\fP\f3
.fl
\-noprompt
.fl
@@ -1711,7 +1711,7 @@
½ÅÍ×: ¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤È¤·¤Æ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ë¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤò¿µ½Å¤ËÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
.LP
.LP
-¤Þ¤º¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤· (\-printcert ¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤«¡¢¤Þ¤¿¤Ï \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \-importcert ¥³¥Þ¥ó¥É¤ò»ÈÍÑ)¡¢ ɽ¼¨¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬¡¢´üÂÔ¤µ¤ì¤ë¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤¢¤ë¥æ¡¼¥¶¡¼¤«¤é¾ÚÌÀ½ñ¤¬Á÷¤é¤ì¤Æ¤¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò /tmp/cert ¤È¤¤¤¦Ì¾Á°¤Ç¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£ ¤³¤Î¾ì¹ç¤Ï¡¢¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¤³¤Î¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë¡¢ \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤òɽ¼¨¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
+¤Þ¤º¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤· (\-printcert ¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤«¡¢¤Þ¤¿¤Ï \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç \-importcert ¥³¥Þ¥ó¥É¤ò»ÈÍÑ)¡¢ ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¡¢ ɽ¼¨¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬¡¢´üÂÔ¤µ¤ì¤ë¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤¢¤ë¥æ¡¼¥¶¡¼¤«¤é¾ÚÌÀ½ñ¤¬Á÷¤é¤ì¤Æ¤¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò /tmp/cert ¤È¤¤¤¦Ì¾Á°¤Ç¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£ ¤³¤Î¾ì¹ç¤Ï¡¢¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¤³¤Î¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë¡¢ \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤òɽ¼¨¤Ç¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
.LP
.nf
\f3
@@ -1744,7 +1744,7 @@
¼¡¤Ë¡¢¾ÚÌÀ½ñ¤òÁ÷¿®¤·¤¿¿Íʪ¤ËÏ¢Íí¤·¡¢¤³¤Î¿Íʪ¤¬Ä󼨤·¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¡¢¾å¤Î¥³¥Þ¥ó¥É¤Çɽ¼¨¤µ¤ì¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¤òÈæ³Ó¤·¤Þ¤¹¡£¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬°ìÃפ¹¤ì¤Ð¡¢Á÷¿®ÅÓÃæ¤Ç¤Û¤«¤Î²¿¼Ô¤« (¹¶·â¼Ô¤Ê¤É) ¤Ë¤è¤ë¾ÚÌÀ½ñ¤Î¤¹¤êÂؤ¨¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤Ç¤¤Þ¤¹¡£Á÷¿®ÅÓÃæ¤Ç¤³¤Î¼ï¤Î¹¶·â¤¬¹Ô¤ï¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤º¤Ë¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È¡¢¹¶·â¼Ô¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¤â¤Î (¹¶·âŪ°Õ¿Þ¤ò»ý¤Ä¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤À JAR ¥Õ¥¡¥¤¥ë¤Ê¤É) ¤ò¿®Íꤹ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
.LP
.LP
-Ãí: ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ëɬ¤º \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥¡¼¥¹¥È¥¢Æâ¤Î¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë \f2\-importcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¾ÚÌÀ½ñ¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¡¢³Îǧ¤òµá¤á¤ë¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¥¤¥ó¥Ý¡¼¥ÈÁàºî¤Ï¡¢¤³¤Î»þÅÀ¤ÇÃæ»ß¤Ç¤¤Þ¤¹¡£¤¿¤À¤·¡¢³Îǧ¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¤Î¤Ï¡¢\-importcert ¥³¥Þ¥ó¥É¤ò \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤻ¤º¤Ë¼Â¹Ô¤·¤¿¾ì¹ç¤À¤±¤Ç¤¹¡£ \f2\-noprompt\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤È¤ÎÂÐÏäϹԤï¤ì¤Þ¤»¤ó¡£
+Ãí: ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ëɬ¤º \f2\-printcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥¡¼¥¹¥È¥¢Æâ¤Î¿®Íê¤Ç¤¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë \f2\-importcert\fP ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¾ÚÌÀ½ñ¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¡¢³Îǧ¤òµá¤á¤ë¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¥¤¥ó¥Ý¡¼¥ÈÁàºî¤Ï¡¢¤³¤Î»þÅÀ¤ÇÃæ»ß¤Ç¤¤Þ¤¹¡£¤¿¤À¤·¡¢³Îǧ¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¤Î¤Ï¡¢\-importcert ¥³¥Þ¥ó¥É¤ò \-noprompt ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤻ¤º¤Ë¼Â¹Ô¤·¤¿¾ì¹ç¤À¤±¤Ç¤¹¡£ ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¡¢ \f2\-noprompt\fP ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤È¤ÎÂÐÏäϹԤï¤ì¤Þ¤»¤ó¡£
.LP
.SS
¥Ñ¥¹¥ï¡¼¥É¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à
--- a/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH native2ascii 1 "14 Apr 2011"
+.TH native2ascii 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH orbd 1 "14 Apr 2011"
+.TH orbd 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH pack200 1 "14 Apr 2011"
+.TH pack200 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH policytool 1 "14 Apr 2011"
+.TH policytool 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmic 1 "14 Apr 2011"
+.TH rmic 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmid 1 "14 Apr 2011"
+.TH rmid 1 "07 May 2011"
.LP
.SH "̾Á°"
@@ -121,7 +121,7 @@
.LP
.LP
-ɬÍפ˱þ¤¸¤Æ¥µ¡¼¥Ó¥¹¤ò³«»Ï¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢ \f2inetd\fP (Solaris) ¤Þ¤¿¤Ï \f2xinetd\fP (Linux) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+ɬÍפ˱þ¤¸¤Æ¥µ¡¼¥Ó¥¹¤ò³«»Ï¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢ \f2inetd\fP (Solaris ¤Î¾ì¹ç)¡¢¤Þ¤¿¤Ï \f2xinetd\fP (Linux) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.LP
.SH "¥ª¥×¥·¥ç¥ó"
.LP
@@ -239,7 +239,7 @@
.fl
\fP
.fi
-ºÇ½é¤ËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¡¢¥Ñ¥¹Ì¾¤Ë¤è¤êÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤ë \f2java\fP ¥³¥Þ¥ó¥É¤Î 1.7.0 ¥Ð¡¼¥¸¥ç¥ó¤Î¼Â¹Ô¤òµö²Ä¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢java.home ¤Ë¤¢¤ë¥Ð¡¼¥¸¥ç¥ó¤Î \f2java\fP ¥³¥Þ¥ó¥É ( \f2rmid\fP ¤¬»ÈÍѤ¹¤ë¤Î¤ÈƱ¤¸¥Ð¡¼¥¸¥ç¥ó) ¤¬»ÈÍѤµ¤ì¤ë¤¿¤á¡¢¤½¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤Ç»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£2 ÈÖÌܤΥ¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¤Æ¡¢¥Ç¥£¥ì¥¯¥È¥ê \f2/files/apps/rmidcmds\fP Æâ¤ÎǤ°Õ¤Î¥³¥Þ¥ó¥É¤Î¼Â¹Ô¸¢¸Â¤òµö²Ä¤·¤Þ¤¹¡£
+ºÇ½é¤ËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¡¢¥Ñ¥¹Ì¾¤Ë¤è¤êÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤ë \f2java\fP ¥³¥Þ¥ó¥É¤Î 1.7.0 ¥Ð¡¼¥¸¥ç¥ó¤Î¼Â¹Ô¤òµö²Ä¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢java.home ¤Ë¤¢¤ë¥Ð¡¼¥¸¥ç¥ó¤Î \f2java\fP ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£ \f2rmid\fP ¤¬»ÈÍѤ¹¤ë¤Î¤ÈƱ¤¸¥Ð¡¼¥¸¥ç¥ó) ¤¬»ÈÍѤµ¤ì¤ë¤¿¤á¡¢¤½¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤Ç»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£2 ÈÖÌܤΥ¢¥¯¥»¥¹¸¢¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¤Æ¡¢¥Ç¥£¥ì¥¯¥È¥ê \f2/files/apps/rmidcmds\fP Æâ¤ÎǤ°Õ¤Î¥³¥Þ¥ó¥É¤Î¼Â¹Ô¸¢¸Â¤òµö²Ä¤·¤Þ¤¹¡£
.LP
3 ÈÖÌܤËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢ \f2ExecOptionPermission\fP ¤Ï¡¢ \f2rmid\fP ¤ËÂФ·¤Æ¡¢¥»¥¥å¥ê¥Æ¥£¡¼¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤ò \f2/files/policies/group.policy\fP ¤È¤·¤ÆÄêµÁ¤·¤Æ¤¤¤ëµ¯Æ°¥°¥ë¡¼¥×¤Î³«»Ï¤òµö²Ä¤·¤Þ¤¹¡£¼¡¤Î¥¢¥¯¥»¥¹¸¢¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤¬ \f2java.security.debug\fP ¥×¥í¥Ñ¥Æ¥£¡¼¤ò»ÈÍѤ¹¤ë¤³¤È¤òµö²Ä¤·¤Æ¤¤¤Þ¤¹¡£ºÇ¸å¤Î¥¢¥¯¥»¥¹¸¢¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤¬ \f2sun.rmi\fP ¤È¤¤¤¦¥×¥í¥Ñ¥Æ¥£¡¼Ì¾¤Î³¬ÁØÆâ¤ÎǤ°Õ¤Î¥×¥í¥Ñ¥Æ¥£¡¼¤ò»ÈÍѤ¹¤ë¤³¤È¤òµö²Ä¤·¤Æ¤¤¤Þ¤¹¡£
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmiregistry 1 "14 Apr 2011"
+.TH rmiregistry 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH schemagen 1 "14 Apr 2011"
+.TH schemagen 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH serialver 1 "14 Apr 2011"
+.TH serialver 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH servertool 1 "14 Apr 2011"
+.TH servertool 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH tnameserv 1 "14 Apr 2011"
+.TH tnameserv 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH unpack200 1 "14 Apr 2011"
+.TH unpack200 1 "07 May 2011"
.LP
.SH "̾Á°"
--- a/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsgen 1 "14 Apr 2011"
+.TH wsgen 1 "07 May 2011"
.SH "̾Á°"
wsgen \- XML Web Services (JAX\-WS) 2.0 ¤Î¤¿¤á¤Î Java(TM) API
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsimport 1 "14 Apr 2011"
+.TH wsimport 1 "07 May 2011"
.SH "̾Á°"
wsimport \- XML Web Services (JAX\-WS) 2.0 ¤Î¤¿¤á¤Î Java(TM) API
.LP
@@ -818,7 +818,7 @@
.ll \n(34u*1u/3u
.if \n(.l<\n(81 .ll \n(81u
.in 0
-ǧ¾Ú¾ðÊó¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë WSDL URI ¤Ç¤¹¡£¤³¤Î URI ¤Î·Á¼°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹ http://username:password@example.org/stock?wsdl
+ǧ¾Ú¾ðÊó¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë WSDL URI ¤Ç¤¹¡£¤³¤Î URI ¤Î·Á¼°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹ http://\f2<¥æ¡¼¥¶¡¼Ì¾>\fP:\f2<¥Ñ¥¹¥ï¡¼¥É>\fP@\f2<¥Û¥¹¥È̾>\fP/\f2<Web ¥µ¡¼¥Ó¥¹Ì¾>\fP?wsdl
.br
.di
.nr b| \n(dn
@@ -1057,10 +1057,10 @@
.nf
\f3
.fl
-\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP
+\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP
.fl
.fi
.LP
-Java ¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢ \f2http://stockquote.xyz/quote?wsdl\fP ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤Ç¡¢¤½¤ì¤é¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
+Java ¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢ \f2http://stockquote.example.com/quote?wsdl\fP ¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Æ¤½¤Î Java ¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹
.br
--- a/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH xjc 1 "14 Apr 2011"
+.TH xjc 1 "07 May 2011"
.LP
.ad c
--- a/jdk/src/solaris/doc/sun/man/man1/jar.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jar.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,17 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jar 1 "02 Jun 2010"
+.TH jar 1 "10 May 2011"
.LP
.SH "Name"
jar\-The Java Archive Tool
.LP
-\f3jar\fP combines multiple files into a single JAR archive file.
+\f3jar\fP combines multiple files into a single JAR archive file.
.SH "SYNOPSIS"
.LP
-
-.LP
.RS 3
.TP 3
Create jar file
@@ -53,9 +51,6 @@
where:
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
cuxtiv0Mmfe
Options that control the \f2jar\fP command.
@@ -80,11 +75,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
The \f3jar\fP tool combines multiple files into a single JAR archive file. \f3jar\fP is a general\-purpose archiving and compression tool, based on ZIP and the
.na
\f2ZLIB\fP @
@@ -93,9 +85,6 @@
.LP
Typical usage to combine files into a jar file is:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -103,20 +92,16 @@
.fl
\fP
.fi
-.RE
.LP
In this example, all the class files in the current directory are placed into the file named \f2myFile.jar\fP. The jar tool automatically generates a manifest file entry named \f2META\-INF/MANIFEST.MF\fP. It is always the first entry in the jar file. The manifest file declares meta\-information about the archive, and stores that data as \f2name\ :\ value\fP pairs. Refer to the
.na
\f2JAR file specification\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file.
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file.
.LP
If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -124,7 +109,6 @@
.fl
\fP
.fi
-.RE
.LP
An existing manifest file must end with a new line character.\ \f3jar\fP does not parse the last line of a manifest file if it does not end with a new line character.
@@ -135,9 +119,6 @@
.LP
\f3Note:\ \fP A jar command that specifies \f2cfm\fP on the command line instead of \f2cmf\fP (the order of the m and \-f options are reversed), the \f3jar\fP command line must specify the name of the jar archive first, followed by the name of the manifest file:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -145,16 +126,12 @@
.fl
\fP
.fi
-.RE
.LP
The manifest is in a text format inspired by RFC822 ASCII format, so it is easy to view and process manifest\-file contents.
.LP
To extract the files from a jar file, use \f2x\fP:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -162,15 +139,11 @@
.fl
\fP
.fi
-.RE
.LP
.LP
To extract individual files from a jar file, supply their filenames:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -178,7 +151,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -186,10 +158,7 @@
.na
\f2JarIndex\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
-.LP
-.RS 3
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
.LP
.nf
\f3
@@ -198,7 +167,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -210,9 +178,6 @@
.br
To copy directories, first compress files in \f2dir1\fP to \f2stdout\fP, then extract from \f2stdin\fP to \f2dir2\fP (omitting the \f2\-f\fP option from both \f2jar\fP commands):
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -220,7 +185,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -228,12 +192,10 @@
.na
\f2Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar.
+http://download.oracle.com/javase/tutorial/deployment/jar.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
c
@@ -241,9 +203,6 @@
.TP 3
u
Updates an existing file \f2jarfile\fP (when \f2f\fP is specified) by adding to it files and directories specified by \f2inputfiles\fP. For example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -251,11 +210,7 @@
.fl
\fP
.fi
-.RE
would add the file \f2foo.class\fP to the existing jar file \f2foo.jar\fP. The \f2\-u\fP option can also update the manifest entry, as given by this example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -263,7 +218,6 @@
.fl
\fP
.fi
-.RE
updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP.
.TP 3
x
@@ -274,9 +228,6 @@
.TP 3
i
Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -284,9 +235,8 @@
.fl
\fP
.fi
-.RE
.LP
-would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.
+would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.
.TP 3
f
Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u).
@@ -301,12 +251,10 @@
Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u).
.TP 3
m
-Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value.
-.LP
+Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value.
+.br
+.br
On the command line, the letters \f3m\fP and \f3f\fP must appear in the same order that \f2manifest\fP and \f2jarfile\fP appear. Example use:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -314,22 +262,18 @@
.fl
\fP
.fi
-.RE
You can add special\-purpose \f2name\ :\ value\fP attribute pairs to the manifest that aren't contained in the default manifest. For example, you can add attributes specifying vendor information, version information, package sealing, or to make JAR\-bundled applications executable. See the
.na
\f2JAR Files\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option.
-.LP
+http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option.
.TP 3
e
Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file.
.br
.br
+.br
For example, this command creates \f2Main.jar\fP where the \f2Main\-Class\fP attribute value in the manifest is set to \f2Main\fP:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -337,12 +281,7 @@
.fl
\fP
.fi
-.RE
-.LP
The java runtime can directly invoke this application by running the following command:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -350,11 +289,7 @@
.fl
\fP
.fi
-.RE
If the entrypoint class name is in a package it may use either a dot (".") or slash ("/") character as the delimiter. For example, if \f2Main.class\fP is in a package called \f2foo\fP the entry point can be specified in the following ways:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -362,11 +297,7 @@
.fl
\fP
.fi
-.RE
or
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -374,18 +305,13 @@
.fl
\fP
.fi
-.RE
-\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted.
-.LP
+\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted.
.TP 3
-\-C \ dir
+\-C\ dir
Temporarily changes directories (\f2cd\fP\ \f2dir\fP) during execution of the \f2jar\fP command while processing the following \f2inputfiles\fP argument. Its operation is intended to be similar to the \f2\-C\fP option of the UNIX \f2tar\fP utility.
.br
.br
For example, this command changes to the \f2classes\fP directory and adds the \f2bar.class\fP from that directory to \f2foo.jar\fP:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -393,11 +319,7 @@
.fl
\fP
.fi
-.RE
This command changes to the \f2classes\fP directory and adds to \f2foo.jar\fP all files within the \f2classes\fP directory (without creating a classes directory in the jar file), then changes back to the original directory before changing to the \f2bin\fP directory to add \f2xyz.class\fP to \f2foo.jar\fP.
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -405,11 +327,7 @@
.fl
\fP
.fi
-.RE
If \f2classes\fP holds files \f2bar1\fP and \f2bar2\fP, then here's what the jar file will contain using \f2jar tf foo.jar\fP:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -425,7 +343,6 @@
.fl
\fP
.fi
-.RE
.LP
.TP 3
\-Joption
@@ -435,8 +352,6 @@
.LP
.SH "COMMAND LINE ARGUMENT FILES"
.LP
-
-.LP
To shorten or simplify the jar command line, you can specify one or more files that themselves contain arguments to the \f2jar\fP command (except \f2\-J\fP options). This enables you to create jar commands of any length, overcoming command line limits imposed by the operating system.
.LP
An argument file can include options and filenames. The arguments within a file can be space\-separated or newline\-separated. Filenames within an argument file are relative to the current directory, not relative to the location of the argument file. Wildcards (*) that might otherwise be expanded by the operating system shell are not expanded. Use of the \f2@\fP character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files.
@@ -447,24 +362,17 @@
.br
The example below, \f2classes.list\fP holds the names of files output by a \f2find\fP command:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
% find \fP\f3.\fP \-name '*.class' \-print > classes.list
.fl
.fi
-.RE
.LP
.LP
You can then execute the \f2jar\fP command on \f2Classes.list\fP by passing it to \f2jar\fP using argfile syntax:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -472,13 +380,9 @@
.fl
\fP
.fi
-.RE
.LP
An argument file can specify a path, but any filenames inside the argument file that have relative paths are relative to the current working directory, not to the path passed in. Here is an example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -486,7 +390,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -494,12 +397,7 @@
.LP
.SH "EXAMPLES"
.LP
-
-.LP
To add all the files in a particular directory to an archive (overwriting contents if the archive already exists). Enumerating verbosely (with the \f2\-v\fP option) will tell you more information about the files in the archive, such as their size and last modified date.
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -535,13 +433,9 @@
.fl
\fP
.fi
-.RE
.LP
If you already have separate subdirectories for images, audio files and classes, you can combine them into a single jar file:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -585,13 +479,9 @@
.fl
\fP
.fi
-.RE
.LP
To see the entry names in the jarfile, use the \f2t\fP option:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -619,7 +509,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -630,9 +519,6 @@
.br
.LP
-.RS 3
-
-.LP
If you split the inter\-dependent classes for a stock trade application into three jar files: \f2main.jar\fP, \f2buy.jar\fP, and \f2sell.jar\fP.
.br
@@ -660,38 +546,34 @@
.fi
.LP
-An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources.
-.RE
+An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources.
.SH "SEE ALSO"
.LP
-
.LP
.na
\f2The Jar Overview\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jarGuide.html
-.br
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
+.LP
.LP
.na
\f2The Jar File Specification\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html
-.br
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
+.LP
.LP
.na
\f2The JarIndex Spec\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index
-.br
-
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
+.LP
.LP
.na
\f2Jar Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar on the Java Software web site.
-.br
-
+http://download.oracle.com/javase/tutorial/deployment/jar/index.html
+.LP
.LP
-pack200(1)
+pack200(1)
+.LP
+
--- a/jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jarsigner 1 "02 Jun 2010"
+.TH jarsigner 1 "10 May 2011"
.LP
.SH "Name"
jarsigner \- JAR Signing and Verification Tool
.LP
-.RS 3
-
-.LP
.LP
Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -51,8 +45,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jarsigner\fP tool is used for two purposes:
.LP
@@ -109,9 +101,6 @@
.SS
Keystore Aliases
.LP
-.RS 3
-
-.LP
.LP
All keystore entities are accessed via unique \f2aliases\fP.
.LP
@@ -121,37 +110,29 @@
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
.fl
- \-keypass dukekeypasswd MyJARFile.jar duke
+ \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke
.fl
\fP
.fi
.LP
.LP
-Keystores are protected with a password, so the store password (in this case "myspass") must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password (in this case "dukekeypasswd") must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password.
+Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password.
.LP
-.RE
.SS
Keystore Location
.LP
-.RS 3
-
-.LP
.LP
\f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory.
.LP
.LP
Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device.
.LP
-.RE
.SS
Keystore Implementation
.LP
-.RS 3
-
-.LP
.LP
The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
.LP
@@ -166,13 +147,13 @@
.na
\f2How to Implement a Provider for the Java Cryptography Architecture\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
.LP
.LP
Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
.LP
.LP
-\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
+\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
.LP
.LP
For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu.
@@ -227,41 +208,36 @@
.na
\f2KeyTool and JarSigner\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
.LP
-.RE
.SS
Supported Algorithms
.LP
-.RS 3
-
.LP
-.LP
-By default, \f3jarsigner\fP signs a JAR file using either
+By default, \f3jarsigner\fP signs a JAR file using one of the following:
.LP
.RS 3
.TP 2
o
-DSA (Digital Signature Algorithm) with the SHA\-1 digest algorithm, or
+DSA (Digital Signature Algorithm) with the SHA1 digest algorithm
.TP 2
o
-the RSA algorithm with the SHA\-256 digest algorithm.
+RSA algorithm with the SHA256 digest algorithm.
+.TP 2
+o
+EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm).
.RE
.LP
.LP
-That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm.
+That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm.
.LP
.LP
These default signature algorithms can be overridden using the \f2\-sigalg\fP option.
.LP
-.RE
.SS
The Signed JAR File
.LP
-.RS 3
-
-.LP
.LP
When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory:
.LP
@@ -271,7 +247,7 @@
a signature file, with a .SF extension, and
.TP 2
o
-a signature block file, with a .DSA extension.
+a signature block file, with a .DSA, .RSA, or .EC extension.
.RE
.LP
@@ -281,23 +257,20 @@
.nf
\f3
.fl
- \-sigFile MKSIGN
+\-sigFile MKSIGN
.fl
\fP
.fi
.LP
.LP
-the files are named "MKSIGN.SF" and "MKSIGN.DSA".
+The files are named "MKSIGN.SF" and "MKSIGN.DSA".
.LP
.LP
If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens.
.LP
\f3The Signature (.SF) File\fP
.LP
-.RS 3
-
-.LP
.LP
A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following:
.LP
@@ -320,25 +293,14 @@
.LP
The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification.
.LP
-.RE
-\f3The Signature Block (.DSA) File\fP
-.LP
-.RS 3
-
+\f3The Signature Block File\fP
.LP
-.LP
-The .SF file is signed and the signature is placed in the .DSA file. The .DSA file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing.
-.LP
-.RE
-.RE
+The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used.
.SS
Signature Timestamp
.LP
-.RS 3
-
.LP
-.LP
-\f2jarsigner\fP tool can now generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options:
+\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options:
.LP
.RS 3
.TP 2
@@ -359,31 +321,31 @@
.LP
Each of these options is detailed in the Options section below.
.LP
-.RE
.SS
JAR File Verification
.LP
-.RS 3
-
-.LP
.LP
A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps:
.LP
.RS 3
.TP 3
1.
-Verify the signature of the .SF file itself.
-.LP
-That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with.
+Verify the signature of the .SF file itself.
+.br
+.br
+That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with.
.TP 3
2.
-Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest.
-.LP
-The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step.
-.LP
-If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File).
-.LP
-One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file.
+Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest.
+.br
+.br
+The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step.
+.br
+.br
+If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File).
+.br
+.br
+One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file.
.TP 3
3.
Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails.
@@ -393,13 +355,9 @@
.LP
If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP.
.LP
-.RE
.SS
Multiple Signatures for a JAR File
.LP
-.RS 3
-
-.LP
.LP
A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in:
.LP
@@ -435,11 +393,8 @@
.LP
Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP.
.LP
-.RE
.SH "OPTIONS"
.LP
-
-.LP
.LP
The various \f3jarsigner\fP options are listed and described below. Note:
.LP
@@ -462,12 +417,15 @@
.RS 3
.TP 3
\-keystore url
-Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property.
-.LP
-A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default).
-.LP
-A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore.
-.LP
+Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property.
+.br
+.br
+A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default).
+.br
+.br
+A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore.
+.br
+.br
Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is,
.nf
\f3
@@ -494,79 +452,93 @@
\f2\-storetype PKCS11\fP
.RE
For example, this command lists the contents of the configured PKCS#11 token:
-.RS 3
-
-.LP
.nf
\f3
.fl
jarsigner \-keystore NONE \-storetype PKCS11 \-list
.fl
-
-.fl
\fP
.fi
-.RE
.TP 3
\-storetype storetype
-Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP.
-.LP
-The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified.
+Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP.
+.br
+.br
+The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified.
.TP 3
-\-storepass password
-Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password.
-.LP
-Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
+\-storepass[:env | :file] argument
+Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password.
+.br
+.br
+If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
+.RS 3
+.TP 2
+o
+\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
+.TP 2
+o
+\f2file\fP: Retrieve the password from the file named \f2argument\fP
+.RE
+Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
.TP 3
-\-keypass password
-Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it.
-.LP
-Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. Also, when typing in a password at the password prompt, the password is echoed (displayed exactly as typed), so be careful not to type it in front of anyone.
+\-keypass[:env | :file] argument
+Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it.
+.br
+.br
+If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
+.RS 3
+.TP 2
+o
+\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
+.TP 2
+o
+\f2file\fP: Retrieve the password from the file named \f2argument\fP
+.RE
+Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
.TP 3
\-sigfile file
-Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file.
-.LP
-The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names.
-.LP
-If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name.
+Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file.
+.br
+.br
+The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names.
+.br
+.br
+If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name.
.TP 3
\-sigalg algorithm
-.RS 3
-
-.LP
-Specifies the name of the signature algorithm to use to sign the JAR file.
-.LP
+Specifies the name of the signature algorithm to use to sign the JAR file.
+.br
+.br
See
.na
\f2Appendix A\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA or SHA256withRSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
-.LP
-.RE
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
.TP 3
\-digestalg algorithm
-.RS 3
-Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
-.LP
+Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
+.br
+.br
See
.na
\f2Appendix A\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA\-256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
-.LP
-.RE
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
.TP 3
\-signedjar file
-Specifies the name to be used for the signed JAR file.
-.LP
-If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file.
+Specifies the name to be used for the signed JAR file.
+.br
+.br
+If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file.
.TP 3
\-verify
-If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)"
-.LP
-It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both.
-.LP
-For further information on verification, see JAR File Verification.
+If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)"
+.br
+.br
+It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both.
+.br
+.br
+For further information on verification, see JAR File Verification.
.TP 3
\-certs
If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes
@@ -578,7 +550,6 @@
o
if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer
.RE
-.LP
The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed:
.RS 3
.TP 2
@@ -596,26 +567,25 @@
In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
.TP 3
\-sectionsonly
-If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File .
-.LP
-By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file.
-.LP
-For further information, see JAR File Verification.
-.LP
-\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
+If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File .
+.br
+.br
+By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file.
+.br
+.br
+For further information, see JAR File Verification.
+.br
+.br
+\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
.TP 3
\-protected
Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
-.RE
-.RS 3
.TP 3
-\-provider provider\-class\-name
-Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP.
-.LP
+\-providerClass provider\-class\-name
+Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP.
+.br
+.br
Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file.
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -629,19 +599,16 @@
.fl
\fP
.fi
-.RE
.TP 3
\-providerName providerName
-If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider.
-.LP
+If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider.
+.br
+.br
For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the
.na
\f2configuration attributes table\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP:
-.RS 3
-
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP:
.nf
\f3
.fl
@@ -653,58 +620,59 @@
.fl
\fP
.fi
-.RE
.TP 3
\-Jjavaoption
-Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
-.LP
+Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
.TP 3
\-tsa url
-If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore.
-.LP
+If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore.
+.br
+.br
To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in
.na
\f2RFC 3161\fP @
.fi
-http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file.
-.LP
+http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file.
.TP 3
\-tsacert alias
-If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA.
-.LP
-The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP.
-.LP
+If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA.
+.br
+.br
+The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP.
.TP 3
\-altsigner class
-Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism.
-.LP
-For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP
-.LP
+Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism.
+.br
+.br
+For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP
.TP 3
\-altsignerpath classpathlist
-Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below.
-.LP
-An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path.
-.LP
+Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below.
+.br
+.br
+An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path.
+.br
+.br
Example of specifying the path to a jar file that contains the class file:
-.RS 3
-
-.LP
-.LP
-\f2\-altsignerpath /home/user/lib/authsigner.jar\fP
-.LP
-.RE
-.LP
-Note that the JAR file name is included.
-.LP
+.nf
+\f3
+.fl
+\-altsignerpath /home/user/lib/authsigner.jar
+.fl
+\fP
+.fi
+Note that the JAR file name is included.
+.br
+.br
Example of specifying the path to the jar file that contains the class file:
-.RS 3
-.LP
-\f2\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP
-.LP
-.RE
-.LP
-Note that the JAR file name is omitted.
+.nf
+\f3
+.fl
+\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
+.fl
+\fP
+.fi
+Note that the JAR file name is omitted.
.TP 3
\-strict
During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details.
@@ -712,25 +680,22 @@
\-verbose:sub\-options
For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information.
.RE
-.SH "EXAMPLES"
+
.LP
-
+.SH "EXAMPLES"
.LP
.SS
Signing a JAR File
.LP
-.RS 3
-
.LP
-.LP
-Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. Suppose the keystore password is "myspass" and the password for \f2jane\fP's private key is "j638klm". You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar":
+Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar":
.LP
.nf
\f3
.fl
- jarsigner \-keystore /working/mystore \-storepass myspass
+ jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
.fl
- \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane
+ \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -747,7 +712,7 @@
.fl
jarsigner \-keystore /working/mystore
.fl
- \-signedjar sbundle.jar bundle.jar jane
+ \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -759,7 +724,7 @@
.nf
\f3
.fl
- jarsigner \-signedjar sbundle.jar bundle.jar jane
+ jarsigner \-signedjar sbundle.jar bundle.jar jane
.fl
\fP
.fi
@@ -771,26 +736,22 @@
.nf
\f3
.fl
- jarsigner bundle.jar jane
+ jarsigner bundle.jar jane
.fl
\fP
.fi
-.RE
.LP
.SS
Verifying a Signed JAR File
.LP
-.RS 3
-
-.LP
.LP
To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following:
.LP
.nf
\f3
.fl
- jarsigner \-verify sbundle.jar
+ jarsigner \-verify sbundle.jar
.fl
\fP
.fi
@@ -851,7 +812,7 @@
Verification with Certificate Information
.LP
.LP
-If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (iff it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example,
+If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example,
.LP
.nf
\f3
@@ -961,11 +922,8 @@
.LP
Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias.
.LP
-.RE
.SH "WARNINGS"
.LP
-
-.LP
During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows:
.nf
\f3
@@ -980,25 +938,25 @@
.fl
This jar contains entries whose signer certificate has expired.
.fl
-
+
.fl
notYetValidCert 4
.fl
This jar contains entries whose signer certificate is not yet valid.
.fl
-
+
.fl
chainNotValidated 4
.fl
This jar contains entries whose certificate chain cannot be correctly validated.
.fl
-
+
.fl
badKeyUsage 8
.fl
This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
.fl
-
+
.fl
badExtendedKeyUsage 8
.fl
@@ -1006,33 +964,33 @@
.fl
doesn't allow code signing.
.fl
-
+
.fl
badNetscapeCertType 8
.fl
- This jar contains entries whose signer certificate's NetscapeCertType extension
+ This jar contains entries whose signer certificate's NetscapeCertType extension
.fl
doesn't allow code signing.
.fl
-
+
.fl
hasUnsignedEntry 16
.fl
This jar contains unsigned entries which have not been integrity\-checked.
.fl
-
+
.fl
notSignedByAlias 32
.fl
This jar contains signed entries which are not signed by the specified alias(es)
.fl
-
+
.fl
aliasNotInStore 32
.fl
This jar contains signed entries that are not signed by alias in this keystore
.fl
-
+
.fl
\fP
.fi
@@ -1042,24 +1000,20 @@
When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned.
.LP
.LP
-\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the exit code
+\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned:
.LP
.nf
\f3
.fl
-failure 1
+failure 1
.fl
\fP
.fi
.LP
-will be returned.
.SS
Compatibility with JDK 1.1
.LP
-.RS 3
-
-.LP
.LP
The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them.
.LP
@@ -1390,7 +1344,7 @@
.nr 44 \n(83+(3*\n(38)
.nr 84 +\n(44
.nr TW \n(84
-.if t .if \n(TW>\n(.li .tm Table at line 1128 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1591,8 +1545,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.RS 3
.TP 2
o
@@ -1606,13 +1558,12 @@
.na
\f4Security\fP @
.fi
-http://java.sun.com/docs/books/tutorial/security/index.html trail of the
+http://download.oracle.com/javase/tutorial/security/index.html trail of the
.na
\f4Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool
+http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool
.RE
.LP
-.RE
--- a/jdk/src/solaris/doc/sun/man/man1/java.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/java.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH java 1 "02 Jun 2010"
+.TH java 1 "10 May 2011"
.LP
.SH "Name"
@@ -38,9 +38,6 @@
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options.
@@ -56,11 +53,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method.
.LP
@@ -70,7 +64,7 @@
.nf
\f3
.fl
- public static void main(String args[])
+public static void main(String args[])
.fl
\fP
.fi
@@ -87,76 +81,79 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases.
.LP
.SH "Standard Options"
.LP
-
-.LP
.RS 3
.TP 3
\-client
-.LP
-Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
-.LP
+Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
+.br
+.br
+For default VM selection, see
+.na
+\f2Server\-Class Machine Detection\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html
+.TP 3
+\-server
+Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
+.br
+.br
For default VM selection, see
.na
\f2Server\-Class Machine Detection\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html
-.TP 3
-\-server
-.LP
-Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
-.LP
-For default VM selection, see
-.na
-\f2Server\-Class Machine Detection\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html
.TP 3
\-agentlib:libname[=options]
-Load native agent library \f2libname\fP, e.g.
-.LP
-\-agentlib:hprof
-.LP
-\-agentlib:jdwp=help
-.LP
-\-agentlib:hprof=help
-.LP
+Load native agent library \f2libname\fP, e.g.
+.br
+.br
+\-agentlib:hprof
+.br
+.br
+\-agentlib:jdwp=help
+.br
+.br
+\-agentlib:hprof=help
+.br
+.br
For more information, see
.na
\f2JVMTI Agent Command Line Options\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting.
+http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting.
.TP 3
\-agentpath:pathname[=options]
Load a native agent library by full pathname. For more information, see
.na
\f2JVMTI Agent Command Line Options\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting.
+http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting.
.TP 3
\-classpath classpath
.TP 3
\-cp classpath
-Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable.
-.LP
+Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable.
+.br
+.br
If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP).
-.LP
+.br
+.br
As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
.br
.br
For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
-.LP
+.br
+.br
For more information on class paths, see
.na
\f2Setting the Class Path\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath.
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath.
.TP 3
\-Dproperty=value
Set a system property value.
@@ -164,19 +161,23 @@
\-d32
.TP 3
\-d64
-Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported.
-.LP
-Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release.
-.LP
-If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release.
+Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported.
+.br
+.br
+Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release.
+.br
+.br
+If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release.
.TP 3
\-enableassertions[:<package name>"..." | :<class name> ]
.TP 3
\-ea[:<package name>"..." | :<class name> ]
-Enable assertions. Assertions are disabled by default.
-.LP
-With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
-.LP
+Enable assertions. Assertions are disabled by default.
+.br
+.br
+With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
+.br
+.br
If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used:
.nf
\f3
@@ -185,26 +186,26 @@
.fl
\fP
.fi
-.LP
-The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below.
+The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below.
.TP 3
\-disableassertions[:<package name>"..." | :<class name> ]
.TP 3
\-da[:<package name>"..." | :<class name> ]
-Disable assertions. This is the default.
-.LP
-With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class.
-.LP
+Disable assertions. This is the default.
+.br
+.br
+With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class.
+.br
+.br
To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used:
.nf
\f3
.fl
-java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat <Main Class>
+java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3
.fl
\fP
.fi
-.LP
-The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below.
+The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below.
.TP 3
\-enablesystemassertions
.TP 3
@@ -215,29 +216,36 @@
.TP 3
\-dsa
Disables asserts in all system classes.
-.LP
.TP 3
\-jar
Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the
.na
\f2Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial/jar for information about working with Jar files and Jar\-file manifests.
-.LP
-When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
-.LP
+http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.
+.br
+.br
+When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
+.br
+.br
Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to
.na
\f2Java Archive (JAR) Files\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jar/index.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html.
.TP 3
\-javaagent:jarpath[=options]
Load a Java programming language agent, see
.na
\f2java.lang.instrument\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/lang/instrument/package\-summary.html.
+http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html.
+.TP 3
+\-jre\-restrict\-search
+Include user\-private JREs in the version search.
+.TP 3
+\-no\-jre\-restrict\-search
+Exclude user\-private JREs in the version search.
.TP 3
\-verbose
.TP 3
@@ -254,8 +262,9 @@
Display version information and exit.
.TP 3
\-version:release
-Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
-.LP
+Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
+.br
+.br
\f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example:
.nf
\f3
@@ -264,11 +273,13 @@
.fl
\fP
.fi
-The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56).
-.LP
-For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
-.LP
-See the following NOTES section for important policy information on the use of this option.
+The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56).
+.br
+.br
+For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
+.br
+.br
+See the following NOTES section for important policy information on the use of this option.
.TP 3
\-showversion
Display version information and continue.
@@ -278,6 +289,9 @@
\-help
Display usage information and exit.
.TP 3
+\-splash:imagepath
+Show splash screen with image specified by \f2imagepath\fP.
+.TP 3
\-X
Display information about non\-standard options and exit.
.RE
@@ -287,9 +301,6 @@
Non\-Standard Options
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Xint
Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode.
@@ -319,18 +330,20 @@
Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program.
.TP 3
\-Xloggc:file
-Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event.
-.LP
-Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line.
-.LP
+Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event.
+.br
+.br
+Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line.
.TP 3
\-Xmsn
-Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics
+Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see
+.na
+\f2HotSpot Ergonomics\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+.br
.br
Examples:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -340,19 +353,20 @@
.fl
\-Xms6m
.fl
-
+
.fl
\fP
.fi
-.RE
.TP 3
\-Xmxn
-Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics
+Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see
+.na
+\f2HotSpot Ergonomics\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+.br
.br
Examples:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -362,28 +376,31 @@
.fl
\-Xmx80m
.fl
-
+
.fl
\fP
.fi
-.RE
On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000m minus overhead amounts.
.TP 3
\-Xprof
Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems.
-.LP
.TP 3
\-Xrs
-Reduces use of operating\-system signals by the Java virtual machine (JVM).
-.LP
-In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly.
-.LP
-Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks.
-.LP
-The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps.
-.LP
-Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed.
-.LP
+Reduces use of operating\-system signals by the Java virtual machine (JVM).
+.br
+.br
+In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly.
+.br
+.br
+Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks.
+.br
+.br
+The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps.
+.br
+.br
+Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed.
+.br
+.br
There are two consequences of specifying \f3\-Xrs\fP:
.RS 3
.TP 2
@@ -402,12 +419,11 @@
.RE
.LP
-.RE
.SH "NOTES"
.LP
-
.LP
-The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
+The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
+.LP
.RS 3
.TP 3
1.
@@ -422,8 +438,7 @@
.fl
\fP
.fi
-.LP
-Would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified.
+This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified.
.TP 3
3.
A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example:
@@ -448,10 +463,23 @@
.RE
.LP
-.SH "SEE ALSO"
+.SH "EXIT STATUS"
+.LP
+.LP
+The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP.
.LP
+.RS 3
+.TP 2
+o
+\f20\fP: Successful completion
+.TP 2
+o
+\f2>0\fP: An error occurred
+.RE
.LP
+.SH "SEE ALSO"
+.LP
.RS 3
.TP 2
o
@@ -470,13 +498,13 @@
.na
\f2The Java Extensions Framework\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
.TP 2
o
.na
\f2Security Features\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/index.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html.
.TP 2
o
.na
--- a/jdk/src/solaris/doc/sun/man/man1/javac.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/javac.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javac 1 "02 Jun 2010"
+.TH javac 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,14 +27,12 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
\fP\f3javac\fP [ options ] [ sourcefiles ] [ classes ] [ @argfiles ]
.fl
-
+
.fl
.fi
@@ -43,9 +41,6 @@
Arguments may be in any order.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options.
@@ -61,11 +56,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3javac\fP tool reads class and interface definitions, written in the Java programming language, and compiles them into bytecode class files. It can also process annotations in Java source files and classes.
.LP
@@ -96,8 +88,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The compiler has a set of standard options that are supported on the current development environment and will be supported in future releases. An additional set of non\-standard options are specific to the current virtual machine and compiler implementations and are subject to change in the future. Non\-standard options begin with \f3\-X\fP.
.LP
@@ -105,28 +95,18 @@
Standard Options
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Akey[=value]
Options to pass to annotation processors. These are not interpreted by javac directly, but are made available for use by individual processors. \f2key\fP should be one or more identifiers separated by ".".
.TP 3
\-cp path or \-classpath path
-Specify where to find user class files, and (optionally) annotation processors and source files. This classpath overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See
-.na
-\f2Setting the Class Path\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath for more details.
-.LP
-If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files.
-.LP
-If the \f3\-processorpath\fP option is not specified, the classpath is also searched for annotation processors.
-.LP
-As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP.
+Specify where to find user class files, and (optionally) annotation processors and source files. This class path overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See Setting the Class Path for more details.
.br
.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. \f3Note:\fP \ Depending of the configuration of your command line environment, you may have to quote the wild card character, for example, \f2javac \-cp "*.jar" MyClass.java\fP.
+>If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files.
+.br
+.br
+If the \f3\-processorpath\fP option is not specified, the class path is also searched for annotation processors.
.TP 3
\-Djava.ext.dirs=directories
Override the location of installed extensions.
@@ -135,17 +115,28 @@
Override the location of endorsed standards path.
.TP 3
\-d directory
-Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP.
-.LP
-If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated.
-.LP
-\f3Note:\fP \ The directory specified by \f3\-d\fP is not automatically added to your user class path.
+Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP.
+.br
+.br
+If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated.
+.br
+.br
+\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path.
.TP 3
\-deprecation
Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP.
.TP 3
\-encoding encoding
-Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.
+Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.
+.TP 3
+\-endorseddirs directories
+Override the location of endorsed standards path.
+.TP 3
+\-extdirs directories
+Overrides the location of the \f2ext\fP directory. The \f2directories\fP variable is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. All JAR archives found are automatically part of the class path.
+.br
+.br
+If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information.
.TP 3
\-g
Generate all debugging information, including local variables. By default, only line number and source file information is generated.
@@ -171,7 +162,13 @@
Print a synopsis of standard options.
.TP 3
\-implicit:{class,none}
-Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types.
+Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types.
+.TP 3
+\-Joption
+Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
+.br
+.br
+\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher.
.TP 3
\-nowarn
Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP.
@@ -183,7 +180,7 @@
Names of the annotation processors to run. This bypasses the default discovery process.
.TP 3
\-processorpath path
-Specify where to find annotation processors; if this option is not used, the classpath will be searched for processors.
+Specify where to find annotation processors; if this option is not used, the class path will be searched for processors.
.TP 3
\-s dir
Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP.
@@ -218,41 +215,42 @@
.RE
.TP 3
\-sourcepath sourcepath
-Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name.
-.LP
-\f3Note:\fP \ Classes found through the classpath may be subject to automatic recompilation if their sources are also found. See Searching For Types.
+Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name.
+.br
+.br
+\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types.
.TP 3
\-verbose
Verbose output. This includes information about each class loaded and each source file compiled.
.TP 3
\-version
-Print version information.
+Print version information.
+.TP 3
+\-Werror
+Terminate compilation if warnings occur.
.TP 3
\-X
Display information about non\-standard options and exit.
.RE
.LP
-.RE
.SS
Cross\-Compilation Options
.LP
-.RS 3
-
-.LP
.LP
By default, classes are compiled against the bootstrap and extension classes of the platform that \f3javac\fP shipped with. But \f3javac\fP also supports \f2cross\-compiling\fP, where classes are compiled against a bootstrap and extension classes of a different Java platform implementation. It is important to use \f3\-bootclasspath\fP and \f3\-extdirs\fP when cross\-compiling; see Cross\-Compilation Example below.
.LP
.RS 3
.TP 3
\-target version
-Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP).
-.LP
+Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP).
+.br
+.br
The default for \f3\-target\fP depends on the value of \f3\-source\fP:
.RS 3
.TP 2
o
-If \-source is \f3not specified\fP, the value of \-target is \f31.6\fP
+If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP
.TP 2
o
If \-source is \f31.2\fP, the value of \-target is \f31.4\fP
@@ -261,25 +259,18 @@
If \-source is \f31.3\fP, the value of \-target is \f31.4\fP
.TP 2
o
-For \f3all other values\fP of \-source, the value of \-target is the value of \f3\-source\fP.
+For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP.
.RE
.TP 3
\-bootclasspath bootclasspath
Cross\-compile against the specified set of boot classes. As with the user class path, boot class path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives.
-.TP 3
-\-extdirs directories
-Cross\-compile against the specified extension directories. \f2Directories\fP is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files.
.RE
.LP
-.RE
.SS
Non\-Standard Options
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Xbootclasspath/p:path
Prepend to the bootstrap class path.
@@ -291,54 +282,19 @@
Override location of bootstrap class files.
.TP 3
\-Xlint
-Enable all recommended warnings. In this release, all available warnings are recommended.
+Enable all recommended warnings. In this release, enabling all available warnings is recommended.
+.TP 3
+\-Xlint:all
+Enable all recommended warnings. In this release, enabling all available warnings is recommended.
.TP 3
\-Xlint:none
-Disable all warnings not mandated by the Java Language Specification.
+Disable all warnings.
+.TP 3
+\-Xlint:name
+Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option.
.TP 3
\-Xlint:\-name
-Disable warning \f2name\fP, where \f2name\fP is one of the warning names supported for \f3\-Xlint:\fP\f2name\fP, below.
-.TP 3
-\-Xlint:unchecked
-Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification.
-.TP 3
-\-Xlint:path
-Warn about nonexistent path (classpath, sourcepath, etc) directories.
-.TP 3
-\-Xlint:serial
-Warn about missing \f2serialVersionUID\fP definitions on serializable classes.
-.TP 3
-\-Xlint:finally
-Warn about \f2finally\fP clauses that cannot complete normally.
-.TP 3
-\-Xlint:fallthrough
-Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement:
-.RS 3
-
-.LP
-.nf
-\f3
-.fl
-switch (x) {
-.fl
-case 1:
-.fl
- System.out.println("1");
-.fl
- // No break; statement here.
-.fl
-case 2:
-.fl
- System.out.println("2");
-.fl
-}
-.fl
-
-.fl
-\fP
-.fi
-.RE
-If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question.
+Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option.
.TP 3
\-Xmaxerrs number
Set the maximum number of errors to print.
@@ -350,7 +306,10 @@
Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP.
.TP 3
\-Xprefer:{newer,source}
-Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.
+Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.
+.TP 3
+\-Xpkginfo:{always,legacy,nonempty}
+Specify handling of package\-info files
.TP 3
\-Xprint
Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change.
@@ -363,27 +322,420 @@
.RE
.LP
-.RE
.SS
-The \-J Option
+Warnings That Can Be Enabled or Disabled with \-Xlint Option
.LP
-.RS 3
-
+.LP
+Enable warning \f2name\fP with the option \f3\-Xlint:\fP\f2name\fP, where \f2name\fP is one of the following warning names. Similarly, you can disable warning \f2name\fP with the option \f3\-Xlint:\-\fP\f2name\fP:
.LP
.RS 3
.TP 3
-\-Joption
-Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f3\-X\fP, it is not a `standard option' of \f3javac\fP. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
-.LP
-\f3Note:\fP \ \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher.
+cast
+Warn about unnecessary and redundant casts. For example:
+.nf
+\f3
+.fl
+String s = (String)"Hello!"
+.fl
+\fP
+.fi
+.TP 3
+classfile
+Warn about issues related to classfile contents.
+.TP 3
+deprecation
+Warn about use of deprecated items. For example:
+.nf
+\f3
+.fl
+ java.util.Date myDate = new java.util.Date();
+.fl
+ int currentDay = myDate.getDay();
+.fl
+\fP
+.fi
+The method \f2java.util.Date.getDay\fP has been deprecated since JDK 1.1.
+.TP 3
+dep\-ann
+Warn about items that are documented with an \f2@deprecated\fP Javadoc comment, but do not have a \f2@Deprecated\fP annotation. For example:
+.nf
+\f3
+.fl
+ /**
+.fl
+ * @deprecated As of Java SE 7, replaced by {@link #newMethod()}
+.fl
+ */
+.fl
+
+.fl
+ public static void deprecatedMethood() { }
+.fl
+
+.fl
+ public static void newMethod() { }
+.fl
+\fP
+.fi
+.TP 3
+divzero
+Warn about division by constant integer 0. For example:
+.nf
+\f3
+.fl
+ int divideByZero = 42 / 0;
+.fl
+\fP
+.fi
+.TP 3
+empty
+Warn about empty statements after \f2if\fP statements. For example:
+.nf
+\f3
+.fl
+class E {
+.fl
+ void m() {
+.fl
+ if (true) ;
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+.TP 3
+fallthrough
+Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement:
+.nf
+\f3
+.fl
+switch (x) {
+.fl
+case 1:
+.fl
+ System.out.println("1");
+.fl
+ // No break statement here.
+.fl
+case 2:
+.fl
+ System.out.println("2");
+.fl
+}
+.fl
+\fP
+.fi
+If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question.
+.TP 3
+finally
+Warn about \f2finally\fP clauses that cannot complete normally. For example:
+.nf
+\f3
+.fl
+ public static int m() {
+.fl
+ try {
+.fl
+ throw new NullPointerException();
+.fl
+ } catch (NullPointerException e) {
+.fl
+ System.err.println("Caught NullPointerException.");
+.fl
+ return 1;
+.fl
+ } finally {
+.fl
+ return 0;
+.fl
+ }
+.fl
+ }
+.fl
+\fP
+.fi
+The compiler generates a warning for \f2finally\fP block in this example. When this method is called, it returns a value of \f20\fP, not \f21\fP. A \f2finally\fP block always executes when the \f2try\fP block exits. In this example, if control is transferred to the \f2catch\fP, then the method exits. However, the \f2finally\fP block must be executed, so it is executed, even though control has already been transferred outside the method.
+.TP 3
+options
+Warn about issues relating to the use of command line options. See Cross\-Compilation Example for an example of this kind of warning.
+.TP 3
+overrides
+Warn about issues regarding method overrides. For example, consider the following two classes:
+.nf
+\f3
+.fl
+public class ClassWithVarargsMethod {
+.fl
+ void varargsMethod(String... s) { }
+.fl
+}
+.fl
+\fP
+.fi
+.nf
+\f3
+.fl
+public class ClassWithOverridingMethod extends ClassWithVarargsMethod {
+.fl
+ @Override
+.fl
+ void varargsMethod(String[] s) { }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates a warning similar to the following:
+.br
+.br
+\f2warning: [override] varargsMethod(String[]) in ClassWithOverridingMethod overrides varargsMethod(String...) in ClassWithVarargsMethod; overriding method is missing '...'\fP
+.br
+.br
+When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. In the method \f2ClassWithVarargsMethod.varargsMethod\fP, the compiler translates the varargs formal parameter \f2String... s\fP to the formal parameter \f2String[] s\fP, an array, which matches the formal parameter of the method \f2ClassWithOverridingMethod.varargsMethod\fP. Consequently, this example compiles.
+.TP 3
+path
+Warn about invalid path elements and nonexistent path directories on the command line (with regards to the class path, the source path, and other paths). Such warnings cannot be suppressed with the \f2@SuppressWarnings\fP annotation. For example:
+.nf
+\f3
+.fl
+javac \-Xlint:path \-classpath /nonexistentpath Example.java
+.fl
+\fP
+.fi
+.TP 3
+processing
+Warn about issues regarding annotation processing. The compiler generates this warning if you have a class that has an annotation, and you use an annotation processor that cannot handle that type of exception. For example, the following is a simple annotation processor:
+.br
+.br
+\f3Source file \fP\f4AnnoProc.java\fP:
+.nf
+\f3
+.fl
+import java.util.*;
+.fl
+import javax.annotation.processing.*;
+.fl
+import javax.lang.model.*;
+.fl
+import javax.lang.model.element.*;
+.fl
+
+.fl
+@SupportedAnnotationTypes("NotAnno")
+.fl
+public class AnnoProc extends AbstractProcessor {
+.fl
+ public boolean process(Set<? extends TypeElement> elems, RoundEnvironment renv) {
+.fl
+ return true;
+.fl
+ }
+.fl
+
+.fl
+ public SourceVersion getSupportedSourceVersion() {
+.fl
+ return SourceVersion.latest();
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+\f3Source file \fP\f4AnnosWithoutProcessors.java\fP\f3:\fP
+.nf
+\f3
+.fl
+@interface Anno { }
+.fl
+
+.fl
+@Anno
+.fl
+class AnnosWithoutProcessors { }
+.fl
+\fP
+.fi
+The following commands compile the annotation processor \f2AnnoProc\fP, then run this annotation processor against the source file \f2AnnosWithoutProcessors.java\fP:
+.nf
+\f3
+.fl
+% javac AnnoProc.java
+.fl
+% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java
+.fl
+\fP
+.fi
+When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning:
+.br
+.br
+\f2warning: [processing] No processor claimed any of these annotations: Anno\fP
+.br
+.br
+To resolve this issue, you can rename the annotation defined and used in the class \f2AnnosWithoutProcessors\fP from \f2Anno\fP to \f2NotAnno\fP.
+.TP 3
+rawtypes
+Warn about unchecked operations on raw types. The following statement generates a \f2rawtypes\fP warning:
+.nf
+\f3
+.fl
+void countElements(List l) { ... }
+.fl
+\fP
+.fi
+The following does not generate a \f2rawtypes\fP warning:
+.nf
+\f3
+.fl
+void countElements(List<?> l) { ... }
+.fl
+\fP
+.fi
+\f2List\fP is a raw type. However, \f2List<?>\fP is a unbounded wildcard parameterized type. Because \f2List\fP is a parameterized interface, you should always specify its type argument. In this example, the \f2List\fP formal argument is specified with a unbounded wildcard (\f2?\fP) as its formal type parameter, which means that the \f2countElements\fP method can accept any instantiation of the \f2List\fP interface.
+.TP 3
+serial
+Warn about missing \f2serialVersionUID\fP definitions on serializable classes. For example:
+.nf
+\f3
+.fl
+public class PersistentTime implements Serializable
+.fl
+{
+.fl
+ private Date time;
+.fl
+
+.fl
+ public PersistentTime() {
+.fl
+ time = Calendar.getInstance().getTime();
+.fl
+ }
+.fl
+
+.fl
+ public Date getTime() {
+.fl
+ return time;
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates the following warning:
+.br
+.br
+\f2warning: [serial] serializable class PersistentTime has no definition of serialVersionUID\fP
+.br
+.br
+If a serializable class does not explicitly declare a field named \f2serialVersionUID\fP, then the serialization runtime will calculate a default \f2serialVersionUID\fP value for that class based on various aspects of the class, as described in the Java Object Serialization Specification. However, it is strongly recommended that all serializable classes explicitly declare \f2serialVersionUID\fP values because the default process of computing \f2serialVersionUID\fP vales is highly sensitive to class details that may vary depending on compiler implementations, and can thus result in unexpected \f2InvalidClassExceptions\fP during deserialization. Therefore, to guarantee a consistent \f2serialVersionUID\fP value across different Java compiler implementations, a serializable class must declare an explicit \f2serialVersionUID\fP value.
+.TP 3
+static
+Warn about issues relating to use of statics. For example:
+.nf
+\f3
+.fl
+class XLintStatic {
+.fl
+ static void m1() { }
+.fl
+ void m2() { this.m1(); }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates the following warning:
+.nf
+\f3
+.fl
+warning: [static] static method should be qualified by type name, XLintStatic, instead of by an expression
+.fl
+\fP
+.fi
+To resolve this issue, you can call the static method \f2m1\fP as follows:
+.nf
+\f3
+.fl
+XLintStatic.m1();
+.fl
+\fP
+.fi
+Alternatively, you can remove the \f2static\fP keyword from the declaration of the method \f2m1\fP.
+.TP 3
+try
+Warn about issues relating to use of \f2try\fP blocks, including try\-with\-resources statements. For example, a warning is generated for the following statement because the resource \f2ac\fP declared in the \f2try\fP statement is not used:
+.nf
+\f3
+.fl
+try ( AutoCloseable ac = getResource() ) {
+.fl
+ // do nothing
+.fl
+}
+.fl
+\fP
+.fi
+.TP 3
+unchecked
+Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. For example:
+.nf
+\f3
+.fl
+ List l = new ArrayList<Number>();
+.fl
+ List<String> ls = l; // unchecked warning
+.fl
+\fP
+.fi
+During type erasure, the types \f2ArrayList<Number>\fP and \f2List<String>\fP become \f2ArrayList\fP and \f2List\fP, respectively.
+.br
+.br
+The variable \f2ls\fP has the parameterized type \f2List<String>\fP. When the \f2List\fP referenced by \f2l\fP is assigned to \f2ls\fP, the compiler generates an unchecked warning; the compiler is unable to determine at compile time, and moreover knows that the JVM will not be able to determine at runtime, if \f2l\fP refers to a \f2List<String>\fP type; it does not. Consequently, heap pollution occurs.
+.br
+.br
+In detail, a heap pollution situation occurs when the \f2List\fP object \f2l\fP, whose static type is \f2List<Number>\fP, is assigned to another \f2List\fP object, \f2ls\fP, that has a different static type, \f2List<String>\fP. However, the compiler still allows this assignment. It must allow this assignment to preserve backwards compatibility with versions of Java SE that do not support generics. Because of type erasure, \f2List<Number>\fP and \f2List<String>\fP both become \f2List\fP. Consequently, the compiler allows the assignment of the object \f2l\fP, which has a raw type of \f2List\fP, to the object \f2ls\fP.
+.TP 3
+varargs
+Warn about unsafe usages of variable arguments (varargs) methods, in particular, those that contain non\-reifiable arguments. For example:
+.nf
+\f3
+.fl
+public class ArrayBuilder {
+.fl
+ public static <T> void addToList (List<T> listArg, T... elements) {
+.fl
+ for (T x : elements) {
+.fl
+ listArg.add(x);
+.fl
+ }
+.fl
+ }
+.fl
+}
+.fl
+\fP
+.fi
+The compiler generates the following warning for the definition of the method \f2ArrayBuilder.addToList\fP:
+.nf
+\f3
+.fl
+warning: [varargs] Possible heap pollution from parameterized vararg type T
+.fl
+\fP
+.fi
+When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. However, the Java programming language does not permit the creation of arrays of parameterized types. In the method \f2ArrayBuilder.addToList\fP, the compiler translates the varargs formal parameter \f2T... elements\fP to the formal parameter \f2T[] elements\fP, an array. However, because of type erasure, the compiler converts the varargs formal parameter to \f2Object[] elements\fP. Consequently, there is a possibility of heap pollution.
.RE
.LP
-.RE
.SH "COMMAND LINE ARGUMENT FILES"
.LP
-
-.LP
.LP
To shorten or simplify the javac command line, you can specify one or more files that themselves contain arguments to the \f2javac\fP command (except \f2\-J\fP options). This enables you to create javac commands of any length on any operating system.
.LP
@@ -405,9 +757,7 @@
.nf
\f3
.fl
- % \fP\f3javac @argfile\fP
-.fl
-
+% \fP\f3javac @argfile\fP
.fl
.fi
@@ -433,7 +783,7 @@
.fl
\-sourcepath /java/pubs/ws/1.3/src/share/classes
.fl
-
+
.fl
\fP
.fi
@@ -451,7 +801,7 @@
.fl
MyClass3.java
.fl
-
+
.fl
\fP
.fi
@@ -465,7 +815,7 @@
.fl
% \fP\f3javac @options @classes\fP
.fl
-
+
.fl
.fi
@@ -479,17 +829,13 @@
.nf
\f3
.fl
- % \fP\f3javac @path1/options @path2/classes\fP
-.fl
-
+% \fP\f3javac @path1/options @path2/classes\fP
.fl
.fi
.LP
.SH "ANNOTATION PROCESSING"
.LP
-
-.LP
.LP
\f3javac\fP provides direct support for annotation processing, superseding the need for the separate annotation processing tool, \f3apt\fP.
.LP
@@ -500,11 +846,7 @@
Overview of annotation processing
.LP
.LP
-Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named
-.br
-\f2\ META\-INF/services/javax.annotation.processing.Processor\fP
-.br
-on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option.
+Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named \f2META\-INF/services/javax.annotation.processing.Processor\fP on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option.
.LP
.LP
After scanning the source files and classes on the command line to determine what annotations are present, the compiler queries the processors to determine what annotations they process. When a match is found, the processor will be invoked. A processor may "claim" the annotations it processes, in which case no further attempt is made to find any processors for those annotations. Once all annotations have been claimed, the compiler does not look for additional processors.
@@ -523,8 +865,6 @@
.LP
.SH "SEARCHING FOR TYPES"
.LP
-
-.LP
.LP
When compiling a source file, the compiler often needs information about a type whose definition did not appear in the source files given on the command line. The compiler needs type information for every class or interface used, extended, or implemented in the source file. This includes classes and interfaces not explicitly mentioned in the source file but which provide information through inheritance.
.LP
@@ -532,11 +872,7 @@
For example, when you subclass \f3java.applet.Applet\fP, you are also using \f3Applet's\fP ancestor classes: \f3java.awt.Panel\fP, \f3java.awt.Container\fP, \f3java.awt.Component\fP, and \f3java.lang.Object\fP.
.LP
.LP
-When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see
-.na
-\f2Setting the Class Path\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath).
+When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see Setting the Class Path).
.LP
.LP
If you set the \-sourcepath option, the compiler searches the indicated path for source files; otherwise the compiler searches the user class path for both class files and source files.
@@ -555,8 +891,6 @@
.LP
.SH "PROGRAMMATIC INTERFACE"
.LP
-
-.LP
.LP
\f3javac\fP supports the new Java Compiler API defined by the classes and interfaces in the \f2javax.tools\fP package.
.LP
@@ -573,8 +907,6 @@
.fl
int rc = javac.run(null, null, null, args);
.fl
-
-.fl
\fP
.fi
@@ -588,11 +920,8 @@
.SS
Old Interface
.LP
-.RS 3
-
.LP
-.LP
-\f3Note:\fP \ This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above.
+\f3Note:\fP This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above.
.LP
.LP
The \f2com.sun.tools.javac.Main\fP class provides two static methods to invoke the compiler from a program:
@@ -604,8 +933,6 @@
.fl
public static int compile(String[] args, PrintWriter out);
.fl
-
-.fl
\fP
.fi
@@ -622,21 +949,14 @@
.LP
Note that all \f3other\fP classes and methods found in a package whose name starts with \f2com.sun.tools.javac\fP (informally known as sub\-packages of \f2com.sun.tools.javac\fP) are strictly internal and subject to change at any time.
.LP
-.RE
.SH "EXAMPLES"
.LP
.SS
Compiling a Simple Program
.LP
-.RS 3
-
-.LP
.LP
One source file, \f2Hello.java\fP, defines a class called \f3greetings.Hello\fP. The \f2greetings\fP directory is the package directory both for the source file and the class file and is off the current directory. This allows us to use the default user class path. It also makes it unnecessary to specify a separate destination directory with \f3\-d\fP.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -682,25 +1002,15 @@
.fl
Hello Everyone
.fl
-
-.fl
.fi
-.RE
.LP
-.RE
.SS
Compiling Multiple Source Files
.LP
-.RS 3
-
-.LP
.LP
This example compiles all the source files in the package \f2greetings\fP.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -720,27 +1030,15 @@
.fl
Aloha.java GutenTag.java Hello.java Hi.java
.fl
-
-.fl
-
-.fl
.fi
-.RE
.LP
-.RE
.SS
Specifying a User Class Path
.LP
-.RS 3
-
-.LP
.LP
Having changed one of the source files in the previous example, we recompile it:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -750,35 +1048,23 @@
.fl
% \f3javac greetings/Hi.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
Since \f2greetings.Hi\fP refers to other classes in the \f2greetings\fP package, the compiler needs to find these other classes. The example above works, because our default user class path happens to be the directory containing the package directory. But suppose we want to recompile this file and not worry about which directory we're in? Then we need to add \f2/examples\fP to the user class path. We can do this by setting \f3CLASSPATH\fP, but here we'll use the \f3\-classpath\fP option.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
% \fP\f3javac \-classpath /examples /examples/greetings/Hi.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
If we change \f2greetings.Hi\fP again, to use a banner utility, that utility also needs to be accessible through the user class path.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -786,42 +1072,26 @@
.fl
/examples/greetings/Hi.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
To execute a class in \f2greetings\fP, we need access both to \f2greetings\fP and to the classes it uses.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
% \fP\f3java \-classpath /examples:/lib/Banners.jar greetings.Hi\fP
.fl
-
-.fl
.fi
-.RE
.LP
-.RE
.SS
Separating Source Files and Class Files
.LP
-.RS 3
-
-.LP
.LP
It often makes sense to keep source files and class files in separate directories, especially on large projects. We use \f3\-d\fP to indicate the separate class file destination. Since the source files are not in the user class path, we use \f3\-sourcepath\fP to help the compiler find them.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -855,61 +1125,56 @@
.fl
Base.class GoodBye.class
.fl
-
-.fl
-
-.fl
.fi
-.RE
.LP
.LP
-\f3Note:\fP \ The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option.
+\f3Note:\fP The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option.
.LP
-.RE
.SS
Cross\-Compilation Example
.LP
-.RS 3
-
.LP
-.LP
-Here we use \f3javac\fP to compile code that will run on a 1.7 VM.
-.LP
-.RS 3
-
+Here we use \f3javac\fP to compile code that will run on a 1.6 VM.
.LP
.nf
\f3
.fl
-% \fP\f3javac \-target 1.7 \-bootclasspath jdk1.7.0/lib/rt.jar \\
+% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\
.fl
\-extdirs "" OldCode.java\fP
.fl
-
-.fl
.fi
-.RE
.LP
.LP
-The \f3\-target 1.7\fP option ensures that the generated class files will be compatible with 1.7 VMs. By default, \f3javac\fP compiles for JDK 6.
+The \f2\-source 1.6\fP option specifies that version 1.6 (or 6) of the Java programming language be used to compile \f2OldCode.java\fP. The option \f3\-target 1.6\fP option ensures that the generated class files will be compatible with 1.6 VMs. Note that in most cases, the value of the \f3\-target\fP option is the value of the \f3\-source\fP option; in this example, you can omit the \f3\-target\fP option.
.LP
.LP
-The Java Platform JDK's \f3javac\fP would also by default compile against its own bootstrap classes, so we need to tell \f3javac\fP to compile against JDK 1.7 bootstrap classes instead. We do this with \f3\-bootclasspath\fP and \f3\-extdirs\fP. Failing to do this might allow compilation against a Java Platform API that would not be present on a 1.7 VM and would fail at runtime.
+You must specify the \f3\-bootclasspath\fP option to specify the correct version of the bootstrap classes (the \f2rt.jar\fP library). If not, the compiler generates a warning:
.LP
-.RE
+.nf
+\f3
+.fl
+% \fP\f3javac \-source 1.6 OldCode.java\fP
+.fl
+warning: [options] bootstrap class path not set in conjunction with \-source 1.6
+.fl
+.fi
+
+.LP
+.LP
+If you do not specify the correct version of bootstrap classes, the compiler will use the old language rules (in this example, it will use version 1.6 of the Java programming language) combined with the new bootstrap classes, which can result in class files that do not work on the older platform (in this case, Java SE 6) because reference to non\-existent methods can get included.
+.LP
.SH "SEE ALSO"
.LP
-
-.LP
.RS 3
.TP 2
o
.na
\f2The javac Guide\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javac/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html
.TP 2
o
java(1) \- the Java Application Launcher
@@ -933,7 +1198,7 @@
.na
\f2The Java Extensions Framework\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
.RE
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/javadoc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/javadoc.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,27 +19,16 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javadoc 1 "02 Jun 2010"
+.TH javadoc 1 "10 May 2011"
.SH "Name"
javadoc \- The Java API Documentation Generator
-.RS 3
-
.LP
-.LP
-Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Sun Solaris.
-.LP
-.RE
+Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Solaris.
.SH "SYNOPSIS"
.LP
-.LP
\f4javadoc\fP\f2\ [\ \fP\f2options\fP\f2\ ]\ [\ packagenames\ ]\ [\ sourcefilenames\ ]\ [\ \-subpackages\fP\ \f2pkg1:pkg2:...\fP\f2\ ]\ [\ \fP\f2@argfiles\fP\f2\ ]\fP
.LP
-.LP
Arguments can be in any order. See processing of Source Files for details on how the Javadoc tool determines which "\f2.java\fP" files to process.
-.LP
-.RS 3
-
-.LP
.RS 3
.TP 3
options
@@ -49,11 +38,7 @@
A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages
.TP 3
sourcefilenames
-A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see
-.na
-\f2Identifiers\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes
+A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes
.TP 3
\-subpackages pkg1:pkg2:...
Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames.
@@ -61,31 +46,19 @@
@argfiles
One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files.
.RE
-
-.LP
-.RE
.SH "DESCRIPTION"
.LP
-.LP
The \f3Javadoc\fP tool parses the declarations and documentation comments in a set of Java source files and produces a corresponding set of HTML pages describing (by default) the public and protected classes, nested classes (but not anonymous inner classes), interfaces, constructors, methods, and fields. You can use it to generate the API (Application Programming Interface) documentation or the implementation documentation for a set of source files.
.LP
-.LP
You can run the Javadoc tool on entire packages, individual source files, or both. When documenting entire packages, you can either use \f2\-subpackages\fP for traversing recursively down from a top\-level directory, or pass in an explicit list of package names. When documenting individual source files, you pass in a list of source (\f2.java\fP) filenames. Examples are given at the end of this document. How Javadoc processes source files is covered next.
-.LP
.SS
Processing of source files
.LP
-.LP
The Javadoc tool processes files that end in "\f2.java\fP" plus other files described under Source Files. If you run the Javadoc tool by explicitly passing in individual source filenames, you can determine exactly which "\f2.java\fP" files are processed. However, that is not how most developers want to work, as it is simpler to pass in package names. The Javadoc tool can be run three ways without explicitly specifying the source filenames. You can (1) pass in package names, (2) use \f2\-subpackages\fP, and (3) use wildcards with source filenames (\f2*.java\fP). In these cases, the Javadoc tool processes a "\f2.java\fP" file only if it fulfills all of the following requirements:
-.LP
.RS 3
.TP 2
o
-Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see
-.na
-\f2Identifiers\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625 for legal characters)
+Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see the Java Language Specification for legal characters)
.TP 2
o
Its directory path relative to the root of the source tree is actually a legal package name (after converting its separators to dots)
@@ -93,11 +66,8 @@
o
Its package statement contains the legal package name (specified in the previous bullet)
.RE
-
-.LP
.LP
\f3Processing of links\fP \- During a run, the Javadoc tool automatically adds cross\-reference links to package, class and member names that are being documented as part of that run. Links appear in several places:
-.LP
.RS 3
.TP 2
o
@@ -124,69 +94,50 @@
o
The index
.RE
-
-.LP
.LP
You can add hyperlinks to existing text for classes not included on the command line (but generated separately) by way of the \f2\-link\fP and \f2\-linkoffline\fP options.
.LP
-.LP
\f3Other processing details\fP \- The Javadoc tool produces one complete document each time it is run; it cannot do incremental builds \-\- that is, it cannot modify or \f2directly\fP incorporate results from previous runs of the Javadoc tool. However, it can link to results from other runs, as just mentioned.
.LP
-.LP
As implemented, the Javadoc tool requires and relies on the java compiler to do its job. The Javadoc tool calls part of \f2javac\fP to compile the declarations, ignoring the member implementation. It builds a rich internal representation of the classes, including the class hierarchy, and "use" relationships, then generates the HTML from that. The Javadoc tool also picks up user\-supplied documentation from documentation comments in the source code.
.LP
-.LP
In fact, the Javadoc tool will run on \f2.java\fP source files that are pure stub files with no method bodies. This means you can write documentation comments and run the Javadoc tool in the earliest stages of design while creating the API, before writing the implementation.
.LP
-.LP
-Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents
-.na
-\f2default constructors\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (section 8.6.7 of \f2Java Language Specification\fP) that are present in the \f2.class\fP files but not in the source code.
-.LP
+Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents default constructors (see Java Language Specification) that are present in the \f2.class\fP files but not in the source code.
.LP
In many cases, the Javadoc tool allows you to generate documentation for source files whose code is incomplete or erroneous. This is a benefit that enables you to generate documentation before all debugging and troubleshooting is done. For example, according to the \f2Java Language Specification\fP, a class that contains an abstract method should itself be declared abstract. The Javadoc tool does not check for this, and would proceed without a warning, whereas the javac compiler stops on this error. The Javadoc tool does do some primitive checking of doc comments. Use the DocCheck doclet to check the doc comments more thoroughly.
.LP
-.LP
When the Javadoc tool builds its internal structure for the documentation, it loads all referenced classes. Because of this, the Javadoc tool must be able to find all referenced classes, whether bootstrap classes, extensions, or user classes. For more about this, see
.na
\f2How Classes Are Found\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
.SS
Javadoc Doclets
.LP
-.LP
You can customize the content and format of the Javadoc tool's output by using doclets. The Javadoc tool has a default "built\-in" doclet, called the standard doclet, that generates HTML\-formatted API documentation. You can modify or subclass the standard doclet, or write your own doclet to generate HTML, XML, MIF, RTF or whatever output format you'd like. Information about doclets and their use is at the following locations:
-.LP
.RS 3
.TP 2
o
.na
\f2Javadoc Doclets\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html
.TP 2
o
The \f2\-doclet\fP command\-line option
.RE
-
-.LP
.LP
When a custom doclet is not specified with the \f2\-doclet\fP command line option, the Javadoc tool will use the default standard doclet. The javadoc tool has several command line options that are available regardless of which doclet is being used. The standard doclet adds a supplementary set of command line options. Both sets of options are described below in the options section.
-.LP
.SS
Related Documentation and Doclets
-.LP
.RS 3
.TP 2
o
.na
\f2Javadoc Enhancements\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc.
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc.
.TP 2
o
.na
@@ -198,7 +149,7 @@
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html for more information about Sun conventions for writing documentation comments.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html for more information about Sun conventions for writing documentation comments.
.TP 2
o
.na
@@ -216,22 +167,18 @@
.na
\f2DocCheck Doclet\fP @
.fi
-http://java.sun.com/javadoc/doccheck \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Sun Doc Check Utilities.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Doc Check Utilities.
.TP 2
o
.na
\f2MIF Doclet\fP @
.fi
-http://java.sun.com/javadoc/mifdoclet \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format.
+http://java.sun.com/j2se/javadoc/mifdoclet/ \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format.
.RE
-
-.LP
.SS
Terminology
.LP
-.LP
The terms \f2documentation comment\fP, \f2doc comment\fP, \f2main description\fP, \f2tag\fP, \f2block tag\fP, and \f2in\-line tag\fP are described at Documentation Comments. These other terms have specific meanings within the context of the Javadoc tool:
-.LP
.RS 3
.TP 3
generated document
@@ -259,34 +206,25 @@
.na
\f21.3\fP @
.fi
-http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members.
+http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members.
.LP
.TP 3
external referenced classes
The referenced classes whose documentation is not being generated during a javadoc run. In other words, these classes are not passed into the Javadoc tool on the command line. Links in the generated documentation to those classes are said to be \f2external references\fP or \f2external links\fP. For example, if you run the Javadoc tool on only the \f2java.awt\fP package, then any class in \f2java.lang\fP, such as \f2Object\fP, is an external referenced class. External referenced classes can be linked to using the \f2\-link\fP and \f2\-linkoffline\fP options. An important property of an external referenced class is that its source comments are normally not available to the Javadoc run. In this case, these comments cannot be inherited.
.RE
-
-.LP
.SH "SOURCE FILES"
.LP
-.LP
The Javadoc tool will generate output originating from four different types of "source" files: Java language source files for classes (\f2.java\fP), package comment files, overview comment files, and miscellaneous unprocessed files. This section also covers test files and template files that can also be in the source tree, but which you want to be sure not to document.
-.LP
.SS
Class Source Code Files
.LP
-.LP
Each class or interface and its members can have their own documentation comments, contained in a \f2.java\fP file. For more details about these doc comments, see Documentation Comments.
-.LP
.SS
Package Comment Files
.LP
-.LP
Each package can have its own documentation comment, contained in its own "source" file, that the Javadoc tool will merge into the package summary page that it generates. You typically include in this comment any documentation that applies to the entire package.
.LP
-.LP
To create a package comment file, you have a choice of two files to place your comments:
-.LP
.RS 3
.TP 2
o
@@ -295,52 +233,18 @@
o
\f2package.html\fP \- Can contain only package comments and Javadoc tags, no package annotations.
.RE
-
-.LP
.LP
A package may have a single \f2package.html\fP file or a single \f2package\-info.java\fP file but not both. Place either file in the package directory in the source tree along with your \f2.java\fP files.
.LP
-.LP
\f4package\-info.java\fP \- This file can contain a package comment of the following structure \-\- the comment is placed before the package declaration:
.LP
-.LP
File: \f2java/applet/package\-info.java\fP
-.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
.nf
\f3
.fl
/**
.fl
- * Provides the classes necessary to create an
+ * Provides the classes necessary to create an
.fl
* applet and the classes an applet uses
.fl
@@ -372,105 +276,12 @@
.fl
\fP
.fi
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 352 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
-
-.LP
.LP
Note that while the comment separators \f2/**\fP and \f2/*\fP must be present, the leading asterisks on the intermediate lines can be omitted.
.LP
-.LP
\f4package.html\fP \- This file can contain a package comment of the following structure \-\- the comment is placed in the \f2<body>\fP element:
.LP
-.LP
File: \f2java/applet/package.html\fP
-.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
.nf
\f3
.fl
@@ -478,7 +289,7 @@
.fl
<BODY>
.fl
-Provides the classes necessary to create an applet and the
+Provides the classes necessary to create an applet and the
.fl
classes an applet uses to communicate with its applet context.
.fl
@@ -506,77 +317,14 @@
.fl
\fP
.fi
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 405 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-40
-
-.LP
.LP
Notice this is just a normal HTML file and does not include a package declaration. The content of the package comment file is written in HTML, like all other comments, with one exception: The documentation comment should not include the comment separators \f2/**\fP and \f2*/\fP or leading asterisks. When writing the comment, you should make the first sentence a summary about the package, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include package tags; as with any documentation comment, all block tags must appear after the main description. If you add a \f2@see\fP tag in a package comment file, it must have a fully\-qualified name. For more details, see the
.na
\f2example of \fP\f2package.html\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments.
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments.
.LP
\f3Processing of package comment file\fP \- When the Javadoc tool runs, it will automatically look for the package comment file; if found, the Javadoc tool does the following:
-.LP
.RS 3
.TP 2
o
@@ -590,35 +338,27 @@
.na
\f2Package Summary\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/applet/package\-summary.html.
+http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html.
.TP 2
o
Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in
.na
\f2Overview Summary\fP @
.fi
-http://java.sun.com/javase/6/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions.
+http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions.
.RE
-
-.LP
.SS
Overview Comment File
.LP
-.LP
Each application or set of packages that you are documenting can have its own overview documentation comment, kept in its own "source" file, that the Javadoc tool will merge into the overview page that it generates. You typically include in this comment any documentation that applies to the entire application or set of packages.
.LP
-.LP
To create an overview comment file, you can name the file anything you want, typically \f4overview.html\fP and place it anywhere, typically at the top level of the source tree. For example, if the source files for the \f2java.applet\fP package are contained in \f2/home/user/src/java/applet\fP directory, you could create an overview comment file at \f2/home/user/src/overview.html\fP.
.LP
-.LP
Notice you can have multiple overview comment files for the same set of source files, in case you want to run javadoc multiple times on different sets of packages. For example, you could run javadoc once with \-private for internal documentation and again without that option for public documentation. In this case, you could describe the documentation as public or internal in the first sentence of each overview comment file.
.LP
-.LP
The content of the overview comment file is one big documentation comment, written in HTML, like the package comment file described previously. See that description for details. To re\-iterate, when writing the comment, you should make the first sentence a summary about the application or set of packages, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include overview tags; as with any documentation comment, all tags except in\-line tags, such as \f2{@link}\fP, must appear after the main description. If you add a \f2@see\fP tag, it must have a fully\-qualified name.
.LP
-.LP
When you run the Javadoc tool, you specify the overview comment file name with the \-overview option. The file is then processed similar to that of a package comment file.
-.LP
.RS 3
.TP 2
o
@@ -632,25 +372,19 @@
.na
\f2Overview Summary\fP @
.fi
-http://java.sun.com/javase/6/docs/api/overview\-summary.html.
+http://download.oracle.com/javase/7/docs/api/overview\-summary.html.
.TP 2
o
Copies the first sentence of the overview comment to the top of the overview summary page.
.RE
-
-.LP
.SS
Miscellaneous Unprocessed Files
.LP
-.LP
You can also include in your source any miscellaneous files that you want the Javadoc tool to copy to the destination directory. These typically includes graphic files, example Java source (.java) and class (.class) files, and self\-standing HTML files whose content would overwhelm the documentation comment of a normal Java source file.
.LP
-.LP
To include unprocessed files, put them in a directory called \f4doc\-files\fP which can be a subdirectory of any package directory that contains source files. You can have one such subdirectory for each package. You might include images, example code, source files, .class files, applets and HTML files. For example, if you want to include the image of a button \f2button.gif\fP in the \f2java.awt.Button\fP class documentation, you place that file in the \f2/home/user/src/java/awt/doc\-files/\fP directory. Notice the \f2doc\-files\fP directory should not be located at \f2/home/user/src/java/doc\-files\fP because \f2java\fP is not a package \-\- that is, it does not directly contain any source files.
.LP
-.LP
All links to these unprocessed files must be hard\-coded, because the Javadoc tool does not look at the files \-\- it simply copies the directory and all its contents to the destination. For example, the link in the \f2Button.java\fP doc comment might look like:
-.LP
.nf
\f3
.fl
@@ -664,23 +398,16 @@
.fl
\fP
.fi
-
-.LP
.SS
Test Files and Template Files
.LP
-.LP
Some developers have indicated they want to store test files and templates files in the source tree near their corresponding source files. That is, they would like to put them in the same directory, or a subdirectory, of those source files.
.LP
-.LP
If you run the Javadoc tool by explicitly passing in individual source filenames, you can deliberately omit test and templates files and prevent them from being processed. However, if you are passing in package names or wildcards, you need to follow certain rules to ensure these test files and templates files are not processed.
.LP
-.LP
Test files differ from template files in that the former are legal, compilable source files, while the latter are not, but may end with ".java".
.LP
-.LP
\f3Test files\fP \- Often developers want to put compilable, runnable test files for a given package in the \f2same\fP directory as the source files for that package. But they want the test files to belong to a package other than the source file package, such as the unnamed package (so the test files have no package statement or a different package statement from the source). In this scenario, when the source is being documented by specifying its package name specified on the command line, the test files will cause warnings or errors. You need to put such test files in a subdirectory. For example, if you want to add test files for source files in \f2com.package1\fP, put them in a subdirectory that would be an invalid package name (because it contains a hyphen):
-.LP
.nf
\f3
.fl
@@ -688,29 +415,17 @@
.fl
\fP
.fi
-
-.LP
.LP
The test directory will be skipped by the Javadoc tool with no warnings.
.LP
-.LP
If your test files contain doc comments, you can set up a separate run of the Javadoc tool to produce documentation of the test files by passing in their test source filenames with wildcards, such as \f2com/package1/test\-files/*.java\fP.
.LP
-.LP
-\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see
-.na
-\f2Identifiers\fP @
-.fi
-http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625).
-.LP
+\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see information about Identifiers in the Java Language Specification).
.SH "GENERATED FILES"
.LP
-.LP
By default, javadoc uses a standard doclet that generates HTML\-formatted documentation. This doclet generates the following kinds of files (where each HTML "page" corresponds to a separate file). Note that javadoc generates files with two types of names: those named after classes/interfaces, and those that are not (such as \f2package\-summary.html\fP). Files in the latter group contain hyphens to prevent filename conflicts with those in the former group.
.LP
-.LP
\f3Basic Content Pages\fP
-.LP
.RS 3
.TP 2
o
@@ -722,11 +437,8 @@
o
One \f3overview page\fP (\f2overview\-summary.html\fP) for the entire set of packages. This is the front page of the generated document. The Javadoc tool will include any HTML text provided in a file specified with the \f2\-overview\fP option. Note that this file is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
.RE
-
-.LP
.LP
\f3Cross\-Reference Pages\fP
-.LP
.RS 3
.TP 2
o
@@ -750,15 +462,12 @@
o
An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English).
.RE
-
-.LP
.LP
\f3Support Files\fP
-.LP
.RS 3
.TP 2
o
-A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP.
+A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP.
.TP 2
o
One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content.
@@ -775,45 +484,14 @@
o
A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree.
.RE
-
-.LP
.LP
\f3HTML Frames\fP
.LP
-.LP
The Javadoc tool will generate either two or three HTML frames, as shown in the figure below. It creates the minimum necessary number of frames by omitting the list of packages if there is only one package (or no packages). That is, when you pass a single package name or source files (*.java) belonging to a single package as arguments into the javadoc command, it will create only one frame (C) in the left\-hand column \-\- the list of classes. When you pass into javadoc two or more package names, it creates a third frame (P) listing all packages, as well as an overview page (Detail). This overview page has the filename \f2overview\-summary.html\fP. Thus, this file is created only if you pass in two or more package names. You can bypass frames by clicking on the "No Frames" link or entering at overview\-summary.html.
.LP
-.LP
If you are unfamiliar with HTML frames, you should be aware that frames can have \f2focus\fP for printing and scrolling. To give a frame focus, click on it. Then on many browsers the arrow keys and page keys will scroll that frame, and the print menu command will print it.
.LP
-.nf
-\f3
-.fl
- \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\-
-.fl
- |C| Detail | |P| Detail |
-.fl
- | | | | | |
-.fl
- | | | |\-| |
-.fl
- | | | |C| |
-.fl
- | | | | | |
-.fl
- | | | | | |
-.fl
- \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\-
-.fl
- javadoc *.java javadoc java.lang java.awt
-.fl
-\fP
-.fi
-
-.LP
-.LP
Load one of the following two files as the starting page depending on whether you want HTML frames or not:
-.LP
.RS 3
.TP 2
o
@@ -822,24 +500,14 @@
o
\f2overview\-summary.html\fP (for no frames)
.RE
-
-.LP
.LP
\f3Generated File Structure\fP
.LP
-.LP
The generated class and interface files are organized in the same directory hierarchy that Java source files and class files are organized. This structure is one directory per subpackage.
.LP
-.LP
For example, the document generated for the class \f2java.applet.Applet\fP class would be located at \f2java/applet/Applet.html\fP. The file structure for the java.applet package follows, given that the destination directory is named \f2apidocs\fP. All files that contain the word "frame" appear in the upper\-left or lower\-left frames, as noted. All other HTML files appear in the right\-hand frame.
.LP
-.RS 3
-
-.LP
-.LP
NOTE \- Directories are shown in \f3bold\fP. The asterisks (\f2*\fP) indicate the files and directories that are \f2omitted\fP when the arguments to javadoc are source filenames (*.java) rather than package names. Also when arguments are source filenames, \f2package\-list\fP is created but is empty. The doc\-files directory will not be created in the destination unless it exists in the source tree.
-.LP
-.RE
.nf
\f3
.fl
@@ -922,44 +590,31 @@
AudioClip.html Page for AudioClip source code
.fl
.fi
-
-.LP
.SS
Generated API Declarations
.LP
-.LP
The Javadoc tool generates a declaration at the start of each class, interface, field, constructor, and method description for that API item. For example, the declaration for the \f2Boolean\fP class is:
.LP
-.LP
\f2public final class Boolean\fP
.br
\f2extends Object\fP
.br
\f2implements Serializable\fP
.LP
-.LP
and the declaration for the \f2Boolean.valueOf\fPmethod is:
.LP
-.LP
\f2public static Boolean valueOf(String s)\fP
.LP
-.LP
The Javadoc tool can include the modifiers \f2public\fP, \f2protected\fP, \f2private\fP, \f2abstract\fP, \f2final\fP, \f2static\fP, \f2transient\fP, and \f2volatile\fP, but not \f2synchronized\fP or \f2native\fP. These last two modifiers are considered implementation detail and not part of the API specification.
.LP
-.LP
Rather than relying on the keyword \f2synchronized\fP, APIs should document their concurrency semantics in the comment's main description, as in "a single \f2Enumeration\fP cannot be used by multiple threads concurrently". The document should not describe how to achieve these semantics. As another example, while \f2Hashtable\fP should be thread\-safe, there's no reason to specify that we achieve this by synchronizing all of its exported methods. We should reserve the right to synchronize internally at the bucket level, thus offering higher concurrency.
-.LP
.SH "DOCUMENTATION COMMENTS"
.LP
-.LP
The original "Documentation Comment Specification" can be found under related documentation.
-.LP
.SS
Commenting the Source Code
.LP
-.LP
You can include \f2documentation comments\fP ("doc comments") in the source code, ahead of declarations for any class, interface, method, constructor, or field. You can also create doc comments for each package and another one for the overview, though their syntax is slightly different. Doc comments are also known informally as "Javadoc comments" (but this term violates its trademark usage). A doc comment consists of the characters between the characters \f2/**\fP that begin the comment and the characters \f2*/\fP that end it. Leading asterisks are allowed on each line and are described further below. The text in a comment can continue onto multiple lines.
-.LP
.nf
\f3
.fl
@@ -973,11 +628,8 @@
.fl
\fP
.fi
-
-.LP
.LP
To save space you can put a comment on one line:
-.LP
.nf
\f3
.fl
@@ -985,14 +637,10 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Placement of comments\fP \- Documentation comments are recognized only when placed immediately before class, interface, constructor, method, or field declarations \-\- see the class example, method example, and field example. Documentation comments placed in the body of a method are ignored. Only one documentation comment per declaration statement is recognized by the Javadoc tool.
.LP
-.LP
A common mistake is to put an \f2import\fP statement between the class comment and the class declaration. Avoid this, as the Javadoc tool will ignore the class comment.
-.LP
.nf
\f3
.fl
@@ -1014,11 +662,8 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3A doc comment is composed of a \fP\f4main description\fP\f3 followed by a \fP\f4tag section\fP \- The \f2main description\fP begins after the starting delimiter \f2/**\fP and continues until the tag section. The \f2tag section\fP starts with the first block tag, which is defined by the first \f2@\fP character that begins a line (ignoring leading asterisks, white space, and leading separator \f2/**\fP). It is possible to have a comment with only a tag section and no main description. The main description cannot continue after the tag section begins. The argument to a tag can span multiple lines. There can be any number of tags \-\- some types of tags can be repeated while others cannot. For example, this \f2@see\fP starts the tag section:
-.LP
.nf
\f3
.fl
@@ -1032,11 +677,8 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Block tags and in\-line tags\fP \- A \f2tag\fP is a special keyword within a doc comment that the Javadoc tool can process. There are two kinds of tags: block tags, which appear as \f2@tag\fP (also known as "standalone tags"), and in\-line tags, which appear within curly braces, as \f2{@tag}\fP. To be interpreted, a block tag must appear at the beginning of a line, ignoring leading asterisks, white space, and separator (\f2/**\fP). This means you can use the \f2@\fP character elsewhere in the text and it will not be interpreted as the start of a tag. If you want to start a line with the \f2@\fP character and not have it be interpreted, use the HTML entity \f2@\fP. Each block tag has associated text, which includes any text following the tag up to, but not including, either the next tag, or the end of the doc comment. This associated text can span multiple lines. An in\-line tag is allowed and interpreted anywhere that text is allowed. The following example contains the block tag \f2@deprecated\fP and in\-line tag \f2{@link}\fP.
-.LP
.nf
\f3
.fl
@@ -1048,17 +690,12 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Comments are written in HTML\fP \- The text must be written in HTML, in that they should use HTML entities and can use HTML tags. You can use whichever version of HTML your browser supports; we have written the standard doclet to generate HTML 3.2\-compliant code elsewhere (outside of the documentation comments) with the inclusion of cascading style sheets and frames. (We preface each generated file with "HTML 4.0" because of the frame sets.)
.LP
-.LP
For example, entities for the less\-than (\f2<\fP) and greater\-than (\f2>\fP) symbols should be written \f2<\fP and \f2>\fP. Likewise, the ampersand (\f2&\fP) should be written \f2&\fP. The bold HTML tag \f2<b>\fP is shown in the following example.
.LP
-.LP
Here is a doc comment:
-.LP
.nf
\f3
.fl
@@ -1072,20 +709,12 @@
.fl
\fP
.fi
-
-.LP
.LP
\f3Leading asterisks\fP \- When javadoc parses a doc comment, leading asterisk (\f2*\fP) characters on each line are discarded; blanks and tabs preceding the initial asterisk (\f2*\fP) characters are also discarded. Starting with 1.4, if you omit the leading asterisk on a line, the leading white space is no longer removed. This enables you to paste code examples directly into a doc comment inside a \f2<PRE>\fP tag, and its indentation will be honored. Spaces are generally interpreted by browsers more uniformly than tabs. Indentation is relative to the left margin (rather than the separator \f2/**\fP or \f2<PRE>\fP tag).
.LP
-.LP
\f3First sentence\fP \- The first sentence of each doc comment should be a summary sentence, containing a concise but complete description of the declared entity. This sentence ends at the first period that is followed by a blank, tab, or line terminator, or at the first block tag. The Javadoc tool copies this first sentence to the member summary at the top of the HTML page.
.LP
-.LP
\f3Declaration with multiple fields\fP \- Java allows declaring multiple fields in a single statement, but this statement can have only one documentation comment, which is copied for all fields. Therefore if you want individual documentation comments for each field, you must declare each field in a separate statement. For example, the following documentation comment doesn't make sense written as a single declaration and would be better handled as two declarations:
-.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -1099,51 +728,32 @@
.fl
\fP
.fi
-.RE
-
-.LP
.LP
The Javadoc tool generates the following documentation from the above code:
-.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
public int \fP\f3x\fP
.fl
.fi
-
-.LP
.RS 3
The horizontal and vertical distances of point (x,y)
.RE
-
-.LP
.nf
\f3
.fl
public int \fP\f3y\fP
.fl
.fi
-
-.LP
.RS 3
The horizontal and vertical distances of point (x,y)
.RE
-
-.LP
-.RE
.LP
\f3Use header tags carefully\fP \- When writing documentation comments for members, it's best not to use HTML heading tags such as <H1> and <H2>, because the Javadoc tool creates an entire structured document and these structural tags might interfere with the formatting of the generated document. However, it is fine to use these headings in class and package comments to provide your own structure.
-.LP
.SS
Automatic Copying of Method Comments
.LP
-.LP
The Javadoc tool has the ability to copy or "inherit" method comments in classes and interfaces under the following two circumstances. Constructors, fields and nested classes do not inherit doc comments.
-.LP
.RS 3
.TP 2
o
@@ -1156,14 +766,10 @@
o
\f3Explicitly inherit comment with {@inheritDoc} tag\fP \- Insert the inline tag \f2{@inheritDoc}\fP in a method main description or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag comment \-\- the corresponding inherited main description or tag comment is copied into that spot.
.RE
-
-.LP
.LP
The source file for the inherited method need only be on the path specified by \-sourcepath for the doc comment to actually be available to copy. Neither the class nor its package needs to be passed in on the command line. This contrasts with 1.3.x and earlier releases, where the class had to be a documented class
.LP
-.LP
\f3Inherit from classes and interfaces\fP \- Inheriting of comments occurs in all three possible cases of inheritance from classes and interfaces:
-.LP
.RS 3
.TP 2
o
@@ -1175,17 +781,12 @@
o
When a method in a class implements a method in an interface
.RE
-
-.LP
.LP
In the first two cases, for method overrides, the Javadoc tool generates a subheading "Overrides" in the documentation for the overriding method, with a link to the method it is overriding, whether or not the comment is inherited.
.LP
-.LP
In the third case, when a method in a given class implements a method in an interface, the Javadoc tool generates a subheading "Specified by" in the documentation for the overriding method, with a link to the method it is implementing. This happens whether or not the comment is inherited.
.LP
-.LP
\f3Algorithm for Inheriting Method Comments\fP \- If a method does not have a doc comment, or has an {@inheritDoc} tag, the Javadoc tool searches for an applicable comment using the following algorithm, which is designed to find the most specific applicable doc comment, giving preference to interfaces over superclasses:
-.LP
.RS 3
.TP 3
1.
@@ -1205,16 +806,11 @@
If step 3a failed to find a doc comment, recursively apply this entire algorithm to the superclass.
.RE
.RE
-
-.LP
.SH "JAVADOC TAGS"
.LP
-.LP
The Javadoc tool parses special tags when they are embedded within a Java doc comment. These doc tags enable you to autogenerate a complete, well\-formatted API from your source code. The tags start with an "at" sign (\f2@\fP) and are case\-sensitive \-\- they must be typed with the uppercase and lowercase letters as shown. A tag must start at the beginning of a line (after any leading spaces and an optional asterisk) or it is treated as normal text. By convention, tags with the same name are grouped together. For example, put all \f2@see\fP tags together.
.LP
-.LP
Tags come in two types:
-.LP
.RS 3
.TP 2
o
@@ -1223,8 +819,6 @@
o
\f3Inline tags\fP \- Can be placed anywhere in the main description or in the comments for block tags. Inline tags are denoted by curly braces: \f2{@tag}\fP.
.RE
-
-.LP
.LP
For information about tags we might introduce in future releases, see
.na
@@ -1232,13 +826,8 @@
.fi
http://java.sun.com/j2se/javadoc/proposed\-tags.html.
.LP
-.LP
The current tags are:
.LP
-.RS 3
-
-.LP
-.LP
.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
@@ -1350,7 +939,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 1122 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 873 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1450,53 +1039,34 @@
.35
.TE
.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
-
-.LP
.LP
For custom tags, see the \-tag option.
-.LP
-.RE
.RS 3
.TP 3
@author\ name\-text
Adds an "Author" entry with the specified \f2name\-text\fP to the generated docs when the \-author option is used. A doc comment may contain multiple \f2@author\fP tags. You can specify one name per \f2@author\fP tag or multiple names per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma.
+.RE
.LP
For more details, see Where Tags Can Be Used and
.na
\f2writing @author tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author.
-.LP
-.TP 3
-@deprecated\ deprecated\-text
-.RS 3
-
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author.
.LP
-Note: You can deprecate a program element using the
-.na
-\f2@Deprecated annotation\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/deprecation.html.
-.LP
+.RS 3
+.TP 3
+@deprecated\ deprecated\-text Note: You can deprecate a program element using the @Deprecated annotation.
.RE
-.RE
-.RS 3
-
-.LP
.LP
Adds a comment indicating that this API should no longer be used (even though it may continue to work). The Javadoc tool moves the \f2deprecated\-text\fP ahead of the main description, placing it in italics and preceding it with a bold warning: "Deprecated". This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field.
.LP
-.LP
The first sentence of \f2deprecated\-text\fP should at least tell the user when the API was deprecated and what to use as a replacement. The Javadoc tool copies just the first sentence to the summary section and index. Subsequent sentences can also explain why it has been deprecated. You should include a \f2{@link}\fP tag (for Javadoc 1.2 or later) that points to the replacement API:
.LP
-.LP
For more details, see
.na
\f2writing @deprecated tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated.
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated.
.RS 3
.TP 2
o
@@ -1518,19 +1088,13 @@
o
For Javadoc 1.1, the standard format is to create a \f2@see\fP tag (which cannot be in\-line) for each \f2@deprecated\fP tag.
.RE
-
-.LP
.LP
For more about deprecation, see
.na
\f2The @deprecated tag\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/index.html.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
.LP
-
-.LP
-.RE
.RS 3
.TP 3
{@code\ text}
@@ -1700,7 +1264,7 @@
.na
\f2writing {@link} tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}.
.LP
.TP 3
{@linkplain\ package.class#member\ label}
@@ -1716,13 +1280,8 @@
.fi
.LP
This would display as:
-.RS 3
-
.LP
-.LP
-Refer to the overridden method.
-.LP
-.RE
+Refer to the overridden method.
.LP
.TP 3
{@literal\ text}
@@ -1799,7 +1358,7 @@
.na
\f2writing @param tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param.
.LP
.TP 3
@return\ description
@@ -1809,7 +1368,7 @@
.na
\f2writing @return tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return.
.LP
.TP 3
@see\ reference
@@ -1834,18 +1393,12 @@
.RS 3
.RS 3
.RS 3
-
-.LP
-.RS 3
.RS 3
.TP 3
See Also:
"The Java Programming Language"
.RE
.RE
-
-.LP
-.RE
.TP 3
@see <a href="URL#value">label</a>
Adds a link as defined by \f2URL\fP#\f2value\fP. The \f2URL\fP#\f2value\fP is a relative or absolute URL. The Javadoc tool distinguishes this from other cases by looking for a less\-than symbol (\f2<\fP) as the first character. For example:
@@ -1858,14 +1411,10 @@
.fi
This generates a link such as:
.RS 3
-.RS 3
.TP 3
See Also:
Java Spec
.RE
-
-.LP
-.RE
.TP 3
@see\ package.class#member\ label
Adds a link, with visible text \f2label\fP, that points to the documentation for the specified name in the Java Language that is referenced. The \f2label\fP is optional; if omitted, the name appears instead as the visible text, suitably shortened \-\- see How a name is displayed. Use \-noqualifier to globally remove the package name from this visible text. Use the label when you want the visible text to be different from the auto\-generated visible text.
@@ -1885,7 +1434,6 @@
.RE
.LP
\f3Example\fP \- In this example, an \f2@see\fP tag (in the \f2Character\fP class) refers to the \f2equals\fP method in the \f2String\fP class. The tag includes both arguments: the name "\f2String#equals(Object)\fP" and the label "\f2equals\fP".
-.RS 3
.nf
\f3
.fl
@@ -1897,11 +1445,7 @@
.fl
\fP
.fi
-.RE
The standard doclet produces HTML something like this:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -1915,19 +1459,12 @@
.fl
\fP
.fi
-.RE
Which looks something like this in a browser, where the label is the visible link text:
.RS 3
-
-.LP
-.RS 3
.TP 3
See Also:
equals
.RE
-
-.LP
-.RE
.LP
\f3Specifying a name\fP \- This \f2package.class\fP\f2#\fP\f2member\fP name can be either fully\-qualified, such as \f2java.lang.String#toUpperCase()\fP or not, such as \f2String#toUpperCase()\fP or \f2#toUpperCase()\fP. If less than fully\-qualified, the Javadoc tool uses the normal Java compiler search order to find it, further described below in Search order for @see. The name can contain whitespace within parentheses, such as between method arguments.
.LP
@@ -2079,7 +1616,7 @@
.nr 40 \n(79+(0*\n(38)
.nr 80 +\n(40
.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1665 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1364 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2186,7 +1723,7 @@
.LP
\f3Search order for @see\fP \- the Javadoc tool will process a \f2@see\fP tag that appears in a source file (.java), package file (package.html or package\-info.java) or overview file (overview.html). In the latter two files, you must fully\-qualify the name you supply with \f2@see\fP. In a source file, you can specify a name that is fully\-qualified or partially\-qualified.
.LP
-When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in Chapter 6, "Names" of the \f2Java Language Specification\fP, Second Edition. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order:
+When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in the \f2Java Language Specification\fP. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order:
.RS 3
.TP 3
1.
@@ -2425,7 +1962,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 1741 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1440 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2598,14 +2135,9 @@
.na
\f2writing @see tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see.
.RE
.RE
-.RS 3
-
-.LP
-.LP
-
.LP
.RS 3
.TP 3
@@ -2634,11 +2166,11 @@
.na
\f2Documenting Serializable Fields and Data for a Class\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the
+http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the
.na
\f2Serialization FAQ\fP @
.fi
-http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see
+http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see
.na
\f2Sun's criteria\fP @
.fi
@@ -2681,7 +2213,7 @@
.na
\f2writing @throws tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception.
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception.
.LP
.TP 3
{@value\ package.class#field}
@@ -2727,7 +2259,7 @@
.na
\f2Constant Field Values\fP @
.fi
-http://java.sun.com/javase/6/docs/api/constant\-values.html page.
+http://download.oracle.com/javase/7/docs/api/constant\-values.html page.
.LP
.TP 3
@version\ version\-text
@@ -2739,376 +2271,111 @@
.na
\f2writing @version tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version.
-.RE
-
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version.
.RE
.SS
Where Tags Can Be Used
.LP
-.LP
The following sections describe where the tags can be used. Note that these tags can be used in all doc comments: \f2@see\fP, \f2@since\fP, \f2@deprecated\fP, \f2{@link}\fP, \f2{@linkplain}\fP, and \f2{@docroot}\fP.
-.LP
-.RS 3
-
-.LP
.SS
Overview Documentation Tags
.LP
-.LP
Overview tags are tags that can appear in the documentation comment for the overview page (which resides in the source file typically named \f2overview.html\fP). Like in any other documentation comments, these tags must appear after the main description.
.LP
-.LP
\f3NOTE\fP \- The \f2{@link}\fP tag has a bug in overview documents in version 1.2 \-\- the text appears properly but has no link. The \f2{@docRoot}\fP tag does not currently work in overview documents.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@author\fP
-.br
-\f2@version\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Overview Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1962 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Overview Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-20
-
-.LP
+\f3Overview Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@author\fP
+.TP 2
+o
+\f2@version\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
.SS
Package Documentation Tags
.LP
-.LP
Package tags are tags that can appear in the documentation comment for a package (which resides in the source file named \f2package.html\fP or \f2package\-info.java\fP). The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@serial\fP
-.br
-\f2@author\fP
-.br
-\f2@version\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Package Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1994 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Package Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-22
-
-.LP
+\f3Package Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@serial\fP
+.TP 2
+o
+\f2@author\fP
+.TP 2
+o
+\f2@version\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
.SS
Class and Interface Documentation Tags
.LP
-.LP
The following are tags that can appear in the documentation comment for a class or interface. The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@deprecated\fP
-.br
-\f2@serial\fP
-.br
-\f2@author\fP
-.br
-\f2@version\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Class/Interface Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 2028 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Class/Interface Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-24
-
-.LP
+\f3Class/Interface Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@deprecated\fP
+.TP 2
+o
+\f2@serial\fP
+.TP 2
+o
+\f2@author\fP
+.TP 2
+o
+\f2@version\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
\f3An example of a class comment:\fP
-.LP
.nf
\f3
.fl
@@ -3146,129 +2413,42 @@
.fl
\fP
.fi
-
-.LP
.SS
Field Documentation Tags
.LP
-.LP
-The following are the tags that can appear in the documentation comment for a field.
-.LP
+The following are the tags that can appear in
.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@deprecated\fP
-.br
-\f2@serial\fP
-.br
-\f2@serialField\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@docRoot}\fP
-.br
-\f2{@value}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Field Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 2103 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Field Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-24
-
-.LP
+\f3Field Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@deprecated\fP
+.TP 2
+o
+\f2@serial\fP
+.TP 2
+o
+\f2@serialField\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.TP 2
+o
+\f2{@value}\fP
+.RE
\f3An example of a field comment:\fP
-.LP
.nf
\f3
.fl
@@ -3286,133 +2466,48 @@
.fl
\fP
.fi
-
-.LP
.SS
Constructor and Method Documentation Tags
.LP
-.LP
The following are the tags that can appear in the documentation comment for a constructor or method, except for \f2@return\fP, which cannot appear in a constructor, and \f2{@inheritDoc}\fP, which has certain restrictions. The \f2@serialData\fP tag can only be used in the doc comment for certain serialization methods.
.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 34 \n(.lu
-.eo
-.am 80
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/2u
-.if \n(.l<\n(80 .ll \n(80u
-.in 0
-\f2@see\fP
-.br
-\f2@since\fP
-.br
-\f2@deprecated\fP
-.br
-\f2@param\fP
-.br
-\f2@return\fP
-.br
-\f2@throws\fP and \f2@exception\fP
-.br
-\f2@serialData\fP
-.br
-\f2{@link}\fP
-.br
-\f2{@linkplain}\fP
-.br
-\f2{@inheritDoc}\fP
-.br
-\f2{@docRoot}\fP
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 38 \w\f3Method/Constructor Tags\fP
-.if \n(80<\n(38 .nr 80 \n(38
-.80
-.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 2162 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f3Method/Constructor Tags\fP
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(80u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(40u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-28
-
-.LP
+\f3Method/Constructor Tags\fP
+.RS 3
+.TP 2
+o
+\f2@see\fP
+.TP 2
+o
+\f2@since\fP
+.TP 2
+o
+\f2@deprecated\fP
+.TP 2
+o
+\f2@param\fP
+.TP 2
+o
+\f2@return\fP
+.TP 2
+o
+\f2@throws\fP and \f2@exception\fP
+.TP 2
+o
+\f2@serialData\fP
+.TP 2
+o
+\f2{@link}\fP
+.TP 2
+o
+\f2{@linkplain}\fP
+.TP 2
+o
+\f2{@inheritDoc}\fP
+.TP 2
+o
+\f2{@docRoot}\fP
+.RE
\f3An example of a method doc comment:\fP
-.LP
.nf
\f3
.fl
@@ -3446,23 +2541,12 @@
.fl
\fP
.fi
-.RE
-
-.LP
.SH "OPTIONS"
.LP
-
-.LP
-.LP
The javadoc tool uses doclets to determine its output. The Javadoc tool uses the default standard doclet unless a custom doclet is specified with the \-doclet option. The Javadoc tool provides a set of command\-line options that can be used with any doclet \-\- these options are described below under the sub\-heading Javadoc Options. The standard doclet provides an additional set of command\-line options that are described below under the sub\-heading Options Provided by the Standard Doclet. All option names are case\-insensitive, though their arguments can be case\-sensitive.
.LP
-.LP
The options are:
.LP
-.RS 3
-
-.LP
-.LP
.TS
.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
.de 35
@@ -3615,6 +2699,8 @@
.br
\-\f2sourcepath\fP
.br
+\-sourcetab
+.br
\-splitindex
.br
\-stylesheetfile
@@ -3627,6 +2713,8 @@
.br
\-tagletpath
.br
+\-top
+.br
\-title
.br
\-use
@@ -3673,7 +2761,7 @@
.nr 42 \n(81+(3*\n(38)
.nr 82 +\n(42
.nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 2340 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 2015 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -3729,53 +2817,47 @@
.rm b+
.rm c+
.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-123
-
-.LP
-.RE
+.if \n-(b.=0 .nr c. \n(.c-\n(d.-127
.LP
Options shown in \f2italic\fP are the Javadoc core options, which are provided by the front end of the Javadoc tool and are available to all doclets. The standard doclet itself provides the non\-italic options.
-.LP
.SS
Javadoc Options
-.LP
.RS 3
.TP 3
\-overview \ path/filename
-Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the \f2\-sourcepath\fP.
-.LP
-While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example.
-.LP
-For information about the file specified by \f2path/filename\fP, see overview comment file.
-.LP
-Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
-.LP
-The title on the overview page is set by \f2\-doctitle\fP.
-.LP
+Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the current directory.
+.br
+.br
+While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example.
+.br
+.br
+For information about the file specified by \f2path/filename\fP, see overview comment file.
+.br
+.br
+Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
+.br
+.br
+The title on the overview page is set by \f2\-doctitle\fP.
.TP 3
\-public
-Shows only public classes and members.
-.LP
+Shows only public classes and members.
.TP 3
\-protected
-Shows only protected and public classes and members. This is the default.
-.LP
+Shows only protected and public classes and members. This is the default.
.TP 3
\-package
-Shows only package, protected, and public classes and members.
-.LP
+Shows only package, protected, and public classes and members.
.TP 3
\-private
-Shows all classes and members.
-.LP
+Shows all classes and members.
.TP 3
\-help
-Displays the online help, which lists these javadoc and doclet command line options.
-.LP
+Displays the online help, which lists these javadoc and doclet command line options.
.TP 3
\-doclet\ class
-Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option.
-.LP
+Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option.
+.br
+.br
For example, to call the MIF doclet, use:
.nf
\f3
@@ -3784,17 +2866,16 @@
.fl
\fP
.fi
-.LP
For full, working examples of running a particular doclet, see the
.na
\f2MIF Doclet documentation\fP @
.fi
-http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-.LP
+http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
.TP 3
\-docletpath\ classpathlist
-Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path.
-.LP
+Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path.
+.br
+.br
Example of path to jar file that contains the starting doclet class file. Notice the jar filename is included.
.nf
\f3
@@ -3815,207 +2896,33 @@
.na
\f2MIF Doclet documentation\fP @
.fi
-http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-.LP
+http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
.TP 3
\-1.1
-\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP
-.LP
+\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP
.TP 3
\-source release
Specifies the version of source code accepted. The following values for \f2release\fP are allowed:
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80 81
-.nr 34 \n(.lu
-.eo
-.am 81
-.br
-.di a+
-.35
-.ft \n(.f
-.ll \n(34u*1u/3u
-.if \n(.l<\n(81 .ll \n(81u
-.in 0
-javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used.
-.br
-.di
-.nr a| \n(dn
-.nr a- \n(dl
-..
-.ec \
-.eo
-.am 81
-.br
-.di b+
-.35
-.ft \n(.f
-.ll \n(34u*1u/3u
-.if \n(.l<\n(81 .ll \n(81u
-.in 0
-javadoc accepts code containing assertions, which were introduced in JDK 1.4.
-.br
-.di
-.nr b| \n(dn
-.nr b- \n(dl
-..
-.ec \
-.eo
-.am 81
-.br
-.di c+
-.35
-.ft \n(.f
-.ll \n(34u*1u/3u
-.if \n(.l<\n(81 .ll \n(81u
-.in 0
-javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
-.br
-.di
-.nr c| \n(dn
-.nr c- \n(dl
-..
-.ec \
-.35
-.nf
-.ll \n(34u
-.nr 80 0
-.nr 31 0
-.nr 32 0
-.nr 38 \w\f31
-.if \n(31<\n(38 .nr 31 \n(38
-.nr 38 \w.5\fP
-.if \n(32<\n(38 .nr 32 \n(38
-.nr 38 \w\f31
-.if \n(31<\n(38 .nr 31 \n(38
-.nr 38 \w.4\fP
-.if \n(32<\n(38 .nr 32 \n(38
-.nr 38 \w\f31
-.if \n(31<\n(38 .nr 31 \n(38
-.nr 38 \w.3\fP
-.if \n(32<\n(38 .nr 32 \n(38
-.80
-.rm 80
-.nr 60 \n(31
-.nr 38 \n(60+\n(32
-.if \n(38>\n(80 .nr 80 \n(38
-.if \n(38<\n(80 .nr 60 +(\n(80-\n(38)/2
-.nr 81 0
-.81
-.rm 81
-.nr 38 \n(a-
-.if \n(81<\n(38 .nr 81 \n(38
-.nr 38 \n(b-
-.if \n(81<\n(38 .nr 81 \n(38
-.nr 38 \n(c-
-.if \n(81<\n(38 .nr 81 \n(38
-.35
-.nf
-.ll \n(34u
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr 60 +\n(40
-.nr 41 \n(80+(3*\n(38)
-.nr 81 +\n(41
-.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 2450 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.ne \n(a|u+\n(.Vu
-.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
-.ta \n(60u \n(80u \n(81u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f31.5\fP\h'|\n(41u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(41u
-.in +\n(37u
-.a+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.ne \n(b|u+\n(.Vu
-.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
-.ta \n(60u \n(80u \n(81u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f31.4\fP\h'|\n(41u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(41u
-.in +\n(37u
-.b+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.ne \n(c|u+\n(.Vu
-.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
-.ta \n(60u \n(80u \n(81u
-.nr 31 \n(.f
-.nr 35 1m
-\&\h'|\n(40u'\f31.3\fP\h'|\n(41u'
-.mk ##
-.nr 31 \n(##
-.sp |\n(##u-1v
-.nr 37 \n(41u
-.in +\n(37u
-.c+
-.in -\n(37u
-.mk 32
-.if \n(32>\n(31 .nr 31 \n(32
-.sp |\n(31u
-.fc
-.nr T. 1
-.T# 1
-.35
-.rm a+
-.rm b+
-.rm c+
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-14
-.LP
-Use the value of \f2release\fP corresponding to that used when compiling the code with javac.
-.LP
+.RS 3
+.TP 2
+o
+\f31.5\fP \- javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used.
+.TP 2
+o
+\f31.4\fP \- javadoc accepts code containing assertions, which were introduced in JDK 1.4.
+.TP 2
+o
+\f31.3\fP \- javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
+.RE
+Use the value of \f2release\fP corresponding to that used when compiling the code with javac.
.TP 3
\-sourcepath\ sourcepathlist
-Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented.
-.LP
-Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files.
-.LP
+Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented.
+.br
+.br
+Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files.
+.br
+.br
Set \f2sourcepathlist\fP to the root directory of the source tree for the package you are documenting. For example, suppose you want to document a package called \f2com.mypackage\fP whose source files are located at:
.nf
\f3
@@ -4031,8 +2938,9 @@
% \fP\f3javadoc \-sourcepath /home/user/src/ com.mypackage\fP
.fl
.fi
-This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP.
-.LP
+This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP.
+.br
+.br
To point to two source paths:
.nf
\f3
@@ -4040,17 +2948,18 @@
% \fP\f3javadoc \-sourcepath /home/user1/src:/home/user2/src com.mypackage\fP
.fl
.fi
-.LP
.TP 3
\-classpath\ classpathlist
Specifies the paths where javadoc will look for referenced classes (\f2.class\fP files) \-\- these are the documented classes plus any classes referenced by those classes. The \f2classpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Follow the instructions in
.na
\f2class path\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
-.LP
-If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
+.br
+.br
+If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP.
+.br
+.br
For example, if you want to document \f2com.mypackage\fP, whose source files reside in the directory \f2/home/user/src/com/mypackage\fP, and if this package relies on a library in \f2/home/user/lib\fP, you would specify:
.nf
\f3
@@ -4058,23 +2967,25 @@
% \fP\f3javadoc \-classpath /home/user/lib \-sourcepath /home/user/src com.mypackage\fP
.fl
.fi
-As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory.
-.LP
+As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory.
+.br
+.br
For an in\-depth description of how the Javadoc tool uses \f2\-classpath\fP to find user classes as it relates to extension classes and bootstrap classes, see
.na
\f2How Classes Are Found\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html.
-.LP
-As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
-.br
-.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.
+.br
+.br
+As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations).
+.br
+.br
+For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
.TP 3
\-subpackages\ \ package1:package2:...
-Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files.
-.LP
+Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files.
+.br
+.br
For example:
.nf
\f3
@@ -4082,10 +2993,10 @@
% \fP\f3javadoc \-d docs \-sourcepath /home/user/src \-subpackages java:javax.swing\fP
.fl
.fi
-This command generates documentation for packages named "java" and "javax.swing" and all their subpackages.
-.LP
-You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages.
-.LP
+This command generates documentation for packages named "java" and "javax.swing" and all their subpackages.
+.br
+.br
+You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages.
.TP 3
\-exclude\ \ packagename1:packagename2:...
Unconditionally excludes the specified packages and their subpackages from the list formed by \f2\-subpackages\fP. It excludes those packages even if they would otherwise be included by some previous or later \f2\-subpackages\fP option. For example:
@@ -4095,36 +3006,32 @@
% \fP\f3javadoc \-sourcepath /home/user/src \-subpackages java \-exclude java.net:java.lang\fP
.fl
.fi
-would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
-.LP
+would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
.TP 3
\-bootclasspath\ classpathlist
Specifies the paths where the boot classes reside. These are nominally the Java platform classes. The bootclasspath is part of the search path the Javadoc tool will use to look up source and class files. See
.na
\f2How Classes Are Found\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).
-.LP
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).
.TP 3
\-extdirs\ dirlist
-Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).
-.LP
+Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).
.TP 3
\-verbose
-Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.
-.LP
+Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.
.TP 3
\-quiet
-Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.
-.LP
+Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.
.TP 3
\-breakiterator\
Uses the internationalized sentence boundary of
.na
\f2java.text.BreakIterator\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
-.LP
+http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
+.br
+.br
From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm:
.RS 3
.TP 2
@@ -4134,31 +3041,22 @@
o
Breakiterator sentence\-break algorithm \- In general, stops at a period, question mark or exclamation mark followed by a space if the next word starts with a capital letter. This is meant to handle most abbreviations (such as "The serial no. is valid", but won't handle "Mr. Smith"). Doesn't stop at HTML tags or sentences that begin with numbers or symbols. Stops at the last period in "../filename", even if embedded in an HTML tag.
.RE
-.RS 3
-
-.LP
-.LP
-NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused.
-.LP
-.RE
+NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused.
.TP 3
\-locale\ language_country_variant
-.RS 3
-.LP
\f3Important\fP \- The \f2\-locale\fP option must be placed \f2ahead\fP (to the left) of any options provided by the standard doclet or any other doclet. Otherwise, the navigation bars will appear in English. This is the only command\-line option that is order\-dependent.
-.LP
-.RE
-.LP
-Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant).
-.LP
-Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes.
-.LP
+.br
+.br
+Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant).
+.br
+.br
+Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes.
.TP 3
\-encoding\ name
-Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used.
-.LP
-Also see \-docencoding and \-charset.
-.LP
+Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used.
+.br
+.br
+Also see \-docencoding and \-charset.
.TP 3
\-Jflag
Passes \f2flag\fP directly to the runtime system java that runs javadoc. Notice there must be no space between the \f2J\fP and the \f2flag\fP. For example, if you need to ensure that the system sets aside 32 megabytes of memory in which to process the generated documentation, then you would call the \f2\-Xmx\fP option of java as follows (\f2\-Xms\fP is optional, as it only sets the size of initial memory, which is useful if you know the minimum amount of memory required):
@@ -4183,12 +3081,12 @@
.RE
.SS
Options Provided by the Standard Doclet
-.LP
.RS 3
.TP 3
\-d\ directory
-Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run.
-.LP
+Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run.
+.br
+.br
For example, the following generates the documentation for the package \f2com.mypackage\fP and saves the results in the \f2/home/user/doc/\fP directory:
.nf
\f3
@@ -4196,28 +3094,27 @@
% \fP\f3javadoc \-d /home/user/doc com.mypackage\fP
.fl
.fi
-.LP
.TP 3
\-use
-Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C.
-.LP
-For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP.
-.LP
-Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP.
-.LP
-You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.
+Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C.
+.br
+.br
+For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP.
+.br
+.br
+Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP.
+.br
+.br
+You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.
.TP 3
\-version
-Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.
-.LP
+Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.
.TP 3
\-author
-Includes the @author text in the generated docs.
-.LP
+Includes the @author text in the generated docs.
.TP 3
\-splitindex
-Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.
-.LP
+Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.
.TP 3
\-windowtitle\ title
Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option.
@@ -4238,8 +3135,7 @@
.fi
.TP 3
\-title\ title
-\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title.
-.LP
+\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title.
.TP 3
\-header\ header
Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped.
@@ -4249,28 +3145,30 @@
% \fP\f3javadoc \-header "<b>Java 2 Platform </b><br>v1.4" com.mypackage\fP
.fl
.fi
-.LP
.TP 3
\-footer\ footer
Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped.
-.LP
+.TP 3
+\-top
+Specifies the text to be placed at the top of each output file.
.TP 3
\-bottom\ text
-Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped.
-.LP
+Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped.
.TP 3
\-link\ extdocURL
-Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument:
-.LP
+Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument:
.RS 3
.TP 2
o
-\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file.
-.LP
-You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to.
-.LP
-When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system.
-.LP
+\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file.
+.br
+.br
+You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to.
+.br
+.br
+When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system.
+.br
+.br
In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the
.na
\f2URL Memo\fP @
@@ -4288,8 +3186,11 @@
\f2\-link <directory>/<directory>/.../<name>\fP
.RE
.RE
-.LP
-You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. \f3Choosing between \-linkoffline and \-link\fP:
+You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents.
+.br
+.br
+\f3Choosing between \-linkoffline and \-link\fP:
+.br
.br
Use \f2\-link\fP:
.RS 3
@@ -4306,16 +3207,17 @@
o
when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side.
.RE
-.LP
+.br
+.br
\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at
.na
-\f2http://java.sun.com/javase/6/docs/api/\fP @
+\f2http://download.oracle.com/javase/7/docs/api/\fP @
.fi
-http://java.sun.com/javase/6/docs/api. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.)
+http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.)
.nf
\f3
.fl
- % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP
+ % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP
.fl
.fi
\f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running:
@@ -4325,17 +3227,21 @@
% \fP\f3javadoc \-d ./spi \-link ../api com.spipackage\fP
.fl
.fi
-.LP
-Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP).
-.LP
-\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP.
-.LP
-Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.)
-.LP
-This option can create links in several places in the generated documentation.
-.LP
-Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets.
-.LP
+Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP).
+.br
+.br
+\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP.
+.br
+.br
+Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.)
+.br
+.br
+This option can create links in several places in the generated documentation.
+.br
+.br
+Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets.
+.br
+.br
\f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced:
.RS 3
.TP 2
@@ -4353,16 +3259,17 @@
.br
The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement.
.RE
-.LP
-An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above.
-.LP
-\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL.
-.LP
+An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above.
+.br
+.br
+\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL.
+.br
+.br
For example, the package list for the Java SE 6 API is located at
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list. and starts as follows:
+http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows:
.nf
\f3
.fl
@@ -4384,31 +3291,39 @@
.fl
\fP
.fi
-.LP
-When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP.
-.LP
-In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists.
-.LP
-\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2.
-.LP
-Specify a different link option for each external document to link to:
-.LP
-\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP
-.LP
-where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP.
-.LP
-\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document.
-.LP
-In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist.
-.LP
+When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP.
+.br
+.br
+In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists.
+.br
+.br
+\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2.
+.br
+.br
+Specify a different link option for each external document to link to:
+.br
+.br
+\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP
+.br
+.br
+where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP.
+.br
+.br
+\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document.
+.br
+.br
+In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist.
.TP 3
\-linkoffline\ extdocURL\ packagelistLoc
-This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection.
-.LP
-More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation.
-.LP
-Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below.
-.LP
+This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection.
+.br
+.br
+More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation.
+.br
+.br
+Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below.
+.br
+.br
The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP:
.RS 3
.TP 2
@@ -4418,35 +3333,39 @@
o
\f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename.
.RE
-.LP
-You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.)
-.LP
-\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://java.sun.com/javase/6/docs/api\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at
+You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.)
+.br
+.br
+\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at
.na
-\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @
+\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
.fi
-http://java.sun.com/javase/6/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.)
+http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.)
.nf
\f3
.fl
-% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP
+% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP
.fl
.fi
-.LP
-\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example.
-.LP
-\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously.
-.LP
-\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity):
-.LP
+\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example.
+.br
+.br
+\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously.
+.br
+.br
+\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity):
+.br
+.br
\f2% \fP\f4javadoc \-linkoffline\fP \f2extdocURL1\fP \f2packagelistLoc1\fP \f2\\\fP
.br
\f2\ \ \ \ \ \ \ \ \ \ \fP\f4\-linkoffline\fP \f2extdocURL2\fP \f2packagelistLoc2\fP \f2\\\fP
.br
-\f2\ \ \ \ \ \ \ \ \ \ ...\fP
-.LP
-\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places.
-.LP
+\f2\ \ \ \ \ \ \ \ \ \ ...\fP
+.br
+.br
+\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places.
+.br
+.br
First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update:
.nf
\f3
@@ -4454,14 +3373,15 @@
% \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP
.fl
.fi
-When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP.
-.LP
+When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP.
.TP 3
\-linksource\
-Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes.
-.LP
-\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links.
-.LP
+Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes.
+.br
+.br
+\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links.
+.br
+.br
Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button":
.nf
\f3
@@ -4482,7 +3402,6 @@
.fl
\fP
.fi
-.LP
.TP 3
\-group\ groupheading\ packagepattern:packagepattern:...
Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP.
@@ -4494,16 +3413,12 @@
o
\f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP).
.RE
-.RS 3
-
-.LP
-.LP
\f3NOTE: If using an asterisk in a pattern or pattern list, the pattern list must be inside quotes, such as \fP\f4"java.lang*:java.util"\fP
-.LP
-.RE
-.LP
-If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages".
-.LP
+.br
+.br
+If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages".
+.br
+.br
For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package.
.nf
\f3
@@ -4517,7 +3432,6 @@
.fi
This results in the groupings:
.RS 3
-.RS 3
.TP 3
Core Packages
\f2java.lang\fP
@@ -4530,38 +3444,27 @@
Other Packages
\f2java.new\fP
.RE
-
-.LP
-.RE
-.LP
.TP 3
\-nodeprecated
-Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.
-.LP
+Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.
.TP 3
\-nodeprecatedlist
-Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.
-.LP
+Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.
.TP 3
\-nosince
-Omits from the generated docs the "Since" sections associated with the @since tags.
-.LP
+Omits from the generated docs the "Since" sections associated with the @since tags.
.TP 3
\-notree
-Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.
-.LP
+Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.
.TP 3
\-noindex
-Omits the index from the generated docs. The index is produced by default.
-.LP
+Omits the index from the generated docs. The index is produced by default.
.TP 3
\-nohelp
-Omits the HELP link in the navigation bars at the top and bottom of each page of output.
-.LP
+Omits the HELP link in the navigation bars at the top and bottom of each page of output.
.TP 3
\-nonavbar
-Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.
-.LP
+Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.
.TP 3
\-helpfile\ path/filename
Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example:
@@ -4582,8 +3485,7 @@
.fi
.TP 3
\-serialwarn
-Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods.
-.LP
+Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods.
.TP 3
\-charset\ name
Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the
@@ -4609,10 +3511,10 @@
.na
\f2HTML standard\fP @
.fi
-http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321)
-.LP
+http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321)
+.br
+.br
Also see \-encoding and \-docencoding.
-.LP
.TP 3
\-docencoding\ name
Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the
@@ -4626,12 +3528,12 @@
% \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP
.fl
.fi
-Also see \-encoding and \-charset.
-.LP
+Also see \-encoding and \-charset.
.TP 3
\-keywords
-Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.)
-.LP
+Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.)
+.br
+.br
The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords:
.nf
\f3
@@ -4646,16 +3548,21 @@
.fl
\fP
.fi
-.LP
.TP 3
\-tag\ \ tagname:Xaoptcmf:"taghead"
-Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run.
-.LP
-The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name.
-.LP
-The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading.
-.LP
-\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: \f4X\fP (disable tag)
+Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run.
+.br
+.br
+The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name.
+.br
+.br
+The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading.
+.br
+.br
+\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters:
+.br
+.br
+\f4X\fP (disable tag)
.br
\f4a\fP (all)
.br
@@ -4670,7 +3577,8 @@
\f4m\fP (methods)
.br
\f4f\fP (fields)
-.LP
+.br
+.br
\f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is:
.nf
\f3
@@ -4715,8 +3623,9 @@
.fl
\fP
.fi
-\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases.
-.LP
+\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases.
+.br
+.br
You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use:
.nf
\f3
@@ -4733,13 +3642,15 @@
.fl
\fP
.fi
-.LP
-The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet.
-.LP
-\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example.
-.LP
-If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order.
-.LP
+The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet.
+.br
+.br
+\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example.
+.br
+.br
+If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order.
+.br
+.br
\f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed):
.nf
\f3
@@ -4758,21 +3669,23 @@
.fl
\fP
.fi
-.LP
-When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown.
-.LP
-The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position.
-.LP
-\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Sun will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Sun. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Sun later creates a standard tag of the same name.
-.LP
+When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown.
+.br
+.br
+The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position.
+.br
+.br
+\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Oracle will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Oracle. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Oracle later creates a standard tag of the same name.
+.br
+.br
\f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See
.na
\f2Comparing Annotations and Javadoc Tags\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations
-.LP
-You can also create more complex block tags, or custom inline tags with the \-taglet option.
-.LP
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations<
+.br
+.br
+You can also create more complex block tags, or custom inline tags with the \-taglet option.
.TP 3
\-taglet\ \ class
Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see:
@@ -4782,13 +3695,14 @@
.na
\f2Taglet Overview\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/taglet/overview.html
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html
.RE
-.LP
-Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes.
-.LP
-Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process.
-.LP
+Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes.
+.br
+.br
+Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process.
+.br
+.br
Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages:
.nf
\f3
@@ -4809,25 +3723,21 @@
.fl
\fP
.fi
-.LP
-Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.
-.LP
+Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.
.TP 3
\-tagletpath\ \ tagletpathlist
-Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.
-.LP
+Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.
.TP 3
\-docfilessubdirs\
-Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.
-.LP
+Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.
.TP 3
\-excludedocfilessubdir\ \ name1:name2...
-Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.
-.LP
+Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.
.TP 3
\-noqualifier\ \ all\ | \ packagename1:packagename2:...
-Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear.
-.LP
+Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear.
+.br
+.br
The following example omits all package qualifiers:
.nf
\f3
@@ -4852,8 +3762,7 @@
.fl
\fP
.fi
-Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used.
-.LP
+Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used.
.TP 3
\-notimestamp\
Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this:
@@ -4864,53 +3773,40 @@
.fl
\fP
.fi
-.LP
.TP 3
\-nocomment\
Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project.
+.TP 3
+\-sourcetab tabLength
+Specify the number of spaces each tab takes up in the source.
.RE
.SH "COMMAND LINE ARGUMENT FILES"
.LP
-
-.LP
-.LP
To shorten or simplify the javadoc command line, you can specify one or more files that themselves contain arguments to the \f2javadoc\fP command (except \f2\-J\fP options). This enables you to create javadoc commands of any length on any operating system.
.LP
-.LP
An argument file can include javac options and source filenames in any combination. The arguments within a file can be space\-separated or newline\-separated. If a filename contains embedded spaces, put the whole filename in double quotes.
.LP
-.LP
Filenames within an argument file are relative to the current directory, not the location of the argument file. Wildcards (*) are not allowed in these lists (such as for specifying \f2*.java\fP). Use of the '\f2@\fP' character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files.
.LP
-.LP
When executing javadoc, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javadoc encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list.
-.LP
.SS
Example \- Single Arg File
.LP
-.LP
You could use a single argument file named "\f2argfile\fP" to hold all Javadoc arguments:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @argfile\fP
.fl
.fi
-
-.LP
.LP
This argument file could contain the contents of both files shown in the next example.
-.LP
.SS
Example \- Two Arg Files
.LP
-.LP
You can create two argument files \-\- one for the Javadoc options and the other for the package names or source filenames: (Notice the following lists have no line\-continuation characters.)
.LP
-.LP
Create a file named "\f2options\fP" containing:
-.LP
.nf
\f3
.fl
@@ -4920,13 +3816,13 @@
.fl
\-splitindex
.fl
- \-windowtitle 'Java(TM) SE 7 API Specification'
-.fl
- \-doctitle 'Java(TM) SE 7 API Specification'
-.fl
- \-header '<b>Java(TM); SE 7'
-.fl
- \-bottom 'Copyright 1993\-2009 Sun Microsystems, Inc. All Rights Reserved.'
+ \-windowtitle 'Java SE 7 API Specification'
+.fl
+ \-doctitle 'Java SE 7 API Specification'
+.fl
+ \-header '<b>Java(TM) SE 7</b>'
+.fl
+ \-bottom 'Copyright © 1993\-2011 Oracle and/or its affiliates. All rights reserved.'
.fl
\-group "Core Packages" "java.*"
.fl
@@ -4936,11 +3832,8 @@
.fl
\fP
.fi
-
-.LP
.LP
Create a file named "\f2packages\fP" containing:
-.LP
.nf
\f3
.fl
@@ -4952,120 +3845,85 @@
.fl
\fP
.fi
-
-.LP
.LP
You would then run javadoc with:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @options @packages\fP
.fl
.fi
-
-.LP
.SS
Example \- Arg Files with Paths
.LP
-.LP
The argument files can have paths, but any filenames inside the files are relative to the current working directory (not \f2path1\fP or \f2path2\fP):
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @path1/options @path2/packages\fP
.fl
.fi
-
-.LP
.SS
Example \- Option Arguments
.LP
-.LP
Here's an example of saving just an argument to a javadoc option in an argument file. We'll use the \f2\-bottom\fP option, since it can have a lengthy argument. You could create a file named "\f2bottom\fP" containing its text argument:
-.LP
.nf
\f3
.fl
-'<font size="\-1"><a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a
-.fl
-bug or feature</a><br><br>Java is a trademark or registered trademark of
-.fl
-Sun Microsystems, Inc. in the US and other countries.<br>Copyright 1993\-2000 Sun
-.fl
-Microsystems, Inc. 901 San Antonio Road,<br>Palo Alto, California, 94303, U.S.A.
-.fl
-All Rights Reserved.</font>'
+<font size="\-1">
+.fl
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
+.fl
+ Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
+.fl
+ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
+.fl
+ Other names may be trademarks of their respective owners.</font>
.fl
\fP
.fi
-
-.LP
.LP
Then run the Javadoc tool with:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc \-bottom @bottom @packages\fP
.fl
.fi
-
-.LP
.LP
Or you could include the \f2\-bottom\fP option at the start of the argument file, and then just run it as:
-.LP
.nf
\f3
.fl
% \fP\f3javadoc @bottom @packages\fP
.fl
.fi
-
-.LP
-
-.LP
.SH "Name"
Running
-.LP
.SH "RUNNING JAVADOC"
.LP
-
-.LP
-.LP
\f3Version Numbers\fP \- The version number of javadoc can be determined using \f3javadoc \-J\-version\fP. The version number of the standard doclet appears in its output stream. It can be turned off with \f2\-quiet\fP.
.LP
-.LP
\f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see
.na
\f2Standard Doclet\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
.LP
\f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the
.na
\f2MIF Doclet documentation\fP @
.fi
http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-.LP
.SH "SIMPLE EXAMPLES"
.LP
-
-.LP
-.LP
You can run javadoc on entire packages or individual source files. Each package name has a corresponding directory name. In the following examples, the source files are located at \f2/home/src/java/awt/*.java\fP. The destination directory is \f2/home/html\fP.
-.LP
.SS
Documenting One or More Packages
.LP
-.LP
To document a package, the source files (\f2*.java\fP) for that package must be located in a directory having the same name as the package. If a package name is made up of several identifiers (separated by dots, such as \f2java.awt.color\fP), each subsequent identifier must correspond to a deeper subdirectory (such as \f2java/awt/color\fP). You may split the source files for a single package among two such directory trees located at different places, as long as \f2\-sourcepath\fP points to them both \-\- for example \f2src1/java/awt/color\fP and \f2src2/java/awt/color\fP.
.LP
-.LP
You can run javadoc either by changing directories (with \f2cd\fP) or by using \f2\-sourcepath\fP option. The examples below illustrate both alternatives.
-.LP
.RS 3
.TP 2
o
@@ -5108,17 +3966,12 @@
.fl
.fi
.RE
-
-.LP
.LP
Result: All cases generate HTML\-formatted documentation for the public and protected classes and interfaces in packages \f2java.awt\fP and \f2java.awt.event\fP and save the HTML files in the specified destination directory (\f2/home/html\fP). Because two or more packages are being generated, the document has three HTML frames \-\- for the list of packages, the list of classes, and the main class pages.
-.LP
.SS
Documenting One or More Classes
.LP
-.LP
The second way to run the Javadoc tool is by passing in one or more source files (\f2.java\fP). You can run javadoc either of the following two ways \-\- by changing directories (with \f2cd\fP) or by fully\-specifying the path to the \f2.java\fP files. Relative paths are relative to the current directory. The \f2\-sourcepath\fP option is ignored when passing in source files. You can use command line wildcards, such as asterisk (*), to specify groups of classes.
-.LP
.RS 3
.TP 2
o
@@ -5155,93 +4008,76 @@
.fi
This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP.
.RE
-
-.LP
.SS
Documenting Both Packages and Classes
.LP
-.LP
You can document entire packages and individual classes at the same time. Here's an example that mixes two of the previous examples. You can use \f2\-sourcepath\fP for the path to the packages but not for the path to the individual classes.
-.LP
.nf
\f3
.fl
% \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt /home/src/java/applet/Applet.java\fP
.fl
.fi
-
-.LP
.LP
This example generates HTML\-formatted documentation for the package \f2java.awt\fP and class \f2Applet\fP. (The Javadoc tool determines the package name for \f2Applet\fP from the package declaration, if any, in the \f2Applet.java\fP source file.)
-.LP
.SH "REAL WORLD EXAMPLE"
.LP
-
-.LP
-.LP
The Javadoc tool has many useful options, some of which are more commonly used than others. Here is effectively the command we use to run the Javadoc tool on the Java platform API. We use 180MB of memory to generate the documentation for the 1500 (approx.) public and protected classes in the Java SE Platform, Standard Edition, v1.2.
.LP
-.LP
The same example is shown twice \-\- first as executed on the command line, then as executed from a makefile. It uses absolute paths in the option arguments, which enables the same \f2javadoc\fP command to be run from any directory.
-.LP
.SS
Command Line Example
.LP
-.LP
-This command line example is over 900 characters, which is too long for some shells, such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation.
-.LP
+The following example may be too long for some shells such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation.
.nf
\f3
.fl
-% javadoc \-sourcepath /java/jdk/src/share/classes \\
-.fl
- \-overview /java/jdk/src/share/classes/overview.html \\
-.fl
- \-d /java/jdk/build/api \\
-.fl
- \-use \\
-.fl
- \-splitIndex \\
-.fl
- \-windowtitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\
-.fl
- \-doctitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\
-.fl
- \-header '<b>Java(TM) SE </b><br><font size="\-1">7</font>' \\
-.fl
- \-bottom '<font size="\-1"><a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit
-.fl
-a bug or feature</a><br><br>Java is a trademark or registered trademark of Sun Microsystems,
-.fl
-Inc. in the US and other countries.<br>Copyright 1993\-1999 Sun Microsystems, Inc.
-.fl
-901 San Antonio Road,<br>Palo Alto, California, 94303, U.S.A. All Rights Reserved.</font>' \\
+% javadoc \-sourcepath /java/jdk/src/share/classes \\
+.fl
+ \-overview /java/jdk/src/share/classes/overview.html \\
+.fl
+ \-d /java/jdk/build/api \\
+.fl
+ \-use \\
+.fl
+ \-splitIndex \\
+.fl
+ \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\
+.fl
+ \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\
+.fl
+ \-header '<b>Java(TM) SE 7</b>' \\
+.fl
+ \-bottom '<font size="\-1">
+.fl
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
+.fl
+ Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
+.fl
+ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
+.fl
+ Other names may be trademarks of their respective owners.</font>' \\
.fl
\-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
.fl
- \-group "Extension Packages" "javax.*" \\
-.fl
- \-J\-Xmx180m \\
+ \-group "Extension Packages" "javax.*" \\
+.fl
+ \-J\-Xmx180m \\
.fl
@packages
.fl
\fP
.fi
-
-.LP
.LP
where \f2packages\fP is the name of a file containing the packages to process, such as \f2java.applet java.lang\fP. None of the options should contain any newline characters between the single quotes. (For example, if you copy and paste this example, delete the newline characters from the \f2\-bottom\fP option.) See the other notes listed below.
-.LP
.SS
Makefile Example
.LP
-.LP
This is an example of a GNU makefile. For an example of a Windows makefile, see
.na
\f2creating a makefile for Windows\fP @
.fi
http://java.sun.com/j2se/javadoc/faq/index.html#makefiles.
-.LP
.nf
\f3
.fl
@@ -5283,15 +4119,15 @@
.fl
HEADER = '<b>Java(TM) SE 7</font>'
.fl
-BOTTOM = '<font size="\-1"><a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit
-.fl
- a bug or feature</a><br><br>Java is a trademark or registered trademark
-.fl
- of Sun Microsystems, Inc. in the US and other countries.<br>Copyright 1993\-1999
-.fl
- Sun Microsystems, Inc. 901 San Antonio Road,<br>Palo Alto, California, 94303, U.S.A.
-.fl
- All Rights Reserved.</font>'
+BOTTOM = '<font size="\-1">
+.fl
+ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
+.fl
+ Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
+.fl
+ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
+.fl
+ Other names may be trademarks of their respective owners.</font>'
.fl
GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"'
.fl
@@ -5301,14 +4137,10 @@
.fl
\fP
.fi
-
-.LP
.LP
Single quotes are used to surround makefile arguments.
.LP
-.LP
\f3NOTES\fP
-.LP
.RS 3
.TP 2
o
@@ -5320,15 +4152,9 @@
o
Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP.
.RE
-
-.LP
.SH "TROUBLESHOOTING"
-.LP
-
-.LP
.SS
General Troubleshooting
-.LP
.RS 3
.TP 2
o
@@ -5347,37 +4173,23 @@
o
\f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename.
.RE
-
-.LP
.SS
Errors and Warnings
.LP
-.LP
Error and warning messages contain the filename and line number to the declaration line rather than to the particular line in the doc comment.
-.LP
.RS 3
.TP 2
o
\f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP.
.RE
-
-.LP
.SH "ENVIRONMENT"
-.LP
-
-.LP
.RS 3
.TP 3
CLASSPATH
Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example:
.:/home/classes:/usr/local/java/classes
.RE
-
-.LP
.SH "SEE ALSO"
-.LP
-
-.LP
.RS 3
.TP 2
o
@@ -5399,75 +4211,24 @@
.na
\f2Javadoc Home Page\fP @
.fi
-http://java.sun.com/j2se/javadoc/index.jsp
+http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html
.TP 2
o
.na
\f2How to Write Doc Comments for Javadoc\fP @
.fi
-http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html
.TP 2
o
.na
\f2Setting the Class Path\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#general
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general
.TP 2
o
.na
\f2How Javac and Javadoc Find Classes\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar)
+http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar)
.RE
-
-.LP
-.LP
-.TS
-.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
-.de 35
-.ps \n(.s
-.vs \n(.vu
-.in \n(.iu
-.if \n(.u .fi
-.if \n(.j .ad
-.if \n(.j=0 .na
-..
-.nf
-.nr #~ 0
-.if n .nr #~ 0.6n
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.fc
-.nr 33 \n(.s
-.rm 80
-.nr 80 0
-.80
-.rm 80
-.nr 38 1n
-.nr 79 0
-.nr 40 \n(79+(0*\n(38)
-.nr 80 +\n(40
-.nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 3869 file Input is too wide - \n(TW units
-.fc
-.nr #T 0-1
-.nr #a 0-1
-.eo
-.de T#
-.ds #d .d
-.if \(ts\n(.z\(ts\(ts .ds #d nl
-.mk ##
-.nr ## -1v
-.ls 1
-.ls
-..
-.ec
-.fc
-.nr T. 1
-.T# 1
-.35
-.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-3
-
-.LP
--- a/jdk/src/solaris/doc/sun/man/man1/javah.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/javah.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,38 +19,28 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javah 1 "02 Jun 2010"
+.TH javah 1 "10 May 2011"
.LP
.SH "Name"
javah \- C Header and Stub File Generator
.LP
-.RS 3
-
-.LP
.LP
\f3javah\fP produces C header files and C source files from a Java class. These files provide the connective glue that allow your Java and C code to interact.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
javah [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . .
.fl
-javah_g [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . .
-.fl
\fP
.fi
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3javah\fP generates C header and source files that are needed to implement native methods. The generated header and source files are used by C programs to reference an object's instance variables from native source code. The .h file contains a struct definition whose layout parallels the layout of the corresponding class. The fields in the struct correspond to instance variables in the class.
.LP
@@ -63,13 +53,8 @@
.LP
The new native method interface, Java Native Interface (JNI), does not require header information or stub files. \f3javah\fP can still be used to generate native method function proptotypes needed for JNI\-style native methods. \f3javah\fP produces JNI\-style output by default, and places the result in the .h file.
.LP
-.LP
-\f3javah_g\fP is a non\-optimized version of \f3javah\fP suitable for use with debuggers like jdb(1).
-.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-o outputfile
@@ -110,11 +95,10 @@
.fl
\fP
.fi
-.LP
As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
.br
.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
+For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
.TP 3
\-bootclasspath path
Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files.
@@ -132,8 +116,6 @@
.LP
.SH "ENVIRONMENT VARIABLES"
.LP
-
-.LP
.RS 3
.TP 3
CLASSPATH
@@ -150,8 +132,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
javac(1), java(1), jdb(1), javap(1), javadoc(1)
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/javap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/javap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,27 +19,21 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javap 1 "02 Jun 2010"
+.TH javap 1 "10 May 2011"
.LP
.SH "Name"
javap \- The Java Class File Disassembler
.LP
-.RS 3
-
-.LP
.LP
Disassembles class files.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
-javap [ \fP\f3options\fP\f3 ] class. . .
+javap [ \fP\f3options\fP\f3 ] classes
.fl
\fP
.fi
@@ -47,13 +41,21 @@
.LP
.SH "DESCRIPTION"
.LP
+.LP
+The \f3javap\fP command disassembles one or more class files. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout.
+.LP
+.RS 3
+.TP 3
+options
+Command\-line options.
+.TP 3
+classes
+List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP).
+.RE
.LP
.LP
-The \f3javap\fP command disassembles a class file. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. For example, compile the following class declaration:
-.LP
-.RS 3
-
+For example, compile the following class declaration:
.LP
.nf
\f3
@@ -96,166 +98,160 @@
.fl
\fP
.fi
-.RE
.LP
.LP
-The output from \f3javap DocFooter\fP yields:
-.LP
-.RS 3
-
+The output from \f3javap DocFooter.class\fP yields:
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
+ java.lang.String date;
.fl
- java.lang.String email;
+ java.lang.String email;
.fl
- public DocFooter();
+ public DocFooter();
.fl
- public void init();
+ public void init();
.fl
- public void paint(java.awt.Graphics);
+ public void paint(java.awt.Graphics);
.fl
}
.fl
\fP
.fi
-.RE
.LP
.LP
-The output from \f3javap \-c DocFooter\fP yields:
-.LP
-.RS 3
-
+The output from \f3javap \-c DocFooter.class\fP yields:
.LP
.nf
\f3
.fl
-Compiled from DocFooter.java
+Compiled from "DocFooter.java"
.fl
public class DocFooter extends java.applet.Applet {
.fl
- java.lang.String date;
-.fl
- java.lang.String email;
-.fl
- public DocFooter();
+ java.lang.String date;
.fl
- public void init();
+
.fl
- public void paint(java.awt.Graphics);
-.fl
-}
+ java.lang.String email;
.fl
.fl
-Method DocFooter()
+ public DocFooter();
.fl
- 0 aload_0
+ Code:
.fl
- 1 invokespecial #1 <Method java.applet.Applet()>
+ 0: aload_0
.fl
- 4 return
+ 1: invokespecial #1 // Method java/applet/Applet."<init>":()V
+.fl
+ 4: return
.fl
.fl
-Method void init()
+ public void init();
.fl
- 0 aload_0
+ Code:
.fl
- 1 sipush 500
+ 0: aload_0
.fl
- 4 bipush 100
+ 1: sipush 500
.fl
- 6 invokevirtual #2 <Method void resize(int, int)>
+ 4: bipush 100
.fl
- 9 aload_0
+ 6: invokevirtual #2 // Method resize:(II)V
.fl
- 10 aload_0
+ 9: aload_0
.fl
- 11 ldc #3 <String "LAST_UPDATED">
+ 10: aload_0
.fl
- 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 11: ldc #3 // String LAST_UPDATED
.fl
- 16 putfield #5 <Field java.lang.String date>
+ 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 19 aload_0
+ 16: putfield #5 // Field date:Ljava/lang/String;
.fl
- 20 aload_0
+ 19: aload_0
.fl
- 21 ldc #6 <String "EMAIL">
+ 20: aload_0
.fl
- 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)>
+ 21: ldc #6 // String EMAIL
.fl
- 26 putfield #7 <Field java.lang.String email>
+ 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
.fl
- 29 return
+ 26: putfield #7 // Field email:Ljava/lang/String;
+.fl
+ 29: return
.fl
.fl
-Method void paint(java.awt.Graphics)
+ public void paint(java.awt.Graphics);
.fl
- 0 aload_1
+ Code:
.fl
- 1 new #8 <Class java.lang.StringBuffer>
+ 0: aload_1
.fl
- 4 dup
+ 1: new #8 // class java/lang/StringBuilder
.fl
- 5 invokespecial #9 <Method java.lang.StringBuffer()>
+ 4: dup
.fl
- 8 aload_0
+ 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V
.fl
- 9 getfield #5 <Field java.lang.String date>
+ 8: aload_0
+.fl
+ 9: getfield #5 // Field date:Ljava/lang/String;
.fl
- 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 15 ldc #11 <String " by ">
+ 15: ldc #11 // String by
.fl
- 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)>
+ 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
.fl
- 20 invokevirtual #12 <Method java.lang.String toString()>
+ 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String;
.fl
- 23 bipush 100
+ 23: bipush 100
+.fl
+ 25: bipush 15
.fl
- 25 bipush 15
+ 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 30: aload_1
.fl
- 30 aload_1
+ 31: aload_0
.fl
- 31 aload_0
+ 32: getfield #7 // Field email:Ljava/lang/String;
.fl
- 32 getfield #7 <Field java.lang.String email>
+ 35: sipush 290
.fl
- 35 sipush 290
+ 38: bipush 15
.fl
- 38 bipush 15
+ 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
- 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
+ 43: return
.fl
- 43 return
+}
.fl
\fP
.fi
-.RE
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
-\-help
+\-help \-\-help \-?
Prints out help message for \f3javap\fP.
.TP 3
+\-version
+Prints out version information.
+.TP 3
\-l
Prints out line and local variable tables.
.TP 3
@@ -268,14 +264,11 @@
\-package
Shows only package, protected, and public classes and members. This is the default.
.TP 3
-\-private
+\-private \-p
Shows all classes and members.
.TP 3
\-Jflag
Pass \f2flag\fP directly to the runtime system. Some examples:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -285,11 +278,16 @@
.fl
\fP
.fi
-.RE
.TP 3
\-s
Prints internal type signatures.
.TP 3
+\-sysinfo
+Shows system information (path, size, date, MD5 hash) of the class being processed.
+.TP 3
+\-constants
+Shows static final constants.
+.TP 3
\-c
Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the
.na
@@ -301,22 +299,7 @@
Prints stack size, number of \f2locals\fP and \f2args\fP for methods.
.TP 3
\-classpath path
-Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
-.nf
-\f3
-.fl
- .:<your_path>
-.fl
-\fP
-.fi
-For example:
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
+Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set.
.TP 3
\-bootclasspath path
Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files.
@@ -326,32 +309,8 @@
.RE
.LP
-.SH "ENVIRONMENT VARIABLES"
-.LP
-
-.LP
-.RS 3
-.TP 3
-CLASSPATH
-Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example, For example:
-.RS 3
-
-.LP
-.nf
-\f3
-.fl
-.:/home/avh/classes:/usr/local/java/classes
-.fl
-\fP
-.fi
-.RE
-.RE
-
-.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
javac(1), java(1), jdb(1), javah(1), javadoc(1)
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/javaws.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/javaws.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,30 +19,18 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH javaws 1 "02 Jun 2010"
+.TH javaws 1 "10 May 2011"
.LP
.SH "Name"
\f2javaws\fP Command Line
.LP
-.LP
-\
-.LP
-.SS
-NAME
-.LP
-.RS 3
-
+.SH "NAME"
.LP
.LP
\f2javaws\fP \- Java Web Start launcher command
.LP
-.RE
-.SS
-SYNOPSIS
-.LP
-.RS 3
-
+.SH "SYNOPSIS"
.LP
.LP
\f2javaws [run\-options] <jnlp>\fP
@@ -50,49 +38,27 @@
.LP
\f2javaws [control\-options]\fP
.LP
-.RE
-.SS
-PARAMETERS
-.LP
-.RS 3
-
+.SH "PARAMETERS"
.LP
.LP
\f2[run\-options]\fP
.LP
-.RS 3
-
-.LP
.LP
Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below.
.LP
-.RE
.LP
\f2<jnlp>\fP
.LP
-.RS 3
-
-.LP
.LP
This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file.
.LP
-.RE
.LP
\f2[control\-options]\fP
.LP
-.RS 3
-
-.LP
.LP
Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below.
.LP
-.RE
-.RE
-.SS
-DESCRIPTION
-.LP
-.RS 3
-
+.SH "DESCRIPTION"
.LP
.LP
The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network.
@@ -103,256 +69,154 @@
.LP
The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release.
.LP
-.RE
-.SS
-RUN\-OPTIONS
-.LP
-.RS 3
-
+.SH "RUN\-OPTIONS"
.LP
.LP
\f2\-offline\fP
.LP
-.RS 3
-
-.LP
.LP
-run Java Web Start in offline mode.
+Run Java Web Start in offline mode.
.LP
-.RE
.LP
\f2\-Xnosplash\fP
.LP
-.RS 3
-
+.LP
+Do not display the initial splash screen.
.LP
.LP
-disable the display of the initial splash screen.
-.LP
-.RE
-.LP
\f2\-open <arguments>\fP
.LP
-.RS 3
-
-.LP
.LP
If specified, replaces the arguments in the jnlp file with \f2\-open <arguments>\fP.
.LP
-.RE
.LP
\f2\-print <arguments>\fP
.LP
-.RS 3
-
-.LP
.LP
If specified, replaces the arguments in the jnlp file with \f2\-print <arguments>\fP.
.LP
-.RE
.LP
\f2\-online\fP
.LP
-.RS 3
-
-.LP
.LP
-run in online mode (default behavior).
+Use online mode (default behavior).
.LP
-.RE
.LP
\f2\-wait\fP
.LP
-.RS 3
-
-.LP
.LP
-If specified, the \f2javaws\fP process will not exit until the application exits.
+If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms.
.LP
-.RE
.LP
\f2\-verbose\fP
.LP
-.RS 3
-
-.LP
.LP
-display additional output.
+Display additional output.
.LP
-.RE
.LP
\f2\-J<option>\fP
.LP
-.RS 3
-
-.LP
.LP
-supply options to the vm.
+Supply options to the VM.
.LP
-.RE
.LP
\f2\-system\fP
.LP
-.RS 3
-
-.LP
-.LP
-run the application from the system cache only.
.LP
-.RE
-.RE
-.SS
-CONTROL\-OPTIONS
+Run the application from the system cache only.
.LP
-.RS 3
-
+.SH "CONTROL\-OPTIONS"
.LP
.LP
\f2\-viewer\fP
.LP
-.RS 3
-
+.LP
+Show the Cache Viewer in the Java Control Panel.
.LP
.LP
-show the Cache Viewer in the java control panel
+\f2\-clearcache\fP
+.LP
.LP
-.RE
+Remove all non\-installed applications from the cache.
+.LP
.LP
\f2\-userConfig <property name>\fP
.LP
-.RS 3
-
-.LP
.LP
-clear the specified deployment property.
+Clear the specified deployment property.
.LP
-.RE
.LP
\f2\-userConfig <property name> <property value>\fP
.LP
-.RS 3
-
-.LP
.LP
-set the specified deployment property to the specified value.
+Set the specified deployment property to the specified value.
.LP
-.RE
.LP
\f2\-uninstall\fP
.LP
-.RS 3
-
-.LP
.LP
-remove all applications from the cache.
+Remove all applications from the cache.
.LP
-.RE
.LP
\f2\-uninstall <jnlp>\fP
.LP
-.RS 3
-
-.LP
.LP
-remove the application from the cache.
+Remove the application from the cache.
.LP
-.RE
.LP
\f2\-import [import\-options] <jnlp>\fP
.LP
-.RS 3
-
-.LP
.LP
-import the application to the cache.
+Import the application to the cache.
.LP
-.RE
-\f3IMPORT\-OPTIONS\fP
+.SH "IMPORT\-OPTIONS"
.LP
.LP
\f2\-silent\fP
.LP
-.RS 3
-
-.LP
.LP
-import silently (with no user interface).
+Import silently (with no user interface).
.LP
-.RE
.LP
\f2\-system\fP
.LP
-.RS 3
-
-.LP
.LP
-import application to the system cache.
+Import application to the system cache.
.LP
-.RE
.LP
\f2\-codebase <url>\fP
.LP
-.RS 3
-
-.LP
.LP
-retrieve resources from the given codebase.
+Retrieve resources from the given codebase.
.LP
-.RE
.LP
\f2\-shortcut\fP
.LP
-.RS 3
-
-.LP
.LP
-install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
+Install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
-.RE
.LP
\f2\-association\fP
.LP
-.RS 3
-
-.LP
-.LP
-install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
-.RE
-.RE
-.SS
-FILES
+Install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
-.RS 3
-
+.SH "FILES"
.LP
.LP
For information about the user and system cache and deployment.properties files, see
.na
\f2System\- and User\-Level Properties\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
.LP
-.RE
-.SS
-MORE INFORMATION
-.LP
-.RS 3
-
+.SH "MORE INFORMATION"
.LP
.LP
For more information about Java Web Start, see
.na
\f2Java Web Start\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.html.
-.LP
-.RS 3
-
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
.LP
-\
-.LP
-.RE
-.RE
--- a/jdk/src/solaris/doc/sun/man/man1/jconsole.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jconsole.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jconsole 1 "02 Jun 2010"
+.TH jconsole 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,41 +39,40 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
Options, if used, should follow immediately after the command name.
-.br
.TP 3
connection = pid | host:port | jmxUrl
.RS 3
-\f2pid\fP\ \ \ Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See
+.TP 2
+o
+\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See
.na
\f2JMX Monitoring and Management\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details.
-.br
-\f2host\fP:\f2port\fP\ \ Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See
+http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
+.TP 2
+o
+\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See
.na
\f2JMX Monitoring and Management\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details.
-.br
-\f2jmxUrl\fP\ \ Address of the JMX agent to be connected to as described in
+http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
+.TP 2
+o
+\f2jmxUrl\fP Address of the JMX agent to be connected to as described in
.na
\f2JMXServiceURL\fP @
.fi
-http://java.sun.com/javase/6/docs/api/javax/management/remote/JMXServiceURL.html.
+http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html.
.RE
.RE
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jconsole\fP command launches a graphical console tool that enables you to monitor and manage Java applications and virtual machines on a local or remote machine.
.LP
@@ -84,17 +81,15 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-interval=n
Set the update interval to \f2n\fP seconds (default is 4 seconds).
.TP 3
-\-notile\
+\-notile
Do not tile windows initially (for two or more connections).
.TP 3
-\-pluginpath\ plugins
+\-pluginpath plugins
Specify a list of directories or JAR files which are searched for JConsole plugins. The \f2plugins\fP path should contain a provider\-configuration file named:
.br
.nf
@@ -104,20 +99,19 @@
.fl
\fP
.fi
-.LP
containing one line for each plugin specifying the fully qualified class name of the class implementing the
.na
\f2com.sun.tools.jconsole.JConsolePlugin\fP @
.fi
-http://java.sun.com/javase/6/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class.
+http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class.
.TP 3
-\-version\
+\-version
Output version information and exit.
.TP 3
-\-help\
+\-help
Output help message and exit.
.TP 3
-\-J<flag>\
+\-J<flag>
Pass <flag> to the Java virtual machine on which jconsole is run.
.RE
@@ -130,13 +124,13 @@
.na
\f2Using JConsole\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html
+http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html
.TP 2
o
.na
\f2Monitoring and Management for Java Platform\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/management/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html
.RE
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/jdb.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jdb.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jdb 1 "02 Jun 2010"
+.TH jdb 1 "10 May 2011"
.LP
.SH "Name"
jdb \- The Java Debugger
.LP
-.RS 3
-
-.LP
.LP
\f3jdb\fP helps you find and fix bugs in Java language programs.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -45,9 +39,6 @@
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options, as specified below.
@@ -60,24 +51,18 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the
.na
\f2Java Platform Debugger Architecture\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
+http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
.LP
.SS
Starting a jdb Session
.LP
-.RS 3
-
-.LP
.LP
There are many ways to start a jdb session. The most frequently used way is to have \f3jdb\fP launch a new Java Virtual Machine (VM) with the main class of the application to be debugged. This is done by substituting the command \f3jdb\fP for \f3java\fP in the command line. For example, if your application's main class is MyClass, you use the following command to debug it under JDB:
.LP
@@ -137,7 +122,7 @@
.na
\f2documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the
+http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the
.na
\f21.4.2 documentation\fP @
.fi
@@ -150,9 +135,6 @@
The following is a list of the basic \f3jdb\fP commands. The Java debugger supports other commands which you can list using \f3jdb\fP's \f2help\fP command.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
help, or ?
The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description.
@@ -164,10 +146,12 @@
Continues execution of the debugged application after a breakpoint, exception, or step.
.TP 3
print
-Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object.
-.LP
-\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option.
-.LP
+Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object.
+.br
+.br
+\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option.
+.br
+.br
\f2print\fP supports many simple Java expressions including those with method invocations, for example:
.RS 3
.TP 2
@@ -188,15 +172,13 @@
.RE
.TP 3
dump
-For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included.
-.LP
-The \f2dump\fP command supports the same set of expressions as the \f2print\fP command.
+For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included.
+.br
+.br
+The \f2dump\fP command supports the same set of expressions as the \f2print\fP command.
.TP 3
threads
List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -204,26 +186,22 @@
.fl
\fP
.fi
-.RE
In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running,
.TP 3
thread
Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above.
.TP 3
where
-\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread.
-.LP
-If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current.
+\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread.
+.br
+.br
+If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current.
.RE
.LP
-.RE
.SS
Breakpoints
.LP
-.RS 3
-
-.LP
.LP
Breakpoints can be set in \f3jdb\fP at line numbers or at the first instruction of a method, for example:
.LP
@@ -249,23 +227,15 @@
.LP
The \f2clear\fP command removes breakpoints using a syntax as in "\f2clear\ MyClass:45\fP". Using the \f2clear\fP or command with no argument displays a list of all breakpoints currently set. The \f2cont\fP command continues execution.
.LP
-.RE
.SS
Stepping
.LP
-.RS 3
-
-.LP
.LP
The \f2step\fP commands advances execution to the next line whether it is in the current stack frame or a called method. The \f2next\fP command advances execution to the next line in the current stack frame.
.LP
-.RE
.SS
Exceptions
.LP
-.RS 3
-
-.LP
.LP
When an exception occurs for which there isn't a catch statement anywhere in the throwing thread's call stack, the VM normally prints an exception trace and exits. When running under \f3jdb\fP, however, control returns to \f3jdb\fP at the offending throw. You can then use \f3jdb\fP to diagnose the cause of the exception.
.LP
@@ -278,12 +248,8 @@
.LP
\f2NOTE: The \fP\f2ignore\fP command does not cause the debugged VM to ignore specific exceptions, only the debugger.
.LP
-.RE
-.RE
.SH "Command Line Options"
.LP
-
-.LP
.LP
When you use \f3jdb\fP in place of the Java application launcher on the command line, \f3jdb\fP accepts many of the same options as the java command, including \f2\-D\fP, \f2\-classpath\fP, and \f2\-X<option>\fP.
.LP
@@ -335,7 +301,7 @@
.na
\f2documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
+http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
.LP
.SS
Options Forwarded to Debuggee Process
@@ -358,8 +324,6 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
javac(1), java(1), javah(1), javap(1), javadoc(1).
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/jhat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jhat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jhat 1 "02 Jun 2010"
+.TH jhat 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,17 +39,17 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
Options, if used, should follow immediately after the command name.
-.br
.TP 3
heap\-dump\-file
Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3".
-.SH "DESCRIPTION"
+.RE
+
+.LP
+.SH "DESCRIPTION"
.LP
.LP
The \f3jhat\fP command parses a java heap dump file and launches a webserver. jhat enables you to browse heap dumps using your favorite webbrowser. jhat supports pre\-designed queries (such as 'show all instances of a known class "Foo"') as well as \f3OQL\fP (\f3O\fPbject \f3Q\fPuery \f3L\fPanguage) \- a SQL\-like query language to query heap dumps. Help on OQL is available from the OQL help page shown by jhat. With the default port, OQL help is available at http://localhost:7000/oqlhelp/
@@ -69,7 +67,7 @@
.na
\f2HotSpotDiagnosticMXBean\fP @
.fi
-http://java.sun.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime;
+http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime;
.TP 2
o
Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option;
@@ -86,7 +84,8 @@
.LP
\f3NOTE:\fP This tool is \f3experimental\fP and may \f3not\fP be available in future versions of the JDK.
.LP
-.SH "OPTIONS"
+.SH "OPTIONS"
+.LP
.RS 3
.TP 3
\-stack false/true
@@ -107,21 +106,22 @@
\-debug int
Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes.
.TP 3
-\-version\
+\-version
Report version number and exit.
.TP 3
-\-h\
+\-h
Output help message and exit.
.TP 3
-\-help\
+\-help
Output help message and exit.
.TP 3
-\-J<flag>\
+\-J<flag>
Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB.
.RE
.LP
-.SH "SEE ALSO"
+.SH "SEE ALSO"
+.LP
.RS 3
.TP 2
o
@@ -136,5 +136,6 @@
.fi
http://java.sun.com/developer/technicalArticles/Programming/HPROF.html
.RE
-.RE
+
+.LP
--- a/jdk/src/solaris/doc/sun/man/man1/jinfo.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jinfo.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jinfo 1 "02 Jun 2010"
+.TH jinfo 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -43,54 +41,55 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
option
Options are mutually exclusive. Option, if used, should follow immediately after the command name.
+.RE
+
+.LP
.RS 3
.TP 3
pid
process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
.RE
+
+.LP
.RS 3
.TP 3
executable
Java executable from which the core dump was produced.
.RE
+
+.LP
.RS 3
.TP 3
core
core file for which the configuration info is to be printed.
.RE
+
+.LP
.RS 3
.TP 3
remote\-hostname\-or\-IP
remote debug server's (see jsadebugd(1)) hostname or IP address.
.RE
+
+.LP
.RS 3
.TP 3
server\-id
optional unique id, if multiple debug servers are running on the same remote host.
.RE
-.RE
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jinfo\fP prints Java configuration information for a given Java process or core file or a remote debug server. Configuration information includes Java System properties and Java virtual machine command line flags. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.:
.br
-
+jinfo \-J\-d64 \-sysprops pid
.LP
-.RS 3
-
-.LP
-jinfo \-J\-d64 \-sysprops pid
-.RE
.LP
\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' need to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
.LP
@@ -99,8 +98,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
<no option>
--- a/jdk/src/solaris/doc/sun/man/man1/jmap.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jmap.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jmap 1 "02 Jun 2010"
+.TH jmap 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -43,8 +41,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
option
@@ -74,14 +70,9 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jmap\fP prints shared object memory maps or heap memory details of a given process or core file or a remote debug server. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.:
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -89,10 +80,11 @@
.fl
\fP
.fi
-.RE
.LP
-\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
+.LP
+\f3NOTE: This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
+.LP
.LP
\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
.LP
@@ -101,12 +93,10 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
<no option>
-When no option is used \f3jmap\fP prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility.
+When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility.
.br
.TP 3
\-dump:[live,]format=b,file=<filename>
--- a/jdk/src/solaris/doc/sun/man/man1/jps.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jps.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jps 1 "02 Jun 2010"
+.TH jps 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,8 +39,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
@@ -55,8 +51,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jps\fP tool lists the instrumented HotSpot Java Virtual Machines (JVMs) on the target system. The tool is limited to reporting information on JVMs for which it has the access permissions.
.LP
@@ -77,8 +71,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The \f3jps\fP command supports a number of options that modify the output of the command. These options are subject to change or removal in the future.
.LP
@@ -107,9 +99,6 @@
.SS
HOST IDENTIFIER
.LP
-.RS 3
-
-.LP
.LP
The host identifier, or \f2hostid\fP is a string that indicates the target system. The syntax of the \f2hostid\fP string largely corresponds to the syntax of a URI:
.LP
@@ -140,11 +129,8 @@
.RE
.LP
-.RE
.SH "OUTPUT FORMAT"
.LP
-
-.LP
.LP
The output of the \f3jps\fP command follows the following pattern:
.LP
@@ -169,8 +155,6 @@
.LP
.SH "EXAMPLES"
.LP
-
-.LP
.LP
This section provides examples of the \f3jps\fP command.
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/jrunscript.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jrunscript.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jrunscript 1 "02 Jun 2010"
+.TH jrunscript 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -39,8 +37,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
@@ -53,8 +49,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jrunscript\fP is a command line script shell. jrunscript supports both an interactive (read\-eval\-print) mode and a batch (\-f option) mode of script execution. This is a scripting language independent shell. By default, JavaScript is the language used, but the \-l option can be used to specify a different language. Through Java to scripting language communication, jrunscript supports "exploratory programming" style.
.LP
@@ -63,8 +57,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-classpath path
@@ -112,10 +104,8 @@
.LP
.SH "EXAMPLES"
.LP
-\f3Executing inline scripts\fP
-.LP
-.RS 3
-
+.SS
+Executing inline scripts
.LP
.nf
\f3
@@ -126,13 +116,10 @@
.fl
\fP
.fi
-.RE
.LP
-\f3Use specified language and evaluate given script file\fP
-.LP
-.RS 3
-
+.SS
+Use specified language and evaluate given script file
.LP
.nf
\f3
@@ -141,42 +128,42 @@
.fl
\fP
.fi
-.RE
.LP
-\f3Interactive mode\fP
-.LP
-.RS 3
-
+.SS
+Interactive mode
.LP
.nf
\f3
.fl
jrunscript
.fl
-js>print('hello world');
+js> print('Hello World\\n');
+.fl
+Hello World
.fl
-hello world
+js> 34 + 55
.fl
-js>34 + 55
+89.0
.fl
-89
+js> t = new java.lang.Thread(function() { print('Hello World\\n'); })
+.fl
+Thread[Thread\-0,5,main]
.fl
-js> thread(function() { print('hello world'); }
+js> t.start()
.fl
-hello world
+js> Hello World
+.fl
+
.fl
js>
.fl
\fP
.fi
-.RE
.LP
-\f3Run script file with script arguments\fP
-.LP
-.RS 3
-
+.SS
+Run script file with script arguments
.LP
.nf
\f3
@@ -185,13 +172,16 @@
.fl
\fP
.fi
-.RE
.LP
test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array.
.SH "SEE ALSO"
.LP
.LP
-If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in jsdocs.
+If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in
+.na
+\f2jsdocs\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html.
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jsadebugd 1 "02 Jun 2010"
+.TH jsadebugd 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -41,35 +39,16 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
pid
process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process.
-.RE
-
-.LP
-.RS 3
.TP 3
executable
-.RE
-
-.LP
-.RS 3
-.TP 3
Java executable from which the core dump was produced
-.RE
-
-.LP
-.RS 3
.TP 3
core
Core file to which the debug server should attach.
-.RE
-
-.LP
-.RS 3
.TP 3
server\-id
Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique.
@@ -78,17 +57,12 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP,
.na
\f2rmiregistry\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi must be started with:
-.LP
-.RS 3
-
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with:
.LP
.nf
\f3
@@ -97,17 +71,16 @@
.fl
\fP
.fi
-.RE
.LP
.LP
where \f2$JAVA_HOME\fP is the JDK installation directory. If rmiregistry was not started, jsadebugd will start an rmiregistry in a standard (1099) port internally. Debug server may be stopped by sending SIGINT (pressing Ctrl\-C) to it.
.LP
.LP
-\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP
+\f3NOTE\fP \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \f2PATH\fP environment variable should contain the location of \f2jvm.dll\fP used by the target process or the location from which the Crash Dump file was produced.
.LP
.LP
-\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
+For example, \f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
.LP
.SH "SEE ALSO"
.LP
@@ -129,7 +102,7 @@
.na
\f2rmiregistry\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi
.RE
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/jstack.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jstack.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstack 1 "02 Jun 2010"
+.TH jstack 1 "10 May 2011"
.LP
.SH "Name"
@@ -29,8 +29,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -45,8 +43,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.LP
Options are mutually exclusive. Option, if used, should follow immediately after the command name. See OPTIONS.
.LP
@@ -78,16 +74,11 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3jstack\fP prints Java stack traces of Java threads for a given Java process or core file or a remote debug server. For each Java frame, the full class name, method name, 'bci' (byte code index) and line number, if available, are printed. With the \-m option, jstack prints both Java and native frames of all threads along with the 'pc' (program counter). For each native frame, the closest native symbol to 'pc', if available, is printed. C++ mangled names are not demangled. To demangle C++ names, the output of this command may be piped to \f3c++filt\fP. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.:
.br
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -95,7 +86,6 @@
.fl
\fP
.fi
-.RE
.LP
.LP
@@ -106,8 +96,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-F
@@ -118,7 +106,7 @@
.na
\f2ownable synchronizers\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html.
+http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html.
.TP 3
\-m
prints mixed mode (both Java and native C/C++ frames) stack trace.
@@ -154,8 +142,6 @@
.LP
.SH "KNOWN BUGS"
.LP
-
-.LP
.LP
Mixed mode stack trace, the \-m option, does not work with the remote debug server.
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/jstat.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jstat.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstat 1 "02 Jun 2010"
+.TH jstat 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -39,8 +37,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
generalOption
@@ -60,17 +56,15 @@
The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details.
.TP 3
interval[s|ms]
-Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds.\ Must be a positive integer.\ If specified, \f3jstat\fP will produce its output at each interval.
+Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval.
.TP 3
count
-Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated.\ Must be a positive integer.
+Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer.
.RE
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jstat\fP tool displays performance statistics for an instrumented HotSpot Java virtual machine (JVM). The target JVM is identified by its virtual machine identifier, or \f2vmid\fP option described below.
.LP
@@ -82,9 +76,6 @@
.SS
VIRTUAL MACHINE IDENTIFIER
.LP
-.RS 3
-
-.LP
.LP
The syntax of the \f2vmid\fP string largely corresponds to the syntax of a URI:
.LP
@@ -115,11 +106,8 @@
.RE
.LP
-.RE
.SH "OPTIONS"
.LP
-
-.LP
.LP
The \f3jstat\fP command supports two types of options, general options and output options. General options cause \f3jstat\fP to display simple usage and version information. Output options determine the content and format of the statistical output.
.br
@@ -150,14 +138,11 @@
.SS
OUTPUT OPTIONS
.LP
-.RS 3
-
+.LP
+If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J). The \f2statOption\fP must come first.
.LP
.LP
-If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J).\ The \f2statOption\fP must come first.
-.LP
-.LP
-Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns.\ Use the \f3\-h\fP option to set the frequency at which the header is displayed.\ Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same.
+Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns. Use the \f3\-h\fP option to set the frequency at which the header is displayed. Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same.
.LP
.LP
Use the \f3\-t\fP option to display a time stamp column, labeled \f2Timestamp\fP as the first column of output. The \f2Timestamp\fP column contains the elapsed time, in seconds, since startup of the target JVM. The resolution of the time stamp is dependent on various factors and is subject to variation due to delayed thread scheduling on heavily loaded systems.
@@ -171,7 +156,7 @@
.RS 3
.TP 3
\-statOption
-Determines the statistics information that \f3jstat\fP displays. The following table lists the available options.\ Use the \f3\-options\fP general option to display the list of options for a particular platform installation.
+Determines the statistics information that \f3jstat\fP displays. The following table lists the available options. Use the \f3\-options\fP general option to display the list of options for a particular platform installation.
.br
.br
.LP
@@ -457,7 +442,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 230 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 215 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -697,13 +682,9 @@
.RE
.LP
-.RE
.SS
STATOPTIONS AND OUTPUT
.LP
-.RS 3
-
-.LP
.LP
The following tables summarize the columns that \f3jstat\fP outputs for each \f2statOption\fP.
.br
@@ -825,7 +806,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 280 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 261 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1082,7 +1063,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 316 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 297 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -1546,7 +1527,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 386 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 367 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2170,7 +2151,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 460 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 441 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2550,7 +2531,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 483 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 464 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -2866,7 +2847,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 537 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 518 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -3094,15 +3075,14 @@
.rm 80 81
.nr 34 \n(.lu
.eo
-.am 80
+.am 81
.br
.di a+
.35
.ft \n(.f
.ll \n(34u*1u/3u
-.if \n(.l<\n(80 .ll \n(80u
+.if \n(.l<\n(81 .ll \n(81u
.in 0
-NGCMN\ \ \ \ \ \ \ \ \ T}~T{
Minimum new generation capacity (KB).
.br
.di
@@ -3262,9 +3242,11 @@
.if \n(80<\n(38 .nr 80 \n(38
.nr 38 \w\f3Column\fP
.if \n(80<\n(38 .nr 80 \n(38
-.nr 38 \wNGCMX \ \ \
+.nr 38 \wNGCMN
.if \n(80<\n(38 .nr 80 \n(38
-.nr 38 \wNGC \ \ \
+.nr 38 \wNGCMX
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \wNGC
.if \n(80<\n(38 .nr 80 \n(38
.nr 38 \wS0CMX
.if \n(80<\n(38 .nr 80 \n(38
@@ -3284,8 +3266,6 @@
.if \n(80<\n(38 .nr 80 \n(38
.80
.rm 80
-.nr 38 \n(a-
-.if \n(80<\n(38 .nr 80 \n(38
.nr 81 0
.nr 38 \w\f3Description\fP
.if \n(81<\n(38 .nr 81 \n(38
@@ -3293,6 +3273,8 @@
.if \n(81<\n(38 .nr 81 \n(38
.81
.rm 81
+.nr 38 \n(a-
+.if \n(81<\n(38 .nr 81 \n(38
.nr 38 \n(b-
.if \n(81<\n(38 .nr 81 \n(38
.nr 38 \n(c-
@@ -3321,7 +3303,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 593 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 572 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -3348,11 +3330,11 @@
.ta \n(80u \n(81u
.nr 31 \n(.f
.nr 35 1m
-\&\h'|\n(40u'\h'|\n(41u'
+\&\h'|\n(40u'NGCMN\h'|\n(41u'
.mk ##
.nr 31 \n(##
.sp |\n(##u-1v
-.nr 37 \n(40u
+.nr 37 \n(41u
.in +\n(37u
.a+
.in -\n(37u
@@ -3364,7 +3346,7 @@
.ta \n(80u \n(81u
.nr 31 \n(.f
.nr 35 1m
-\&\h'|\n(40u'NGCMX \ \ \\h'|\n(41u'
+\&\h'|\n(40u'NGCMX\h'|\n(41u'
.mk ##
.nr 31 \n(##
.sp |\n(##u-1v
@@ -3380,7 +3362,7 @@
.ta \n(80u \n(81u
.nr 31 \n(.f
.nr 35 1m
-\&\h'|\n(40u'NGC \ \ \\h'|\n(41u'
+\&\h'|\n(40u'NGC\h'|\n(41u'
.mk ##
.nr 31 \n(##
.sp |\n(##u-1v
@@ -3522,7 +3504,7 @@
.rm i+
.rm j+
.TE
-.if \n-(b.=0 .nr c. \n(.c-\n(d.-49
+.if \n-(b.=0 .nr c. \n(.c-\n(d.-47
.LP
.SS
@@ -3717,7 +3699,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 635 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 614 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -4062,7 +4044,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 677 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 656 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -4407,7 +4389,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 719 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 698 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -4792,7 +4774,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 769 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 748 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -5091,7 +5073,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 795 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 774 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -5176,10 +5158,7 @@
.if \n-(b.=0 .nr c. \n(.c-\n(d.-19
.LP
-.SS
-
-.LP
-.SH ""
+.SH "EXAMPLES"
.LP
.LP
This section presents some examples of monitoring a local JVM with a \f2lvmid\fP of 21891.
@@ -5355,7 +5334,6 @@
.LP
The \f2lvmid\fP is combined with the name of the remote host to construct a \f2vmid\fP of \f240496@remote.domain\fP. This \f2vmid\fP results in the use of the \f3rmi\fP protocol to communicate to the default \f3jstatd\fP server on the remote host. The \f3jstatd\fP server is located using the \f3rmiregistry\fP on \f2remote.domain\fP that is bound to the default \f3rmiregistry\fP port (port 1099).
.LP
-.RE
.SH "SEE ALSO"
.LP
.RS 3
--- a/jdk/src/solaris/doc/sun/man/man1/jstatd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/jstatd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jstatd 1 "02 Jun 2010"
+.TH jstatd 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -42,8 +40,6 @@
.LP
.SH "PARAMETERS"
.LP
-
-.LP
.RS 3
.TP 3
options
@@ -53,8 +49,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3jstatd\fP tool is an RMI server application that monitors for the creation and termination of instrumented HotSpot Java virtual machines (JVMs) and provides a interface to allow remote monitoring tools to attach to JVMs running on the local host.
.LP
@@ -66,8 +60,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
The \f3jstatd\fP command supports the following options:
.LP
@@ -89,8 +81,6 @@
.LP
.SH "SECURITY"
.LP
-
-.LP
.LP
The \f3jstatd\fP server can only monitor JVMs for which it has the appropriate native access permissions. Therefor the \f3jstatd\fP process must be running with the same user credentials as the target JVMs. Some user credentials, such as the \f2root\fP user in UNIX(TM) based systems, have permission to access the instrumentation exported by any JVM on the system. A \f3jstatd\fP process running with such credentials can monitor any JVM on the system, but introduces additional security concerns.
.LP
@@ -102,7 +92,7 @@
.na
\f2Policy File Syntax\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html.
.LP
.LP
The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server.
@@ -145,15 +135,11 @@
.LP
.SH "REMOTE INTERFACE"
.LP
-
-.LP
.LP
The interface exported by the \f3jstatd\fP process is proprietary and is guaranteed to change. Users and developers are discouraged from writing to this interface.
.LP
.SH "EXAMPLES"
.LP
-
-.LP
.LP
Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background.
.LP
@@ -264,7 +250,7 @@
.na
\f2rmiregistry\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry
.RE
.LP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/doc/sun/man/man1/jvisualvm.1 Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,104 @@
+." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+." 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.
+."
+.TH jvisualvm 1 "10 May 2011"
+
+.LP
+.SH "Name"
+\f2jvisualvm\fP \- Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool
+.LP
+.SH "SYNOPSIS"
+.LP
+.nf
+\f3
+.fl
+ \fP\f3jvisualvm\fP [ \f2options\fP ]
+.fl
+.fi
+
+.LP
+.SH "PARAMETERS"
+.LP
+.LP
+Options, if used, should follow immediately after the command name. Options may be in any order. For a discussion of parameters that apply to a specific option, see OPTIONS below.
+.LP
+.SH "DESCRIPTION"
+.LP
+.LP
+Java VisualVM is an intuitive graphical user interface that provides detailed information about Java technology\-based applications (Java applications) while they are running on a given Java Virtual Machine (JVM(*)). The name Java VisualVM comes from the fact that Java VisualVM provides information about the JVM software \f2visually\fP.
+.LP
+.LP
+Java VisualVM combines several monitoring, troubleshooting, and profiling utilities into a single tool. For example, most of the functionality offered by the standalone tools \f2jmap\fP, \f2jinfo\fP, \f2jstat\fP and \f2jstack\fP have been integrated into Java VisualVM. Other functionalities, such as some of those offered by the JConsole tool, can be added as optional plug\-ins.
+.LP
+.SH "OPTIONS"
+.LP
+.LP
+The following option is possible when you launch Java VisualVM.
+.LP
+.RS 3
+.TP 3
+\-J<jvm_option>\
+Pass this \f2<jvm_option>\fP to the JVM software.
+.RE
+
+.LP
+.SH "USAGE"
+.LP
+.LP
+Java VisualVM is useful to Java application developers to troubleshoot applications and to monitor and improve the applications' performance. Java VisualVM can allow developers to generate and analyse heap dumps, track down memory leaks, perform and monitor garbage collection, and perform lightweight memory and CPU profiling. Plug\-ins also exist that expand the functionality of Java VisualVM. For example, most of the functionality of the JConsole tool is available via the MBeans Tab and JConsole Plug\-in Wrapper plug\-ins. You can choose from a catalog of standard Java VisualVM plug\-ins by selecting 'Tools' | 'Plugins' in the Java VisualVM menus.
+.LP
+.LP
+Start Java VisualVM with the following command:
+.LP
+.nf
+\f3
+.fl
+% jvisualvm \fP\f4<options>\fP\f3
+.fl
+\fP
+.fi
+
+.LP
+.SH "SEE ALSO"
+.LP
+.LP
+For more details about Java VisualVM see the following pages.
+.LP
+.RS 3
+.TP 2
+o
+.na
+\f2Java VisualVM developers' site\fP @
+.fi
+http://visualvm.java.net
+.TP 2
+o
+.na
+\f2Java VisualVM in Java SE platform documentation\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html
+.RE
+
+.LP
+.LP
+\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP
+.LP
+
--- a/jdk/src/solaris/doc/sun/man/man1/keytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/keytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH keytool 1 "02 Jun 2010"
+.TH keytool 1 "10 May 2011"
.LP
.SH "Name"
keytool \- Key and Certificate Management Tool
.LP
-.RS 3
-
.LP
Manages a keystore (database) of cryptographic keys, X.509 certificate chains, and trusted certificates.
-.RE
+.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +43,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
\f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers.
.LP
A \f2certificate\fP is a digitally signed statement from one entity (person, company, etc.), saying that the public key (and some other information) of some other entity has a particular value. (See Certificates.) When data is digitally signed, the signature can be verified to check the data integrity and authenticity. \f2Integrity\fP means that the data has not been modified or tampered with, and \f2authenticity\fP means the data indeed comes from whoever claims to have created and signed it.
@@ -57,14 +51,12 @@
\f3keytool\fP also enables users to administer secret keys used in symmetric encryption/decryption (e.g. DES).
.LP
.LP
-\f3keytool\fP stores the keys and certificates in a \f2keystore\fP.
+\f3keytool\fP stores the keys and certificates in a \f2keystore\fP.
.LP
.SH "COMMAND AND OPTION NOTES"
.LP
-
.LP
-.LP
-The various commands and their options are listed and described below . Note:
+The various commands and their options are listed and described below. Note:
.LP
.RS 3
.TP 2
@@ -114,6 +106,7 @@
.fl
\fP
.fi
+.LP
is equivalent to
.nf
\f3
@@ -128,10 +121,9 @@
.SS
Option Defaults
.LP
-.RS 3
-
.LP
-Below are the defaults for various option values.
+Below are the defaults for various option values.
+.LP
.nf
\f3
.fl
@@ -153,12 +145,16 @@
.fl
1024 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "DSA")
.fl
+ 256 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "EC")
+.fl
56 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DES")
.fl
168 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DESede")
.fl
.fl
+
+.fl
\-validity 90
.fl
@@ -169,7 +165,7 @@
.fl
\-storetype the value of the "keystore.type" property in the security properties file,
.fl
- which is returned by the static \fP\f4getDefaultType\fP\f3 method in
+ which is returned by the static \fP\f4getDefaultType\fP\f3 method in
.fl
\fP\f4java.security.KeyStore\fP\f3
.fl
@@ -181,25 +177,39 @@
.fl
\-protected false
.fl
-
-.fl
\fP
.fi
.LP
-In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA", and if the underlying private key is of type "RSA", \f2\-sigalg\fP defaults to "SHA256withRSA". Please consult the
+.LP
+In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key:
+.LP
+.RS 3
+.TP 2
+o
+If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA"
+.TP 2
+o
+If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA".
+.TP 2
+o
+If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA".
+.RE
+
+.LP
+.LP
+Please consult the
.na
\f2Java Cryptography Architecture API Specification & Reference\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
-.RE
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
+.LP
.SS
Common Options
.LP
-.RS 3
-
.LP
-The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output.
+The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output.
+.LP
.LP
There is also a \f2\-J\fP\f2javaoption\fP option that may appear for any command. If it appears, the specified \f2javaoption\fP string is passed through directly to the Java interpreter. This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
.LP
@@ -209,39 +219,59 @@
.RS 3
.TP 3
\-storetype storetype
-This qualifier specifies the type of keystore to be instantiated.
+.LP
+This qualifier specifies the type of keystore to be instantiated.
.TP 3
\-keystore keystore
+.LP
The keystore location.
.LP
If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created
.LP
Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device).
.TP 3
-\-storepass storepass
+\-storepass[:env|:file] argument
+.LP
The password which is used to protect the integrity of the keystore.
.LP
-\f2storepass\fP must be at least 6 characters long. It must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it.
+If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows:
+.RS 3
+.TP 2
+o
+\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
+.TP 2
+o
+\f2file\fP: Retrieve the password from the file named \f2argument\fP
+.RE
+.LP
+\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).)
+.LP
+The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it.
.LP
When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed.
.TP 3
\-providerName provider_name
-Used to identify a cryptographic service provider's name when listed in the security properties file.
+.LP
+Used to identify a cryptographic service provider's name when listed in the security properties file.
.TP 3
\-providerClass provider_class_name
-Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.
+.LP
+Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.
.TP 3
\-providerArg provider_arg
-Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.
+.LP
+Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.
.TP 3
\-protected
+.LP
Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
.LP
Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively.
.TP 3
\-ext {name{:critical}{=value}}
-Denotes an X.509 certificate extension. The option can be used in \f2\-genkeypair\fP and \f2\-gencert\fP to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2":critical"\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false.
-.RS 3
+.LP
+Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP.
+.RE
.LP
.LP
@@ -478,7 +508,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 289 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 319 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
@@ -657,7 +687,7 @@
For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then.
.LP
.LP
-A special name \f2"honored"\fP, used in \-gencert only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma\-seperated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default.
+A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default.
.LP
.LP
If, besides the \-ext honored option, another named or OID \-ext option is provided, this extension will be added to those already honored. However, if this name (or OID) also appears in the honored value, its value and criticality overrides the one in the request.
@@ -668,32 +698,61 @@
.LP
\f3Note:\fP Users should be aware that some combinations of extensions (and other certificate fields) may not conform to the Internet standard. See Warning Regarding Certificate Conformance for details.
.LP
-.RE
-.RE
-.RE
.SH "COMMANDS"
.LP
-
-.LP
.SS
Creating or Adding Data to the Keystore
.LP
.RS 3
-
+.TP 3
+\-gencert {\-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}
.LP
-.RS 3
-.TP 3
-\-gencert {\-infile infile} {\-outfile outfile} {\-dname dname} {\-ext ext}* {\-rfc} {\-alias alias} {\-sigalg sigalg} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] [\-keypass keypass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
+Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created.
.LP
-Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from infile (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into outfile (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created.
-.LP
-\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. valDays tells the number of days for which the certificate should be considered valid.
+\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid.
.LP
If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used.
.LP
-\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP.
+\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP.
+.LP
+The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain.
+.LP
+The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP:
+.nf
+\f3
+.fl
+keytool \-alias ca \-dname CN=CA \-genkeypair
+.fl
+keytool \-alias ca1 \-dname CN=CA \-genkeypair
+.fl
+keytool \-alias ca2 \-dname CN=CA \-genkeypair
+.fl
+keytool \-alias e1 \-dname CN=E1 \-genkeypair
+.fl
+\fP
+.fi
+.LP
+The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued:
+.nf
+\f3
+.fl
+keytool \-alias ca1 \-certreq | keytool \-alias ca \-gencert \-ext san=dns:ca1 | keytool \-alias ca1 \-importcert
+.fl
+keytool \-alias ca2 \-certreq | $KT \-alias ca1 \-gencert \-ext san=dns:ca2 | $KT \-alias ca2 \-importcert
+.fl
+\fP
+.fi
+.LP
+The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain:
+.nf
+\f3
+.fl
+keytool \-alias e1 \-certreq | keytool \-alias ca2 \-gencert > e1.cert
+.fl
+\fP
+.fi
.TP 3
-\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
+\-genkeypair {\-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}
.LP
Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP.
.LP
@@ -704,30 +763,18 @@
\f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
.LP
\f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field.
-.RS 3
-
.LP
-.LP
-The option value can be set in one of these two forms:
-.LP
+The option value can be set in one of these two forms:
.RS 3
.TP 3
1.
-.LP
-([+\-]\f2nnn\fP[ymdHMS])+
+([+\-]\f2nnn\fP[ymdHMS])+
.TP 3
2.
-.LP
-[yyyy/mm/dd] [HH:MM:SS]
+[yyyy/mm/dd] [HH:MM:SS]
.RE
-
-.LP
.LP
-With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be:
-.LP
-.RS 3
-
-.LP
+With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be:
.nf
\f3
.fl
@@ -743,16 +790,10 @@
.fl
\fP
.fi
-.RE
-
-.LP
.LP
-With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local timezone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format.
-.LP
+With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format.
.LP
-When the option is not provided, the start date is the current time. The option can be provided at most once.
-.LP
-.RE
+When the option is not provided, the start date is the current time. The option can be provided at most once.
.LP
\f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid.
.LP
@@ -790,25 +831,17 @@
\f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply.
.RE
\f3Importing a New Trusted Certificate\fP
-.RS 3
-.LP
-Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore.
-.LP
.LP
-If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts".
+Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore.
.LP
-.LP
-If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user.
+If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts".
.LP
-.RE
+If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user.
\f3Importing a Certificate Reply\fP
-.RS 3
.LP
-When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified).
-.LP
+When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified).
.LP
-The methods of determining whether the certificate reply is trusted are described in the following:
-.LP
+The methods of determining whether the certificate reply is trusted are described in the following:
.RS 3
.TP 2
o
@@ -817,12 +850,8 @@
o
\f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it.
.RE
-
.LP
-.LP
-If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it.
-.LP
-.RE
+If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it.
.LP
This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward.
.TP 3
@@ -842,14 +871,12 @@
.LP
Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input.
.RE
-.RE
+
+.LP
.SS
Exporting Data
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-certreq {\-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}
.LP
@@ -879,14 +906,10 @@
.RE
.LP
-.RE
.SS
Displaying Data
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption}
.LP
@@ -896,27 +919,36 @@
.LP
You cannot specify both \f2\-v\fP and \f2\-rfc\fP.
.TP 3
-\-printcert {\-file cert_file | \-sslserver host[:port]} {\-rfc} {\-v} {\-Jjavaoption}
+\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}
.LP
+Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin.
.LP
If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard.
.LP
If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard
.LP
-If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the JSSE Reference Guide for more information.
+If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the
+.na
+\f2JSSE Reference Guide\fP @
+.fi
+http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information.
+.LP
+\f3Note\fP: This option can be used independently of a keystore.
+.TP 3
+\-printcrl \-file crl_ {\-v}
+.LP
+Reads the certificate revocation list (CRL) from the file \f2crl_file\fP.
+.LP
+A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP.
.LP
\f3Note\fP: This option can be used independently of a keystore.
.RE
.LP
-.RE
.SS
Managing the Keystore
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
.LP
@@ -940,46 +972,45 @@
.RE
.LP
-.RE
.SS
Getting Help
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
\-help
.LP
-Lists the basic commands and their options.
+Lists the basic commands and their options.
+.LP
+For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command:
+.nf
+\f3
+.fl
+ keytool \-\fP\f4command_name\fP\f3 \-help
+.fl
+\fP
+.fi
.RE
.LP
-.RE
.SH "EXAMPLES"
.LP
-
-.LP
.LP
Suppose you want to create a keystore for managing your public/private key pair and certificates from entities you trust.
.LP
.SS
Generating Your Key Pair
.LP
-.RS 3
-
-.LP
.LP
The first thing you need to do is create a keystore and generate the key pair. You could use a command such as the following:
.LP
.nf
\f3
.fl
- keytool \-genkeypair \-dname "cn=Mark Jones, ou=JavaSoft, o=Sun, c=US"
+ keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US"
.fl
- \-alias business \-keypass kpi135 \-keystore /working/mykeystore
+ \-alias business \-keypass \fP\f4<new password for private key>\fP\f3 \-keystore /working/mykeystore
.fl
- \-storepass ab987c \-validity 180
+ \-storepass \fP\f4<new password for keystore>\fP\f3 \-validity 180
.fl
\fP
.fi
@@ -989,10 +1020,10 @@
(Please note: This must be typed as a single line. Multiple lines are used in the examples just for legibility purposes.)
.LP
.LP
-This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password "ab987c". It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "JavaSoft", organization of "Sun" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long.
+This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password specified by \f2<new password for keystore>\fP. It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "Java", organization of "Oracle" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long.
.LP
.LP
-It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password "kpi135".
+It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password specified by \f2<new password for private key>\fP.
.LP
.LP
The command could be significantly shorter if option defaults were accepted. As a matter of fact, no options are required; defaults are used for unspecified options that have default values, and you are prompted for any required values. Thus, you could simply have the following:
@@ -1006,17 +1037,15 @@
.fi
.LP
-In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password.
+.LP
+In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password.
.LP
-The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (a private key password of "kpi135", etc.)
.LP
-.RE
+The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (for example, a distinguished name of "cn=Mark Jones, ou=Java, o=Oracle, c=US").
+.LP
.SS
Requesting a Signed Certificate from a Certification Authority
.LP
-.RS 3
-
-.LP
.LP
So far all we've got is a self\-signed certificate. A certificate is more likely to be trusted by others if it is signed by a Certification Authority (CA). To get such a signature, you first generate a Certificate Signing Request (CSR), via the following:
.LP
@@ -1029,14 +1058,12 @@
.fi
.LP
+.LP
This creates a CSR (for the entity identified by the default alias "mykey") and puts the request in the file named "MarkJ.csr". Submit this file to a CA, such as VeriSign, Inc. The CA will authenticate you, the requestor (usually off\-line), and then will return a certificate, signed by them, authenticating your public key. (In some cases, they will actually return a chain of certificates, each one authenticating the public key of the signer of the previous certificate in the chain.)
-.RE
+.LP
.SS
Importing a Certificate for the CA
.LP
-.RS 3
-
-.LP
.LP
You need to replace your self\-signed certificate with a certificate chain, where each certificate in the chain authenticates the public key of the signer of the previous certificate in the chain, up to a "root" CA.
.LP
@@ -1054,7 +1081,7 @@
.LP
.LP
-The "cacerts" keystore file ships with five VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate".
+The "cacerts" keystore file ships with several VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate".
.LP
.LP
A certificate from a CA is usually either self\-signed, or signed by another CA (in which case you also need a certificate authenticating that CA's public key). Suppose company ABC, Inc., is a CA, and you obtain a file named "ABCCA.cer" that is purportedly a self\-signed certificate from ABC, authenticating that CA's public key.
@@ -1074,14 +1101,12 @@
.fi
.LP
+.LP
This creates a "trusted certificate" entry in the keystore, with the data from the file "ABCCA.cer", and assigns the alias "abc" to the entry.
-.RE
+.LP
.SS
Importing the Certificate Reply from the CA
.LP
-.RS 3
-
-.LP
.LP
Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file.
.LP
@@ -1095,16 +1120,14 @@
.fl
\fP
.fi
-.RE
.LP
.SS
Exporting a Certificate Authenticating Your Public Key
.LP
-.RS 3
-
.LP
-Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature.
+Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature.
+.LP
.LP
One way they can do this is by first importing your public key certificate into their keystore as a "trusted" entry. You can export the certificate and supply it to your clients. As an example, you can copy your certificate to a file named \f2MJ.cer\fP via the following, assuming the entry is aliased by "mykey":
.LP
@@ -1117,14 +1140,12 @@
.fi
.LP
+.LP
Given that certificate, and the signed JAR file, a client can use the \f3jarsigner\fP tool to authenticate your signature.
-.RE
+.LP
.SS
Importing Keystore
.LP
-.RS 3
-
-.LP
.LP
The command "importkeystore" is used to import an entire keystore into another keystore, which means all entries from the source keystore, including keys and certificates, are all imported to the destination keystore within a single command. You can use this command to import entries from a different type of keystore. During the import, all new entries in the destination keystore will have the same alias names and protection passwords (for secret keys and private keys). If \f3keytool\fP has difficulties recover the private keys or secret keys from the source keystore, it will prompt you for a password. If it detects alias duplication, it will ask you for a new one, you can specify a new alias or simply allow \f3keytool\fP to overwrite the existing one.
.LP
@@ -1134,128 +1155,108 @@
.nf
\f3
.fl
-keytool \-importkeystore
+ keytool \-importkeystore
.fl
\-srckeystore key.jks \-destkeystore NONE
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3
.fl
\fP
.fi
.LP
.LP
-The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the desination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. In this way, you can issue a \f3keytool\fP command that will never ask you a question. This makes it very convenient to include a \f3keytool\fP command into a script file, like this:
+The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the destination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. The following command demonstrates this:
.LP
.nf
\f3
.fl
-keytool \-importkeystore
+ keytool \-importkeystore
.fl
\-srckeystore key.jks \-destkeystore NONE
.fl
\-srcstoretype JKS \-deststoretype PKCS11
.fl
- \-srcstorepass changeit \-deststorepass topsecret
+ \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3
.fl
\-srcalias myprivatekey \-destalias myoldprivatekey
.fl
- \-srckeypass oldkeypass \-destkeypass mynewkeypass
+ \-srckeypass \fP\f4<source entry password>\fP\f3 \-destkeypass \fP\f4<destination entry password>\fP\f3
.fl
\-noprompt
.fl
\fP
.fi
-.RE
.LP
.SS
-Generating Certificates for a typical SSL Server
-.LP
-.RS 3
-
+Generating Certificates for a Typical SSL Server
.LP
.LP
-Keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermadiate CA (ca), and SSL server (server) are as follows:
+The following are keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermediate CA (ca), and SSL server (server). Ensure that you store all the certificates in the same keystore. In these examples, it is recommended that you specify RSA as the key algorithm.
.LP
.nf
\f3
.fl
-keytool \-keystore root.jks \-genkeypair \-alias root \-ext bc:c
+keytool \-genkeypair \-keystore root.jks \-alias root \-ext bc:c
.fl
-keytool \-keystore ca.jks \-alias ca
+keytool \-genkeypair \-keystore ca.jks \-alias ca \-ext bc:c
.fl
-keytool \-keystore server.jks \-alias server
+keytool \-genkeypair \-keystore server.jks \-alias server
.fl
-
+
.fl
-keytool \-keystore root.jks \-alias root \-exportcert > root.pem
+keytool \-keystore root.jks \-alias root \-exportcert \-rfc > root.pem
.fl
-
+
.fl
-keytool \-keystore ca.jks \-certreq \-alias ca | keytool \-keystore root.jks \-gencert \-alias root \-ext BC=0 > ca.pem
+keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-certreq \-alias ca | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore root.jks \-gencert \-alias root \-ext BC=0 \-rfc > ca.pem
.fl
keytool \-keystore ca.jks \-importcert \-alias ca \-file ca.pem
.fl
-
+
.fl
-keytool \-keystore server.jks \-certreq \-alias server | keytool \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE >server.pem
+keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore server.jks \-certreq \-alias server | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE \-rfc > server.pem
.fl
cat root.pem ca.pem server.pem | keytool \-keystore server.jks \-importcert \-alias server
.fl
\fP
.fi
-.RE
.LP
.SH "TERMINOLOGY and WARNINGS"
.LP
-
-.LP
.SS
KeyStore
.LP
-.RS 3
-
.LP
A keystore is a storage facility for cryptographic keys and certificates.
-.RE
+.LP
.RS 3
.TP 2
o
-.TP 2
-o
\f3KeyStore Entries\fP
-.RS 3
-
.LP
Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include:
.RS 3
.TP 3
1.
-\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types od entry, while \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains.
+\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains.
.TP 3
2.
\f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate.
.RE
-
-.LP
-.RE
.TP 2
o
\f3KeyStore Aliases\fP
-.RS 3
.LP
-All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP.
-.LP
+All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP.
.LP
-An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity.
-.LP
+An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity.
.LP
-For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command:
-.LP
+For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command:
.nf
\f3
.fl
@@ -1263,9 +1264,8 @@
.fl
\fP
.fi
-
.LP
-This specifies an inital password of "dukekeypasswd" required by subsequent commands to access the private key assocated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following:
+This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following:
.nf
\f3
.fl
@@ -1273,49 +1273,37 @@
.fl
\fP
.fi
-
.LP
This changes the password from "dukekeypasswd" to "newpass".
.LP
-Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it.
-.LP
-.RE
+Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it.
.TP 2
o
\f3KeyStore Implementation\fP
-.RS 3
+.LP
The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
.LP
-Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it.
-.LP
+Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it.
.LP
-There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
-.LP
+There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
.LP
Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in
.na
\f2How to Implement a Provider for the Java Cryptography Architecture\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
-.LP
+http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
.LP
-Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
-.LP
+Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
.LP
-\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
-.LP
+\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
.LP
-For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu.
-.LP
+For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu.
.LP
-If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
-.LP
+If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
.LP
-Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
-.LP
+Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
.LP
-The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
-.LP
+The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
.nf
\f3
.fl
@@ -1323,11 +1311,8 @@
.fl
\fP
.fi
-
.LP
-.LP
-The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file:
-.LP
+The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file:
.nf
\f3
.fl
@@ -1335,14 +1320,10 @@
.fl
\fP
.fi
-
-.LP
.LP
-To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type.
-.LP
+To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type.
.LP
-For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
-.LP
+For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
.nf
\f3
.fl
@@ -1350,50 +1331,45 @@
.fl
\fP
.fi
+.LP
+Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
+.RE
.LP
-Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
-.RE
-.RE
.SS
Certificate
.LP
+A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value.
.RS 3
-
-.LP
-A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value.
-.RE
-.RS 3
-.TP 2
-o
.TP 2
o
\f3Certificate Terms\fP
.RS 3
-
-.LP
-.RS 3
.TP 3
Public Keys
-These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.
+.LP
+These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.
.TP 3
Digitally Signed
-If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.
+.LP
+If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.
.TP 3
Identity
-A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.
+.LP
+A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.
.TP 3
Signature
-A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).
+.LP
+A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).
.TP 3
Private Keys
-These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.
+.LP
+These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.
.TP 3
Entity
-An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.
+.LP
+An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.
.RE
-
-.LP
.LP
Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as
.na
@@ -1407,26 +1383,22 @@
.na
\f2Entrust\fP @
.fi
-http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as the Netscape/Microsoft Certificate Servers or the Entrust CA product for your organization.
-.LP
-.LP
-Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates.
+http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization.
.LP
+Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates.
.LP
-\f3keytool\fP currently handles X.509 certificates.
-.LP
-.RE
+\f3keytool\fP currently handles X.509 certificates.
.TP 2
o
\f3X.509 Certificates\fP
-.RS 3
+.LP
The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data.
.LP
-All X.509 certificates have the following data, in addition to the signature:
-.LP
+All X.509 certificates have the following data, in addition to the signature:
.RS 3
.TP 3
Version
+.LP
This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates.
.LP
\f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic.
@@ -1436,475 +1408,86 @@
\f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use.
.TP 3
Serial Number
-The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).
+.LP
+The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).
.TP 3
Signature Algorithm Identifier
-This identifies the algorithm used by the CA to sign the certificate.
+.LP
+This identifies the algorithm used by the CA to sign the certificate.
.TP 3
Issuer Name
-The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)
+.LP
+The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)
.TP 3
Validity Period
-Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.
+.LP
+Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.
.TP 3
Subject Name
+.LP
The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example,
.nf
\f3
.fl
- CN=Java Duke, OU=Java Software Division, O=Sun Microsystems Inc, C=US
+ CN=Java Duke, OU=Java Software Division, O=Oracle Corporation, C=US
.fl
\fP
.fi
-(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.)
+.LP
+(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.)
.TP 3
Subject Public Key Information
-This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters.
-.RE
-
.LP
+This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters.
.RE
.TP 2
o
\f3Certificate Chains\fP
-.RS 3
.LP
-\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key.
-.LP
+\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key.
.LP
-When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate.
-.LP
+When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate.
.LP
-Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key.
-.LP
+Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key.
.LP
-In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain.
-.LP
+In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain.
.LP
-Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore.
-.LP
+Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore.
.LP
-A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP.
-.LP
+A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP.
.LP
-The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's webpage, etc.).
-.LP
-.RE
+The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.).
.TP 2
o
\f3The cacerts Certificates File\fP
-.RS 3
.LP
-A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
-.LP
-.LP
-The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with several root CA certificates with the following aliases and X.500 owner distinguished names:
+A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
.LP
-.RS 3
-.TP 2
-*
-\f3Alias\fP: thawtepersonalfreemailca
-.br
-\f3Owner DN\fP: EmailAddress=personal\-freemail@thawte.com,
-.br
-CN=Thawte Personal Freemail CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawtepersonalbasicca
-.br
-\f3Owner DN\fP: EmailAddress=personal\-basic@thawte.com,
-.br
-CN=Thawte Personal Basic CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawtepersonalpremiumca
-.br
-\f3Owner DN\fP: EmailAddress=personal\-premium@thawte.com,
-.br
-CN=Thawte Personal Premium CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawteserverca
-.br
-\f3Owner DN\fP: EmailAddress=server\-certs@thawte.com,
-.br
-CN=Thawte Server CA, OU=Certification Services Division,
-.br
-O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: thawtepremiumserverca
-.br
-\f3Owner DN\fP: EmailAddress=premium\-server@thawte.com,
-.br
-CN=Thawte Premium Server CA,
-.br
-OU=Certification Services Division,
-.br
-O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
-.TP 2
-*
-\f3Alias\fP: verisignclass1ca
-.br
-\f3Owner DN\fP: OU=Class 1 Public Primary Certification Authority,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass2ca
-.br
-\f3Owner DN\fP: OU=Class 2 Public Primary Certification Authority,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass3ca
-.br
-\f3Owner DN\fP: OU=Class 3 Public Primary Certification Authority,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignserverca
-.br
-\f3Owner DN\fP: OU=Secure Server Certification Authority,
-.br
-O="RSA Data Security, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass1g2ca
-.br
-\f3Owner DN\fP: OU=VeriSign Trust Network,
-.br
-OU="(c) 1998 VeriSign, Inc. \- For authorized use only",
-.br
-OU=Class 1 Public Primary Certification Authority \- G2,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass1g3ca
-.br
-\f3Owner DN\fP: CN=VeriSign Class 1 Public Primary Certification Authority \- G3, OU="(c) 1999 VeriSign, Inc. \- For authorized use only",
-.br
-OU=VeriSign Trust Network,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass2g2ca
-.br
-\f3Owner DN\fP: OU=VeriSign Trust Network,
-.br
-OU="(c) 1998 VeriSign, Inc. \- For authorized use only",
-.br
-OU=Class 2 Public Primary Certification Authority \- G2,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass2g3ca
-.br
-\f3Owner DN\fP: CN=VeriSign Class 2 Public Primary Certification Authority \- G3,
-.br
-OU="(c) 1999 VeriSign, Inc. \- For authorized use only",
-.br
-OU=VeriSign Trust Network,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass3g2ca
-.br
-\f3Owner DN\fP: OU=VeriSign Trust Network,
-.br
-OU="(c) 1998 VeriSign, Inc. \- For authorized use only",
-.br
-OU=Class 3 Public Primary Certification Authority \- G2,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: verisignclass3g3ca
-.br
-\f3Owner DN\fP: CN=VeriSign Class 3 Public Primary Certification Authority \- G3,
-.br
-OU="(c) 1999 VeriSign, Inc. \- For authorized use only",
-.br
-OU=VeriSign Trust Network,
-.br
-O="VeriSign, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: baltimorecodesigningca
-.br
-\f3Owner DN\fP: CN=Baltimore CyberTrust Code Signing Root,
-.br
-OU=CyberTrust, O=Baltimore, C=IE
-.TP 2
-*
-\f3Alias\fP: gtecybertrustglobalca
-.br
-\f3Owner DN\fP: CN=GTE CyberTrust Global Root,
-.br
-OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US
-.TP 2
-*
-\f3Alias\fP: baltimorecybertrustca
-.br
-\f3Owner DN\fP: CN=Baltimore CyberTrust Root,
-.br
-OU=CyberTrust, O=Baltimore, C=IE
-.TP 2
-*
-\f3Alias\fP: gtecybertrust5ca
-.br
-\f3Owner DN\fP: CN=GTE CyberTrust Root 5,
-.br
-OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US
-.TP 2
-*
-\f3Alias\fP: entrustclientca
-.br
-\f3Owner DN\fP: CN=Entrust.net Client Certification Authority,
-.br
-OU=(c) 1999 Entrust.net Limited,
-.br
-OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab.,
-.br
-O=Entrust.net, C=US
-.TP 2
-*
-\f3Alias\fP: entrustglobalclientca
-.br
-\f3Owner DN\fP: CN=Entrust.net Client Certification Authority,
-.br
-OU=(c) 2000 Entrust.net Limited,
-.br
-OU=www.entrust.net/GCCA_CPS incorp. by ref. (limits liab.),
-.br
-O=Entrust.net
-.TP 2
-*
-\f3Alias\fP: entrust2048ca
-.br
-\f3Owner DN\fP: CN=Entrust.net Certification Authority (2048),
-.br
-OU=(c) 1999 Entrust.net Limited,
-.br
-OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.),
-.br
-O=Entrust.net
-.TP 2
-*
-\f3Alias\fP: entrustsslca
-.br
-\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority,
-.br
-OU=(c) 1999 Entrust.net Limited,
-.br
-OU=www.entrust.net/CPS incorp. by ref. (limits liab.),
-.br
-O=Entrust.net, C=US
-.TP 2
-*
-\f3Alias\fP: entrustgsslca
-.br
-\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority,
-.br
-OU=(c) 2000 Entrust.net Limited,
-.br
-OU=www.entrust.net/SSL_CPS incorp. by ref. (limits liab.),
-.br
-O=Entrust.net
-.TP 2
-*
-\f3Alias\fP: godaddyclass2ca
-.br
-\f3Owner DN\fP: OU=Go Daddy Class 2 Certification Authority,
-.br
-O="The Go Daddy Group, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: starfieldclass2ca
-.br
-\f3Owner DN\fP: OU=Starfield Class 2 Certification Authority,
-.br
-O="Starfield Technologies, Inc.", C=US
-.TP 2
-*
-\f3Alias\fP: valicertclass2ca
-.br
-\f3Owner DN\fP: EMAILADDRESS=info@valicert.com,
-.br
-CN=http://www.valicert.com/,
-.br
-OU=ValiCert Class 2 Policy Validation Authority,
-.br
-O="ValiCert, Inc.", L=ValiCert Validation Network
-.TP 2
-*
-\f3Alias\fP: geotrustglobalca
-.br
-\f3Owner DN\fP: CN=GeoTrust Global CA,
-.br
-O=GeoTrust Inc., C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureca
-.br
-\f3Owner DN\fP: OU=Equifax Secure Certificate Authority,
-.br
-O=Equifax, C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureebusinessca1
-.br
-\f3Owner DN\fP: CN=Equifax Secure eBusiness CA\-1,
-.br
-O=Equifax Secure Inc., C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureebusinessca2
-.br
-\f3Owner DN\fP: OU=Equifax Secure eBusiness CA\-2,
-.br
-O=Equifax Secure, C=US
-.TP 2
-*
-\f3Alias\fP: equifaxsecureglobalebusinessca1
-.br
-\f3Owner DN\fP: CN=Equifax Secure Global eBusiness CA\-1,
-.br
-O=Equifax Secure Inc., C=US
-.TP 2
-*
-\f3Alias\fP: soneraclass1ca
-.br
-\f3Owner DN\fP: CN=Sonera Class1 CA, O=Sonera, C=FI
-.TP 2
-*
-\f3Alias\fP: soneraclass2ca
-.br
-\f3Owner DN\fP: CN=Sonera Class2 CA, O=Sonera, C=FI
-.TP 2
-*
-\f3Alias\fP: comodoaaaca
-.br
-\f3Owner DN\fP: CN=AAA Certificate Services,
-.br
-O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-.TP 2
-*
-\f3Alias\fP: addtrustclass1ca
-.br
-\f3Owner DN\fP: CN=AddTrust Class 1 CA Root,
-.br
-OU=AddTrust TTP Network, O=AddTrust AB, C=SE
-.TP 2
-*
-\f3Alias\fP: addtrustexternalca
-.br
-\f3Owner DN\fP: CN=AddTrust External CA Root,
-.br
-OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
-.TP 2
-*
-\f3Alias\fP: addtrustqualifiedca
-.br
-\f3Owner DN\fP: CN=AddTrust Qualified CA Root,
-.br
-OU=AddTrust TTP Network, O=AddTrust AB, C=SE
-.TP 2
-*
-\f3Alias\fP: utnuserfirsthardwareca
-.br
-\f3Owner DN\fP: CN=UTN\-USERFirst\-Hardware,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.TP 2
-*
-\f3Alias\fP: utnuserfirstclientauthemailca
-.br
-\f3Owner DN\fP: CN=UTN\-USERFirst\-Client Authentication and Email,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.TP 2
-*
-\f3Alias\fP: utndatacorpsgcca
-.br
-\f3Owner DN\fP: CN=UTN \- DATACorp SGC,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.TP 2
-*
-\f3Alias\fP: utnuserfirstobjectca
-.br
-\f3Owner DN\fP: CN=UTN\-USERFirst\-Object,
-.br
-OU=http://www.usertrust.com, O=The USERTRUST Network,
-.br
-L=Salt Lake City, ST=UT, C=US
-.RE
-
+The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command:
+.nf
+\f3
+.fl
+keytool \-list \-keystore \fP\f4java.home\fP\f3/lib/security/cacerts
+.fl
+\fP
+.fi
.LP
-.LP
-The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK.
-.LP
-.RS 3
-
-.LP
-
+The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK.
.LP
-\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP
-.br
-
-.LP
-Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file.
-.br
-
-.LP
-.RE
-
-.LP
-.RE
+\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file.
.TP 2
o
\f3The Internet RFC 1421 Certificate Encoding Standard\fP
-.RS 3
-.LP
-Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism.
.LP
+Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism.
.LP
-Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded.
-.LP
+Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded.
.LP
-The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified.
-.LP
+The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified.
.LP
-The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format.
-.LP
+The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format.
.LP
-In its printable encoding format, the encoded certificate is bounded at the beginning by
-.LP
+In its printable encoding format, the encoded certificate is bounded at the beginning by
.nf
\f3
.fl
@@ -1912,11 +1495,8 @@
.fl
\fP
.fi
-
.LP
-.LP
-and at the end by
-.LP
+and at the end by
.nf
\f3
.fl
@@ -1925,23 +1505,21 @@
\fP
.fi
.RE
-.RE
.LP
.SS
X.500 Distinguished Names
.LP
-.RS 3
-
.LP
-X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts:
+X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts:
+.LP
.RS 3
.TP 2
o
\f2commonName\fP \- common name of a person, e.g., "Susan Jones"
.TP 2
o
-\f2organizationUnit\fP \- small organization (e.g, department or division) name, e.g., "Purchasing"
+\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing"
.TP 2
o
\f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc."
@@ -1975,7 +1553,7 @@
.nf
\f3
.fl
- CN=commonName
+ CN=commonName
.fl
OU=organizationUnit
.fl
@@ -1997,17 +1575,19 @@
.nf
\f3
.fl
-CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US
+CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, S=California, C=US
.fl
\fP
.fi
.LP
-and a sample command using such a string is
+.LP
+and a sample command using such a string is
+.LP
.nf
\f3
.fl
-keytool \-genkeypair \-dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino,
+keytool \-genkeypair \-dname "CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino,
.fl
S=California, C=US" \-alias mark
.fl
@@ -2024,7 +1604,7 @@
.nf
\f3
.fl
-CN=Steve Meier, OU=SunSoft, O=Sun, C=US
+CN=Steve Meier, OU=Java, O=Oracle, C=US
.fl
\fP
.fi
@@ -2036,7 +1616,7 @@
.nf
\f3
.fl
- cn=peter schuster, o=Sun Microsystems\\, Inc., o=sun, c=us
+ cn=Peter Schuster, ou=Java\\, Product Development, o=Oracle, c=US
.fl
\fP
.fi
@@ -2045,14 +1625,12 @@
.LP
It is never necessary to specify a distinguished name string on a command line. If it is needed for a command, but not supplied on the command line, the user is prompted for each of the subcomponents. In this case, a comma does not need to be escaped by a "\\".
.LP
-.RE
.SS
WARNING Regarding Importing Trusted Certificates
.LP
-.RS 3
-
.LP
-IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate!
+IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate!
+.LP
.LP
View it first (using the \f2\-printcert\fP command, or the \f2\-importcert\fP command without the \f2\-noprompt\fP option), and make sure that the displayed certificate fingerprint(s) match the expected ones. For example, suppose someone sends or emails you a certificate, and you put it in a file named \f2/tmp/cert\fP. Before you consider adding the certificate to your list of trusted certificates, you can execute a \f2\-printcert\fP command to view its fingerprints, as in
.LP
@@ -2083,17 +1661,15 @@
.fi
.LP
-Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside).
+.LP
+Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside).
+.LP
.LP
Note: it is not required that you execute a \f2\-printcert\fP command prior to importing a certificate, since before adding a certificate to the list of trusted certificates in the keystore, the \f2\-importcert\fP command prints out the certificate information and prompts you to verify it. You then have the option of aborting the import operation. Note, however, this is only the case if you invoke the \f2\-importcert\fP command without the \f2\-noprompt\fP option. If the \f2\-noprompt\fP option is given, there is no interaction with the user.
.LP
-.RE
.SS
Warning Regarding Passwords
.LP
-.RS 3
-
-.LP
.LP
Most commands operating on a keystore require the store password. Some commands require a private/secret key password.
.LP
@@ -2103,13 +1679,9 @@
.LP
If you don't specify a required password option on a command line, you will be prompted for it.
.LP
-.RE
.SS
Warning Regarding Certificate Conformance
.LP
-.RS 3
-
-.LP
.LP
The Internet standard
.na
@@ -2117,39 +1689,31 @@
.fi
http://tools.ietf.org/rfc/rfc5280.txt has defined a profile on conforming X.509 certificates, which includes what values and value combinations are valid for certificate fields and extensions. \f3keytool\fP has not enforced all these rules so it can generate certificates which do not conform to the standard, and these certificates might be rejected by JRE or other applications. Users should make sure that they provide the correct options for \f2\-dname\fP, \f2\-ext\fP, etc.
.LP
-.RE
.SH "SEE ALSO"
.LP
-
-.LP
.RS 3
.TP 2
o
-.LP
-jar(1) tool documentation
+jar(1) tool documentation
.TP 2
o
-.LP
-jarsigner(1) tool documentation
+jarsigner(1) tool documentation
.TP 2
o
-.LP
the
.na
\f4Security\fP @
.fi
-http://java.sun.com/docs/books/tutorial/security/index.html trail of the
+http://download.oracle.com/javase/tutorial/security/index.html trail of the
.na
\f4Java Tutorial\fP @
.fi
-http://java.sun.com/docs/books/tutorial for examples of the use of \f3keytool\fP
+http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP
.RE
.LP
.SH "CHANGES"
.LP
-
-.LP
.LP
The command interface for keytool changed in Java SE 6.
.LP
@@ -2184,19 +1748,19 @@
.na
\f2\-keyclone\fP @
.fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#keycloneCmd
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd
.TP 2
o
.na
\f2\-identitydb\fP @
.fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#identitydbCmd
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd
.TP 2
o
.na
\f2\-selfcert\fP @
.fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#selfcertCmd
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd
.RE
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/native2ascii.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/native2ascii.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH native2ascii 1 "02 Jun 2010"
+.TH native2ascii 1 "10 May 2011"
.LP
.SH "Name"
native2ascii \- Native\-to\-ASCII Converter
.LP
-.RS 3
-
-.LP
.LP
-Converts a file with native\-encoded characters (characters which are non\-Latin 1 and non\-Unicode) to one with Unicode\-encoded characters.
+Converts a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes, or visa versa.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -46,31 +40,29 @@
.LP
.SH "DESCRIPTION"
.LP
-
.LP
-.LP
-The Java compiler and other Java tools can only process files which contain Latin\-1 and/or Unicode\-encoded (\\udddd notation) characters. \f2native2ascii\fP converts files which contain other character encodings into files containing Latin\-1 and/or Unicode\-encoded charaters.
+\f2native2ascii\fP converts files that are encoded to any character encoding that is supported by the Java runtime environment to files encoded in ASCII, using Unicode escapes ("\\uxxxx" notation) for all characters that are not part of the ASCII character set. This process is required for properties files containing characters not in ISO\-8859\-1 character sets. The tool can also perform the reverse conversion.
.LP
.LP
If \f2outputfile\fP is omitted, standard output is used for output. If, in addition, \f2inputfile\fP is omitted, standard input is used for input.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-reverse
-Perform the reverse operation: convert a file with Latin\-1 and/or Unicode encoded characters to one with native\-encoded characters.
+Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment.
.br
.br
.TP 3
\-encoding encoding_name
-Specify the encoding name which is used by the conversion procedure. The default encoding is taken from System property \f2file.encoding\fP. The \f2encoding_name\fP string must be taken from the first column of the table of supported encodings in the
+Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the
.na
\f4Supported Encodings\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/intl/encoding.doc.html document.
+http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document.
+.br
+.br
.TP 3
\-Joption
Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
--- a/jdk/src/solaris/doc/sun/man/man1/orbd.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/orbd.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,15 +19,12 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH orbd 1 "02 Jun 2010"
+.TH orbd 1 "10 May 2011"
.LP
.SH "Name"
orbd \- The Object Request Broker Daemon
.LP
-.RS 3
-
-.LP
.LP
\f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment.
.LP
@@ -36,13 +33,10 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -54,8 +48,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The Server Manager included with the \f3orbd\fP tool is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. The persistent servers, while publishing the persistent object references in the Naming Service, include the port number of the ORBD in the object reference instead of the port number of the Server. The inclusion of an ORBD port number in the object reference for persistent object references has the following advantages:
.LP
@@ -77,7 +69,7 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
.LP
.SH "OPTIONS"
.LP
@@ -141,11 +133,11 @@
.na
\f2CORBA objects\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The
.na
\f2name binding\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
.LP
.LP
Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service.
@@ -224,7 +216,7 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
.LP
.SH "Server Manager"
.LP
@@ -239,7 +231,7 @@
.na
\f2sample tutorial\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
.LP
.LP
Start \f2orbd\fP.
@@ -362,7 +354,7 @@
.na
\f2Naming Service\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
.br
.TP 2
o
--- a/jdk/src/solaris/doc/sun/man/man1/pack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/pack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH pack200 1 "02 Jun 2010"
+.TH pack200 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.LP
\f4pack200\fP\f2 [ \fP\f2options\fP ] \f2output\-file\fP \f2JAR\-file\fP
.LP
@@ -36,9 +34,6 @@
Options may be in any order. The last option on the command line or in a properties file supersedes all previously specified options.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options.
@@ -51,11 +46,8 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f2pack200\fP tool is a Java application that transforms a JAR file into a compressed \f2pack200\fP file using the Java \f2gzip\fP compressor. The \f2pack200\fP files are highly compressed files that can be directly deployed, saving bandwidth and reducing download time.
.LP
@@ -65,83 +57,56 @@
.SS
Typical usage:
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 myarchive.pack.gz myarchive.jar\fP
.LP
-.RE
.LP
In this example, \f2myarchive.pack.gz\fP is produced using the default \f2pack200\fP settings.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.LP
\f4\-r \-\-repack\fP
.LP
-.RS 3
-
-.LP
.LP
Produces a JAR file by packing the file \f2myarchive.jar\fP and unpacking it. The resulting file can be used as an input to the \f2jarsigner(1)\fP tool.
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 \-\-repack myarchive\-packer.jar myarchive.jar\fP
.LP
.LP
\f2% pack200 \-\-repack myarchive.jar\fP
.LP
-.RE
-.RE
.LP
\f4\-g \-\-no\-gzip\fP
.LP
-.RS 3
-
-.LP
.LP
Produces a \f2pack200\fP file. With this option a suitable compressor must be used, and the target system must use a corresponding decompresser.
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 \-\-no\-gzip myarchive.pack myarchive.jar\fP
.LP
-.RE
-.RE
.LP
\f4\-G \-\-strip\-debug\fP
.LP
-.RS 3
-
-.LP
.LP
Strips attributes used for debugging from the output. These include \f2SourceFile\fP, \f2LineNumberTable\fP, \f2LocalVariableTable\fP and \f2LocalVariableTypeTable\fP. Removing these attributes reduces the size of both downloads and installations but reduces the usefulness of debuggers.
.LP
-.RE
+.LP
+\f4\-\-keep\-file\-order\fP
+.LP
+.LP
+Preserve the order of files in the input file; this is the default behavior.
+.LP
.LP
\f4\-O \-\-no\-keep\-file\-order\fP
.LP
-.RS 3
-
-.LP
.LP
The packer will reorder and transmit all elements. Additionally, the packer may remove JAR directory names. This will reduce the download size; however, certain JAR file optimizations, such as indexing, may not work correctly.
.LP
-.RE
.LP
\f4\-Svalue \-\-segment\-limit=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
The value is the estimated target size N (in bytes) of each archive segment. If a single input file requires
.br
@@ -151,31 +116,23 @@
The size of each segment is estimated by counting the size of each input file to be transmitted in the segment, along with the size of its name and other transmitted properties.
.LP
.LP
-The default is \f21000000\fP (a million bytes). This allows input JAR files of moderate size to be transmitted in one segment. It also puts a limit on memory requirements for packers and unpackers.
+The default is \-1, which means the packer will always create a single segment output file. In cases where extremely large output files are generated, users are strongly encouraged to use segmenting or break up the input file into smaller JARs.
.LP
.LP
A 10MB JAR packed without this limit will typically pack about 10% smaller, but the packer may require a larger Java heap (about ten times the segment limit).
.LP
-.RE
.LP
\f4\-Evalue \-\-effort=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
If the value is set to a single decimal digit, the packer will use the indicated amount of effort in compressing the archive. Level \f21\fP may produce somewhat larger size and faster compression speed, while level \f29\fP will take much longer but may produce better compression. The special value \f20\fP instructs the packer to copy through the original JAR file directly with no compression. The JSR 200 standard requires any unpacker to understand this special case as a pass\-through of the entire archive.
.LP
.LP
The default is \f25\fP, investing a modest amount of time to produce reasonable compression.
.LP
-.RE
.LP
\f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
Overrides the default, which preserves the input information, but may cause the transmitted archive to be larger. The possible values are:
.LP
@@ -195,13 +152,9 @@
.RE
.LP
-.RE
.LP
\f4\-mvalue \-\-modification\-time=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
The possible values are:
.LP
@@ -215,23 +168,15 @@
.RE
.LP
-.RE
.LP
\f4\-Pfile \-\-pass\-file=\fP\f2file\fP
.LP
-.RS 3
-
-.LP
.LP
Indicates that a file should be passed through bytewise with no compression. By repeating the option, multiple files may be specified. There is no pathname transformation, except that the system file separator is replaced by the JAR file separator "\f2/\fP". The resulting file names must match exactly as strings with their occurrences in the JAR file. If file is a directory name, all files under that directory will be passed.
.LP
-.RE
.LP
\f4\-Uaction \-\-unknown\-attribute=\fP\f2action\fP
.LP
-.RS 3
-
-.LP
.LP
Overrides the default behavior; i.e., the classfile containing the unknown attribute will be passed through with the specified action. The possible values for actions are:
.LP
@@ -248,7 +193,6 @@
.RE
.LP
-.RE
.LP
\f4\-Cattribute\-name=\fP\f2layout\fP \f3\-\-class\-attribute=\fP\f2attribute\-name=action\fP
.br
@@ -258,9 +202,6 @@
.br
\f4\-Dattribute\-name=\fP\f2layout\fP \f3\-\-code\-attribute=\fP\f2attribute\-name=action\fP
.LP
-.RS 3
-
-.LP
.LP
With the above four options, the attribute layout can be specified for a class entity, such as Class attribute, Field attribute, Method attribute, and Code attribute. The attribute\-name is the name of the attribute for which the layout or action is being defined. The possible values for action are:
.LP
@@ -282,19 +223,12 @@
.LP
Example: \f2\-\-class\-attribute=CompilationID=pass\fP will cause the class file containing this attribute to be passed through without further action by the packer.
.LP
-.RE
.LP
\f4\-f\fP\f2 \fP\f2pack.properties\fP \f3\-\-config\-file=\fP\f2pack.properties\fP
.LP
-.RS 3
-
-.LP
.LP
A configuration file, containing Java properties to initialize the packer, may be specified on the command line.
.LP
-.RS 3
-
-.LP
.LP
\f2% pack200 \-f pack.properties myarchive.pack.gz myarchive.jar\fP
.br
@@ -318,69 +252,53 @@
.br
\f2segment.limit=\-1\fP
.LP
-.RE
-.RE
-.RS 3
-
-.LP
.LP
\f4\-v \-\-verbose\fP
.LP
-.RS 3
-
-.LP
.LP
Outputs minimal messages. Multiple specification of this option will output more verbose messages.
.LP
-.RE
.LP
\f4\-q \-\-quiet\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies quiet operation with no messages.
.LP
-.RE
.LP
\f4\-lfilename \-\-log\-file=\fP\f2filename\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies a log file to output messages.
.LP
-.RE
+.LP
+\f4\-? \-h \-\-help\fP
+.LP
.LP
-\f4\-Joption\fP
+Prints help information about this command.
.LP
-.RS 3
-
+.LP
+\f4\-V \-\-version\fP
.LP
.LP
-Passes option to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java.
+Prints version information about this command.
+.LP
+.LP
+\f4\-J\fP\f2option\fP
.LP
-.RE
-.RE
+.LP
+Passes \f2option\fP to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java.
+.LP
.SH "EXIT STATUS"
.LP
-
-.LP
.LP
The following exit values are returned:
.LP
-.RS 3
-
-.LP
.LP
\f2\ 0\fP for successful completion;
.LP
.LP
\f2>0\fP if an error occurs.
.LP
-.RE
.SH "SEE ALSO"
.LP
.RS 3
@@ -392,13 +310,13 @@
.na
\f2Java SE Documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/index.html
+http://download.oracle.com/javase/7/docs/index.html
.TP 2
o
.na
\f2Java Deployment Guide \- Pack200\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html
+http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
.TP 2
o
jar(1) \- Java Archive Tool
@@ -413,8 +331,6 @@
.LP
.SH "NOTES"
.LP
-
-.LP
.LP
This command should not be confused with \f2pack(1)\fP. They are distinctly separate products.
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/policytool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/policytool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH policytool 1 "02 Jun 2010"
+.TH policytool 1 "10 May 2011"
.LP
.SH "Name"
@@ -28,8 +28,6 @@
\f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI.
.SH "SYNOPSIS"
.LP
-
-.LP
.RS 3
.TP 3
\
@@ -57,7 +55,7 @@
.na
\f2the Policytool Users Guide\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html.
.SH "OPTIONS"
.RS 3
.TP 3
@@ -67,22 +65,22 @@
.na
\f2Default Policy Implementation and Syntax\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
.br
.na
\f2Policy Tool Users' Guide\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
.br
.na
\f2Security Permissions\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
.br
.na
\f2Security Overview\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html
+http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
.br
.RE
.RE
--- a/jdk/src/solaris/doc/sun/man/man1/rmic.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/rmic.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmic 1 "02 Jun 2010"
+.TH rmic 1 "10 May 2011"
.LP
.SH "Name"
rmic \- The Java RMI Compiler
.LP
-.RS 3
-
-.LP
.LP
\f3rmic\fP generates stub, skeleton, and tie classes for remote objects using either the JRMP or IIOP protocols. Also generates OMG IDL.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +41,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3rmic\fP compiler generates stub and skeleton class files (JRMP protocol) and stub and tie class files (IIOP protocol) for remote objects. These classes files are generated from compiled Java programming language classes that are remote object implementation classes. A remote implementation class is a class that implements the interface \f2java.rmi.Remote\fP. The class names in the \f3rmic\fP command must be for classes that have been compiled successfully with the \f3javac\fP command and must be fully package qualified. For example, running \f3rmic\fP on the class file name \f2HelloImpl\fP as shown here:
.LP
@@ -81,8 +73,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-bootclasspath path
@@ -90,9 +80,6 @@
.TP 3
\-classpath path
Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -100,11 +87,7 @@
.fl
\fP
.fi
-.RE
For example:
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -112,13 +95,9 @@
.fl
\fP
.fi
-.RE
.TP 3
\-d directory
Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -126,7 +105,6 @@
.fl
\fP
.fi
-.RE
would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.)
.br
\
@@ -136,16 +114,16 @@
.TP 3
\-g
Enables generation of all debugging information, including local variables. By default, only line number information is generated.
-.LP
.TP 3
\-idl
Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the
.na
\f2Java Language to IDL Mapping\fP @
.fi
-http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description.
-.LP
-When the \f2\-idl\fP option is used, other options also include:
+http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description.
+.br
+.br
+When the \f2\-idl\fP option is used, other options also include:
.RS 3
.TP 3
\-always or \-alwaysgenerate
@@ -160,31 +138,22 @@
\-idlFile\ fromJavaPackage[.class]\ toIDLFile
Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\
.RE
-.LP
.TP 3
\-iiop
-Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class.
-.LP
+Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class.
+.br
+.br
Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention:
-.RS 3
-
-.LP
.nf
\f3
.fl
_<implementationName>_stub.class
.fl
-\fP
-.br
-\f3
-.fl
_<interfaceName>_tie.class
.fl
\fP
.fi
-.RE
-.LP
-When the \f2\-iiop\fP option is used, other options also include:
+When the \f2\-iiop\fP option is used, other options also include:
.RS 3
.TP 3
\-always or \-alwaysgenerate
@@ -197,13 +166,11 @@
Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option.
.TP 3
\-poa
-Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP.
-.LP
-The \f2PortableServer\fP module for the
+Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the
.na
\f2Portable Object Adapter\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf.
.RE
.TP 3
\-J
@@ -214,18 +181,18 @@
.TP 3
\-nowarn
Turns off warnings. If used the compiler does not print out any warnings.
-.LP
+.TP 3
+\-nowrite
+Does not write compiled classes to the file system.
.TP 3
\-vcompat
Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation.
.TP 3
\-verbose
Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded.
-.LP
.TP 3
\-v1.1
Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used).
-.LP
.TP 3
\-v1.2
(default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine.
@@ -234,15 +201,10 @@
.LP
.SH "ENVIRONMENT VARIABLES"
.LP
-
-.LP
.RS 3
.TP 3
CLASSPATH
Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example,
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -251,18 +213,15 @@
\fP
.fi
.RE
-.RE
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
java(1), javac(1),
.na
\f2CLASSPATH\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/rmid.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/rmid.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmid 1 "02 Jun 2010"
+.TH rmid 1 "10 May 2011"
.LP
.SH "Name"
rmid \- The Java RMI Activation System Daemon
.LP
-.RS 3
-
-.LP
.LP
\f3rmid\fP starts the activation system daemon that allows objects to be registered and activated in a virtual machine (VM).
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,18 +41,16 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the
.na
\f2Java RMI Specification\fP @
.fi
-http://java.sun.com/javase/6/docs/platform/rmi/spec/rmiTOC.html and
+http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and
.na
\f2Activation tutorials\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
+http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
.LP
.LP
The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows:
@@ -133,8 +125,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-C<someCommandLineOption>
@@ -169,7 +159,6 @@
.TP 3
\-J\-Dsun.rmi.activation.execPolicy=<policy>
Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP:
-.LP
.RS 3
.TP 2
o
@@ -255,17 +244,9 @@
The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups.
.LP
To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example:
-.RS 3
-
.LP
-.LP
-\f2rmid \-J\-Djava.security.policy=rmid.policy\fP
-.LP
+\f2rmid \-J\-Djava.security.policy=rmid.policy\fP
.RE
-.RE
-.TP 2
-o
-.LP
.TP 2
o
\f4<policyClassName>\fP
@@ -285,7 +266,6 @@
\fP
.fi
Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object.
-.LP
.TP 2
o
\f3none\fP
@@ -318,9 +298,9 @@
\-stop
Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098.
.RE
-.SH "ENVIRONMENT VARIABLES"
+
.LP
-
+.SH "ENVIRONMENT VARIABLES"
.LP
.RS 3
.TP 3
@@ -338,13 +318,11 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
.LP
rmic(1),
.na
\f2CLASSPATH\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath, java(1)
+http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1)
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,19 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH rmiregistry 1 "02 Jun 2010"
+.TH rmiregistry 1 "10 May 2011"
.LP
.SH "Name"
rmiregistry \- The Java Remote Object Registry
.LP
.RS 3
+The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host.
+.RE
.LP
-.LP
-The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host.
-.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -47,8 +43,6 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f3rmiregistry\fP command creates and starts a remote object registry on the specified \f2port\fP on the current host. If \f2port\fP is omitted, the registry is started on port 1099. The \f3rmiregistry\fP command produces no output and is typically run in the background. For example:
.LP
@@ -69,8 +63,6 @@
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-J
@@ -80,17 +72,12 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
-.LP
java(1),
.na
\f2java.rmi.registry.LocateRegistry\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/rmi/registry/LocateRegistry.html and
+http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and
.na
\f2java.rmi.Naming\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/rmi/Naming.html
-.LP
-
+http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html
--- a/jdk/src/solaris/doc/sun/man/man1/schemagen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/schemagen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH schemagen 1 "02 Jun 2010"
+.TH schemagen 1 "10 May 2011"
.LP
.SH "Name"
@@ -30,8 +30,7 @@
.br
\f3Implementation Version:\fP 2.1.3
.LP
-.SS
-Launching schemagen
+.SH "Launching schemagen"
.LP
.LP
The schema generator can be launched using the appropriate \f2schemagen\fP shell script in the \f2bin\fP directory for your platform.
@@ -46,9 +45,6 @@
.fi
https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html.
.LP
-.RS 3
-
-.LP
.nf
\f3
.fl
@@ -58,19 +54,13 @@
.fl
\fP
.fi
-.RE
.LP
.LP
If your java sources/classes reference other classes, they must be accessable on your system CLASSPATH environment variable, or they need to be given to the tool by using the \f2\-classpath\fP/\f2\-cp\fP options. Otherwise you will see errors when generating your schema.
.LP
-.RS 3
-
-.LP
-\f3Command Line Options\fP
-.LP
-.RS 3
-
+.SS
+Command Line Options
.LP
.nf
\f3
@@ -79,24 +69,29 @@
.fl
.fl
-Options:
+Options:
+.fl
+ \-d <path> : specify where to place processor and javac generated class files
.fl
- \-d <path> : Specify where to place processor and javac generated class files
+ \-cp <path> : specify where to find user specified files
+.fl
+ \-classpath <path> : specify where to find user specified files
.fl
- \-cp <path> : Specify where to find user specified files
+ \-encoding <encoding> : specify encoding to be used for apt/javac invocation
+.fl
+
.fl
- \-classpath <path> : Specify where to find user specified files
+ \-episode <file> : generate episode file for separate compilation
.fl
- \-help : Display this usage message
+ \-version : display version information
+.fl
+ \-help : display this usage message
.fl
\fP
.fi
-.RE
.LP
-.RE
-.SS
-Generated Resource Files
+.SH "Generated Resource Files"
.LP
.LP
The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use
@@ -105,7 +100,8 @@
.fi
https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html.
.LP
-.SH "See Also"
+.SH "Name"
+See Also
.LP
.RS 3
.TP 2
@@ -124,7 +120,7 @@
.na
\f2Java Architecture for XML Binding (JAXB)\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
.RE
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/serialver.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/serialver.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,23 +19,17 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH serialver 1 "02 Jun 2010"
+.TH serialver 1 "10 May 2011"
.LP
.SH "Name"
serialver \- The Serial Version Command
.LP
-.RS 3
-
-.LP
.LP
The \f3serialver\fP command returns the \f2serialVersionUID\fP.
.LP
-.RE
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -45,9 +39,6 @@
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
options
Command\-line options, as specified in this document.
@@ -57,18 +48,13 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f3serialver\fP returns the \f2serialVersionUID\fP for one or more classes in a form suitable for copying into an evolving class. When invoked with no arguments it prints a usage line.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-classpath <directories and zip/jar files separated by :>
@@ -88,36 +74,24 @@
.LP
.SH "NOTES"
.LP
-
-.LP
.LP
The \f3serialver\fP command loads and initializes the specified classes in its virtual machine, and by default, it does not set a security manager. If \f3serialver\fP is to be run with untrusted classes, a security manager can be set with the following option:
.LP
-.RS 3
-
-.LP
.LP
\f2\-J\-Djava.security.manager\fP
.LP
-.RE
.LP
and, if necessary, a security policy can be specified with the following option:
.LP
-.RS 3
-
-.LP
.LP
\f2\-J\-Djava.security.policy=<policy file>\fP
.LP
-.RE
.SH "SEE ALSO"
.LP
-
-.LP
.LP
.na
\f2java.io.ObjectStreamClass\fP @
.fi
-http://java.sun.com/javase/6/docs/api/java/io/ObjectStreamClass.html
+http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/servertool.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/servertool.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH servertool 1 "02 Jun 2010"
+.TH servertool 1 "10 May 2011"
.LP
.SH "Name"
servertool \- The Java(TM) IDL Server Tool
.LP
-.RS 3
-
-.LP
-\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server.
-.RE
+\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server.
.SH "SYNOPSIS"
.LP
-
-.LP
.nf
\f3
.fl
@@ -54,15 +48,11 @@
.LP
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
The \f2servertool\fP provides the command\-line interface for the application programmers to register, unregister, startup, and shutdown a persistent server. Other commands are provided to obtain various statistical information about the server.
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-ORBInitialHost nameserverhost
@@ -75,8 +65,6 @@
.LP
.SH "COMMANDS"
.LP
-
-.LP
.RS 3
.TP 3
register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ]
@@ -122,6 +110,4 @@
.LP
.SH "SEE ALSO"
.LP
-
-.LP
orbd(1)
--- a/jdk/src/solaris/doc/sun/man/man1/tnameserv.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/tnameserv.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH tnameserv 1 "02 Jun 2010"
+.TH tnameserv 1 "10 May 2011"
.LP
.SH "Name"
@@ -30,7 +30,7 @@
.na
\f2Java IDL Naming Service Included with ORBD\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html topic.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic.
.LP
.LP
Topics in this section include:
@@ -120,11 +120,11 @@
.na
\f2The Hello World Example Using RMI\-IIOP\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service.
+http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service.
.na
\f2Java IDL: Running the Hello World Example on TWO Machines\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
.LP
.LP
For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP.
@@ -170,16 +170,12 @@
.LP
This command\-line option is available for use with \f2tnameserve\fP:
.RS 3
-
-.LP
-.RS 3
.TP 3
\-Joption
Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
.RE
.LP
-.RE
.SH "Stopping the Java\ IDL Transient Naming Service"
.LP
.LP
@@ -190,28 +186,27 @@
.LP
The following sample program illustrates how to add names to the namespace. It is a self\-contained Transient Naming Service client that creates the following simple tree.
.LP
-.nf
-\f3
-.fl
-\fP\f3
-.fl
- \fP\f4Initial\fP\f3
-.fl
- \fP\f4Naming Context\fP\f3
-.fl
- / \\
-.fl
- / \\
-.fl
- plans \fP\f4Personal\fP\f3
-.fl
- / \\
-.fl
- / \\
-.fl
- calendar schedule\fP
-.fl
-.fi
+.RS 3
+.TP 2
+o
+\f4Initial Naming Context\fP
+.RS 3
+.TP 2
+*
+\f3plans\fP
+.TP 2
+*
+\f4Personal\fP
+.RS 3
+.TP 2
+-
+\f3calendar\fP
+.TP 2
+-
+\f3schedule\fP
+.RE
+.RE
+.RE
.LP
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/unpack200.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/unpack200.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH unpack200 1 "02 Jun 2010"
+.TH unpack200 1 "10 May 2011"
.LP
.SH "Name"
@@ -27,8 +27,6 @@
.LP
.SH "SYNOPSIS"
.LP
-
-.LP
.LP
\f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP
.LP
@@ -36,9 +34,6 @@
Options may be in any order. The last option on the command line supersedes all previously specified options.
.LP
.RS 3
-
-.LP
-.RS 3
.TP 3
input\-file
Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker.
@@ -48,107 +43,78 @@
.RE
.LP
-.RE
.SH "DESCRIPTION"
.LP
-
-.LP
.LP
\f2unpack200\fP is a native implementation that transforms a packed file produced by \f2pack200\fP(1) into a JAR file. Typical usage:
.LP
-.RS 3
-
-.LP
.LP
\f2% unpack200 myarchive.pack.gz myarchive.jar\fP
.LP
-.RE
.LP
In this example, the \f2myarchive.jar\fP is produced from \f2myarchive.pack.gz\fP using the default \f2unpack200\fP settings.
.LP
.SH "OPTIONS"
.LP
-.SS
-Standard Options
-.LP
-.RS 3
-
-.LP
.LP
\f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP
.LP
-.RS 3
-
-.LP
.LP
Sets the deflation to be \f2true\fP, \f2false\fP, or \f2keep\fP on all entries within a JAR file. The default mode is \f2keep\fP. If \f2true\fP or \f2false\fP, overrides the default behavior and sets the deflation mode on all entries within the output JAR file.
.LP
-.RE
-.RE
-.SS
-Non\-Standard Options
-.LP
-.RS 3
-
-.LP
.LP
\f4\-r \-\-remove\-pack\-file\fP
.LP
-.RS 3
-
-.LP
.LP
Removes the input packed file.
.LP
-.RE
.LP
\f4\-v \-\-verbose\fP
.LP
-.RS 3
-
-.LP
.LP
Outputs minimal messages. Multiple specification of this option will output more verbose messages.
.LP
-.RE
.LP
\f4\-q \-\-quiet\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies quiet operation with no messages.
.LP
-.RE
.LP
\f4\-lfilename \-\-log\-file=\fP\f2filename\fP
.LP
-.RS 3
-
-.LP
.LP
Specifies a log file to output messages.
.LP
-.RE
-.RE
+.LP
+\f4\-? \-h \-\-help\fP
+.LP
+.LP
+Prints help information about this command.
+.LP
+.LP
+\f4\-V \-\-version\fP
+.LP
+.LP
+Prints version information about this command.
+.LP
+.LP
+\f4\-J\fP\f2option\fP
+.LP
+.LP
+Passes \f2option\fP to the Java launcher called by \f2unpack200\fP.
+.LP
.SH "EXIT STATUS"
.LP
-
-.LP
.LP
The following exit values are returned:
.LP
-.RS 3
-
-.LP
.LP
\f2\ 0\fP if successful completion;
.LP
.LP
\f2>0\fP if an error occurred.
.LP
-.RE
.SH "SEE ALSO"
.LP
.RS 3
@@ -160,13 +126,13 @@
.na
\f2Java SE Documentation\fP @
.fi
-http://java.sun.com/javase/6/docs/index.html
+http://download.oracle.com/javase/7/docs/index.html
.TP 2
o
.na
\f2Java Deployment Guide \- Pack200\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html
+http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
.TP 2
o
jar(1) \- Java Archive Tool
@@ -181,8 +147,6 @@
.LP
.SH "NOTES"
.LP
-
-.LP
.LP
This command should not be confused with \f2unpack(1)\fP. They are distinctly separate products.
.LP
--- a/jdk/src/solaris/doc/sun/man/man1/wsgen.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/wsgen.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,21 +19,15 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsgen 1 "02 Jun 2010"
+.TH wsgen 1 "10 May 2011"
.SH "Name"
wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
-.RS 3
-
-.LP
.LP
\f3Specification Version:\fP 2.1
.br
\f3Implementation Version:\fP 2.1.1
.LP
-.LP
The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint implementation class (SEI) and generates all the required artifacts for web service deployment, and invocation
-.LP
-.RE
.SH "Overview"
.LP
The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see
@@ -354,7 +348,7 @@
.nr 41 \n(80+(3*\n(38)
.nr 81 +\n(41
.nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 139 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 133 file Input is too wide - \n(TW units
.fc
.nr #T 0-1
.nr #a 0-1
--- a/jdk/src/solaris/doc/sun/man/man1/wsimport.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/wsimport.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH wsimport 1 "02 Jun 2010"
+.TH wsimport 1 "10 May 2011"
.SH "Name"
wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
.LP
@@ -685,14 +685,295 @@
.fi
https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html.
.LP
+The following table lists \f2wsimport\fP non\-standard options:
+.LP
+.TS
+.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
+.de 35
+.ps \n(.s
+.vs \n(.vu
+.in \n(.iu
+.if \n(.u .fi
+.if \n(.j .ad
+.if \n(.j=0 .na
+..
+.nf
+.nr #~ 0
+.if n .nr #~ 0.6n
+.ds #d .d
+.if \(ts\n(.z\(ts\(ts .ds #d nl
+.fc
+.nr 33 \n(.s
+.rm 80 81
+.nr 34 \n(.lu
+.eo
+.am 81
+.br
+.di a+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Map headers not bound to request or response message to Java method parameters.
+.br
+.di
+.nr a| \n(dn
+.nr a- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di b+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+WSDL URI that specifies the file that contains authorization information; this URI is in the following format: http://\f2<user name>\fP:\f2<password>\fP@\f2<host name>\fP/\f2<Web service name>\fP?wsdl
+.br
+.di
+.nr b| \n(dn
+.nr b- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di c+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Print debugging information.
+.br
+.di
+.nr c| \n(dn
+.nr c- \n(dl
+..
+.ec \
+.eo
+.am 80
+.br
+.di d+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(80 .ll \n(80u
+.in 0
+\f3\-Xno\-addressing\-databinding\fP
+.br
+.di
+.nr d| \n(dn
+.nr d- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di e+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Enable binding of W3C \f2EndpointReferenceType\fP to Java.
+.br
+.di
+.nr e| \n(dn
+.nr e- \n(dl
+..
+.ec \
+.eo
+.am 81
+.br
+.di f+
+.35
+.ft \n(.f
+.ll \n(34u*1u/3u
+.if \n(.l<\n(81 .ll \n(81u
+.in 0
+Do not compile generated Java files.
+.br
+.di
+.nr f| \n(dn
+.nr f- \n(dl
+..
+.ec \
+.35
+.nf
+.ll \n(34u
+.nr 80 0
+.nr 38 \w\f3Option\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-XadditionalHeaders\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-Xauthfile <file>\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-Xdebug\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 38 \w\f3\-Xnocompile\fP
+.if \n(80<\n(38 .nr 80 \n(38
+.80
+.rm 80
+.nr 38 \n(d-
+.if \n(80<\n(38 .nr 80 \n(38
+.nr 81 0
+.nr 38 \w\f3Description\fP
+.if \n(81<\n(38 .nr 81 \n(38
+.81
+.rm 81
+.nr 38 \n(a-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(b-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(c-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(e-
+.if \n(81<\n(38 .nr 81 \n(38
+.nr 38 \n(f-
+.if \n(81<\n(38 .nr 81 \n(38
+.35
+.nf
+.ll \n(34u
+.nr 38 1n
+.nr 79 0
+.nr 40 \n(79+(0*\n(38)
+.nr 80 +\n(40
+.nr 41 \n(80+(3*\n(38)
+.nr 81 +\n(41
+.nr TW \n(81
+.if t .if \n(TW>\n(.li .tm Table at line 193 file Input is too wide - \n(TW units
+.fc
+.nr #T 0-1
+.nr #a 0-1
+.eo
+.de T#
+.ds #d .d
+.if \(ts\n(.z\(ts\(ts .ds #d nl
+.mk ##
+.nr ## -1v
+.ls 1
+.ls
+..
+.ec
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP
+.ne \n(a|u+\n(.Vu
+.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.a+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(b|u+\n(.Vu
+.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.b+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(c|u+\n(.Vu
+.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.c+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(d|u+\n(.Vu
+.ne \n(e|u+\n(.Vu
+.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
+.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(40u
+.in +\n(37u
+.d+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.e+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.ne \n(f|u+\n(.Vu
+.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
+.ta \n(80u \n(81u
+.nr 31 \n(.f
+.nr 35 1m
+\&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u'
+.mk ##
+.nr 31 \n(##
+.sp |\n(##u-1v
+.nr 37 \n(41u
+.in +\n(37u
+.f+
+.in -\n(37u
+.mk 32
+.if \n(32>\n(31 .nr 31 \n(32
+.sp |\n(31u
+.fc
+.nr T. 1
+.T# 1
+.35
+.rm a+
+.rm b+
+.rm c+
+.rm d+
+.rm e+
+.rm f+
+.TE
+.if \n-(b.=0 .nr c. \n(.c-\n(d.-26
+
+.LP
.SH "Example"
.nf
\f3
.fl
-\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP
+\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP
.fl
.fi
.LP
-This will generate the Java artifacts and compile them by importing the \f2http://stockquote.xyz/quote?wsdl\fP.
+This will generate the Java artifacts and compile them by importing the \f2http://stockquote.example.com/quote?wsdl\fP.
.br
--- a/jdk/src/solaris/doc/sun/man/man1/xjc.1 Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/solaris/doc/sun/man/man1/xjc.1 Sat May 14 11:24:26 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
." This code is free software; you can redistribute it and/or modify it
@@ -19,19 +19,18 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH xjc 1 "02 Jun 2010"
+.TH xjc 1 "10 May 2011"
.LP
-.ad c
.SH "Name"
xjc \- Java(TM) Architecture for XML Binding
.br
-Binding Compiler
+Binding Compiler
+.LP
.LP
\f3Specification Version:\fP 2.1
.br
-\f3Reference Implementation (RI) Version:\fP 2.1.3 .ad l
-
+\f3Reference Implementation (RI) Version:\fP 2.1.3
.LP
.SH "Launching xjc"
.LP
@@ -42,84 +41,87 @@
.fi
https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html.
.LP
-.RS 3
-
-.LP
.LP
\f2% xjc \-help\fP
.LP
-.RE
-\f3Output\fP
-.LP
-.RS 3
-
+.SS
+Output
.LP
.nf
\f3
.fl
-Usage: xjc [\-options ...] <schema_file/URL/dir> ... [\-b <bindinfo>] ...
+Usage: xjc [\-options ...] <schema file/URL/dir/jar> ... [\-b <bindinfo>] ...
+.fl
+If dir is specified, all schema files in it will be compiled.
+.fl
+If jar is specified, /META\-INF/sun\-jaxb.episode binding file will be compiled.
.fl
Options:
.fl
- \-nv : do not perform strict validation of the input schema(s)
+ \-nv : do not perform strict validation of the input schema(s)
.fl
- \-extension : allow vendor extensions \- do not strictly follow the
+ \-extension : allow vendor extensions \- do not strictly follow the Compatibility Rules and App E.2 from the JAXB Spec
.fl
- Compatibility Rules and App E.2 from the JAXB Spec
+ \-b <file/dir> : specify external bindings files (each <file> must have its own \-b); if a directory is given, **/*.xjb is searched
.fl
- \-b <file/dir> : specify external bindings files (each <file> must have its own \-b)
+ \-d <dir> : generated files will go into this directory
+.fl
+ \-p <pkg> : specifies the target package
.fl
- If a directory is given, **/*.xjb is searched
+ \-httpproxy <proxy> : set HTTP/HTTPS proxy; format is [user[:password]@]proxyHost:proxyPort
.fl
- \-d <dir> : generated files will go into this directory
+ \-httpproxyfile <f> : works like \-httpproxy but takes the argument in a file to protect password
.fl
- \-p <pkg> : specifies the target package
+ \-classpath <arg> : specify where to find user class files
.fl
- \-httpproxy <proxy> : set HTTP/HTTPS proxy. Format is [user[:password]@]proxyHost:proxyPort
+ \-catalog <file> : specify catalog files to resolve external entity references; support TR9401, XCatalog, and OASIS XML Catalog format
.fl
- \-httpproxyfile <file>: set the proxy string (same format as above).
+ \-readOnly : generated files will be in read\-only mode
.fl
- \-classpath <arg> : specify where to find user class files
+ \-npa : suppress generation of package level annotations (**/package\-info.java)
+.fl
+ \-no\-header : suppress generation of a file header with timestamp
.fl
- \-catalog <file> : specify catalog files to resolve external entity references
+ \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features
.fl
- support TR9401, XCatalog, and OASIS XML Catalog format.
+ \-xmlschema : treat input as W3C XML Schema (default)
.fl
- \-readOnly : generated files will be in read\-only mode
+ \-relaxng : treat input as RELAX NG (experimental,unsupported)
.fl
- \-npa : suppress generation of package level annotations (**/package\-info.java)
+ \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported)
.fl
- \-no\-header : suppress generation of a file header with timestamp
+ \-dtd : treat input as XML DTD (experimental,unsupported)
.fl
- \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features.
+ \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported)
+.fl
+ \-verbose : be extra verbose
.fl
- \-xmlschema : treat input as W3C XML Schema (default)
+ \-quiet : suppress compiler output
.fl
- \-relaxng : treat input as RELAX NG (experimental,unsupported)
+ \-help : display this help message
.fl
- \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported)
+ \-version : display version information
+.fl
+
.fl
- \-dtd : treat input as XML DTD (experimental,unsupported)
+
.fl
- \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported)
+Extensions:
.fl
- \-verbose : be extra verbose
+ \-Xlocator : enable source location support for generated code
.fl
- \-quiet : suppress compiler output
+ \-Xsync\-methods : generate accessor methods with the 'synchronized' keyword
.fl
- \-help : display this help message
+ \-mark\-generated : mark the generated code as @javax.annotation.Generated
.fl
- \-version : display version information
+ \-episode <FILE> : generate the episode file for separate compilation
.fl
\fP
.fi
-.RE
.LP
.SH "OPTIONS"
.LP
-
-.LP
.RS 3
.TP 3
\-nv
@@ -129,15 +131,9 @@
By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions
.TP 3
\-b <file>
-Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files:
-.RS 3
-
-.LP
-\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP
+Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP
.br
-\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP
-.RE
-In addition, the ordering of the schema files and binding files on the command line does not matter.
+\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter.
.TP 3
\-d <dir>
By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you.
@@ -199,12 +195,30 @@
<schema file/URL/dir>
Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them.
.RE
+
+.LP
.SS
-Summary of Deprecated and Removed Command Line Options
+Non\-Standard Command Line Options
.LP
.RS 3
+.TP 3
+\-Xlocator
+Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling.
+.TP 3
+\-Xsync\-methods
+Causes all of the generated method signatures to include the \f2synchronized\fP keyword.
+.TP 3
+\-mark\-generated
+Mark the generated code with the annotation \f2@javax.annotation.Generated\fP.
+.TP 3
+\-episode <file>
+Generate the specified episode file for separate compilation.
+.RE
.LP
+.SS
+Deprecated and Removed Command Line Options
+.LP
.RS 3
.TP 3
\-host & \-port
@@ -215,13 +229,9 @@
.TP 3
\-source
The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase.
-.TP 3
-\-Xlocator & \-Xsync\-methods
-These switches have been disabled for now. We plan on releasing this functionality as a separate download in the future.
.RE
.LP
-.RE
.SS
Compiler Restrictions
.LP
@@ -280,7 +290,7 @@
.na
\f2Java Architecture for XML Binding (JAXB)\fP @
.fi
-http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html
+http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
.RE
.LP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 "com_sun_management_UnixOperatingSystem.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 "%lld"
+
+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_UnixOperatingSystem_getSystemCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ if(perfInit() == 0) {
+ return get_cpu_load(-1);
+ } else {
+ return -1.0;
+ }
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad
+(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/solaris/native/com/sun/management/SolarisOperatingSystem.c Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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_UnixOperatingSystem.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_UnixOperatingSystem_getSystemCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return get_cpu_load(-1);
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return get_process_load();
+}
+
--- a/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Sat May 14 11:24:26 2011 -0700
@@ -58,6 +58,8 @@
public native long getProcessCpuTime();
public native long getFreePhysicalMemorySize();
public native long getTotalPhysicalMemorySize();
+ public native double getSystemCpuLoad();
+ public native double getProcessCpuLoad();
static {
initialize();
--- a/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Fri May 13 13:20:16 2011 +0200
+++ b/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,9 +34,27 @@
#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;
+typedef enum boolean_values { false=0, true=1};
+
static void set_low(jlong* value, jint low) {
*value &= (jlong)0xffffffff << 32;
*value |= (jlong)(julong)(juint)low;
@@ -56,11 +74,14 @@
static HANDLE main_process;
+int perfiInit(void);
+
JNIEXPORT void JNICALL
Java_com_sun_management_OperatingSystem_initialize
(JNIEnv *env, jclass cls)
{
main_process = GetCurrentProcess();
+ perfiInit();
}
JNIEXPORT jlong JNICALL
@@ -132,3 +153,788 @@
GlobalMemoryStatus(&ms);
return ms.dwTotalPhys;
}
+
+// 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
+pdh_fail(PDH_STATUS pdhStat) {
+ return pdhStat != ERROR_SUCCESS && pdhStat != PDH_MORE_DATA;
+}
+
+// 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.
+#define PDH_PROCESSOR_IDX ((DWORD) 238)
+#define PDH_PROCESSOR_TIME_IDX ((DWORD) 6)
+#define PDH_PRIV_PROCESSOR_TIME_IDX ((DWORD) 144)
+#define PDH_PROCESS_IDX ((DWORD) 230)
+#define PDH_ID_PROCESS_IDX ((DWORD) 784)
+#define PDH_CONTEXT_SWITCH_RATE_IDX ((DWORD) 146)
+#define PDH_SYSTEM_IDX ((DWORD) 2)
+#define PDH_VIRTUAL_BYTES_IDX ((DWORD) 174)
+
+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 DWORD (WINAPI *PdhCloseQueryFunc)(
+ HQUERY hQuery
+ );
+typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)(
+ HQUERY hQuery
+ );
+typedef DWORD (WINAPI *PdhGetFormattedCounterValueFunc)(
+ HCOUNTER hCounter,
+ DWORD dwFormat,
+ LPDWORD lpdwType,
+ PPDH_FMT_COUNTERVALUE pValue
+ );
+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 PDH_STATUS (WINAPI *PdhMakeCounterPathFunc)(
+ PDH_COUNTER_PATH_ELEMENTS *pCounterPathElements,
+ LPTSTR szFullPathBuffer,
+ LPDWORD pcchBufferSize,
+ DWORD dwFlags
+ );
+
+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;
+static PdhMakeCounterPathFunc PdhMakeCounterPath_i;
+
+static HANDLE thisProcess;
+static double cpuFactor;
+static DWORD num_cpus;
+
+#define FT2JLONG(X) ((((jlong)X.dwHighDateTime) << 32) | ((jlong)X.dwLowDateTime))
+#define COUNTER_BUF_SIZE 256
+// Min time between query updates.
+#define MIN_UPDATE_INTERVAL 500
+#define CONFIG_SUCCESSFUL 0
+
+/**
+ * Struct for PDH queries.
+ */
+typedef struct {
+ HQUERY query;
+ uint64_t lastUpdate; // Last time query was updated (current millis).
+} UpdateQueryS, *UpdateQueryP;
+
+/**
+ * Struct for the processor load counters.
+ */
+typedef struct {
+ UpdateQueryS query;
+ HCOUNTER* counters;
+ int noOfCounters;
+} MultipleCounterQueryS, *MultipleCounterQueryP;
+
+/**
+ * Struct for the jvm process load counter.
+ */
+typedef struct {
+ UpdateQueryS query;
+ HCOUNTER counter;
+} SingleCounterQueryS, *SingleCounterQueryP;
+
+static char* getProcessPDHHeader(void);
+
+/**
+ * Currently available counters.
+ */
+static SingleCounterQueryS cntCtxtSwitchRate;
+static SingleCounterQueryS cntVirtualSize;
+static SingleCounterQueryS cntProcLoad;
+static SingleCounterQueryS cntProcSystemLoad;
+static MultipleCounterQueryS multiCounterCPULoad;
+
+static CRITICAL_SECTION processHeaderLock;
+static CRITICAL_SECTION initializationLock;
+
+/**
+ * Initialize the perf module at startup.
+ */
+int
+perfiInit(void)
+{
+ InitializeCriticalSection(&processHeaderLock);
+ InitializeCriticalSection(&initializationLock);
+ return 0;
+}
+
+/**
+ * Dynamically sets up function pointers to the PDH library.
+ *
+ * @return CONFIG_SUCCESSFUL on success, negative on failure.
+ */
+static int
+get_functions(HMODULE h, char *ebuf, size_t elen) {
+ // 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");
+ PdhMakeCounterPath_i = (PdhMakeCounterPathFunc)GetProcAddress(h, "PdhMakeCounterPathA");
+
+ if (PdhAddCounter_i == NULL || PdhOpenQuery_i == NULL ||
+ PdhCloseQuery_i == NULL || PdhCollectQueryData_i == NULL ||
+ PdhGetFormattedCounterValue_i == NULL || PdhEnumObjectItems_i == NULL ||
+ PdhRemoveCounter_i == NULL || PdhLookupPerfNameByIndex_i == NULL || PdhMakeCounterPath_i == NULL)
+ {
+ _snprintf(ebuf, elen, "Required method could not be found.");
+ return -1;
+ }
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * 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 CONFIG_SUCCESSFUL 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;
+ now = clock();
+
+ // Need to limit how often we update the query
+ // to mimise 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 CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Places the resolved counter name of the counter at the specified index in the
+ * supplied buffer. There must be enough space in the buffer to hold the counter name.
+ *
+ * @param index the counter index as specified in the registry.
+ * @param buf the buffer in which to place the counter name.
+ * @param size the size of the counter name buffer.
+ * @param ebuf the error message buffer.
+ * @param elen the length of the error buffer.
+ * @return CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+find_name(DWORD index, char *buf, DWORD size) {
+ PDH_STATUS res;
+
+ if ((res = PdhLookupPerfNameByIndex_i(NULL, index, buf, &size)) != ERROR_SUCCESS) {
+
+ /* printf("Could not open counter %d: error=0x%08x", index, res); */
+ /* if (res == PDH_CSTATUS_NO_MACHINE) { */
+ /* printf("User probably does not have sufficient privileges to use"); */
+ /* printf("performance counters. If you are running on Windows 2003"); */
+ /* printf("or Windows Vista, make sure the user is in the"); */
+ /* printf("Performance Logs user group."); */
+ /* } */
+ return -1;
+ }
+
+ if (size == 0) {
+ /* printf("Failed to get counter name for %d: empty string", index); */
+ return -1;
+ }
+
+ // windows vista does not null-terminate the string (allthough the docs says it will)
+ buf[size - 1] = '\0';
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Sets up the supplied SingleCounterQuery to listen for the specified counter.
+ * initPDH() must have been run prior to calling this function!
+ *
+ * @param counterQuery the counter query to set up.
+ * @param counterString the string specifying the path to the counter.
+ * @param ebuf the error buffer.
+ * @param elen the length of the error buffer.
+ * @returns CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+initSingleCounterQuery(SingleCounterQueryP counterQuery, char *counterString) {
+ if (PdhOpenQuery_i(NULL, 0, &counterQuery->query.query) != ERROR_SUCCESS) {
+ /* printf("Could not open query for %s", counterString); */
+ return -1;
+ }
+ if (PdhAddCounter_i(counterQuery->query.query, counterString, 0, &counterQuery->counter) != ERROR_SUCCESS) {
+ /* printf("Could not add counter %s for query", counterString); */
+ if (counterQuery->counter != NULL) {
+ PdhRemoveCounter_i(counterQuery->counter);
+ }
+ if (counterQuery->query.query != NULL) {
+ PdhCloseQuery_i(counterQuery->query.query);
+ }
+ memset(counterQuery, 0, sizeof(SingleCounterQueryS));
+ return -1;
+ }
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Sets up the supplied SingleCounterQuery to listen for the time spent
+ * by the HotSpot process.
+ *
+ * @param counterQuery the counter query to set up as a process counter.
+ * @param ebuf the error buffer.
+ * @param elen the length of the error buffer.
+ * @returns CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+initProcLoadCounter(void) {
+ char time[COUNTER_BUF_SIZE];
+ char counter[COUNTER_BUF_SIZE*2];
+
+ if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) {
+ return -1;
+ }
+ _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time);
+ return initSingleCounterQuery(&cntProcLoad, counter);
+}
+
+static int
+initProcSystemLoadCounter(void) {
+ char time[COUNTER_BUF_SIZE];
+ char counter[COUNTER_BUF_SIZE*2];
+
+ if (find_name(PDH_PRIV_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) {
+ return -1;
+ }
+ _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time);
+ return initSingleCounterQuery(&cntProcSystemLoad, counter);
+}
+
+/**
+ * Sets up the supplied MultipleCounterQuery to check on the processors.
+ * (Comment: Refactor and prettify as with the the SingleCounter queries
+ * if more MultipleCounterQueries are discovered.)
+ *
+ * initPDH() must have been run prior to calling this function.
+ *
+ * @param multiQuery a pointer to a MultipleCounterQueryS, will be filled in with
+ * the necessary info to check the PDH processor counters.
+ * @return CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+initProcessorCounters(void) {
+ char processor[COUNTER_BUF_SIZE]; //'Processor' == #238
+ char time[COUNTER_BUF_SIZE]; //'Time' == 6
+ DWORD c_size, i_size;
+ HQUERY tmpQuery;
+ DWORD i, p_count;
+ BOOL error;
+ char *instances, *tmp;
+ PDH_STATUS pdhStat;
+
+ c_size = i_size = 0;
+ tmpQuery = NULL;
+ error = false;
+
+ // This __try / __except stuff is there since Windows 2000 beta (or so) sometimes triggered
+ // an access violation when the user had insufficient privileges to use the performance
+ // counters. This was previously guarded by a very ugly piece of code which disabled the
+ // global trap handling in JRockit. Don't know if this really is needed anymore, but otoh,
+ // if we keep it we don't crash on Win2k beta. /Ihse, 2005-05-30
+ __try {
+ if (find_name(PDH_PROCESSOR_IDX, processor, sizeof(processor)-1) < 0) {
+ return -1;
+ }
+ } __except (EXCEPTION_EXECUTE_HANDLER) { // We'll catch all exceptions here.
+ /* printf("User does not have sufficient privileges to use performance counters"); */
+ return -1;
+ }
+
+ if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) {
+ return -1;
+ }
+ //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
+ &c_size, // and 0 length to get
+ NULL, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+ if (pdh_fail(pdhStat)) {
+ /* printf("could not enumerate processors (1) error=%d", pdhStat); */
+ return -1;
+ }
+
+ // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will)
+ instances = calloc(i_size, 1);
+ if (instances == NULL) {
+ /* printf("could not allocate memory (1) %d bytes", i_size); */
+ error = true;
+ goto end;
+ }
+
+ c_size = 0;
+ pdhStat = PdhEnumObjectItems_i (
+ NULL, // reserved
+ NULL, // local machine
+ processor, // object to enumerate
+ NULL, // pass in NULL buffers
+ &c_size, // and 0 length to get
+ instances, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+
+ if (pdh_fail(pdhStat)) {
+ /* printf("could not enumerate processors (2) error=%d", pdhStat); */
+ error = true;
+ goto end;
+ }
+ //count perf count instances.
+ for (p_count = 0, tmp = instances; *tmp != 0; tmp = &tmp[lstrlen(tmp)+1], p_count++);
+
+ //is this correct for HT?
+ assert(p_count == num_cpus+1);
+
+ //ok, have number of perf counters.
+ multiCounterCPULoad.counters = calloc(p_count, sizeof(HCOUNTER));
+ if (multiCounterCPULoad.counters == NULL) {
+ /* printf("could not allocate memory (2) count=%d", p_count); */
+ error = true;
+ goto end;
+ }
+
+ multiCounterCPULoad.noOfCounters = p_count;
+
+ if (PdhOpenQuery_i(NULL, 0, &multiCounterCPULoad.query.query) != ERROR_SUCCESS) {
+ /* printf("could not create query"); */
+ error = true;
+ goto end;
+ }
+ //now, fetch the counters.
+ for (i = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[lstrlen(tmp)+1], i++) {
+ char counter[2*COUNTER_BUF_SIZE];
+
+ _snprintf(counter, sizeof(counter)-1, "\\%s(%s)\\%s", processor, tmp, time);
+
+ if (PdhAddCounter_i(multiCounterCPULoad.query.query, counter, 0, &multiCounterCPULoad.counters[i]) != ERROR_SUCCESS) {
+ /* printf("error adding processor counter %s", counter); */
+ error = true;
+ goto end;
+ }
+ }
+
+ free(instances);
+ instances = NULL;
+
+ // Query once to initialize the counters needing at least two queries
+ // (like the % CPU usage) to calculate correctly.
+ if (PdhCollectQueryData_i(multiCounterCPULoad.query.query) != ERROR_SUCCESS)
+ error = true;
+
+ end:
+ if (instances != NULL) {
+ free(instances);
+ }
+ if (tmpQuery != NULL) {
+ PdhCloseQuery_i(tmpQuery);
+ }
+ if (error) {
+ int i;
+
+ if (multiCounterCPULoad.counters != NULL) {
+ for (i = 0; i < multiCounterCPULoad.noOfCounters; i++) {
+ if (multiCounterCPULoad.counters[i] != NULL) {
+ PdhRemoveCounter_i(multiCounterCPULoad.counters[i]);
+ }
+ }
+ free(multiCounterCPULoad.counters[i]);
+ }
+ if (multiCounterCPULoad.query.query != NULL) {
+ PdhCloseQuery_i(multiCounterCPULoad.query.query);
+ }
+ memset(&multiCounterCPULoad, 0, sizeof(MultipleCounterQueryS));
+ return -1;
+ }
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Help function that initializes the PDH process header for the JRockit process.
+ * (You should probably use getProcessPDHHeader() instead!)
+ *
+ * initPDH() must have been run prior to calling this function.
+ *
+ * @param ebuf the error buffer.
+ * @param elen the length of the error buffer.
+ *
+ * @return the PDH instance description corresponding to the JVM process.
+ */
+static char*
+initProcessPDHHeader(void) {
+ static char hotspotheader[2*COUNTER_BUF_SIZE];
+
+ char counter[2*COUNTER_BUF_SIZE];
+ char processes[COUNTER_BUF_SIZE]; //'Process' == #230
+ char pid[COUNTER_BUF_SIZE]; //'ID Process' == 784
+ char module_name[MAX_PATH];
+ PDH_STATUS pdhStat;
+ DWORD c_size = 0, i_size = 0;
+ HQUERY tmpQuery = NULL;
+ int i, myPid = _getpid();
+ BOOL error = false;
+ char *instances, *tmp, *instance_name, *dot_pos;
+
+ tmpQuery = NULL;
+ myPid = _getpid();
+ error = false;
+
+ if (find_name(PDH_PROCESS_IDX, processes, sizeof(processes) - 1) < 0) {
+ return NULL;
+ }
+
+ if (find_name(PDH_ID_PROCESS_IDX, pid, sizeof(pid) - 1) < 0) {
+ return NULL;
+ }
+ //time is same.
+
+ c_size = 0;
+ i_size = 0;
+
+ pdhStat = PdhEnumObjectItems_i (
+ NULL, // reserved
+ NULL, // local machine
+ processes, // object to enumerate
+ NULL, // pass in NULL buffers
+ &c_size, // and 0 length to get
+ NULL, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+
+ //ok, now we have enough to enumerate all processes
+ if (pdh_fail(pdhStat)) {
+ /* printf("Could not enumerate processes (1) error=%d", pdhStat); */
+ return NULL;
+ }
+
+ // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will)
+ if ((instances = calloc(i_size, 1)) == NULL) {
+ /* printf("Could not allocate memory %d bytes", i_size); */
+ error = true;
+ goto end;
+ }
+
+ c_size = 0;
+
+ pdhStat = PdhEnumObjectItems_i (
+ NULL, // reserved
+ NULL, // local machine
+ processes, // object to enumerate
+ NULL, // pass in NULL buffers
+ &c_size, // and 0 length to get
+ instances, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+
+ // ok, now we have enough to enumerate all processes
+ if (pdh_fail(pdhStat)) {
+ /* printf("Could not enumerate processes (2) error=%d", pdhStat); */
+ error = true;
+ goto end;
+ }
+
+ if (PdhOpenQuery_i(NULL, 0, &tmpQuery) != ERROR_SUCCESS) {
+ /* printf("Could not create temporary query"); */
+ error = true;
+ goto end;
+ }
+
+ // Find our module name and use it to extract the instance name used by PDH
+ if (GetModuleFileName(NULL, module_name, MAX_PATH) >= MAX_PATH-1) {
+ /* printf("Module name truncated"); */
+ error = true;
+ goto end;
+ }
+ instance_name = strrchr(module_name, '\\'); //drop path
+ instance_name++; //skip slash
+ dot_pos = strchr(instance_name, '.'); //drop .exe
+ dot_pos[0] = '\0';
+
+ //now, fetch the counters.
+ for (tmp = instances; *tmp != 0 && !error; tmp = &tmp[lstrlen(tmp)+1]) {
+ HCOUNTER hc = NULL;
+ BOOL done = false;
+
+ // Skip until we find our own process name
+ if (strcmp(tmp, instance_name) != 0) {
+ continue;
+ }
+
+ // iterate over all instance indexes and try to find our own pid
+ for (i = 0; !done && !error; i++){
+ PDH_STATUS res;
+ _snprintf(counter, sizeof(counter)-1, "\\%s(%s#%d)\\%s", processes, tmp, i, pid);
+
+ if (PdhAddCounter_i(tmpQuery, counter, 0, &hc) != ERROR_SUCCESS) {
+ /* printf("Failed to create process id query"); */
+ error = true;
+ goto end;
+ }
+
+ res = PdhCollectQueryData_i(tmpQuery);
+
+ if (res == PDH_INVALID_HANDLE) {
+ /* printf("Failed to query process id"); */
+ res = -1;
+ done = true;
+ } else if (res == PDH_NO_DATA) {
+ done = true;
+ } else {
+ PDH_FMT_COUNTERVALUE cv;
+
+ PdhGetFormattedCounterValue_i(hc, PDH_FMT_LONG, NULL, &cv);
+ /*
+ * 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 (cv.CStatus != PDH_CSTATUS_VALID_DATA) {
+ done = true;
+ } else if (cv.longValue == myPid) {
+ _snprintf(hotspotheader, sizeof(hotspotheader)-1, "\\%s(%s#%d)\0", processes, tmp, i);
+ PdhRemoveCounter_i(hc);
+ goto end;
+ }
+ }
+ PdhRemoveCounter_i(hc);
+ }
+ }
+ end:
+ if (instances != NULL) {
+ free(instances);
+ }
+ if (tmpQuery != NULL) {
+ PdhCloseQuery_i(tmpQuery);
+ }
+ if (error) {
+ return NULL;
+ }
+ return hotspotheader;
+}
+
+/**
+ * Returns the PDH string prefix identifying the HotSpot process. Use this prefix when getting
+ * counters from the PDH process object representing HotSpot.
+ *
+ * Note: this call may take some time to complete.
+ *
+ * @param ebuf error buffer.
+ * @param elen error buffer length.
+ *
+ * @return the header to be used when retrieving PDH counters from the HotSpot process.
+ * Will return NULL if the call failed.
+ */
+static char *
+getProcessPDHHeader(void) {
+ static char *processHeader = NULL;
+
+ EnterCriticalSection(&processHeaderLock); {
+ if (processHeader == NULL) {
+ processHeader = initProcessPDHHeader();
+ }
+ } LeaveCriticalSection(&processHeaderLock);
+ return processHeader;
+}
+
+int perfInit(void);
+
+double
+perfGetCPULoad(int which)
+{
+ PDH_FMT_COUNTERVALUE cv;
+ HCOUNTER c;
+
+ if (perfInit() < 0) {
+ // warn?
+ return -1.0;
+ }
+
+ if (multiCounterCPULoad.query.query == NULL) {
+ // warn?
+ return -1.0;
+ }
+
+ if (which == -1) {
+ 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 ) == CONFIG_SUCCESSFUL) {
+ return cv.doubleValue / 100;
+ }
+ return -1.0;
+}
+
+double
+perfGetProcessLoad(void)
+{
+ PDH_FMT_COUNTERVALUE cv;
+
+ if (perfInit() < 0) {
+ // warn?
+ return -1.0;
+ }
+
+ if (cntProcLoad.query.query == NULL) {
+ // warn?
+ return -1.0;
+ }
+
+ if (getPerformanceData(&cntProcLoad.query, cntProcLoad.counter, &cv, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100) == CONFIG_SUCCESSFUL) {
+ double d = cv.doubleValue / cpuFactor;
+ d = min(1, d);
+ d = max(0, d);
+ return d;
+ }
+ return -1.0;
+}
+
+/**
+ * Helper to initialize the PDH library. Loads the library and sets up the functions.
+ * Note that once loaded, we will never unload the PDH library.
+ *
+ * @return CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+int
+perfInit(void) {
+ static HMODULE h;
+ static BOOL running, inited;
+
+ int error;
+
+ if (running) {
+ return CONFIG_SUCCESSFUL;
+ }
+
+ error = CONFIG_SUCCESSFUL;
+
+ // this is double checked locking again, but we try to bypass the worst by
+ // implicit membar at end of lock.
+ EnterCriticalSection(&initializationLock); {
+ if (!inited) {
+ char buf[64] = "";
+ SYSTEM_INFO si;
+
+ // CMH. But windows will not care about our affinity when giving
+ // us measurements. Need the real, raw num cpus.
+
+ GetSystemInfo(&si);
+ num_cpus = si.dwNumberOfProcessors;
+ // Initialize the denominator for the jvm load calculations
+ cpuFactor = num_cpus * 100;
+
+ /**
+ * Do this dynamically, so we don't fail to start on systems without pdh.
+ */
+ if ((h = LoadLibrary("pdh.dll")) == NULL) {
+ /* printf("Could not load pdh.dll (%d)", GetLastError()); */
+ error = -2;
+ } else if (get_functions(h, buf, sizeof(buf)) < 0) {
+ FreeLibrary(h);
+ h = NULL;
+ error = -2;
+ /* printf("Failed to init pdh functions: %s.\n", buf); */
+ } else {
+ if (initProcessorCounters() != 0) {
+ /* printf("Failed to init system load counters.\n"); */
+ } else if (initProcLoadCounter() != 0) {
+ /* printf("Failed to init process load counter.\n"); */
+ } else if (initProcSystemLoadCounter() != 0) {
+ /* printf("Failed to init process system load counter.\n"); */
+ } else {
+ inited = true;
+ }
+ }
+ }
+ } LeaveCriticalSection(&initializationLock);
+
+ if (inited && error == CONFIG_SUCCESSFUL) {
+ running = true;
+ }
+
+ return error;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_OperatingSystem_getSystemCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return perfGetCPULoad(-1);
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_OperatingSystem_getProcessCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return perfGetProcessLoad();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7028071
+ * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
+ *
+ * @run main GetProcessCpuLoad
+ */
+
+import java.lang.management.*;
+import com.sun.management.OperatingSystemMXBean;
+
+public class GetProcessCpuLoad {
+ public static void main(String[] argv) throws Exception {
+ OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean)
+ ManagementFactory.getOperatingSystemMXBean();
+ double load;
+ for(int i=0; i<10; i++) {
+ load = mbean.getProcessCpuLoad();
+ if((load<0.0 || load>1.0) && load != -1.0) {
+ throw new RuntimeException("getProcessCpuLoad() returns " + load
+ + " which is not in the [0.0,1.0] interval");
+ }
+ try {
+ Thread.sleep(200);
+ } catch(InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7028071
+ * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
+ *
+ * @run main GetSystemCpuLoad
+ */
+
+import java.lang.management.*;
+import com.sun.management.OperatingSystemMXBean;
+
+public class GetSystemCpuLoad {
+ public static void main(String[] argv) throws Exception {
+ OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean)
+ ManagementFactory.getOperatingSystemMXBean();
+ double load;
+ for(int i=0; i<10; i++) {
+ load = mbean.getSystemCpuLoad();
+ if((load<0.0 || load>1.0) && load != -1.0) {
+ throw new RuntimeException("getSystemCpuLoad() returns " + load
+ + " which is not in the [0.0,1.0] interval");
+ }
+ try {
+ Thread.sleep(200);
+ } catch(InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/spec/EllipticCurveMatch.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6738532
+ * @summary Check EllipticCurve.equals() does not compare seed value of curve.
+ * @run main/othervm EllipticCurveMatch
+ * @author Mike StJohns
+ */
+
+import java.security.spec.*;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+
+public class EllipticCurveMatch {
+ static String primeP256 =
+ "0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF";
+ static String aP256 =
+ "0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC";
+ static String bP256 =
+ "05AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B";
+ static String seedP256 =
+ "0C49D360886E704936A6678E1139D26B7819F7E90";
+
+ private static EllipticCurve addSeedToCurve(EllipticCurve curve)
+ {
+ SecureRandom rand = new SecureRandom();
+ byte[] seed = new byte[12];
+ rand.nextBytes(seed);
+
+ return new EllipticCurve (curve.getField(), curve.getA(), curve.getB(),
+ seed);
+ }
+
+ private static EllipticCurve getP256Curve()
+ {
+ ECFieldFp field = new ECFieldFp(new BigInteger (primeP256,16));
+ BigInteger a = new BigInteger (aP256, 16);
+ BigInteger b = new BigInteger (bP256, 16);
+
+ return new EllipticCurve (field, a, b);
+ }
+
+ public static void main (String[] argv) throws Exception {
+ EllipticCurve firstCurve = getP256Curve();
+ EllipticCurve secondCurve = addSeedToCurve(firstCurve);
+ EllipticCurve thirdCurve = addSeedToCurve(firstCurve);
+
+ if (!firstCurve.equals(firstCurve))
+ throw new Exception("Original curve doesn't equal itself");
+
+ if (!firstCurve.equals(secondCurve))
+ throw new Exception ("Original curve doesn't equal seeded curve");
+
+ if (!secondCurve.equals(secondCurve))
+ throw new Exception ("Seeded curve doesn't equal itself");
+
+ if (!secondCurve.equals(thirdCurve))
+ throw new Exception ("Seeded curve doesn't equal differently " +
+ "seeded curve");
+ System.out.println("Curve equals test passed");
+ }
+}
--- a/jdk/test/java/util/Locale/LocaleEnhanceTest.java Fri May 13 13:20:16 2011 +0200
+++ b/jdk/test/java/util/Locale/LocaleEnhanceTest.java Sat May 14 11:24:26 2011 -0700
@@ -45,7 +45,7 @@
/**
* @test
- * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504
+ * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603 7044019
* @summary test API changes to Locale
* @compile LocaleEnhanceTest.java
* @run main/othervm -esa LocaleEnhanceTest
@@ -616,11 +616,9 @@
assertEquals("latn US", "Latin", latnLocale.getDisplayScript());
assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript());
- // note, no localization data yet other than US
- // this should break when we have localization data for DE
Locale.setDefault(Locale.GERMANY);
- assertEquals("latn DE", "Latin", latnLocale.getDisplayScript());
- assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript());
+ assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript());
+ assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript());
Locale.setDefault(oldLocale);
}
@@ -632,10 +630,8 @@
assertEquals("latn US", "Latin", latnLocale.getDisplayScript(Locale.US));
assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript(Locale.US));
- // note, no localization data yet other than US
- // this should break when we have localization data for DE
- assertEquals("latn DE", "Latin", latnLocale.getDisplayScript(Locale.GERMANY));
- assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript(Locale.GERMANY));
+ assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript(Locale.GERMANY));
+ assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript(Locale.GERMANY));
}
public void testGetDisplayName() {
--- a/langtools/.hgtags Fri May 13 13:20:16 2011 +0200
+++ b/langtools/.hgtags Sat May 14 11:24:26 2011 -0700
@@ -115,3 +115,4 @@
53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
258e6654aba25aab91c9ba3b4c53d05bc895a86c jdk7-b140
+90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141
--- a/langtools/src/share/classes/com/sun/source/util/Trees.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/source/util/Trees.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* 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 @@
import javax.tools.Diagnostic;
import javax.tools.JavaCompiler.CompilationTask;
+import com.sun.source.tree.CatchTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.MethodTree;
@@ -207,4 +208,11 @@
public abstract void printMessage(Diagnostic.Kind kind, CharSequence msg,
com.sun.source.tree.Tree t,
com.sun.source.tree.CompilationUnitTree root);
+
+ /**
+ * Gets the lub of an exception parameter declared in a catch clause.
+ * @param tree the tree for the catch clause
+ * @return The lub of the exception parameter
+ */
+ public abstract TypeMirror getLub(CatchTree tree);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Sat May 14 11:24:26 2011 -0700
@@ -149,11 +149,20 @@
ClassUseMapper mapper = new ClassUseMapper(configuration.root, classtree);
ClassDoc[] classes = configuration.root.classes();
for (int i = 0; i < classes.length; i++) {
- ClassUseWriter.generate(configuration, mapper, classes[i]);
+ // If -nodeprecated option is set and the containing package is marked
+ // as deprecated, do not generate the class-use page. We will still generate
+ // the class-use page if the class is marked as deprecated but the containing
+ // package is not since it could still be linked from that package-use page.
+ if (!(configuration.nodeprecated &&
+ Util.isDeprecated(classes[i].containingPackage())))
+ ClassUseWriter.generate(configuration, mapper, classes[i]);
}
PackageDoc[] pkgs = configuration.packages;
for (int i = 0; i < pkgs.length; i++) {
- PackageUseWriter.generate(configuration, mapper, pkgs[i]);
+ // If -nodeprecated option is set and the package is marked
+ // as deprecated, do not generate the package-use page.
+ if (!(configuration.nodeprecated && Util.isDeprecated(pkgs[i])))
+ PackageUseWriter.generate(configuration, mapper, pkgs[i]);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
* 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 @@
import com.sun.javadoc.*;
import java.util.*;
import java.io.*;
+import java.net.*;
/**
* Configure the output based on the command line options.
@@ -48,6 +49,7 @@
* @author Robert Field.
* @author Atul Dambalkar.
* @author Jamie Ho
+ * @author Bhavesh Patel (Modified)
*/
public class ConfigurationImpl extends Configuration {
@@ -110,6 +112,11 @@
public String stylesheetfile = "";
/**
+ * Argument for command line option "-Xdocrootparent".
+ */
+ public String docrootparent = "";
+
+ /**
* True if command line option "-nohelp" is used. Default value is false.
*/
public boolean nohelp = false;
@@ -239,6 +246,8 @@
stylesheetfile = os[1];
} else if (opt.equals("-charset")) {
charset = os[1];
+ } else if (opt.equals("-xdocrootparent")) {
+ docrootparent = os[1];
} else if (opt.equals("-nohelp")) {
nohelp = true;
} else if (opt.equals("-splitindex")) {
@@ -322,7 +331,8 @@
option.equals("-helpfile") ||
option.equals("-stylesheetfile") ||
option.equals("-charset") ||
- option.equals("-overview")) {
+ option.equals("-overview") ||
+ option.equals("-xdocrootparent")) {
return 2;
} else {
return 0;
@@ -372,6 +382,13 @@
return false;
}
nohelp = true;
+ } else if (opt.equals("-xdocrootparent")) {
+ try {
+ new URL(os[1]);
+ } catch (MalformedURLException e) {
+ reporter.printError(getText("doclet.MalformedURL", os[1]));
+ return false;
+ }
} else if (opt.equals("-overview")) {
if (nooverview == true) {
reporter.printError(getText("doclet.Option_conflict",
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,15 +42,15 @@
public class DeprecatedListWriter extends SubWriterHolderWriter {
private static final String[] ANCHORS = new String[] {
- "interface", "class", "enum", "exception", "error", "annotation_type",
- "field", "method", "constructor", "enum_constant",
+ "package", "interface", "class", "enum", "exception", "error",
+ "annotation_type", "field", "method", "constructor", "enum_constant",
"annotation_type_member"
};
private static final String[] HEADING_KEYS = new String[] {
- "doclet.Deprecated_Interfaces", "doclet.Deprecated_Classes",
- "doclet.Deprecated_Enums", "doclet.Deprecated_Exceptions",
- "doclet.Deprecated_Errors",
+ "doclet.Deprecated_Packages", "doclet.Deprecated_Interfaces",
+ "doclet.Deprecated_Classes", "doclet.Deprecated_Enums",
+ "doclet.Deprecated_Exceptions", "doclet.Deprecated_Errors",
"doclet.Deprecated_Annotation_Types",
"doclet.Deprecated_Fields",
"doclet.Deprecated_Methods", "doclet.Deprecated_Constructors",
@@ -59,9 +59,9 @@
};
private static final String[] SUMMARY_KEYS = new String[] {
- "doclet.deprecated_interfaces", "doclet.deprecated_classes",
- "doclet.deprecated_enums", "doclet.deprecated_exceptions",
- "doclet.deprecated_errors",
+ "doclet.deprecated_packages", "doclet.deprecated_interfaces",
+ "doclet.deprecated_classes", "doclet.deprecated_enums",
+ "doclet.deprecated_exceptions", "doclet.deprecated_errors",
"doclet.deprecated_annotation_types",
"doclet.deprecated_fields",
"doclet.deprecated_methods", "doclet.deprecated_constructors",
@@ -70,7 +70,7 @@
};
private static final String[] HEADER_KEYS = new String[] {
- "doclet.Interface", "doclet.Class",
+ "doclet.Package", "doclet.Interface", "doclet.Class",
"doclet.Enum", "doclet.Exceptions",
"doclet.Errors",
"doclet.AnnotationType",
@@ -116,7 +116,7 @@
DeprecatedListWriter depr =
new DeprecatedListWriter(configuration, filename);
depr.generateDeprecatedListFile(
- new DeprecatedAPIListBuilder(configuration.root));
+ new DeprecatedAPIListBuilder(configuration));
depr.close();
} catch (IOException exc) {
configuration.standardmessage.error(
@@ -149,8 +149,14 @@
memberTableHeader[0] = configuration.getText("doclet.0_and_1",
configuration.getText(HEADER_KEYS[i]),
configuration.getText("doclet.Description"));
- writers[i].addDeprecatedAPI(deprapi.getList(i),
- HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
+ // DeprecatedAPIListBuilder.PACKAGE == 0, so if i == 0, it is
+ // a PackageDoc.
+ if (i == DeprecatedAPIListBuilder.PACKAGE)
+ addPackageDeprecatedAPI(deprapi.getList(i),
+ HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
+ else
+ writers[i - 1].addDeprecatedAPI(deprapi.getList(i),
+ HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
}
}
body.addContent(div);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -198,23 +198,27 @@
PackageIndexFrameWriter.generate(configuration);
}
PackageDoc prev = null, next;
- for(int i = 0; i < packages.length; i++) {
- PackageFrameWriter.generate(configuration, packages[i]);
- next = (i + 1 < packages.length && packages[i+1].name().length() > 0) ?
- packages[i+1] : null;
- //If the next package is unnamed package, skip 2 ahead if possible
- next = (i + 2 < packages.length && next == null) ?
- packages[i+2]: next;
- AbstractBuilder packageSummaryBuilder = configuration.
- getBuilderFactory().getPackageSummaryBuilder(
- packages[i], prev, next);
- packageSummaryBuilder.build();
- if (configuration.createtree) {
- PackageTreeWriter.generate(configuration,
- packages[i], prev, next,
- configuration.nodeprecated);
+ for (int i = 0; i < packages.length; i++) {
+ // if -nodeprecated option is set and the package is marked as
+ // deprecated, do not generate the package-summary.html, package-frame.html
+ // and package-tree.html pages for that package.
+ if (!(configuration.nodeprecated && Util.isDeprecated(packages[i]))) {
+ PackageFrameWriter.generate(configuration, packages[i]);
+ next = (i + 1 < packages.length &&
+ packages[i + 1].name().length() > 0) ? packages[i + 1] : null;
+ //If the next package is unnamed package, skip 2 ahead if possible
+ next = (i + 2 < packages.length && next == null) ? packages[i + 2] : next;
+ AbstractBuilder packageSummaryBuilder =
+ configuration.getBuilderFactory().getPackageSummaryBuilder(
+ packages[i], prev, next);
+ packageSummaryBuilder.build();
+ if (configuration.createtree) {
+ PackageTreeWriter.generate(configuration,
+ packages[i], prev, next,
+ configuration.nodeprecated);
+ }
+ prev = packages[i];
}
- prev = packages[i];
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat May 14 11:24:26 2011 -0700
@@ -159,22 +159,42 @@
StringBuilder buf = new StringBuilder();
int previndex = 0;
while (true) {
- // Search for lowercase version of {@docRoot}
- index = lowerHtml.indexOf("{@docroot}", previndex);
- // If next {@docRoot} tag not found, append rest of htmlstr and exit loop
- if (index < 0) {
- buf.append(htmlstr.substring(previndex));
- break;
- }
- // If next {@docroot} tag found, append htmlstr up to start of tag
- buf.append(htmlstr.substring(previndex, index));
- previndex = index + 10; // length for {@docroot} string
- // Insert relative path where {@docRoot} was located
- buf.append(relativepathNoSlash);
- // Append slash if next character is not a slash
- if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length()
- && htmlstr.charAt(previndex) != '/') {
- buf.append(DirectoryManager.URL_FILE_SEPARATOR);
+ if (configuration.docrootparent.length() > 0) {
+ // Search for lowercase version of {@docRoot}/..
+ index = lowerHtml.indexOf("{@docroot}/..", previndex);
+ // If next {@docRoot}/.. pattern not found, append rest of htmlstr and exit loop
+ if (index < 0) {
+ buf.append(htmlstr.substring(previndex));
+ break;
+ }
+ // If next {@docroot}/.. pattern found, append htmlstr up to start of tag
+ buf.append(htmlstr.substring(previndex, index));
+ previndex = index + 13; // length for {@docroot}/.. string
+ // Insert docrootparent absolute path where {@docRoot}/.. was located
+
+ buf.append(configuration.docrootparent);
+ // Append slash if next character is not a slash
+ if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') {
+ buf.append(DirectoryManager.URL_FILE_SEPARATOR);
+ }
+ } else {
+ // Search for lowercase version of {@docRoot}
+ index = lowerHtml.indexOf("{@docroot}", previndex);
+ // If next {@docRoot} tag not found, append rest of htmlstr and exit loop
+ if (index < 0) {
+ buf.append(htmlstr.substring(previndex));
+ break;
+ }
+ // If next {@docroot} tag found, append htmlstr up to start of tag
+ buf.append(htmlstr.substring(previndex, index));
+ previndex = index + 10; // length for {@docroot} string
+ // Insert relative path where {@docRoot} was located
+ buf.append(relativepathNoSlash);
+ // Append slash if next character is not a slash
+ if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length() &&
+ htmlstr.charAt(previndex) != '/') {
+ buf.append(DirectoryManager.URL_FILE_SEPARATOR);
+ }
}
}
return buf.toString();
@@ -1395,6 +1415,44 @@
}
/**
+ * Add package deprecation information to the documentation tree
+ *
+ * @param deprPkgs list of deprecated packages
+ * @param headingKey the caption for the deprecated package table
+ * @param tableSummary the summary for the deprecated package table
+ * @param tableHeader table headers for the deprecated package table
+ * @param contentTree the content tree to which the deprecated package table will be added
+ */
+ protected void addPackageDeprecatedAPI(List<Doc> deprPkgs, String headingKey,
+ String tableSummary, String[] tableHeader, Content contentTree) {
+ if (deprPkgs.size() > 0) {
+ Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
+ getTableCaption(configuration().getText(headingKey)));
+ table.addContent(getSummaryTableHeader(tableHeader, "col"));
+ Content tbody = new HtmlTree(HtmlTag.TBODY);
+ for (int i = 0; i < deprPkgs.size(); i++) {
+ PackageDoc pkg = (PackageDoc) deprPkgs.get(i);
+ HtmlTree td = HtmlTree.TD(HtmlStyle.colOne,
+ getPackageLink(pkg, getPackageName(pkg)));
+ if (pkg.tags("deprecated").length > 0) {
+ addInlineDeprecatedComment(pkg, pkg.tags("deprecated")[0], td);
+ }
+ HtmlTree tr = HtmlTree.TR(td);
+ if (i % 2 == 0) {
+ tr.addStyle(HtmlStyle.altColor);
+ } else {
+ tr.addStyle(HtmlStyle.rowColor);
+ }
+ tbody.addContent(tr);
+ }
+ table.addContent(tbody);
+ Content li = HtmlTree.LI(HtmlStyle.blockList, table);
+ Content ul = HtmlTree.UL(HtmlStyle.blockList, li);
+ contentTree.addContent(ul);
+ }
+ }
+
+ /**
* Prine table header information about color, column span and the font.
*
* @param color Background color.
@@ -2120,7 +2178,7 @@
}
}
text = (isplaintext) ?
- refMemName : getCode() + refMemName + getCodeEnd();
+ refMemName : getCode() + Util.escapeHtmlChars(refMemName) + getCodeEnd();
result.append(getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing,
refMem, (label.length() == 0)? text: label, false));
@@ -2280,6 +2338,7 @@
public String commentTagsToString(Tag holderTag, Doc doc, Tag[] tags,
boolean isFirstSentence) {
StringBuilder result = new StringBuilder();
+ boolean textTagChange = false;
// Array of all possible inline tags for this javadoc run
configuration.tagletManager.checkTags(doc, tags, true);
for (int i = 0; i < tags.length; i++) {
@@ -2295,13 +2354,26 @@
result.append(output == null ? "" : output.toString());
if (originalLength == 0 && isFirstSentence && tagelem.name().equals("@inheritDoc") && result.length() > 0) {
break;
+ } else if (configuration.docrootparent.length() > 0 &&
+ tagelem.name().equals("@docRoot") &&
+ ((tags[i + 1]).text()).startsWith("/..")) {
+ //If Xdocrootparent switch ON, set the flag to remove the /.. occurance after
+ //{@docRoot} tag in the very next Text tag.
+ textTagChange = true;
+ continue;
} else {
- continue;
+ continue;
}
} else {
+ String text = tagelem.text();
+ //If Xdocrootparent switch ON, remove the /.. occurance after {@docRoot} tag.
+ if (textTagChange) {
+ text = text.replaceFirst("/..", "");
+ textTagChange = false;
+ }
//This is just a regular text tag. The text may contain html links (<a>)
//or inline tag {@docRoot}, which will be handled as special cases.
- String text = redirectRelativeLinks(tagelem.holder(), tagelem.text());
+ text = redirectRelativeLinks(tagelem.holder(), text);
// Replace @docRoot only if not represented by an instance of DocRootTaglet,
// that is, only if it was not present in a source file doc comment.
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
* 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 @@
packgen = new PackageFrameWriter(configuration, packageDoc);
String pkgName = Util.getPackageName(packageDoc);
Content body = packgen.getBody(false, packgen.getWindowTitle(pkgName));
- Content pkgNameContent = new StringContent(pkgName);
+ Content pkgNameContent = new RawHtml(pkgName);
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar,
packgen.getTargetPackageLink(packageDoc, "classFrame", pkgNameContent));
body.addContent(heading);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -80,7 +80,10 @@
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.addAttr(HtmlAttr.TITLE, packagesLabel.toString());
for(int i = 0; i < packages.length; i++) {
- if (packages[i] != null) {
+ // Do not list the package if -nodeprecated option is set and the
+ // package is marked as deprecated.
+ if (packages[i] != null &&
+ (!(configuration.nodeprecated && Util.isDeprecated(packages[i])))) {
ul.addContent(getPackage(packages[i]));
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Sat May 14 11:24:26 2011 -0700
@@ -137,6 +137,8 @@
protected void addPackagesList(PackageDoc[] packages, Content tbody) {
for (int i = 0; i < packages.length; i++) {
if (packages[i] != null && packages[i].name().length() > 0) {
+ if (configuration.nodeprecated && Util.isDeprecated(packages[i]))
+ continue;
Content packageLinkContent = getPackageLink(packages[i],
getPackageName(packages[i]));
Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, packageLinkContent);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Sat May 14 11:24:26 2011 -0700
@@ -242,11 +242,16 @@
*/
protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException {
Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
- getHyperLink("", pkg.name(), new StringContent(Util.getPackageName(pkg))));
+ getHyperLink("", Util.getPackageName(pkg),
+ new RawHtml(Util.getPackageName(pkg))));
contentTree.addContent(tdFirst);
HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
tdLast.addStyle(HtmlStyle.colLast);
- addSummaryComment(pkg, tdLast);
+ if (pkg != null && pkg.name().length() != 0) {
+ addSummaryComment(pkg, tdLast);
+ } else {
+ tdLast.addContent(getSpace());
+ }
contentTree.addContent(tdLast);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Sat May 14 11:24:26 2011 -0700
@@ -114,11 +114,12 @@
Content packageHead = new RawHtml(heading);
tHeading.addContent(packageHead);
div.addContent(tHeading);
+ addDeprecationInfo(div);
if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) {
- HtmlTree subTitleDiv = new HtmlTree(HtmlTag.DIV);
- subTitleDiv.addStyle(HtmlStyle.subTitle);
- addSummaryComment(packageDoc, subTitleDiv);
- div.addContent(subTitleDiv);
+ HtmlTree docSummaryDiv = new HtmlTree(HtmlTag.DIV);
+ docSummaryDiv.addStyle(HtmlStyle.docSummary);
+ addSummaryComment(packageDoc, docSummaryDiv);
+ div.addContent(docSummaryDiv);
Content space = getSpace();
Content descLink = getHyperLink("", "package_description",
descriptionLabel, "", "");
@@ -139,6 +140,28 @@
}
/**
+ * Add the package deprecation information to the documentation tree.
+ *
+ * @param div the content tree to which the deprecation information will be added
+ */
+ public void addDeprecationInfo(Content div) {
+ Tag[] deprs = packageDoc.tags("deprecated");
+ if (Util.isDeprecated(packageDoc)) {
+ HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
+ deprDiv.addStyle(HtmlStyle.deprecatedContent);
+ Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase);
+ deprDiv.addContent(deprPhrase);
+ if (deprs.length > 0) {
+ Tag[] commentTags = deprs[0].inlineTags();
+ if (commentTags.length > 0) {
+ addInlineDeprecatedComment(packageDoc, deprs[0], deprDiv);
+ }
+ }
+ div.addContent(deprDiv);
+ }
+ }
+
+ /**
* {@inheritDoc}
*/
public Content getSummaryHeader() {
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Sat May 14 11:24:26 2011 -0700
@@ -82,12 +82,20 @@
}
PackageDoc[] pds = rd.specifiedPackages();
for (int i = 0; i < pds.length; i++) {
- convertPackage(configuration, pds[i], outputdir);
+ // If -nodeprecated option is set and the package is marked as deprecated,
+ // do not convert the package files to HTML.
+ if (!(configuration.nodeprecated && Util.isDeprecated(pds[i])))
+ convertPackage(configuration, pds[i], outputdir);
}
ClassDoc[] cds = rd.specifiedClasses();
for (int i = 0; i < cds.length; i++) {
- convertClass(configuration, cds[i],
- getPackageOutputDir(outputdir, cds[i].containingPackage()));
+ // If -nodeprecated option is set and the class is marked as deprecated
+ // or the containing package is deprecated, do not convert the
+ // package files to HTML.
+ if (!(configuration.nodeprecated &&
+ (Util.isDeprecated(cds[i]) || Util.isDeprecated(cds[i].containingPackage()))))
+ convertClass(configuration, cds[i],
+ getPackageOutputDir(outputdir, cds[i].containingPackage()));
}
}
@@ -106,7 +114,12 @@
String classOutputdir = getPackageOutputDir(outputdir, pd);
ClassDoc[] cds = pd.allClasses();
for (int i = 0; i < cds.length; i++) {
- convertClass(configuration, cds[i], classOutputdir);
+ // If -nodeprecated option is set and the class is marked as deprecated,
+ // do not convert the package files to HTML. We do not check for
+ // containing package deprecation since it is already check in
+ // the calling method above.
+ if (!(configuration.nodeprecated && Util.isDeprecated(cds[i])))
+ convertClass(configuration, cds[i], classOutputdir);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,10 @@
* {@inheritDoc}
*/
public TagletOutput getDocRootOutput() {
- return new TagletOutputImpl(htmlWriter.relativepathNoSlash);
+ if (htmlWriter.configuration.docrootparent.length() > 0)
+ return new TagletOutputImpl(htmlWriter.configuration.docrootparent);
+ else
+ return new TagletOutputImpl(htmlWriter.relativepathNoSlash);
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -132,7 +132,11 @@
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.addStyle(HtmlStyle.horizontal);
for (int i = 0; i < packages.length; i++) {
- if (packages[i].name().length() == 0) {
+ // If the package name length is 0 or if -nodeprecated option
+ // is set and the package is marked as deprecated, do not include
+ // the page in the list of package hierarchies.
+ if (packages[i].name().length() == 0 ||
+ (configuration.nodeprecated && Util.isDeprecated(packages[i]))) {
continue;
}
String link = pathString(packages[i], "package-tree.html");
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@
contentContainer,
description,
details,
+ docSummary,
header,
horizontal,
footer,
@@ -67,6 +68,7 @@
subNavList,
subTitle,
summary,
+ deprecatedContent,
tabEnd,
title,
topNav;
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Sat May 14 11:24:26 2011 -0700
@@ -68,6 +68,7 @@
doclet.see.malformed_tag=Tag {0}: Malformed: {1}
doclet.Inherited_API_Summary=Inherited API Summary
doclet.Deprecated_API=Deprecated API
+doclet.Deprecated_Packages=Deprecated Packages
doclet.Deprecated_Classes=Deprecated Classes
doclet.Deprecated_Enums=Deprecated Enums
doclet.Deprecated_Interfaces=Deprecated Interfaces
@@ -79,6 +80,7 @@
doclet.Deprecated_Methods=Deprecated Methods
doclet.Deprecated_Enum_Constants=Deprecated Enum Constants
doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements
+doclet.deprecated_packages=deprecated packages
doclet.deprecated_classes=deprecated classes
doclet.deprecated_enums=deprecated enums
doclet.deprecated_interfaces=deprecated interfaces
@@ -245,6 +247,7 @@
-tag <name>:<locations>:<header> Specify single argument custom tags\n\
-taglet The fully qualified name of Taglet to register\n\
-tagletpath The path to Taglets\n\
+ -Xdocrootparent <url> Replaces all appearances of @docRoot followed by /.. in doc comments with <url>\n\
-charset <charset> Charset for cross-platform viewing of generated documentation.\n\
-helpfile <file> Include file that help link links to\n\
-linksource Generate source in HTML\n\
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Sat May 14 11:24:26 2011 -0700
@@ -11,54 +11,30 @@
doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64
doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64
-# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc.
doclet.Prev=\u524D
-# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc.
doclet.Next=\u6B21
-# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc.
-doclet.Prev_Class=PREV CLASS
-# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc.
-doclet.Next_Class=NEXT CLASS
-# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc.
-doclet.Prev_Package=PREV PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc.
-doclet.Next_Package=NEXT PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index.
-doclet.Prev_Letter=PREV LETTER
-# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index.
-doclet.Next_Letter=NEXT LETTER
-# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc.
-doclet.Show_Lists=SHOW LISTS
-# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc.
-doclet.Hide_Lists=HIDE LISTS
+doclet.Prev_Class=\u524D\u306E\u30AF\u30E9\u30B9
+doclet.Next_Class=\u6B21\u306E\u30AF\u30E9\u30B9
+doclet.Prev_Package=\u524D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.Next_Package=\u6B21\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.Prev_Letter=\u524D\u306E\u6587\u5B57
+doclet.Next_Letter=\u6B21\u306E\u6587\u5B57
doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9
doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8
doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary.
-doclet.Summary=SUMMARY:
-# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail.
-doclet.Detail=DETAIL:
-# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc.
-doclet.navNested=NESTED
-# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc.
-doclet.navAnnotationTypeOptionalMember=OPTIONAL
-# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeRequiredMember=REQUIRED
-# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeMember=ELEMENT
-# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc.
-doclet.navField=FIELD
-# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc.
-doclet.navEnum=ENUM CONSTANTS
-# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc.
-doclet.navConstructor=CONSTR
-# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc.
-doclet.navMethod=METHOD
-# The following resource does not seem to be used anymore.
-doclet.navFactoryMethod=FACTORY
+doclet.Summary=\u6982\u8981:
+doclet.Detail=\u8A73\u7D30:
+doclet.navNested=\u30CD\u30B9\u30C8
+doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3
+doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808
+doclet.navAnnotationTypeMember=\u8981\u7D20
+doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.navEnum=\u5217\u6319\u5B9A\u6570
+doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
+doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
doclet.Index=\u7D22\u5F15
doclet.Window_Single_Index=\u7D22\u5F15
doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
@@ -66,12 +42,6 @@
doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
doclet.New_Page=NewPage
doclet.None=\u306A\u3057
-# The following resource does not seem to be used anymore
-doclet.CLASSES=CLASSES
-# The following resource does not seem to be used anymore
-doclet.MEMBERS=MEMBERS
-# The following resource does not seem to be used anymore
-doclet.NONE=\u306A\u3057
doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
doclet.navDeprecated=\u975E\u63A8\u5968
doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
@@ -136,10 +106,7 @@
doclet.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
doclet.Or=\u307E\u305F\u306F
doclet.Frames=\u30D5\u30EC\u30FC\u30E0
-# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames.
-doclet.FRAMES=FRAMES
-# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames.
-doclet.NO_FRAMES=NO FRAMES
+doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057
doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
doclet.Source_Code=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9:
@@ -147,11 +114,10 @@
doclet.Cannot_handle_no_packages=\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002
doclet.Frame_Alert=\u30D5\u30EC\u30FC\u30E0\u95A2\u9023\u306E\u30A2\u30E9\u30FC\u30C8
doclet.Overview-Member-Frame=\u6982\u8981\u30E1\u30F3\u30D0\u30FC\u30FB\u30D5\u30EC\u30FC\u30E0
-doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002{0}\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059\u3002
doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3002
+doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306B\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30F3
doclet.Frame_Version=\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
-doclet.Link_To=\u30EA\u30F3\u30AF\u5148
doclet.Following_From_Class=\u30AF\u30E9\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0:
doclet.Following_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0:
doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
@@ -167,7 +133,7 @@
doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F4\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
@@ -190,16 +156,16 @@
doclet.Help_line_24=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306B\u3088\u308A\u3001\u524D\u307E\u305F\u306F\u6B21\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u95A2\u9023\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\u3067\u304D\u307E\u3059\u3002
doclet.Help_line_25=\u30D5\u30EC\u30FC\u30E0/\u30D5\u30EC\u30FC\u30E0\u306A\u3057
doclet.Help_line_26=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306FHTML\u30D5\u30EC\u30FC\u30E0\u306E\u8868\u793A\u3068\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u3067\u3082\u3001\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u3067\u3082\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-doclet.Help_line_27=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-doclet.Help_line_28=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.Help_line_29=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_27={0}\u30EA\u30F3\u30AF\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_28=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
+doclet.Help_line_29=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.Help_line_30=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
doclet.Help_enum_line_1=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
doclet.Help_enum_line_2=\u5217\u6319\u578B\u306E\u5BA3\u8A00
doclet.Help_enum_line_3=\u5217\u6319\u578B\u306E\u8AAC\u660E
doclet.Help_annotation_type_line_1=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
doclet.Help_annotation_type_line_2=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
doclet.Help_annotation_type_line_3=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
-doclet.The=The
doclet.Style_line_1=javadoc\u30B9\u30BF\u30A4\u30EB\u30FB\u30B7\u30FC\u30C8
doclet.Style_line_2=\u8272\u3084\u30D5\u30A9\u30F3\u30C8\u306A\u3069\u306E\u30B9\u30BF\u30A4\u30EB\u5C5E\u6027\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306F\u3001\u3053\u3053\u3067\u5B9A\u7FA9\u3057\u307E\u3059
doclet.Style_line_3=\u30DA\u30FC\u30B8\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u8272
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Sat May 14 11:24:26 2011 -0700
@@ -11,54 +11,30 @@
doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784
doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784
-# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc.
doclet.Prev=\u4E0A\u4E00\u4E2A
-# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc.
doclet.Next=\u4E0B\u4E00\u4E2A
-# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc.
-doclet.Prev_Class=PREV CLASS
-# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc.
-doclet.Next_Class=NEXT CLASS
-# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc.
-doclet.Prev_Package=PREV PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc.
-doclet.Next_Package=NEXT PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index.
-doclet.Prev_Letter=PREV LETTER
-# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index.
-doclet.Next_Letter=NEXT LETTER
-# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc.
-doclet.Show_Lists=SHOW LISTS
-# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc.
-doclet.Hide_Lists=HIDE LISTS
+doclet.Prev_Class=\u4E0A\u4E00\u4E2A\u7C7B
+doclet.Next_Class=\u4E0B\u4E00\u4E2A\u7C7B
+doclet.Prev_Package=\u4E0A\u4E00\u4E2A\u7A0B\u5E8F\u5305
+doclet.Next_Package=\u4E0B\u4E00\u4E2A\u7A0B\u5E8F\u5305
+doclet.Prev_Letter=\u4E0A\u4E00\u4E2A\u5B57\u6BCD
+doclet.Next_Letter=\u4E0B\u4E00\u4E2A\u5B57\u6BCD
doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B
doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3
doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA
doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E
doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570
doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3
-# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary.
-doclet.Summary=SUMMARY:
-# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail.
-doclet.Detail=DETAIL:
-# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc.
-doclet.navNested=NESTED
-# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc.
-doclet.navAnnotationTypeOptionalMember=OPTIONAL
-# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeRequiredMember=REQUIRED
-# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeMember=ELEMENT
-# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc.
-doclet.navField=FIELD
-# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc.
-doclet.navEnum=ENUM CONSTANTS
-# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc.
-doclet.navConstructor=CONSTR
-# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc.
-doclet.navMethod=METHOD
-# The following resource does not seem to be used anymore.
-doclet.navFactoryMethod=FACTORY
+doclet.Summary=\u6982\u8981:
+doclet.Detail=\u8BE6\u7EC6\u8D44\u6599:
+doclet.navNested=\u5D4C\u5957
+doclet.navAnnotationTypeOptionalMember=\u53EF\u9009
+doclet.navAnnotationTypeRequiredMember=\u5FC5\u9700
+doclet.navAnnotationTypeMember=\u5143\u7D20
+doclet.navField=\u5B57\u6BB5
+doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
+doclet.navConstructor=\u6784\u9020\u5668
+doclet.navMethod=\u65B9\u6CD5
doclet.Index=\u7D22\u5F15
doclet.Window_Single_Index=\u7D22\u5F15
doclet.Window_Split_Index={0} - \u7D22\u5F15
@@ -66,12 +42,6 @@
doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
doclet.New_Page=NewPage
doclet.None=\u65E0
-# The following resource does not seem to be used anymore
-doclet.CLASSES=CLASSES
-# The following resource does not seem to be used anymore
-doclet.MEMBERS=MEMBERS
-# The following resource does not seem to be used anymore
-doclet.NONE=\u65E0
doclet.Factory_Method_Detail=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
doclet.navDeprecated=\u5DF2\u8FC7\u65F6
doclet.Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
@@ -136,10 +106,7 @@
doclet.Option=\u9009\u9879
doclet.Or=\u6216
doclet.Frames=\u6846\u67B6
-# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames.
-doclet.FRAMES=FRAMES
-# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames.
-doclet.NO_FRAMES=NO FRAMES
+doclet.No_Frames=\u65E0\u6846\u67B6
doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
doclet.Source_Code=\u6E90\u4EE3\u7801:
@@ -147,11 +114,10 @@
doclet.Cannot_handle_no_packages=\u65E0\u6CD5\u5904\u7406\u6CA1\u6709\u7A0B\u5E8F\u5305\u7684\u60C5\u51B5\u3002
doclet.Frame_Alert=\u6846\u67B6\u9884\u8B66
doclet.Overview-Member-Frame=\u6210\u5458\u6846\u67B6\u6982\u89C8
-doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002
+doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002\u94FE\u63A5\u5230{0}\u3002
doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
-doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C\u3002
+doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C
doclet.Frame_Version=\u6846\u67B6\u7248\u672C
-doclet.Link_To=\u94FE\u63A5\u5230
doclet.Following_From_Class=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u7C7B{0}\u590D\u5236\u7684
doclet.Following_From_Interface=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u63A5\u53E3{0}\u590D\u5236\u7684
doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
@@ -167,7 +133,7 @@
doclet.Help_line_1=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F
doclet.Help_line_2=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002
doclet.Help_line_3={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002
-doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u56DB\u4E2A\u7C7B\u522B:
+doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B:
doclet.Help_line_5=\u7C7B/\u63A5\u53E3
doclet.Help_line_6=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210:
doclet.Help_line_7=\u7C7B\u7EE7\u627F\u56FE
@@ -190,16 +156,16 @@
doclet.Help_line_24=\u8FD9\u4E9B\u94FE\u63A5\u4F7F\u60A8\u53EF\u4EE5\u8F6C\u81F3\u4E0B\u4E00\u4E2A\u6216\u4E0A\u4E00\u4E2A\u7C7B, \u63A5\u53E3, \u7A0B\u5E8F\u5305\u6216\u76F8\u5173\u9875\u9762\u3002
doclet.Help_line_25=\u6846\u67B6/\u65E0\u6846\u67B6
doclet.Help_line_26=\u8FD9\u4E9B\u94FE\u63A5\u7528\u4E8E\u663E\u793A\u548C\u9690\u85CF HTML \u6846\u67B6\u3002\u6240\u6709\u9875\u9762\u5747\u5177\u6709\u6709\u6846\u67B6\u548C\u65E0\u6846\u67B6\u4E24\u79CD\u663E\u793A\u65B9\u5F0F\u3002
-doclet.Help_line_27=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002
-doclet.Help_line_28=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
-doclet.Help_line_29=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
+doclet.Help_line_27={0}\u94FE\u63A5\u663E\u793A\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)\u3002
+doclet.Help_line_28=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002
+doclet.Help_line_29=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
+doclet.Help_line_30=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
doclet.Help_enum_line_1=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
doclet.Help_enum_line_2=\u679A\u4E3E\u58F0\u660E
doclet.Help_enum_line_3=\u679A\u4E3E\u8BF4\u660E
doclet.Help_annotation_type_line_1=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
doclet.Help_annotation_type_line_2=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
doclet.Help_annotation_type_line_3=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E
-doclet.The=\u8BE5
doclet.Style_line_1=Javadoc \u6837\u5F0F\u8868
doclet.Style_line_2=\u5728\u6B64\u5904\u5B9A\u4E49\u989C\u8272, \u5B57\u4F53\u548C\u5176\u4ED6\u6837\u5F0F\u5C5E\u6027\u4EE5\u8986\u76D6\u9ED8\u8BA4\u503C
doclet.Style_line_3=\u9875\u9762\u80CC\u666F\u989C\u8272
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -419,7 +419,7 @@
docencoding = encoding;
}
- classDocCatalog = new ClassDocCatalog(root.specifiedClasses());
+ classDocCatalog = new ClassDocCatalog(root.specifiedClasses(), this);
initTagletManager(customTagStrs);
}
@@ -677,15 +677,18 @@
}
/**
- * Return true if the doc element is getting documented, depending upon
- * -nodeprecated option and @deprecated tag used. Return true if
- * -nodeprecated is not used or @deprecated tag is not used.
+ * Return true if the ClassDoc element is getting documented, depending upon
+ * -nodeprecated option and the deprecation information. Return true if
+ * -nodeprecated is not used. Return false if -nodeprecated is used and if
+ * either ClassDoc element is deprecated or the containing package is deprecated.
+ *
+ * @param cd the ClassDoc for which the page generation is checked
*/
- public boolean isGeneratedDoc(Doc doc) {
+ public boolean isGeneratedDoc(ClassDoc cd) {
if (!nodeprecated) {
return true;
}
- return (doc.tags("deprecated")).length == 0;
+ return !(Util.isDeprecated(cd) || Util.isDeprecated(cd.containingPackage()));
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Sat May 14 11:24:26 2011 -0700
@@ -2,17 +2,10 @@
/*
Overall document style
*/
-* {
- margin:0;
- padding:0;
-}
body {
font-family:Helvetica, Arial, sans-serif;
color:#000000;
}
-p {
- margin:20px 0;
-}
pre {
font-size:1.0em;
}
@@ -30,35 +23,18 @@
}
ul {
margin:10px 0 10px 20px;
-}
-li {
- list-style:disc;
-}
-dl dt {
- font-size:0.95em;
- font-weight:bold;
- margin:10px 0 0 0;
-}
-dl dd {
- margin:10px 0 10px 20px;
-}
-dl dd ul {
- margin-left:0;
-}
-dl dd ul li {
- list-style:none;
- margin:10px 0 10px 0;
+ list-style-type:disc;
}
caption {
background: #CCCCFF;
color:#000000;
- text-align: left;
- font-size: 150%;
- font-weight: bold;
- border-left: 2px ridge;
- border-right: 2px ridge;
- border-top: 2px ridge;
- padding-left: 5px;
+ text-align:left;
+ font-size:150%;
+ font-weight:bold;
+ border-left:2px ridge;
+ border-right:2px ridge;
+ border-top:2px ridge;
+ padding-left:5px;
width:auto;
}
/*
@@ -70,11 +46,11 @@
color:#000000;
}
.legalCopy {
- margin:7px;
+ margin:7px 0;
}
.bar {
font-size:1em;
- margin:10px 0 0 10px;
+ margin:10px 0 0 2px;
}
.bar a {
font-weight:normal;
@@ -84,24 +60,21 @@
*/
.topNav {
border-top:2px solid #C0C0C0;
- margin:7px;
padding:7px 0;
height:2.8em;
- width:99%;
+ width:100%;
min-width:600px;
}
.bottomNav {
border-top:2px solid #C0C0C0;
- margin:7px;
padding:7px 0;
height:2.8em;
- width:99%;
+ width:100%;
}
.subNav {
border-bottom:2px solid #C0C0C0;
float:left;
- width:99%;
- margin:7px;
+ width:100%;
min-width:600px;
}
.subNav div {
@@ -120,7 +93,7 @@
/* Navigation bar list styles */
.topNav ul.navList, .bottomNav ul.navList {
background-color:#EEEEFF;
- padding:7px 5px;
+ padding:4px 4px;
margin:0;
float:left;
width:80%;
@@ -128,7 +101,7 @@
ul.navList li{
list-style:none;
float:left;
- padding:3px 4px;
+ padding:0 4px;
color:#000000;
font-size:0.98em;
}
@@ -142,14 +115,16 @@
.subNav ul.navList {
float:left;
margin:0;
+ padding:0;
font-size:0.8em;
width:350px;
}
ul.subNavList {
float:left;
- margin:0;
font-size:0.8em;
width:350px;
+ margin:0;
+ padding:0;
}
ul.subNavList li{
list-style:none;
@@ -161,16 +136,16 @@
*/
.header, .footer {
clear:both;
- margin:0 7px;
+ padding:10px 0;
}
.indexHeader {
font-size:0.9em;
- margin:10px 0 7px 10px;
+ margin:10px 0 0 2px;
}
.header ul {
padding-left:20px;
}
-/* Header and footer title styles */
+/* Header and footer title styles */
.header h1.title {
font-size:1.4em;
text-align:center;
@@ -181,7 +156,16 @@
margin:0;
}
.subTitle {
+ padding-top:10px;
+}
+/*
+Content styles
+*/
+.deprecatedContent {
margin:0;
+ padding:10px 0;
+}
+.docSummary {
padding-top:10px;
}
/*
@@ -190,11 +174,11 @@
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer,
.constantValuesContainer {
clear:both;
- padding:10px 10px;
position:relative;
+ padding-bottom:20px;
}
.indexContainer {
- padding:0 0 10px 10px;
+ padding:0 0 0 2px;
font-size:0.9em;
}
/*
@@ -221,7 +205,8 @@
.indexContainer h2 {
font-weight:normal;
font-size:1.0em;
- padding:10px 0 0 0;
+ padding:5px 0 0 0;
+ margin:10px 0 0 0;
}
.contentContainer h2 {
margin:10px 0;
@@ -263,7 +248,7 @@
background:#CCCCFF;
border:0;
border:2px ridge;
- padding-left:5px;
+ margin:0;
}
div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 {
background:#EEEEFF;
@@ -274,23 +259,22 @@
div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
font-size:1.15em;
font-weight:bold;
- padding:0 0 10px 0;
+ padding:0 0 5px 0;
+ margin:0;
}
/*
Table styles
*/
.contentContainer table {
- border-collapse: collapse ;
+ border-collapse:collapse ;
width:100%;
}
.contentContainer table td, .contentContainer table th {
border:2px ridge;
- padding:3px;
}
/* Constant values page table styles */
.constantValuesContainer table {
- border-collapse: collapse ;
- margin:0 0 10px 0;
+ border-collapse:collapse;
}
.constantValuesContainer table caption{
font-size:0.95em;
@@ -303,12 +287,9 @@
}
/* Class-use/Package-use page table styles */
.classUseContainer table {
- border-collapse: collapse ;
+ border-collapse:collapse ;
width:100%;
- margin:0 0 15px 0;
-}
-.classUseContainer ul li ul li table {
- margin-bottom:30px;
+ margin:0 0 10px 0;
}
.classUseContainer ul li ul li table caption{
font-size:0.95em;
@@ -365,6 +346,7 @@
/* Container specific list styles */
.indexContainer ul {
margin:0;
+ padding:0;
}
.indexContainer ul li {
list-style:none;
@@ -376,6 +358,7 @@
list-style:none;
border:0;
border-bottom:2px ridge;
+ height:1%;
}
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast {
list-style:none;
@@ -395,6 +378,7 @@
div.details ul.blockList ul.blockList ul.blockList li.blockList {
border:0;
border-bottom:2px ridge;
+ height:1%;
}
/* Definition list styles */
ul.blockList li.blockList dl{
@@ -413,9 +397,17 @@
ul.blockList li.blockList pre{
margin:0 0 15px 0;
}
+.description dl dt {
+ font-size:0.95em;
+ font-weight:bold;
+ margin:5px 0 0 0;
+}
+.description dl dd {
+ margin:10px 0 10px 20px;
+}
/* List content styles */
ul.blockList li.blockList ul.blockList li.blockList pre{
- margin:10px 0 15px 0;
+ margin:10px 0 10px 0;
}
ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre,
ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,13 +47,6 @@
/**
* {@inheritDoc}
*/
- public boolean inPackage() {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
public TagletOutput getTagletOutput(Doc holder, TagletWriter writer) {
return writer.deprecatedTagOutput(holder);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,8 +25,9 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
import com.sun.javadoc.*;
-import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.Configuration;
/**
* This class acts as an artificial PackageDoc for classes specified
@@ -88,13 +89,16 @@
*/
private Map<String,Set<ClassDoc>> interfaces;
+ private Configuration configuration;
+
/**
* Construct a new ClassDocCatalog.
*
* @param classdocs the array of ClassDocs to catalog
*/
- public ClassDocCatalog (ClassDoc[] classdocs) {
+ public ClassDocCatalog (ClassDoc[] classdocs, Configuration config) {
init();
+ this.configuration = config;
for (int i = 0; i < classdocs.length; i++) {
addClassDoc(classdocs[i]);
}
@@ -151,9 +155,10 @@
private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) {
PackageDoc pkg = classdoc.containingPackage();
- if (pkg.isIncluded()) {
- //No need to catalog this class since it's package is
- //included on the command line
+ if (pkg.isIncluded() || (configuration.nodeprecated && Util.isDeprecated(pkg))) {
+ //No need to catalog this class if it's package is
+ //included on the command line or if -nodeprecated option is set
+ // and the containing package is marked as deprecated.
return;
}
String key = Util.getPackageName(pkg);
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -122,8 +122,12 @@
*/
private void buildTree(ClassDoc[] classes, Configuration configuration) {
for (int i = 0; i < classes.length; i++) {
+ // In the tree page (e.g overview-tree.html) do not include
+ // information of classes which are deprecated or are a part of a
+ // deprecated package.
if (configuration.nodeprecated &&
- classes[i].tags("deprecated").length > 0) {
+ (Util.isDeprecated(classes[i]) ||
+ Util.isDeprecated(classes[i].containingPackage()))) {
continue;
}
if (classes[i].isEnum()) {
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,27 +27,29 @@
import com.sun.javadoc.*;
import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.Configuration;
/**
- * Build list of all the deprecated classes, constructors, fields and methods.
+ * Build list of all the deprecated packages, classes, constructors, fields and methods.
*
* @author Atul M Dambalkar
*/
public class DeprecatedAPIListBuilder {
- public static final int NUM_TYPES = 11;
+ public static final int NUM_TYPES = 12;
- public static final int INTERFACE = 0;
- public static final int CLASS = 1;
- public static final int ENUM = 2;
- public static final int EXCEPTION = 3;
- public static final int ERROR = 4;
- public static final int ANNOTATION_TYPE = 5;
- public static final int FIELD = 6;
- public static final int METHOD = 7;
- public static final int CONSTRUCTOR = 8;
- public static final int ENUM_CONSTANT = 9;
- public static final int ANNOTATION_TYPE_MEMBER = 10;
+ public static final int PACKAGE = 0;
+ public static final int INTERFACE = 1;
+ public static final int CLASS = 2;
+ public static final int ENUM = 3;
+ public static final int EXCEPTION = 4;
+ public static final int ERROR = 5;
+ public static final int ANNOTATION_TYPE = 6;
+ public static final int FIELD = 7;
+ public static final int METHOD = 8;
+ public static final int CONSTRUCTOR = 9;
+ public static final int ENUM_CONSTANT = 10;
+ public static final int ANNOTATION_TYPE_MEMBER = 11;
/**
* List of deprecated type Lists.
@@ -58,25 +60,33 @@
/**
* Constructor.
*
- * @param root Root of the tree.
+ * @param configuration the current configuration of the doclet
*/
- public DeprecatedAPIListBuilder(RootDoc root) {
+ public DeprecatedAPIListBuilder(Configuration configuration) {
deprecatedLists = new ArrayList<List<Doc>>();
for (int i = 0; i < NUM_TYPES; i++) {
deprecatedLists.add(i, new ArrayList<Doc>());
}
- buildDeprecatedAPIInfo(root);
+ buildDeprecatedAPIInfo(configuration);
}
/**
* Build the sorted list of all the deprecated APIs in this run.
- * Build separate lists for deprecated classes, constructors, methods and
- * fields.
+ * Build separate lists for deprecated packages, classes, constructors,
+ * methods and fields.
*
- * @param root Root of the tree.
+ * @param configuration the current configuration of the doclet.
*/
- private void buildDeprecatedAPIInfo(RootDoc root) {
- ClassDoc[] classes = root.classes();
+ private void buildDeprecatedAPIInfo(Configuration configuration) {
+ PackageDoc[] packages = configuration.packages;
+ PackageDoc pkg;
+ for (int c = 0; c < packages.length; c++) {
+ pkg = packages[c];
+ if (Util.isDeprecated(pkg)) {
+ getList(PACKAGE).add(pkg);
+ }
+ }
+ ClassDoc[] classes = configuration.root.classes();
for (int i = 0; i < classes.length; i++) {
ClassDoc cd = classes[i];
if (Util.isDeprecated(cd)) {
@@ -90,7 +100,7 @@
getList(ENUM).add(cd);
} else if (cd.isError()) {
getList(ERROR).add(cd);
- }else if (cd.isAnnotationType()) {
+ } else if (cd.isAnnotationType()) {
getList(ANNOTATION_TYPE).add(cd);
}
}
@@ -102,7 +112,7 @@
}
if (cd.isAnnotationType()) {
composeDeprecatedList(getList(ANNOTATION_TYPE_MEMBER),
- ((AnnotationTypeDoc) cd).elements());
+ ((AnnotationTypeDoc) cd).elements());
}
}
sortDeprecatedLists();
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -207,7 +207,17 @@
* Should this doc element be added to the index map?
*/
protected boolean shouldAddToIndexMap(Doc element) {
- return !(noDeprecated && element.tags("deprecated").length > 0);
+ if (element instanceof PackageDoc)
+ // Do not add to index map if -nodeprecated option is set and the
+ // package is marked as deprecated.
+ return !(noDeprecated && Util.isDeprecated(element));
+ else
+ // Do not add to index map if -nodeprecated option is set and if the
+ // Doc is marked as deprecated or the containing package is marked as
+ // deprecated.
+ return !(noDeprecated &&
+ (Util.isDeprecated(element) ||
+ Util.isDeprecated(((ProgramElementDoc)element).containingPackage())));
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -76,13 +76,16 @@
protected void generatePackageListFile(RootDoc root) {
PackageDoc[] packages = configuration.packages;
- String[] names = new String[packages.length];
+ ArrayList<String> names = new ArrayList<String>();
for (int i = 0; i < packages.length; i++) {
- names[i] = packages[i].name();
+ // if the -nodeprecated option is set and the package is marked as
+ // deprecated, do not include it in the packages list.
+ if (!(configuration.nodeprecated && Util.isDeprecated(packages[i])))
+ names.add(packages[i].name());
}
- Arrays.sort(names);
- for (int i = 0; i < packages.length; i++) {
- println(names[i]);
+ Collections.sort(names);
+ for (int i = 0; i < names.size(); i++) {
+ println(names.get(i));
}
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Sat May 14 11:24:26 2011 -0700
@@ -861,11 +861,15 @@
* @param doc the Doc to check.
* @return true if the given Doc is deprecated.
*/
- public static boolean isDeprecated(ProgramElementDoc doc) {
+ public static boolean isDeprecated(Doc doc) {
if (doc.tags("deprecated").length > 0) {
return true;
}
- AnnotationDesc[] annotationDescList = doc.annotations();
+ AnnotationDesc[] annotationDescList;
+ if (doc instanceof PackageDoc)
+ annotationDescList = ((PackageDoc)doc).annotations();
+ else
+ annotationDescList = ((ProgramElementDoc)doc).annotations();
for (int i = 0; i < annotationDescList.length; i++) {
if (annotationDescList[i].annotationType().qualifiedName().equals(
java.lang.Deprecated.class.getName())){
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,11 +34,13 @@
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
+import com.sun.source.tree.CatchTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.Scope;
import com.sun.source.tree.Tree;
@@ -49,7 +51,7 @@
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.TypeSymbol;
import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Type.UnionClassType;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Enter;
@@ -430,4 +432,16 @@
log.useSource(oldSource);
}
}
+
+ @Override
+ public TypeMirror getLub(CatchTree tree) {
+ JCCatch ct = (JCCatch) tree;
+ JCVariableDecl v = ct.param;
+ if (v.type != null && v.type.getKind() == TypeKind.UNION) {
+ UnionClassType ut = (UnionClassType) v.type;
+ return ut.getLub();
+ } else {
+ return v.type;
+ }
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Sat May 14 11:24:26 2011 -0700
@@ -649,7 +649,7 @@
public Iterator<Symbol> iterator() {
return new CompoundScopeIterator(subScopes) {
Iterator<Symbol> nextIterator(Scope s) {
- return s.getElements().iterator();
+ return s.getElements(sf).iterator();
}
};
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Sat May 14 11:24:26 2011 -0700
@@ -186,6 +186,9 @@
public boolean allowSimplifiedVarargs() {
return compareTo(JDK1_7) >= 0;
}
+ public boolean allowObjectToPrimitiveCast() {
+ return compareTo(JDK1_7) >= 0;
+ }
public static SourceVersion toSourceVersion(Source source) {
switch(source) {
case JDK1_2:
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Sat May 14 11:24:26 2011 -0700
@@ -25,6 +25,8 @@
package com.sun.tools.javac.code;
+import java.util.Collections;
+
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.code.Symbol.*;
@@ -741,6 +743,38 @@
}
}
+ // a clone of a ClassType that knows about the alternatives of a union type.
+ public static class UnionClassType extends ClassType implements UnionType {
+ final List<? extends Type> alternatives_field;
+
+ public UnionClassType(ClassType ct, List<? extends Type> alternatives) {
+ super(ct.outer_field, ct.typarams_field, ct.tsym);
+ allparams_field = ct.allparams_field;
+ supertype_field = ct.supertype_field;
+ interfaces_field = ct.interfaces_field;
+ all_interfaces_field = ct.interfaces_field;
+ alternatives_field = alternatives;
+ }
+
+ public Type getLub() {
+ return tsym.type;
+ }
+
+ public java.util.List<? extends TypeMirror> getAlternatives() {
+ return Collections.unmodifiableList(alternatives_field);
+ }
+
+ @Override
+ public TypeKind getKind() {
+ return TypeKind.UNION;
+ }
+
+ @Override
+ public <R, P> R accept(TypeVisitor<R, P> v, P p) {
+ return v.visitUnion(this, p);
+ }
+ }
+
public static class ArrayType extends Type
implements javax.lang.model.type.ArrayType {
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Sat May 14 11:24:26 2011 -0700
@@ -74,8 +74,9 @@
final JavacMessages messages;
final Names names;
final boolean allowBoxing;
+ final boolean allowCovariantReturns;
+ final boolean allowObjectToPrimitiveCast;
final ClassReader reader;
- final Source source;
final Check chk;
List<Warner> warnStack = List.nil();
final Name capturedName;
@@ -92,9 +93,11 @@
context.put(typesKey, this);
syms = Symtab.instance(context);
names = Names.instance(context);
- allowBoxing = Source.instance(context).allowBoxing();
+ Source source = Source.instance(context);
+ allowBoxing = source.allowBoxing();
+ allowCovariantReturns = source.allowCovariantReturns();
+ allowObjectToPrimitiveCast = source.allowObjectToPrimitiveCast();
reader = ClassReader.instance(context);
- source = Source.instance(context);
chk = Check.instance(context);
capturedName = names.fromString("<captured wildcard>");
messages = JavacMessages.instance(context);
@@ -409,6 +412,7 @@
return
s.tag == BOT || s.tag == CLASS ||
s.tag == ARRAY || s.tag == TYPEVAR;
+ case WILDCARD: //we shouldn't be here - avoids crash (see 7034495)
case NONE:
return false;
default:
@@ -949,8 +953,9 @@
return true;
if (t.isPrimitive() != s.isPrimitive())
- return allowBoxing && (isConvertible(t, s, warn) || isConvertible(s, t, warn));
-
+ return allowBoxing && (
+ isConvertible(t, s, warn)
+ || (allowObjectToPrimitiveCast && isConvertible(s, t, warn)));
if (warn != warnStack.head) {
try {
warnStack = warnStack.prepend(warn);
@@ -2309,7 +2314,7 @@
if (elemtype == t.elemtype)
return t;
else
- return new ArrayType(elemtype, t.tsym);
+ return new ArrayType(upperBound(elemtype), t.tsym);
}
@Override
@@ -3070,7 +3075,7 @@
if (hasSameArgs(r1, r2))
return covariantReturnType(r1.getReturnType(), r2res, warner);
- if (!source.allowCovariantReturns())
+ if (!allowCovariantReturns)
return false;
if (isSubtypeUnchecked(r1.getReturnType(), r2res, warner))
return true;
@@ -3087,7 +3092,7 @@
public boolean covariantReturnType(Type t, Type s, Warner warner) {
return
isSameType(t, s) ||
- source.allowCovariantReturns() &&
+ allowCovariantReturns &&
!t.isPrimitive() &&
!s.isPrimitive() &&
isAssignable(t, s, warner);
@@ -3293,7 +3298,7 @@
}
if (giveWarning && !isReifiable(reverse ? from : to))
warn.warn(LintCategory.UNCHECKED);
- if (!source.allowCovariantReturns())
+ if (!allowCovariantReturns)
// reject if there is a common method signature with
// incompatible return types.
chk.checkCompatibleAbstracts(warn.pos(), from, to);
@@ -3320,7 +3325,7 @@
Type t2 = to;
if (disjointTypes(t1.getTypeArguments(), t2.getTypeArguments()))
return false;
- if (!source.allowCovariantReturns())
+ if (!allowCovariantReturns)
// reject if there is a common method signature with
// incompatible return types.
chk.checkCompatibleAbstracts(warn.pos(), from, to);
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Sat May 14 11:24:26 2011 -0700
@@ -168,11 +168,11 @@
}
JCIdent left = (JCIdent)assign.lhs;
Symbol method = rs.resolveQualifiedMethod(left.pos(),
- env,
- a.type,
- left.name,
- List.<Type>nil(),
- null);
+ env,
+ a.type,
+ left.name,
+ List.<Type>nil(),
+ null);
left.sym = method;
left.type = method.type;
if (method.owner != a.type.tsym)
@@ -190,6 +190,15 @@
Attribute enterAttributeValue(Type expected,
JCExpression tree,
Env<AttrContext> env) {
+ //first, try completing the attribution value sym - if a completion
+ //error is thrown, we should recover gracefully, and display an
+ //ordinary resolution diagnostic.
+ try {
+ expected.tsym.complete();
+ } catch(CompletionFailure e) {
+ log.error(tree.pos(), "cant.resolve", Kinds.kindName(e.sym), e.sym);
+ return new Attribute.Error(expected);
+ }
if (expected.isPrimitive() || types.isSameType(expected, syms.stringType)) {
Type result = attr.attribExpr(tree, env, expected);
if (result.isErroneous())
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Sat May 14 11:24:26 2011 -0700
@@ -2910,6 +2910,7 @@
public void visitTypeUnion(JCTypeUnion tree) {
ListBuffer<Type> multicatchTypes = ListBuffer.lb();
+ ListBuffer<Type> all_multicatchTypes = null; // lazy, only if needed
for (JCExpression typeTree : tree.alternatives) {
Type ctype = attribType(typeTree, env);
ctype = chk.checkType(typeTree.pos(),
@@ -2931,9 +2932,23 @@
}
}
multicatchTypes.append(ctype);
+ if (all_multicatchTypes != null)
+ all_multicatchTypes.append(ctype);
+ } else {
+ if (all_multicatchTypes == null) {
+ all_multicatchTypes = ListBuffer.lb();
+ all_multicatchTypes.appendList(multicatchTypes);
+ }
+ all_multicatchTypes.append(ctype);
}
}
- tree.type = result = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt);
+ Type t = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt);
+ if (t.tag == CLASS) {
+ List<Type> alternatives =
+ ((all_multicatchTypes == null) ? multicatchTypes : all_multicatchTypes).toList();
+ t = new UnionClassType((ClassType) t, alternatives);
+ }
+ tree.type = result = t;
}
public void visitTypeParameter(JCTypeParameter tree) {
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Sat May 14 11:24:26 2011 -0700
@@ -681,6 +681,12 @@
"cant.apply.diamond.1",
t, diags.fragment("diamond.non.generic", t));
return types.createErrorType(t);
+ } else if (tree.typeargs != null &&
+ tree.typeargs.nonEmpty()) {
+ log.error(tree.clazz.pos(),
+ "cant.apply.diamond.1",
+ t, diags.fragment("diamond.and.explicit.params", t));
+ return types.createErrorType(t);
} else {
return t;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Sat May 14 11:24:26 2011 -0700
@@ -1153,8 +1153,7 @@
if (chk.subset(exc, caughtInTry)) {
log.error(pos, "except.already.caught", exc);
} else if (!chk.isUnchecked(pos, exc) &&
- exc.tsym != syms.throwableType.tsym &&
- exc.tsym != syms.exceptionType.tsym &&
+ !isExceptionOrThrowable(exc) &&
!chk.intersects(exc, thrownInTry)) {
log.error(pos, "except.never.thrown.in.try", exc);
} else if (allowImprovedCatchAnalysis) {
@@ -1163,7 +1162,8 @@
// unchecked exception, the result list would not be empty, as the augmented
// thrown set includes { RuntimeException, Error }; if 'exc' was a checked
// exception, that would have been covered in the branch above
- if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty()) {
+ if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty() &&
+ !isExceptionOrThrowable(exc)) {
String key = catchableThrownTypes.length() == 1 ?
"unreachable.catch" :
"unreachable.catch.1";
@@ -1171,6 +1171,12 @@
}
}
}
+ //where
+ private boolean isExceptionOrThrowable(Type exc) {
+ return exc.tsym == syms.throwableType.tsym ||
+ exc.tsym == syms.exceptionType.tsym;
+ }
+
public void visitConditional(JCConditional tree) {
scanCond(tree.cond);
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Sat May 14 11:24:26 2011 -0700
@@ -1609,18 +1609,31 @@
// type.tsym.flatName() should == proxy.enumFlatName
TypeSymbol enumTypeSym = proxy.enumType.tsym;
VarSymbol enumerator = null;
- for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator);
- e.scope != null;
- e = e.next()) {
- if (e.sym.kind == VAR) {
- enumerator = (VarSymbol)e.sym;
- break;
+ CompletionFailure failure = null;
+ try {
+ for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator);
+ e.scope != null;
+ e = e.next()) {
+ if (e.sym.kind == VAR) {
+ enumerator = (VarSymbol)e.sym;
+ break;
+ }
}
}
+ catch (CompletionFailure ex) {
+ failure = ex;
+ }
if (enumerator == null) {
- log.error("unknown.enum.constant",
- currentClassFile, enumTypeSym, proxy.enumerator);
- result = new Attribute.Error(enumTypeSym.type);
+ if (failure != null) {
+ log.warning("unknown.enum.constant.reason",
+ currentClassFile, enumTypeSym, proxy.enumerator,
+ failure.getDiagnostic());
+ } else {
+ log.warning("unknown.enum.constant",
+ currentClassFile, enumTypeSym, proxy.enumerator);
+ }
+ result = new Attribute.Enum(enumTypeSym.type,
+ new VarSymbol(0, proxy.enumerator, syms.botType, enumTypeSym));
} else {
result = new Attribute.Enum(enumTypeSym.type, enumerator);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Sat May 14 11:24:26 2011 -0700
@@ -479,7 +479,12 @@
state.pop(1);// index
Type a = state.stack[state.stacksize-1];
state.pop(1);
- state.push(types.erasure(types.elemtype(a))); }
+ //sometimes 'null type' is treated as a one-dimensional array type
+ //see Gen.visitLiteral - we should handle this case accordingly
+ Type stackType = a.tag == BOT ?
+ syms.objectType :
+ types.erasure(types.elemtype(a));
+ state.push(stackType); }
break;
case goto_:
markDead();
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Sat May 14 11:24:26 2011 -0700
@@ -72,11 +72,11 @@
}
public Element asElement(TypeMirror t) {
- Type type = cast(Type.class, t);
- switch (type.tag) {
- case TypeTags.CLASS:
- case TypeTags.ERROR:
- case TypeTags.TYPEVAR:
+ switch (t.getKind()) {
+ case DECLARED:
+ case ERROR:
+ case TYPEVAR:
+ Type type = cast(Type.class, t);
return type.asElement();
default:
return null;
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Sat May 14 11:24:26 2011 -0700
@@ -762,9 +762,6 @@
compiler.err.unclosed.str.lit=\
unclosed string literal
-compiler.err.unknown.enum.constant=\
- in class file {0}: unknown enum constant {1}.{2}
-
# 0: name
compiler.err.unsupported.encoding=\
unsupported encoding: {0}
@@ -1307,6 +1304,15 @@
compiler.warn.annotation.method.not.found.reason=\
Cannot find annotation method ''{1}()'' in type ''{0}'': {2}
+# 0: symbol, 1: name
+compiler.warn.unknown.enum.constant=\
+ unknown enum constant {1}.{2}
+
+# 0: symbol, 1: name, 2: message segment
+compiler.warn.unknown.enum.constant.reason=\
+ unknown enum constant {1}.{2}\n\
+ reason: {3}
+
# 0: type, 1: type
compiler.warn.raw.class.use=\
found raw type: {0}\n\
@@ -1618,6 +1624,9 @@
compiler.misc.diamond.non.generic=\
cannot use ''<>'' with non-generic class {0}
+compiler.misc.diamond.and.explicit.params=\
+ cannot use ''<>'' with explicit type parameters for constructor
+
# 0: type, 1: list of type
compiler.misc.explicit.param.do.not.conform.to.bounds=\
explicit type argument {0} does not conform to declared bound(s) {1}
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Sat May 14 11:24:26 2011 -0700
@@ -228,6 +228,9 @@
# 0: symbol
compiler.err.multicatch.parameter.may.not.be.assigned=\u8907\u6570catch\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+# 0: type, 1: type
+compiler.err.multicatch.types.must.be.disjoint=\u8907\u6570catch\u6587\u306E\u4EE3\u66FF\u3092\u30B5\u30D6\u30AF\u30E9\u30B9\u5316\u306B\u3088\u3063\u3066\u95A2\u9023\u4ED8\u3051\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n\u4EE3\u66FF{0}\u306F\u4EE3\u66FF{1}\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3067\u3059
+
compiler.err.finally.without.try=''finally''\u3078\u306E''try''\u304C\u3042\u308A\u307E\u305B\u3093
# 0: type, 1: message segment
@@ -436,8 +439,12 @@
# Errors related to annotation processing
+# 0: symbol, 1: string, 2: stack-trace
compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2}
+# 0: symbol, 1: string
+compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}
+
# 0: string
compiler.err.proc.cant.find.class=''{0}''\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
@@ -535,8 +542,6 @@
compiler.err.unclosed.str.lit=\u6587\u5B57\u5217\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093
-compiler.err.unknown.enum.constant=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u5185: \u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}
-
# 0: name
compiler.err.unsupported.encoding=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3059: {0}
@@ -686,6 +691,7 @@
# 0: file name
compiler.note.sunapi.filename={0}\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
+
compiler.note.sunapi.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
# The following string may appear after one of the above sunapi messages.
@@ -796,6 +802,12 @@
# 0: type, 1: type
compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059
+# 0: list of type
+compiler.warn.unreachable.catch=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059
+
+# 0: list of type
+compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059
+
# 0: symbol
compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
@@ -888,6 +900,9 @@
# 0: symbol
compiler.warn.try.resource.not.referenced=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306F\u5BFE\u5FDC\u3059\u308Btry\u6587\u306E\u672C\u4F53\u3067\u306F\u53C2\u7167\u3055\u308C\u307E\u305B\u3093
+# 0: type
+compiler.warn.try.resource.throws.interrupted.exc=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306B\u3001InterruptedException\u3092\u30B9\u30ED\u30FC\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u30E1\u30F3\u30D0\u30FC\u30FB\u30E1\u30BD\u30C3\u30C9close()\u304C\u3042\u308A\u307E\u3059
+
compiler.warn.unchecked.assign={0}\u304B\u3089{1}\u3078\u306E\u7121\u691C\u67FB\u4EE3\u5165\u3067\u3059
# 0: symbol, 1: type
@@ -924,6 +939,12 @@
compiler.warn.annotation.method.not.found.reason=\u30BF\u30A4\u30D7''{0}''\u5185\u306B\u6CE8\u91C8\u30E1\u30BD\u30C3\u30C9''{1}()''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {2}
+# 0: symbol, 1: name
+compiler.warn.unknown.enum.constant=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}
+
+# 0: symbol, 1: name, 2: message segment
+compiler.warn.unknown.enum.constant.reason=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}\n\u7406\u7531: {3}
+
# 0: type, 1: type
compiler.warn.raw.class.use=raw\u578B\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {0}\n\u6C4E\u7528\u30AF\u30E9\u30B9{1}\u306E\u578B\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093
@@ -1011,7 +1032,11 @@
## above strings.
compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059
-compiler.misc.bad.enclosing.method=\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0}
+#0: symbol, 1: symbol
+compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1}
+
+# 0: symbol
+compiler.misc.bad.enclosing.method=\u30AF\u30E9\u30B9{0}\u306E\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059
compiler.misc.bad.runtime.invisible.param.annotations=RuntimeInvisibleParameterAnnotations\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0}
@@ -1140,11 +1165,7 @@
# 0: type
compiler.misc.diamond.non.generic=\u975E\u6C4E\u7528\u30AF\u30E9\u30B9{0}\u3067''<>''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
-
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.misc.diamond.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
# 0: type, 1: list of type
compiler.misc.explicit.param.do.not.conform.to.bounds=\u660E\u793A\u7684\u306A\u578B\u5F15\u6570{0}\u306F\u3001\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
@@ -1291,7 +1312,7 @@
# 0: symbol, 1: symbol, 2: symbol, 3: symbol
compiler.misc.varargs.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
-compiler.misc.non.denotable.type=\u3053\u3053\u3067\u975E\u578B\u6307\u5B9A\u578B{0}\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.diamond.and.anon.class=\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
# 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
compiler.misc.inapplicable.method={0} {1}.{2}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({3})
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Sat May 14 11:24:26 2011 -0700
@@ -228,6 +228,9 @@
# 0: symbol
compiler.err.multicatch.parameter.may.not.be.assigned=\u53EF\u80FD\u672A\u5206\u914D multi-catch \u53C2\u6570{0}
+# 0: type, 1: type
+compiler.err.multicatch.types.must.be.disjoint=multi-catch \u8BED\u53E5\u4E2D\u7684\u66FF\u4EE3\u65E0\u6CD5\u901A\u8FC7\u5B50\u7C7B\u5316\u5173\u8054\n\u66FF\u4EE3{0}\u662F\u66FF\u4EE3{1}\u7684\u5B50\u7C7B
+
compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''try''
# 0: type, 1: message segment
@@ -436,8 +439,12 @@
# Errors related to annotation processing
+# 0: symbol, 1: string, 2: stack-trace
compiler.err.proc.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n{2}
+# 0: symbol, 1: string
+compiler.err.proc.cant.access.1=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}
+
# 0: string
compiler.err.proc.cant.find.class=\u627E\u4E0D\u5230 ''{0}'' \u7684\u7C7B\u6587\u4EF6\u3002
@@ -535,8 +542,6 @@
compiler.err.unclosed.str.lit=\u672A\u7ED3\u675F\u7684\u5B57\u7B26\u4E32\u6587\u5B57
-compiler.err.unknown.enum.constant=\u5728\u7C7B\u6587\u4EF6{0}\u4E2D: \u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}
-
# 0: name
compiler.err.unsupported.encoding=\u4E0D\u652F\u6301\u7684\u7F16\u7801: {0}
@@ -686,6 +691,7 @@
# 0: file name
compiler.note.sunapi.filename={0}\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002
+
compiler.note.sunapi.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002
# The following string may appear after one of the above sunapi messages.
@@ -796,6 +802,12 @@
# 0: type, 1: type
compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A
+# 0: list of type
+compiler.warn.unreachable.catch=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0}
+
+# 0: list of type
+compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0}
+
# 0: symbol
compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B
@@ -888,6 +900,9 @@
# 0: symbol
compiler.warn.try.resource.not.referenced=\u4E0D\u80FD\u5728\u76F8\u5E94\u7684 try \u8BED\u53E5\u7684\u6B63\u6587\u4E2D\u5F15\u7528\u53EF\u81EA\u52A8\u7ED3\u675F\u7684\u8D44\u6E90{0}
+# 0: type
+compiler.warn.try.resource.throws.interrupted.exc=\u53EF\u81EA\u52A8\u5173\u95ED\u7684\u8D44\u6E90{0}\u5305\u542B\u7684\u6210\u5458\u65B9\u6CD5 close() \u53EF\u80FD\u629B\u51FA InterruptedException
+
compiler.warn.unchecked.assign=\u672A\u7ECF\u68C0\u67E5\u7684\u5206\u914D: \u5C06{0}\u5206\u914D\u7ED9{1}
# 0: symbol, 1: type
@@ -924,6 +939,12 @@
compiler.warn.annotation.method.not.found.reason=\u65E0\u6CD5\u627E\u5230\u7C7B\u578B ''{0}'' \u7684\u6CE8\u91CA\u65B9\u6CD5 ''{1}()'': {2}
+# 0: symbol, 1: name
+compiler.warn.unknown.enum.constant=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}
+
+# 0: symbol, 1: name, 2: message segment
+compiler.warn.unknown.enum.constant.reason=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}\n\u539F\u56E0: {3}
+
# 0: type, 1: type
compiler.warn.raw.class.use=\u627E\u5230\u539F\u59CB\u7C7B\u578B: {0}\n\u7F3A\u5C11\u6CDB\u578B\u7C7B{1}\u7684\u7C7B\u578B\u53C2\u6570
@@ -1011,7 +1032,11 @@
## above strings.
compiler.misc.bad.class.signature=\u9519\u8BEF\u7684\u7C7B\u7B7E\u540D: {0}
-compiler.misc.bad.enclosing.method=\u9519\u8BEF\u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027: {0}
+#0: symbol, 1: symbol
+compiler.misc.bad.enclosing.class={0}\u7684\u5C01\u95ED\u7C7B\u9519\u8BEF: {1}
+
+# 0: symbol
+compiler.misc.bad.enclosing.method=\u7C7B {0} \u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027\u9519\u8BEF
compiler.misc.bad.runtime.invisible.param.annotations=\u9519\u8BEF\u7684 RuntimeInvisibleParameterAnnotations \u5C5E\u6027: {0}
@@ -1140,11 +1165,7 @@
# 0: type
compiler.misc.diamond.non.generic=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u975E\u6CDB\u578B\u7C7B{0}\u4E00\u8D77\u4F7F\u7528
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0}
-
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0}
+compiler.misc.diamond.and.explicit.params=\u4E0D\u80FD\u5C06 ''<>'' \u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528
# 0: type, 1: list of type
compiler.misc.explicit.param.do.not.conform.to.bounds=\u663E\u5F0F\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u7B26\u5408\u58F0\u660E\u7684\u8303\u56F4{1}
@@ -1291,7 +1312,7 @@
# 0: symbol, 1: symbol, 2: symbol, 3: symbol
compiler.misc.varargs.clash.with={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2}
-compiler.misc.non.denotable.type=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E0D\u53EF\u6307\u793A\u7684\u7C7B\u578B{0}
+compiler.misc.diamond.and.anon.class=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u533F\u540D\u5185\u90E8\u7C7B\u4E00\u8D77\u4F7F\u7528
# 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
compiler.misc.inapplicable.method={0} {1}.{2}\u4E0D\u9002\u7528\n({3})
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Sat May 14 11:24:26 2011 -0700
@@ -87,6 +87,7 @@
javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
javac.opt.prefer=\u6697\u9ED9\u7684\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u3001\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3068\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4E21\u65B9\u304C\u898B\u3064\u304B\u3063\u305F\u969B\u3069\u3061\u3089\u3092\u8AAD\u307F\u8FBC\u3080\u304B\u6307\u5B9A\u3059\u308B
+javac.opt.AT=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u540D
## errors
@@ -96,6 +97,7 @@
javac.err.invalid.flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059
javac.err.invalid.target={0}\u306F\u7121\u52B9\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059
javac.err.no.source.files=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
+javac.err.no.source.files.classes=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30AF\u30E9\u30B9\u540D\u304C\u3042\u308A\u307E\u305B\u3093
javac.err.req.arg={0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059
javac.err.invalid.source={0}\u306F\u7121\u52B9\u306A\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059
javac.err.error.writing.file={0}\u306E\u66F8\u8FBC\u307F\u30A8\u30E9\u30FC\u3067\u3059\u3002{1}
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Sat May 14 11:24:26 2011 -0700
@@ -87,6 +87,7 @@
javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6CE8\u91CA\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F
javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F
javac.opt.prefer=\u6307\u5B9A\u8BFB\u53D6\u6587\u4EF6, \u5F53\u540C\u65F6\u627E\u5230\u9690\u5F0F\u7F16\u8BD1\u7C7B\u7684\u6E90\u6587\u4EF6\u548C\u7C7B\u6587\u4EF6\u65F6
+javac.opt.AT=\u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C\u6587\u4EF6\u540D
## errors
@@ -96,6 +97,7 @@
javac.err.invalid.flag=\u65E0\u6548\u7684\u6807\u8BB0: {0}
javac.err.invalid.target=\u65E0\u6548\u7684\u76EE\u6807\u53D1\u884C\u7248: {0}
javac.err.no.source.files=\u65E0\u6E90\u6587\u4EF6
+javac.err.no.source.files.classes=\u65E0\u6E90\u6587\u4EF6\u6216\u7C7B\u540D
javac.err.req.arg={0}\u9700\u8981\u53C2\u6570
javac.err.invalid.source=\u65E0\u6548\u7684\u6E90\u53D1\u884C\u7248: {0}
javac.err.error.writing.file=\u5199\u5165{0}\u65F6\u51FA\u9519; {1}
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Sat May 14 11:24:26 2011 -0700
@@ -266,6 +266,8 @@
com.sun.swing.internal.plaf.basic.resources = tiger legacy
com.sun.swing.internal.plaf.metal.resources = tiger legacy
com.sun.swing.internal.plaf.synth.resources = tiger legacy
+com.sun.tracing = tiger legacy
+com.sun.tracing.dtrace = tiger legacy
java.applet = tiger legacy
java.awt = tiger legacy
java.awt.color = tiger legacy
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Sat May 14 11:24:26 2011 -0700
@@ -75,7 +75,7 @@
tag.End_delimiter_missing_for_possible_SeeTag=\u30B3\u30E1\u30F3\u30C8\u6587\u5B57\u5217"{0}"\u3067\u3001\u6709\u52B9\u306Asee\u30BF\u30B0\u306B\u7D42\u7AEF\u30C7\u30EA\u30DF\u30BF}\u304C\u3042\u308A\u307E\u305B\u3093
tag.Improper_Use_Of_Link_Tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0"{0}"\u306B\u7D42\u4E86\u6587\u5B57''}''\u304C\u3042\u308A\u307E\u305B\u3093
javadoc.File_Read_Error=\u30D5\u30A1\u30A4\u30EB{0}\u306E\u8AAD\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-javadoc.Body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093
+javadoc.Body_missing_from_html_file=HTML\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093
javadoc.End_body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u306E\u9589\u3058\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093
javadoc.Multiple_package_comments=\u30D1\u30C3\u30B1\u30FC\u30B8"{0}"\u306B\u8907\u6570\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B3\u30E1\u30F3\u30C8\u306E\u30BD\u30FC\u30B9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F
javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Fri May 13 13:20:16 2011 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Sat May 14 11:24:26 2011 -0700
@@ -75,7 +75,7 @@
tag.End_delimiter_missing_for_possible_SeeTag=\u6CE8\u91CA\u5B57\u7B26\u4E32\u4E2D\u53EF\u80FD\u51FA\u73B0\u7684 See \u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F\u5206\u9694\u7B26 }: "{0}"
tag.Improper_Use_Of_Link_Tag=\u5185\u5D4C\u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F ''}'' \u5B57\u7B26: "{0}"
javadoc.File_Read_Error=\u8BFB\u53D6\u6587\u4EF6{0}\u65F6\u51FA\u9519
-javadoc.Body_missing_from_html_file=HTML \u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0
+javadoc.Body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0
javadoc.End_body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u7ED3\u675F\u6807\u8BB0
javadoc.Multiple_package_comments=\u627E\u5230\u7A0B\u5E8F\u5305 "{0}" \u7684\u591A\u4E2A\u7A0B\u5E8F\u5305\u6CE8\u91CA\u6E90
javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6553182
+ * @summary This test verifies the -Xdocrootparent option.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester TestDocRootLink
+ * @run main TestDocRootLink
+ */
+public class TestDocRootLink extends JavadocTester {
+
+ private static final String BUG_ID = "6553182";
+ private static final String[][] TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ }
+ };
+ private static final String[][] NEGATED_TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ }
+ };
+ private static final String[][] TEST2 = {
+ {BUG_ID + FS + "pkg2" + FS + "C2.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg2" + FS + "package-summary.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ }
+ };
+ private static final String[][] NEGATED_TEST2 = {
+ {BUG_ID + FS + "pkg2" + FS + "C2.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg2" + FS + "package-summary.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ }
+ };
+ private static final String[] ARGS1 =
+ new String[]{
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
+ };
+ private static final String[] ARGS2 =
+ new String[]{
+ "-d", BUG_ID, "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg2"
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestDocRootLink tester = new TestDocRootLink();
+ run(tester, ARGS1, TEST1, NEGATED_TEST1);
+ run(tester, ARGS2, TEST2, NEGATED_TEST2);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+package pkg1;
+
+/**
+ * Class 1. This is a test.
+ * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a>. Lets see if this works
+ * or not.
+ */
+public class C1 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,18 @@
+<html>
+<head>
+<title>javax.management package</title>
+</head>
+<body bgcolor="white">
+This is a test.
+ <p id="spec">
+ @see <a href="{@docRoot}/../technotes/guides/index.html">
+ Test document 1</a>
+ in particular the
+ <a href="{@docRoot}/../technotes/guides/index.html">
+
+ Test document 2.</a>
+
+ @since 1.5
+
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+package pkg2;
+
+/**
+ * Class 1. This is a test.
+ * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a>. Lets see if this works
+ * or not.
+ */
+public class C2 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,18 @@
+<html>
+<head>
+<title>javax.management package</title>
+</head>
+<body bgcolor="white">
+This is a test.
+ <p id="spec">
+ @see <a href="{@docRoot}/../technotes/guides/index.html">
+ Test document 1</a>
+ in particular the
+ <a href="{@docRoot}/../technotes/guides/index.html">
+
+ Test document 2.</a>
+
+ @since 1.5
+
+</body>
+</html>
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,20 +23,19 @@
/*
* @test
- * @bug 4934778 4777599
+ * @bug 4934778 4777599 6553182
* @summary Make sure that the -help option works properly. Make sure
* the help link appears in the documentation.
* @author jamieh
* @library ../lib/
- * @build JavadocTester
- * @build TestHelpOption
+ * @build JavadocTester TestHelpOption
* @run main TestHelpOption
*/
public class TestHelpOption extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4934778-4777599";
+ private static final String BUG_ID = "4934778-4777599-6553182";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -79,6 +78,7 @@
{STANDARD_OUTPUT, "-tag "},
{STANDARD_OUTPUT, "-taglet "},
{STANDARD_OUTPUT, "-tagletpath "},
+ {STANDARD_OUTPUT, "-Xdocrootparent "},
{STANDARD_OUTPUT, "-charset "},
{STANDARD_OUTPUT, "-helpfile "},
{STANDARD_OUTPUT, "-linksource "},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6758050
+ * @summary Test HTML output for nested generic types.
+ * @author bpatel
+ * @library ../lib/
+ * @build JavadocTester TestNestedGenerics
+ * @run main TestNestedGenerics
+ */
+
+public class TestNestedGenerics extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "6758050";
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[]{
+ "-d", BUG_ID, "-source", "1.5", "-sourcepath", SRC_DIR,
+ "pkg"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST = {
+ {BUG_ID + FS + "pkg" + FS + "NestedGenerics.html",
+ "<div class=\"block\">Contains <a " +
+ "href=\"../pkg/NestedGenerics.html#foo(java.util.Map)\"><code>foo" +
+ "(java.util.Map<A, java.util.Map<A, A>>)</code></a></div>"
+ }
+ };
+ private static final String[][] NEGATED_TEST = NO_TEST;
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestNestedGenerics tester = new TestNestedGenerics();
+ run(tester, ARGS, TEST, NEGATED_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+package pkg;
+
+import java.util.Map;
+
+/** Contains {@link #foo} */
+public class NestedGenerics {
+ public static <A> void foo(Map<A, Map<A, A>> map) {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+/**
+ * Another test class.
+ *
+ * @author Bhavesh Patel
+ */
+public class C2 {
+
+ public static enum ModalExclusionType {
+ /**
+ * Test comment.
+ */
+ NO_EXCLUDE,
+ /**
+ * Another comment.
+ */
+ APPLICATION_EXCLUDE
+ };
+
+ /**
+ * A string constant.
+ */
+ public static final String CONSTANT1 = "C2";
+
+ /**
+ * A sample method.
+ *
+ * @param param some parameter.
+ */
+ public void method(String param) {
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.*;
+
+/**
+* Test Deprecated class
+* @deprecated This class is Deprecated.
+*/
+public class FooDepr {
+
+ public void method(Vector<Object> o){}
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6492694
+ * @summary Test package deprecation.
+ * @author bpatel
+ * @library ../lib/
+ * @build JavadocTester TestPackageDeprecation
+ * @run main TestPackageDeprecation
+ */
+
+public class TestPackageDeprecation extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "6492694";
+
+ //Javadoc arguments.
+ private static final String[] ARGS1 = new String[]{
+ "-d", BUG_ID + "-1", "-source", "1.5", "-sourcepath", SRC_DIR, "-use", "pkg", "pkg1",
+ SRC_DIR + FS + "C2.java", SRC_DIR + FS + "FooDepr.java"
+ };
+ private static final String[] ARGS2 = new String[]{
+ "-d", BUG_ID + "-2", "-source", "1.5", "-sourcepath", SRC_DIR, "-use", "-nodeprecated",
+ "pkg", "pkg1", SRC_DIR + FS + "C2.java", SRC_DIR + FS + "FooDepr.java"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST1 = {
+ {BUG_ID + "-1" + FS + "pkg1" + FS + "package-summary.html",
+ "<div class=\"deprecatedContent\"><span class=\"strong\">Deprecated.</span>" + NL +
+ "<div class=\"block\"><i>This package is Deprecated.</i></div>"
+ },
+ {BUG_ID + "-1" + FS + "deprecated-list.html",
+ "<li><a href=\"#package\">Deprecated Packages</a></li>"
+ }
+ };
+ private static final String[][] TEST2 = NO_TEST;
+ private static final String[][] NEGATED_TEST1 = NO_TEST;
+ private static final String[][] NEGATED_TEST2 = {
+ {BUG_ID + "-2" + FS + "overview-summary.html", "pkg1"},
+ {BUG_ID + "-2" + FS + "allclasses-frame.html", "FooDepr"}
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestPackageDeprecation tester = new TestPackageDeprecation();
+ run(tester, ARGS1, TEST1, NEGATED_TEST1);
+ run(tester, ARGS2, TEST2, NEGATED_TEST2);
+ if ((new java.io.File(BUG_ID + "-2" + FS + "pkg1" + FS +
+ "package-summary.html")).exists()) {
+ throw new Error("Test Fails: packages summary should not be" +
+ "generated for deprecated package.");
+ } else {
+ System.out.println("Test passes: package-summary.html not found.");
+ }
+ if ((new java.io.File(BUG_ID + "-2" + FS + "FooDepr.html")).exists()) {
+ throw new Error("Test Fails: FooDepr should not be" +
+ "generated as it is deprecated.");
+ } else {
+ System.out.println("Test passes: FooDepr.html not found.");
+ }
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+package pkg;
+
+public class A {
+ /** Test constant. */
+ public static final String DEMO= "y";
+ public static final String THIS_IS_OK= "(x)";
+
+ public String DEMO_STRING = "<Hello World>";
+
+ public A() {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+package pkg1;
+
+public class ClassUseTest1 <T extends Foo & Foo2> {
+
+ public <T extends Foo & Foo2> T method(T t) {
+ return null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+package pkg1;
+
+import java.util.*;
+
+/**
+* Test Deprecated class
+* @deprecated This class is Deprecated.
+*/
+public class Foo {
+
+ public void method(Vector<Object> o){}
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+package pkg1;
+
+public interface Foo2 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 pkg1 used.
+ * @deprecated This package is Deprecated.
+ */
+package pkg1;
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,19 +23,18 @@
/*
* @test
- * @bug 4494033
+ * @bug 4494033 7028815
* @summary Run tests on doclet stylesheet.
* @author jamieh
* @library ../lib/
- * @build JavadocTester
- * @build TestStylesheet
+ * @build JavadocTester TestStylesheet
* @run main TestStylesheet
*/
public class TestStylesheet extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4494033";
+ private static final String BUG_ID = "4494033-7028815";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -56,15 +55,18 @@
"body {" + NL + " font-family:Helvetica, Arial, sans-serif;" + NL +
" color:#000000;" + NL + "}"},
{BUG_ID + FS + "stylesheet.css",
- "dl dd ul li {" + NL + " list-style:none;" + NL +
- " margin:10px 0 10px 0;" + NL + "}"},
+ "ul {" + NL + " margin:10px 0 10px 20px;" + NL +
+ " list-style-type:disc;" + NL + "}"},
// Test whether a link to the stylesheet file is inserted properly
// in the class documentation.
{BUG_ID + FS + "pkg" + FS + "A.html",
"<link rel=\"stylesheet\" type=\"text/css\" " +
"href=\"../stylesheet.css\" title=\"Style\">"}
};
- private static final String[][] NEGATED_TEST = NO_TEST;
+ private static final String[][] NEGATED_TEST = {
+ {BUG_ID + FS + "stylesheet.css",
+ "* {" + NL + " margin:0;" + NL + " padding:0;" + NL + "}"}
+ };
/**
* The entry point of the test.
--- a/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java Sat May 14 11:24:26 2011 -0700
@@ -37,8 +37,7 @@
private static final String BUG_ID = "7010342";
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
- "<div class=\"subTitle\">" + NL + "<div class=\"block\">This is the " +
- "description of package pkg.</div>" + NL + "</div>"
+ "<div class=\"block\">This is the description of package pkg.</div>"
},
{BUG_ID + FS + "pkg" + FS + "C.html",
"<div class=\"subTitle\">pkg</div>"
--- a/langtools/test/tools/javac/6558548/T6558548.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/6558548/T6558548.java Sat May 14 11:24:26 2011 -0700
@@ -1,9 +1,9 @@
/*
* @test /nodynamiccopyright/
- * @bug 6558548
+ * @bug 6558548 7039937
* @summary The compiler needs to be aligned with clarified specification of throws
* @compile/fail/ref=T6558548_latest.out -XDrawDiagnostics T6558548.java
- * @compile/fail/ref=T6558548_6.out -source 6 -XDrawDiagnostics T6558548.java
+ * @compile/fail/ref=T6558548_6.out -source 6 -Xlint:-options -XDrawDiagnostics T6558548.java
*/
class T6558548 {
@@ -12,7 +12,7 @@
void checked() throws InterruptedException {}
void runtime() throws IllegalArgumentException {}
- void m1() {
+ void m1a() {
try {
throw new java.io.FileNotFoundException();
}
@@ -20,7 +20,7 @@
catch(java.io.IOException exc) { } // 6: ok; latest: unreachable
}
- void m1a() {
+ void m1b() {
try {
throw new java.io.IOException();
}
@@ -28,11 +28,20 @@
catch(java.io.IOException exc) { } //ok
}
- void m2() {
+ void m1c() {
try {
- nothing();
+ throw new java.io.FileNotFoundException();
}
- catch(Exception exc) { } // ok
+ catch(java.io.FileNotFoundException exc) { }
+ catch(Exception ex) { } //ok (Exception/Throwable always allowed)
+ }
+
+ void m1d() {
+ try {
+ throw new java.io.FileNotFoundException();
+ }
+ catch(java.io.FileNotFoundException exc) { }
+ catch(Throwable ex) { } //ok (Exception/Throwable always allowed)
}
void m3() {
@@ -131,7 +140,7 @@
runtime();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m17() {
@@ -139,7 +148,7 @@
nothing();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m18() {
@@ -148,7 +157,7 @@
}
catch(RuntimeException exc) { }
catch(InterruptedException exc) { }
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m19() {
@@ -157,7 +166,7 @@
}
catch(RuntimeException exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m20() {
@@ -166,7 +175,7 @@
}
catch(RuntimeException exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m21() {
@@ -182,7 +191,7 @@
runtime();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } // 6: ok; latest: unreachable
+ catch(Exception exc) { } // 6: ok; latest: ok (Exception/Throwable always allowed)
}
void m23() {
@@ -190,7 +199,7 @@
nothing();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } // 6: ok; latest: unreachable
+ catch(Exception exc) { } // 6: ok; latest: ok (Exception/Throwable always allowed)
}
void m24() {
@@ -208,7 +217,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m26() {
@@ -217,7 +226,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m27() {
@@ -227,7 +236,7 @@
catch(RuntimeException exc) { }
catch(Error exc) { }
catch(InterruptedException exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m28() {
@@ -237,7 +246,7 @@
catch(RuntimeException exc) { }
catch(Error exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m29() {
@@ -247,7 +256,7 @@
catch(RuntimeException exc) { }
catch(Error exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m30() {
@@ -265,7 +274,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m32() {
@@ -274,7 +283,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m33() {
--- a/langtools/test/tools/javac/6558548/T6558548_6.out Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/6558548/T6558548_6.out Sat May 14 11:24:26 2011 -0700
@@ -1,9 +1,7 @@
-- compiler.warn.source.no.bootclasspath: 1.6
-T6558548.java:159:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
T6558548.java:168:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:239:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:249:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:291:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:298:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:177:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:248:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:258:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:300:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:307:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
6 errors
-1 warning
--- a/langtools/test/tools/javac/6558548/T6558548_latest.out Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/6558548/T6558548_latest.out Sat May 14 11:24:26 2011 -0700
@@ -1,23 +1,9 @@
T6558548.java:20:9: compiler.warn.unreachable.catch: java.io.FileNotFoundException
-T6558548.java:134:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:142:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:151:9: compiler.warn.unreachable.catch.1: java.lang.InterruptedException,java.lang.RuntimeException
-T6558548.java:159:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:160:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
T6558548.java:168:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:169:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:185:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:193:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:211:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:220:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:230:9: compiler.warn.unreachable.catch.1: java.lang.InterruptedException,java.lang.RuntimeException,java.lang.Error
-T6558548.java:239:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:240:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:249:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:250:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:268:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:277:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:291:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:298:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:177:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:248:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:258:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:300:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:307:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
6 errors
-15 warnings
+1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T7040104.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7040104
+ * @summary javac NPE on Object a[]; Object o = (a=null)[0];
+ */
+
+public class T7040104 {
+ public static void main(String[] args) {
+ T7040104 t = new T7040104();
+ t.test1();
+ t.test2();
+ t.test3();
+ if (t.npeCount != 3) {
+ throw new AssertionError();
+ }
+ }
+
+ int npeCount = 0;
+
+ void test1() {
+ Object a[];
+ try {
+ Object o = (a = null)[0];
+ }
+ catch (NullPointerException npe) {
+ npeCount++;
+ }
+ }
+
+ void test2() {
+ Object a[][];
+ try {
+ Object o = (a = null)[0][0];
+ }
+ catch (NullPointerException npe) {
+ npeCount++;
+ }
+ }
+
+ void test3() {
+ Object a[][][];
+ try {
+ Object o = (a = null)[0][0][0];
+ }
+ catch (NullPointerException npe) {
+ npeCount++;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/6550655/T6550655.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 6550655
+ * @summary javac crashes when compiling against an annotated class
+ */
+
+import java.io.File;
+import java.net.URI;
+import java.util.Arrays;
+
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class T6550655 {
+
+ JavaCompiler javacTool;
+ File testDir;
+ TestKind testKind;
+ EnumActionKind actionKind;
+
+ String testSource = "enum E { NORTH, SOUTH, WEST, EAST; }\n" +
+ "@I(val = E.NORTH)class A {}\n" +
+ "@interface I { E val(); }";
+
+ T6550655(JavaCompiler javacTool, File testDir, TestKind testKind, EnumActionKind actionKind) {
+ this.javacTool = javacTool;
+ this.testDir = testDir;
+ this.testKind = testKind;
+ this.actionKind = actionKind;
+ }
+
+ void test() {
+ testDir.mkdirs();
+ compile(null, new JavaSource("Test.java", testSource));
+ actionKind.doAction(this);
+ compile(new DiagnosticChecker(), testKind.source);
+ }
+
+ void compile(DiagnosticChecker dc, JavaSource... sources) {
+ try {
+ CompilationTask ct = javacTool.getTask(null, null, dc,
+ Arrays.asList("-d", testDir.getAbsolutePath(), "-cp", testDir.getAbsolutePath()),
+ null, Arrays.asList(sources));
+ ct.call();
+ }
+ catch (Exception e) {
+ error("Internal compilation error");
+ }
+ }
+
+ void replaceEnum(String newSource) {
+ compile(null, new JavaSource("Replace.java", newSource));
+ };
+
+ void removeEnum() {
+ File enumClass = new File(testDir, "E.class");
+ if (!enumClass.exists()) {
+ error("Expected file E.class does not exists in folder " + testDir);
+ }
+ enumClass.delete();
+ };
+
+ void error(String msg) {
+ System.err.println(msg);
+ nerrors++;
+ }
+
+ class DiagnosticChecker implements DiagnosticListener<JavaFileObject> {
+
+ String[][] expectedKeys = new String[][] {
+ // DIRECT, INDIRECT
+ {/*REPLACE1*/ "compiler.err.cant.resolve.location" , "compiler.warn.unknown.enum.constant" },
+ {/*REPLACE2*/ "compiler.err.cant.resolve.location.args", "compiler.warn.annotation.method.not.found" },
+ {/*REMOVE*/ "compiler.err.cant.resolve" , "compiler.warn.unknown.enum.constant.reason" } };
+
+ String keyToIgnore = "compiler.err.attribute.value.must.be.constant";
+
+ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+ String expectedCode = expectedKeys[actionKind.ordinal()][testKind.ordinal()];
+ if (!diagnostic.getCode().equals(keyToIgnore) &&
+ !diagnostic.getCode().equals(expectedCode)) {
+ error("Unexpected diagnostic" +
+ "\nfound " + diagnostic.getCode() +
+ "\nexpected " + expectedCode +
+ "\ntestKind " + testKind +
+ "\nactionKind " + actionKind);
+ }
+ }
+ }
+
+ //global declarations
+
+ enum EnumActionKind {
+ REPLACE1("enum E { SOUTH, WEST, EAST; }") {
+ @Override
+ void doAction(T6550655 test) {
+ test.replaceEnum(optionalSource);
+ }
+ },
+ REPLACE2("@interface I { E valNew() default E.EAST; }") {
+ @Override
+ void doAction(T6550655 test) {
+ test.replaceEnum(optionalSource);
+ }
+ },
+ REMOVE(null) {
+ @Override
+ void doAction(T6550655 test) { test.removeEnum(); }
+ };
+
+ String optionalSource;
+
+ private EnumActionKind(String optionalSource) {
+ this.optionalSource = optionalSource;
+ }
+
+ abstract void doAction(T6550655 test);
+ }
+
+ enum TestKind {
+ DIRECT("@I(val = E.NORTH)class C1 {}"),
+ INDIRECT("class C2 { A a; }");
+
+ JavaSource source;
+
+ private TestKind(final String code) {
+ this.source = new JavaSource("Test.java", code);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ String SCRATCH_DIR = System.getProperty("user.dir");
+ JavaCompiler javacTool = ToolProvider.getSystemJavaCompiler();
+ int n = 0;
+ for (TestKind testKind : TestKind.values()) {
+ for (EnumActionKind actionKind : EnumActionKind.values()) {
+ File testDir = new File(SCRATCH_DIR, "test"+n);
+ new T6550655(javacTool, testDir, testKind, actionKind).test();
+ n++;
+ }
+ }
+ if (nerrors > 0) {
+ throw new AssertionError("Some errors have been detected");
+ }
+ }
+
+ static class JavaSource extends SimpleJavaFileObject {
+
+ String source;
+
+ public JavaSource(String filename, String source) {
+ super(URI.create("myfo:/" + filename), JavaFileObject.Kind.SOURCE);
+ this.source = source;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return source;
+ }
+ }
+
+ static int nerrors = 0;
+}
--- a/langtools/test/tools/javac/diags/examples.not-yet.txt Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/diags/examples.not-yet.txt Sat May 14 11:24:26 2011 -0700
@@ -41,7 +41,6 @@
compiler.err.type.var.more.than.once.in.result # UNUSED
compiler.err.undetermined.type
compiler.err.unexpected.type
-compiler.err.unknown.enum.constant # in bad class file
compiler.err.unsupported.cross.fp.lit # Scanner: host system dependent
compiler.err.wrong.target.for.polymorphic.signature.definition # Transitional 292
compiler.misc.assignment.from.super-bound
@@ -112,3 +111,5 @@
compiler.warn.unchecked.assign # DEAD, replaced by compiler.misc.unchecked.assign
compiler.warn.unchecked.cast.to.type # DEAD, replaced by compiler.misc.unchecked.cast.to.type
compiler.warn.unexpected.archive.file # Paths: zip file with unknown extn
+compiler.warn.unknown.enum.constant # in bad class file
+compiler.warn.unknown.enum.constant.reason # in bad class file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/DiamondAndExplicitParams.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+// key: compiler.misc.diamond.and.explicit.params
+// key: compiler.err.cant.apply.diamond.1
+
+class DiamondAndAnonClass {
+ static class Foo<X> {
+ <Z> Foo() {}
+ }
+ void m() {
+ Foo<String> foo = new <Integer> Foo<>();
+ }
+}
--- a/langtools/test/tools/javac/diags/examples/UnreachableCatch1.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/diags/examples/UnreachableCatch1.java Sat May 14 11:24:26 2011 -0700
@@ -23,14 +23,21 @@
// key: compiler.warn.unreachable.catch.1
+import java.io.*;
+
class UnreachableCatch1 {
void test() {
try {
- throw new IllegalArgumentException();
+ if (true) {
+ throw new FileNotFoundException();
+ }
+ else {
+ throw new EOFException();
+ }
}
- catch(Error err) { }
- catch(RuntimeException rex) { }
- catch(Throwable t) { } //unreachable
+ catch(FileNotFoundException fnf) { }
+ catch(EOFException eof) { }
+ catch(IOException ex) { } //unreachable
}
}
--- a/langtools/test/tools/javac/generics/7034511/T7034511a.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/generics/7034511/T7034511a.java Sat May 14 11:24:26 2011 -0700
@@ -1,6 +1,7 @@
/*
* @test /nodynamiccopyright/
- * @bug 7034511
+ * @ignore backing out 7034511, see 7040883
+ * @bug 7034511 7040883
* @summary Loophole in typesafety
* @compile/fail/ref=T7034511a.out -XDrawDiagnostics T7034511a.java
*/
--- a/langtools/test/tools/javac/generics/7034511/T7034511b.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/generics/7034511/T7034511b.java Sat May 14 11:24:26 2011 -0700
@@ -1,6 +1,7 @@
/*
* @test /nodynamiccopyright/
- * @bug 7034511
+ * @ignore backing out 7034511, see 7040883
+ * @bug 7034511 7040883
* @summary Loophole in typesafety
* @compile/fail/ref=T7034511b.out -XDrawDiagnostics T7034511b.java
*/
--- a/langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java Sat May 14 11:24:26 2011 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7030150
+ * @bug 7030150 7039931
* @summary Type inference for generic instance creation failed for formal type parameter
*/
@@ -125,6 +125,14 @@
default: return false;
}
}
+
+ boolean matches(TypeArgumentKind other) {
+ switch (other) {
+ case STRING: return this != INTEGER;
+ case INTEGER: return this != STRING;
+ default: return true;
+ }
+ }
}
enum ArgumentKind {
@@ -149,9 +157,11 @@
for (TypeArgumentKind declArgKind : TypeArgumentKind.values()) {
for (TypeArgArity arity : TypeArgArity.values()) {
for (TypeArgumentKind useArgKind : TypeArgumentKind.values()) {
- for (ArgumentKind argKind : ArgumentKind.values()) {
- new GenericConstructorAndDiamondTest(boundKind, constructorKind,
- declArgKind, arity, useArgKind, argKind).run(comp, fm);
+ for (TypeArgumentKind diamondArgKind : TypeArgumentKind.values()) {
+ for (ArgumentKind argKind : ArgumentKind.values()) {
+ new GenericConstructorAndDiamondTest(boundKind, constructorKind,
+ declArgKind, arity, useArgKind, diamondArgKind, argKind).run(comp, fm);
+ }
}
}
}
@@ -165,18 +175,21 @@
TypeArgumentKind declTypeArgumentKind;
TypeArgArity useTypeArgArity;
TypeArgumentKind useTypeArgumentKind;
+ TypeArgumentKind diamondTypeArgumentKind;
ArgumentKind argumentKind;
JavaSource source;
DiagnosticChecker diagChecker;
GenericConstructorAndDiamondTest(BoundKind boundKind, ConstructorKind constructorKind,
TypeArgumentKind declTypeArgumentKind, TypeArgArity useTypeArgArity,
- TypeArgumentKind useTypeArgumentKind, ArgumentKind argumentKind) {
+ TypeArgumentKind useTypeArgumentKind, TypeArgumentKind diamondTypeArgumentKind,
+ ArgumentKind argumentKind) {
this.boundKind = boundKind;
this.constructorKind = constructorKind;
this.declTypeArgumentKind = declTypeArgumentKind;
this.useTypeArgArity = useTypeArgArity;
this.useTypeArgumentKind = useTypeArgumentKind;
+ this.diamondTypeArgumentKind = diamondTypeArgumentKind;
this.argumentKind = argumentKind;
this.source = new JavaSource();
this.diagChecker = new DiagnosticChecker();
@@ -189,7 +202,7 @@
"}\n" +
"class Test {\n" +
"void test() {\n" +
- "Foo#TA1 f = new #TA2 Foo<>(#A);\n" +
+ "Foo#TA1 f = new #TA2 Foo<#TA3>(#A);\n" +
"}\n" +
"}\n";
@@ -201,6 +214,7 @@
replace("#CK", constructorKind.constrStr)
.replace("#TA1", declTypeArgumentKind.getArgs(TypeArgArity.ONE))
.replace("#TA2", useTypeArgumentKind.getArgs(useTypeArgArity))
+ .replace("#TA3", diamondTypeArgumentKind.typeargStr)
.replace("#A", argumentKind.argStr);
}
@@ -227,9 +241,15 @@
boolean badMethodTypeArg = constructorKind != ConstructorKind.NON_GENERIC &&
!useTypeArgumentKind.matches(argumentKind);
- boolean badGenericType = !boundKind.matches(declTypeArgumentKind);
+ boolean badExplicitParams = (useTypeArgumentKind != TypeArgumentKind.NONE &&
+ diamondTypeArgumentKind == TypeArgumentKind.NONE) ||
+ !boundKind.matches(diamondTypeArgumentKind);
- boolean shouldFail = badActual || badArity || badMethodTypeArg || badGenericType;
+ boolean badGenericType = !boundKind.matches(declTypeArgumentKind) ||
+ !diamondTypeArgumentKind.matches(declTypeArgumentKind);
+
+ boolean shouldFail = badActual || badArity ||
+ badMethodTypeArg || badExplicitParams || badGenericType;
if (shouldFail != diagChecker.errorFound) {
throw new Error("invalid diagnostics for source:\n" +
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg01.java Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that explicit type-argument that causes resolution failure is rejected
- * @compile/fail/ref=Neg01.out -XDrawDiagnostics Neg01.java
- */
-
-class Neg01 {
-
- static class Foo<X> {
- <T> Foo(T t) {}
- }
-
- Foo<Integer> fi1 = new <String> Foo<>(1);
- Foo<Integer> fi2 = new <String> Foo<Integer>(1);
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg01.out Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Neg01.java:15:24: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: Neg01.Foo), (compiler.misc.infer.no.conforming.assignment.exists: X, int, java.lang.String)
-Neg01.java:16:24: compiler.err.cant.apply.symbol.1: kindname.constructor, Foo, T, int, kindname.class, Neg01.Foo<X>, (compiler.misc.no.conforming.assignment.exists: int, java.lang.String)
-2 errors
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg02.java Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that compiler rejects bad number of explicit type-arguments
- * @compile/fail/ref=Neg02.out -XDrawDiagnostics Neg02.java
- */
-
-class Neg02 {
-
- static class Foo<X> {
- <T> Foo(T t) {}
- }
-
- Foo<Integer> fi1 = new <String, Integer> Foo<>("");
- Foo<Integer> fi2 = new <String, Integer> Foo<Integer>("");
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg02.out Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Neg02.java:15:24: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: Neg02.Foo), (compiler.misc.arg.length.mismatch)
-Neg02.java:16:24: compiler.err.cant.apply.symbol.1: kindname.constructor, Foo, T, java.lang.String, kindname.class, Neg02.Foo<X>, (compiler.misc.arg.length.mismatch)
-2 errors
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg03.java Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that explicit type-argument that does not conform to bound is rejected
- * @compile/fail/ref=Neg03.out -XDrawDiagnostics Neg03.java
- */
-
-class Neg03 {
-
- static class Foo<X> {
- <T extends Integer> Foo(T t) {}
- }
-
- Foo<Integer> fi1 = new <String> Foo<>(1);
- Foo<Integer> fi2 = new <String> Foo<Integer>(1);
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg03.out Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Neg03.java:15:24: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: Neg03.Foo), (compiler.misc.explicit.param.do.not.conform.to.bounds: java.lang.String, java.lang.Integer)
-Neg03.java:16:24: compiler.err.cant.apply.symbol.1: kindname.constructor, Foo, T, int, kindname.class, Neg03.Foo<X>, (compiler.misc.explicit.param.do.not.conform.to.bounds: java.lang.String, java.lang.Integer)
-2 errors
--- a/langtools/test/tools/javac/generics/diamond/7030150/Pos01.java Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * 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 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that redundant type-arguments on non-generic constructor are accepted
- * @compile Pos01.java
- */
-
-class Pos01 {
-
- static class Foo<X> {
- Foo(X t) {}
- }
-
- Foo<Integer> fi1 = new Foo<>(1);
- Foo<Integer> fi2 = new Foo<Integer>(1);
- Foo<Integer> fi3 = new <String> Foo<>(1);
- Foo<Integer> fi4 = new <String> Foo<Integer>(1);
- Foo<Integer> fi5 = new <String, String> Foo<>(1);
- Foo<Integer> fi6 = new <String, String> Foo<Integer>(1);
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Pos02.java Fri May 13 13:20:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * 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 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that diamond in return context works w/o problems
- * @compile Pos02.java
- */
-
-class Pos02<X> {
-
- Pos02(X x) {}
-
-
- Pos02<X> test(X x) {
- return new Pos02<>(x);
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/typevars/T7040883.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7040883 7034511
+ * @summary Compilation error: "length in Array is defined in an inaccessible class or interface"
+ * @compile T7040883.java
+ */
+
+public class T7040883 {
+
+ <Z> Z[] getListeners(Class<Z> z) { return null; }
+
+ void test(String s) {
+ int i = getListeners(s.getClass()).length;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/wildcards/7034495/T7034495.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ *
+ * 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 7034495
+ * @summary Javac asserts on usage of wildcards in bounds
+ * @compile/fail/ref=T7034495.out -XDrawDiagnostics T7034495.java
+ */
+class T7034495 {
+
+ interface A<T> {
+ T foo();
+ }
+
+ interface B<T> {
+ T foo();
+ }
+
+ interface C<T extends A<?> & B<?>> { }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/wildcards/7034495/T7034495.out Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,2 @@
+T7034495.java:40:17: compiler.err.types.incompatible.diff.ret: T7034495.B<?>, T7034495.A<?>, foo()
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/Neg07.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,50 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 7039822
+ * @summary Verify typing of lub of exception parameter w.r.t getClass
+ * @author Joseph D. Darcy
+ * @compile/fail/ref=Neg07.out -XDrawDiagnostics Neg07.java
+ */
+
+public class Neg07 {
+ private static void test(int i) {
+ try {
+ thrower(i);
+ } catch (SonException | DaughterException e) {
+ Class<? extends HasFoo> clazz2 = e.getClass(); // Rejected!
+ HasFoo m = e;
+ e.foo();
+ }
+ }
+
+ private static interface HasFoo {
+ void foo();
+ }
+
+ static void thrower(int i) throws SonException, DaughterException {
+ if (i == 0)
+ throw new SonException();
+ else
+ throw new DaughterException();
+ }
+
+ private static class ParentException extends RuntimeException {}
+
+ private static class SonException
+ extends ParentException
+ implements HasFoo {
+
+ public void foo() {
+ System.out.println("SonException.foo");
+ }
+ }
+
+ private static class DaughterException
+ extends ParentException
+ implements HasFoo {
+
+ public void foo() {
+ System.out.println("DaughterException.foo");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/Neg07.out Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,2 @@
+Neg07.java:14:56: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Class<compiler.misc.type.captureof: 1, ? extends Neg07.ParentException>, java.lang.Class<? extends Neg07.HasFoo>
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/Pos10.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7039822
+ * @summary Verify lub of an exception parameter can be an intersection type
+ * @author Joseph D. Darcy
+ */
+
+public class Pos10 {
+ public static void main(String... args) {
+ test(0);
+ test(1);
+
+ if (record != 0b11)
+ throw new RuntimeException("Unexpected exception execution: " +
+ record);
+ if (closeRecord != 0b11)
+ throw new RuntimeException("Unexpected close execution: " +
+ closeRecord);
+ }
+
+ private static int record = 0;
+ private static int closeRecord = 0;
+
+ private static void test(int i) {
+ try {
+ thrower(i);
+ } catch (SonException | DaughterException e) {
+ Class<? extends ParentException> clazz = e.getClass();
+ HasFoo m = e;
+ e.foo();
+
+ try (AutoCloseable ac = e) {
+ e.toString();
+ } catch(Exception except) {
+ throw new RuntimeException(except);
+ }
+ }
+ }
+
+ private static interface HasFoo {
+ void foo();
+ }
+
+ private static void thrower(int i) throws SonException, DaughterException {
+ if (i == 0)
+ throw new SonException();
+ else
+ throw new DaughterException();
+ }
+
+ private static class ParentException extends RuntimeException {}
+
+ private static class SonException
+ extends ParentException
+ implements HasFoo, AutoCloseable {
+
+ public void foo() {
+ record |= 0b01;
+ }
+
+ @Override
+ public void close() {
+ closeRecord |= 0b01;
+ }
+ }
+
+ private static class DaughterException
+ extends ParentException
+ implements HasFoo, AutoCloseable {
+
+ public void foo() {
+ record |= 0b10;
+ }
+
+ @Override
+ public void close() {
+ closeRecord |= 0b10;
+ }
+ }
+}
--- a/langtools/test/tools/javac/multicatch/model/Model01.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/multicatch/model/Model01.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
else
throw new B2();
}
- catch(B1 | B2 ex) { }
+ catch(@UnionTypeInfo({"Test.B1", "Test.B2"}) B1 | B2 ex) { }
}
}
--- a/langtools/test/tools/javac/multicatch/model/ModelChecker.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/multicatch/model/ModelChecker.java Sat May 14 11:24:26 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
* 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,7 +30,7 @@
* @compile -processor ModelChecker Model01.java
*/
-import com.sun.source.tree.VariableTree;
+import com.sun.source.tree.CatchTree;
import com.sun.source.util.TreePathScanner;
import com.sun.source.util.Trees;
import com.sun.source.util.TreePath;
@@ -41,6 +41,12 @@
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.UnionType;
+import javax.lang.model.type.UnknownTypeException;
+import javax.lang.model.util.SimpleTypeVisitor6;
+import javax.lang.model.util.SimpleTypeVisitor7;
@SupportedAnnotationTypes("Check")
public class ModelChecker extends JavacTestingAbstractProcessor {
@@ -69,20 +75,59 @@
}
@Override
- public Void visitVariable(VariableTree node, Void p) {
- Element ex = trees.getElement(getCurrentPath());
+ public Void visitCatch(CatchTree node, Void p) {
+ TreePath param = new TreePath(getCurrentPath(), node.getParameter());
+ Element ex = trees.getElement(param);
+ validateUnionTypeInfo(ex);
if (ex.getSimpleName().contentEquals("ex")) {
assertTrue(ex.getKind() == ElementKind.EXCEPTION_PARAMETER, "Expected EXCEPTION_PARAMETER - found " + ex.getKind());
- for (Element e : types.asElement(ex.asType()).getEnclosedElements()) {
+ for (Element e : types.asElement(trees.getLub(node)).getEnclosedElements()) {
Member m = e.getAnnotation(Member.class);
if (m != null) {
assertTrue(e.getKind() == m.value(), "Expected " + m.value() + " - found " + e.getKind());
}
}
- assertTrue(assertionCount == 3, "Expected 3 assertions - found " + assertionCount);
+ assertTrue(assertionCount == 9, "Expected 9 assertions - found " + assertionCount);
}
- return super.visitVariable(node, p);
+ return super.visitCatch(node, p);
+ }
+ }
+
+ private void validateUnionTypeInfo(Element ex) {
+ UnionTypeInfo ut = ex.getAnnotation(UnionTypeInfo.class);
+ assertTrue(ut != null, "UnionType annotation must be present");
+
+ TypeMirror expectedUnionType = ex.asType();
+ assertTrue(expectedUnionType.getKind() == TypeKind.UNION, "UNION kind expected");
+
+ try {
+ new SimpleTypeVisitor6<Void, Void>(){}.visit(expectedUnionType);
+ throw new RuntimeException("Expected UnknownTypeException not thrown.");
+ } catch (UnknownTypeException ute) {
+ ; // Expected
}
+
+ UnionType unionType = new SimpleTypeVisitor7<UnionType, Void>(){
+ @Override
+ protected UnionType defaultAction(TypeMirror e, Void p) {return null;}
+
+ @Override
+ public UnionType visitUnion(UnionType t, Void p) {return t;}
+ }.visit(expectedUnionType);
+ assertTrue(unionType != null, "Must get a non-null union type.");
+
+ assertTrue(ut.value().length == unionType.getAlternatives().size(), "Cardinalities do not match");
+
+ String[] typeNames = ut.value();
+ for(int i = 0; i < typeNames.length; i++) {
+ TypeMirror typeFromAnnotation = nameToType(typeNames[i]);
+ assertTrue(types.isSameType(typeFromAnnotation, unionType.getAlternatives().get(i)),
+ "Types were not equal.");
+ }
+ }
+
+ private TypeMirror nameToType(String name) {
+ return elements.getTypeElement(name).asType();
}
private static void assertTrue(boolean cond, String msg) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/model/UnionTypeInfo.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+/**
+ * Used by ModelChecker to validate the modeling information of a union type.
+ */
+@interface UnionTypeInfo {
+ String[] value();
+}
--- a/langtools/test/tools/javac/processing/model/TestSymtabItems.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/processing/model/TestSymtabItems.java Sat May 14 11:24:26 2011 -0700
@@ -44,6 +44,7 @@
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symtab;
import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.main.JavaCompiler;
import com.sun.tools.javac.model.JavacTypes;
import com.sun.tools.javac.util.Context;
@@ -62,6 +63,7 @@
JavacFileManager.preRegister(c);
Symtab syms = Symtab.instance(c);
JavacTypes types = JavacTypes.instance(c);
+ JavaCompiler.instance(c); // will init ClassReader.sourceCompleter
// print("noSymbol", syms.noSymbol);
// print("errSymbol", syms.errSymbol);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/model/type/TestUnionType.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7029150
+ * @summary Test support for union types
+ * @library ../../../lib
+ */
+
+import java.net.URI;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import javax.lang.model.util.*;
+import javax.tools.*;
+
+import com.sun.source.tree.*;
+import com.sun.source.util.*;
+
+
+public class TestUnionType extends JavacTestingAbstractProcessor {
+ enum TestKind {
+ SingleType("E1", "E1",
+ "VariableTree: E1 e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type DECLARED",
+ "VariableTree: elem.type.elem CLASS E1",
+ "VariableTree: type DECLARED",
+ "VariableTree: type.elem CLASS E1",
+ "VariableTree: type.elem.type DECLARED"),
+
+ ValidTypes("E1, E2", "E1 | E2",
+ "VariableTree: E1 | E2 e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type UNION Test.E1,Test.E2",
+ "VariableTree: elem.type.elem null",
+ "VariableTree: type UNION Test.E1,Test.E2",
+ "VariableTree: type.elem null"),
+
+ InvalidTypes("E1, E2", "E1 | EMissing",
+ "VariableTree: E1 | EMissing e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type UNION Test.E1,EMissing",
+ "VariableTree: elem.type.elem null",
+ "VariableTree: type UNION Test.E1,EMissing",
+ "VariableTree: type.elem null"),
+
+ Uncaught("E1", "E1 | E2",
+ "VariableTree: E1 | E2 e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type UNION Test.E1,Test.E2",
+ "VariableTree: elem.type.elem null",
+ "VariableTree: type UNION Test.E1,Test.E2",
+ "VariableTree: type.elem null");
+
+ TestKind(String throwsTypes, String catchTypes, String... gold) {
+ this.throwsTypes = throwsTypes;
+ this.catchTypes = catchTypes;
+ this.gold = Arrays.asList(gold);
+ }
+
+ final String throwsTypes;
+ final String catchTypes;
+ final List<String> gold;
+ }
+
+ static class TestFileObject extends SimpleJavaFileObject {
+ public static final String template =
+ "class Test {\n"
+ + " class E1 extends Exception { }\n"
+ + " class E2 extends Exception { }\n"
+ + " void doSomething() throws #T { }\n"
+ + " void test() {\n"
+ + " try {\n"
+ + " doSomething();\n"
+ + " } catch (#C e) {\n"
+ + " }\n"
+ + " }\n"
+ + "}\n";
+
+ public TestFileObject(TestKind tk) {
+ super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+ this.tk = tk;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return template
+ .replace("#T", tk.throwsTypes)
+ .replace("#C", tk.catchTypes);
+ }
+ final TestKind tk;
+ }
+
+ public static void main(String... args) throws Exception {
+ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+ List<String> options = Arrays.asList("-proc:only");
+ for (TestKind tk: TestKind.values()) {
+ System.err.println("Test: " + tk);
+ TestUnionType p = new TestUnionType();
+ JavaFileObject fo = new TestFileObject(tk);
+ JavaCompiler.CompilationTask task = comp.getTask(null, null, null, options, null, Arrays.asList(fo));
+ task.setProcessors(Arrays.asList(p));
+ boolean ok = task.call();
+ System.err.println("compilation " + (ok ? "passed" : "failed"));
+ if (!ok)
+ throw new Exception("compilation failed unexpectedly");
+ if (!p.log.equals(tk.gold)) {
+ System.err.println("Expected output:");
+ for (String g: tk.gold)
+ System.err.println(g);
+ throw new Exception("unexpected output from test");
+ }
+ System.err.println();
+ }
+ }
+
+ Trees trees;
+ List<String> log;
+
+ @Override
+ public void init(ProcessingEnvironment env) {
+ super.init(env);
+ trees = Trees.instance(env);
+ log = new ArrayList<String>();
+ }
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ if (!roundEnv.processingOver()) {
+ for (Element e: roundEnv.getRootElements()) {
+ scan(trees.getPath(e));
+ }
+ }
+ return true;
+ }
+
+ void scan(TreePath path) {
+ new Scanner().scan(path, null);
+ }
+
+ class Scanner extends TreePathScanner<Void,Void> {
+ @Override
+ public Void visitVariable(VariableTree tree, Void ignore) {
+ TreePath p = getCurrentPath();
+ Element e = trees.getElement(p);
+ if (e.getKind() == ElementKind.EXCEPTION_PARAMETER) {
+ log("VariableTree: " + tree);
+ log("VariableTree: elem " + print(e));
+ log("VariableTree: elem.type " + print(e.asType()));
+ log("VariableTree: elem.type.elem " + print(types.asElement(e.asType())));
+ TypeMirror tm = trees.getTypeMirror(p);
+ log("VariableTree: type " + print(tm));
+ log("VariableTree: type.elem " + print(types.asElement(tm)));
+ if (types.asElement(tm) != null)
+ log("VariableTree: type.elem.type " + print(types.asElement(tm).asType()));
+ }
+ return super.visitVariable(tree, null);
+ }
+
+ String print(TypeMirror tm) {
+ return (tm == null) ? null : new TypePrinter().visit(tm);
+ }
+
+ String print(Element e) {
+ return (e == null) ? null : (e.getKind() + " " + e.getSimpleName());
+ }
+
+ void log(String msg) {
+ System.err.println(msg);
+ log.add(msg);
+ }
+ }
+
+ class TypePrinter extends SimpleTypeVisitor7<String, Void> {
+ @Override
+ protected String defaultAction(TypeMirror tm, Void ignore) {
+ return String.valueOf(tm.getKind());
+ }
+
+ @Override
+ public String visitUnion(UnionType t, Void ignore) {
+ return (t.getKind() + " " + t.getAlternatives());
+ }
+ }
+}
--- a/langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java Fri May 13 13:20:16 2011 +0200
+++ b/langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java Sat May 14 11:24:26 2011 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7017664
+ * @bug 7017664 7036906
* @summary Basher for CompoundScopes
*/
@@ -127,8 +127,17 @@
}
}
log("testing scope: " + root);
- checkElems(root);
- checkShadowed(root);
+ checkElems(root, null);
+ checkElems(root, new OddFilter());
+ checkShadowed(root, null);
+ checkShadowed(root, new OddFilter());
+ }
+ }
+
+ class OddFilter implements Filter<Symbol> {
+ public boolean accepts(Symbol s) {
+ Name numPart = s.name.subName(1, s.name.length());
+ return Integer.parseInt(numPart.toString()) % 2 != 0;
}
}
@@ -165,15 +174,20 @@
* Check that CompoundScope.getElements() correctly visits all symbols
* in all subscopes (in the correct order)
*/
- void checkElems(CompoundScope cs) {
- List<Symbol> allSymbols = elems;
+ void checkElems(CompoundScope cs, Filter<Symbol> sf) {
int count = 0;
- for (Symbol s : cs.getElements()) {
+ ListBuffer<Symbol> found = ListBuffer.lb();
+ List<Symbol> allSymbols = sf == null ?
+ elems :
+ filter(elems, sf);
+ int expectedCount = allSymbols.length();
+ for (Symbol s : sf == null ? cs.getElements() : cs.getElements(sf)) {
checkSameSymbols(s, allSymbols.head);
allSymbols = allSymbols.tail;
+ found.append(s);
count++;
}
- if (count != elems.size()) {
+ if (count != expectedCount) {
error("CompoundScope.getElements() did not returned enough symbols");
}
}
@@ -182,22 +196,35 @@
* Check that CompoundScope.getElements() correctly visits all symbols
* with a given name in all subscopes (in the correct order)
*/
- void checkShadowed(CompoundScope cs) {
+ void checkShadowed(CompoundScope cs, Filter<Symbol> sf) {
for (Map.Entry<Name, List<Symbol>> shadowedEntry : shadowedMap.entrySet()) {
int count = 0;
- List<Symbol> shadowed = shadowedEntry.getValue();
+ List<Symbol> shadowed = sf == null ?
+ shadowedEntry.getValue() :
+ filter(shadowedEntry.getValue(), sf);
+ int expectedCount = shadowed.length();
Name name = shadowedEntry.getKey();
- for (Symbol s : cs.getElementsByName(name)) {
+ for (Symbol s : sf == null ? cs.getElementsByName(name) : cs.getElementsByName(name, sf)) {
checkSameSymbols(s, shadowed.head);
shadowed = shadowed.tail;
count++;
}
- if (count != shadowedEntry.getValue().size()) {
+ if (count != expectedCount) {
error("CompoundScope.lookup() did not returned enough symbols for name " + name);
}
}
}
+ List<Symbol> filter(List<Symbol> elems, Filter<Symbol> sf) {
+ ListBuffer<Symbol> res = ListBuffer.lb();
+ for (Symbol s : elems) {
+ if (sf.accepts(s)) {
+ res.append(s);
+ }
+ }
+ return res.toList();
+ }
+
void checkSameSymbols(Symbol found, Symbol req) {
if (found != req) {
error("Symbol mismatch - found : " + found + ":" + found.hashCode() + "\n" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/types/CastObjectToPrimitiveTest.java Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7038363
+ * @summary cast from object to primitive should be for source >= 1.7
+ * @compile/fail/ref=CastObjectToPrimitiveTest.out -XDrawDiagnostics -Xlint:-options -source 5 CastObjectToPrimitiveTest.java
+ * @compile/fail/ref=CastObjectToPrimitiveTest.out -XDrawDiagnostics -Xlint:-options -source 6 CastObjectToPrimitiveTest.java
+ * @compile CastObjectToPrimitiveTest.java
+ */
+
+class CastObjectToPrimitiveTest {
+ void m() {
+ Object o = 42;
+ int i = (int) o;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/types/CastObjectToPrimitiveTest.out Sat May 14 11:24:26 2011 -0700
@@ -0,0 +1,2 @@
+CastObjectToPrimitiveTest.java:36:23: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), java.lang.Object, int
+1 error