Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 8586dc90 编写于 作者: L lana
浏览文件
操作

Merge

上级 48a3ac87 f4849a9a
展开全部 隐藏空白更改
内联 并排
Showing with 26996 addition and 13573 deletion
.hgtags
浏览文件 @ 8586dc90
......@@ -114,3 +114,6 @@ aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
9315c733fb17ddfb9fb44be7e0ffea37bf3c727d jdk7-b140
63eeefe118da18c75ba3d36266768cd1ccaaca6b jdk7-b141
312612e89ece62633f4809706dec00bcd5fe7c2d jdk7-b142
make/common/Defs-linux.gmk
浏览文件 @ 8586dc90
......@@ -354,7 +354,7 @@ HAVE_DPS = no
# Japanese manpages
#
JA_SOURCE_ENCODING = eucJP
JA_TARGET_ENCODINGS = eucJP
JA_TARGET_ENCODINGS = UTF-8
# Settings for the JDI - Serviceability Agent binding.
HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
......
make/common/Program.gmk
浏览文件 @ 8586dc90
......@@ -55,10 +55,13 @@ program_default_rule: all
program: $(ACTUAL_PROGRAM)
# reuse the mapfiles in the launcher's directory, the same should
# be applicable to the tool launchers as well.
FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
include $(BUILDDIR)/common/Mapfile-vers.gmk
# Work-around for missing processor specific mapfiles
ifndef CROSS_COMPILE_ARCH
# reuse the mapfiles in the launcher's directory, the same should
# be applicable to the tool launchers as well.
FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
include $(BUILDDIR)/common/Mapfile-vers.gmk
endif
include $(JDK_TOPDIR)/make/common/Rules.gmk
......
make/common/Release.gmk
浏览文件 @ 8586dc90
......@@ -85,8 +85,8 @@ ifdef OPENJDK
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
......@@ -164,7 +164,7 @@ endif # solaris
ifeq ($(PLATFORM), linux)
MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
MAN1SUBDIR=man
JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
JA_DIRNAME=ja_JP.UTF-8
endif # linux
define copy-man-pages
......@@ -190,8 +190,7 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
done
$(java-vm-cleanup)
if [ "$(JA_DIRNAME)" != "" ] ; then \
$(MV) $1/man/ja $1/man/$(JA_DIRNAME); \
$(CD) $1/man && $(LN) -s $(JA_DIRNAME) ja; \
$(CD) $1/man && $(RM) ja && $(LN) -s $(JA_DIRNAME) ja; \
fi
endef
......
make/common/shared/Defs-utils.gmk
浏览文件 @ 8586dc90
......@@ -109,6 +109,8 @@ FMT = $(UTILS_COMMAND_PATH)fmt
GDB = $(UTILS_USR_BIN_PATH)gdb
GREP = $(UTILS_COMMAND_PATH)grep
GUNZIP = $(UTILS_COMMAND_PATH)gunzip
# GZIP is used for solaris. Linux and windows use tar czf
GZIP = $(UTILS_COMMAND_PATH)gzip
HEAD = $(UTILS_USR_BIN_PATH)head
HG = hg
ID = $(UTILS_COMMAND_PATH)id
......
make/common/shared/Defs-versions.gmk
浏览文件 @ 8586dc90
......@@ -72,10 +72,6 @@ endif
# REQUIRED_DXSDK_VER
# Windows only: The version of DirectX SDK expected.
#
# REQUIRED_FREE_SPACE
# The minimum disk space needed as determined by running 'du -sk' on a fully
# built workspace.
#
# REQUIRED_FREETYPE_VERSION
# If we are using freetype, the freetype version expected.
#
......@@ -131,11 +127,6 @@ ifeq ($(PLATFORM), solaris)
REQUIRED_OS_VERSION = 5.10
REQUIRED_OS_VARIANT_NAME = Solaris
REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
ifeq ($(ARCH_FAMILY), sparc)
REQUIRED_FREE_SPACE = 1300000
else
REQUIRED_FREE_SPACE = 1040000
endif
REQUIRED_COMPILER_NAME = Sun Studio 12 Update 1
REQUIRED_COMPILER_VERSION = SS12u1
# Cross-compilation compiler versions are target specific
......@@ -157,7 +148,6 @@ ifeq ($(PLATFORM), linux)
REQUIRED_OS_VERSION = 2.6
REQUIRED_OS_VARIANT_NAME = Fedora
REQUIRED_OS_VARIANT_VERSION = 9
REQUIRED_FREE_SPACE = 1460000
REQUIRED_ALSA_VERSION = 0.9.1
REQUIRED_COMPILER_NAME = GCC4
REQUIRED_COMPILER_VERSION = GCC4
......@@ -187,7 +177,6 @@ ifeq ($(PLATFORM), windows)
REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
REQUIRED_CYGWIN_VER = 4.0
REQUIRED_MKS_VER = 6.1
REQUIRED_FREE_SPACE = 500000
REQUIRED_DXSDK_VER = 0x0900
ifeq ($(CC_VERSION),msvc)
REQUIRED_COMPILER_NAME = Visual Studio 10
......
make/common/shared/Platform.gmk
浏览文件 @ 8586dc90
......@@ -428,8 +428,6 @@ endif
# Machines with 512Mb or less of real memory are considered low memory
# build machines and adjustments will be made to prevent excessing
# system swapping during the build.
# If we don't know, assume 512. Subtract 128 from MB for VM MAX.
# Don't set VM max over 1024-128=896.
ifeq ($(JDK_HAS_MEM_INFO),)
JDK_HAS_MEM_INFO=true
export JDK_HAS_MEM_INFO
......@@ -440,18 +438,8 @@ ifeq ($(JDK_HAS_MEM_INFO),)
else \
echo "false"; \
fi)
MAX_VM_MEMORY := $(shell \
if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
expr $(MB_OF_MEMORY) '-' 128 2> $(DEV_NULL) ; \
else \
echo "896"; \
fi)
MIN_VM_MEMORY := $(shell \
if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
expr $(MAX_VM_MEMORY) '-' 8 2> $(DEV_NULL) ; \
else \
echo "128"; \
fi)
MAX_VM_MEMORY := 512
MIN_VM_MEMORY := $(MAX_VM_MEMORY)
else
MB_OF_MEMORY := unknown
LOW_MEMORY_MACHINE := true
......
make/common/shared/Sanity-Settings.gmk
浏览文件 @ 8586dc90
......@@ -192,8 +192,6 @@ endif
ALL_SETTINGS+=$(call addRequiredVersionSetting,OS_VERSION)
ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_NAME)
ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_VERSION)
ALL_SETTINGS+=$(call addRequiredSetting,TEMP_FREE_SPACE)
ALL_SETTINGS+=$(call addRequiredSetting,FREE_SPACE)
ALL_SETTINGS+=$(call addRequiredSetting,MB_OF_MEMORY)
......
make/common/shared/Sanity.gmk
浏览文件 @ 8586dc90
......@@ -69,8 +69,6 @@ endef
# Settings and rules to validate the JDK build environment.
ifeq ($(PLATFORM), solaris)
FREE_SPACE := $(shell $(DF) -b $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
TEMP_FREE_SPACE := $(shell $(DF) -b $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
# What kind of system we are using (Variations are Solaris and OpenSolaris)
OS_VERSION := $(shell uname -r)
OS_VARIANT_NAME := $(strip $(shell head -1 /etc/release | awk '{print $$1;}') )
......@@ -88,8 +86,6 @@ ifeq ($(PLATFORM), solaris)
endif
ifeq ($(PLATFORM), linux)
FREE_SPACE := $(shell $(DF) --sync -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
TEMP_FREE_SPACE := $(shell $(DF) --sync -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
# What kind of system we are using (Variation is the Linux vendor)
OS_VERSION := $(shell uname -r)
OS_VARIANT_NAME := $(shell \
......@@ -118,8 +114,6 @@ ifeq ($(PLATFORM), linux)
endif
ifeq ($(PLATFORM), windows)
FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
# Windows 2000 is 5.0, Windows XP is 5.1, Windows 2003 is 5.2
# Assume 5.0 (Windows 2000) if systeminfo does not help
WINDOWS_MAPPING-5.0 := Windows2000
......@@ -715,18 +709,6 @@ sane-outputdir:
" Either obtain these permissions or set ALT_OUTPUTDIR. \n" \
"" >> $(ERROR_FILE) ; \
fi
@#
@# OUTPUTDIR must have enough free space...
@#
@if [ $(FREE_SPACE) -lt $(REQUIRED_FREE_SPACE) ]; then \
$(ECHO) "WARNING: You may not have enough free space in your OUTPUTDIR. The \n" \
" current value of OUTPUTDIR is \n" \
" $(OUTPUTDIR) \n" \
" You need "$(REQUIRED_FREE_SPACE)" Kbytes free on this device to build \n" \
" and it appears that only "$(FREE_SPACE)" Kbytes are free. \n" \
" Either obtain more space or set ALT_OUTPUTDIR to a larger disk. \n" \
"" >> $(WARNING_FILE) ; \
fi
######################################################
# if specified, ALT_BOOTDIR must point to non-relative path if set
......
make/docs/Makefile
浏览文件 @ 8586dc90
......@@ -51,6 +51,7 @@ DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs/index.html
DEV_DOCS_URL-6 = http://download.oracle.com/javase/6/docs/index.html
DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
# Url to Java Language Spec
#JLS3_URL = http://java.sun.com/docs/books/jls/
......@@ -205,7 +206,13 @@ COMMON_JAVADOCFLAGS = \
-use \
-keywords \
$(ADDITIONAL_JAVADOCFLAGS)
ADDITIONAL_JAVADOCFLAGS =
ifdef OPENJDK
ADDITIONAL_JAVADOCFLAGS = \
-Xdocrootparent $(DOCS_BASE_URL)
else
ADDITIONAL_JAVADOCFLAGS =
endif
# Draft used for non-fcs documents
JDK_IS_FCS = false
......@@ -1142,56 +1149,6 @@ $(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAP
$(prep-target)
$(call PackageFilter,$(SCTPAPI_PKGS))
#############################################################
#
# tracingdocs
#
ALL_OTHER_TARGETS += tracingdocs
TRACING_DOCDIR := $(JRE_API_DOCSDIR)/tracing
TRACING2COREAPI := ../$(JDKJRE2COREAPI)
TRACING_DOCTITLE := Java$(TRADEMARK) Platform Tracing
TRACING_WINDOWTITLE := Platform Tracing
TRACING_HEADER := <strong>Platform Tracing</strong>
TRACING_BOTTOM := $(call CommonBottom,$(TRACING_FIRST_COPYRIGHT_YEAR))
# TRACING_PKGS is located in NON_CORE_PKGS.gmk
TRACING_INDEX_HTML = $(TRACING_DOCDIR)/index.html
TRACING_OPTIONS_FILE = $(DOCSTMPDIR)/tracing.options
TRACING_PACKAGES_FILE = $(DOCSTMPDIR)/tracing.packages
tracingdocs: $(TRACING_INDEX_HTML)
# Set relative location to core api document root
$(TRACING_INDEX_HTML): GET2DOCSDIR=$(TRACING2COREAPI)/..
# Run javadoc if the index file is out of date or missing
$(TRACING_INDEX_HTML): $(TRACING_OPTIONS_FILE) $(TRACING_PACKAGES_FILE)
$(prep-javadoc)
$(call JavadocSummary,$(TRACING_OPTIONS_FILE),$(TRACING_PACKAGES_FILE))
$(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
@$(TRACING_OPTIONS_FILE) @$(TRACING_PACKAGES_FILE)
# Create file with javadoc options in it
$(TRACING_OPTIONS_FILE):
$(prep-target)
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(TRACING_DOCTITLE)) ; \
$(call OptionPair,-windowtitle,$(TRACING_WINDOWTITLE) $(DRAFT_WINTITLE));\
$(call OptionPair,-header,$(TRACING_HEADER)$(DRAFT_HEADER)) ; \
$(call OptionPair,-bottom,$(TRACING_BOTTOM)$(DRAFT_BOTTOM)) ; \
$(call OptionTrip,-linkoffline,$(TRACING2COREAPI),$(COREAPI_DOCSDIR)/); \
) >> $@
# Create a file with the package names in it
$(TRACING_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TRACING_PKGS))
$(prep-target)
$(call PackageFilter,$(TRACING_PKGS))
#############################################################
#
# Get a cache of all the directories
......
make/docs/NON_CORE_PKGS.gmk
浏览文件 @ 8586dc90
......@@ -88,9 +88,6 @@ SMARTCARDIO_PKGS = javax.smartcardio
SCTPAPI_PKGS = com.sun.nio.sctp
TRACING_PKGS = com.sun.tracing \
com.sun.tracing.dtrace
# non-core packages in rt.jar
NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(MGMT_PKGS) \
......@@ -100,6 +97,5 @@ NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(OLD_JSSE_PKGS) \
$(HTTPSERVER_PKGS) \
$(SMARTCARDIO_PKGS) \
$(TRACING_PKGS) \
$(SCTPAPI_PKGS)
make/java/java/FILES_java.gmk
浏览文件 @ 8586dc90
......@@ -356,6 +356,7 @@ JAVA_JAVA_java = \
java/util/regex/Matcher.java \
java/util/regex/MatchResult.java \
java/util/regex/ASCII.java \
java/util/regex/UnicodeProp.java \
java/util/regex/PatternSyntaxException.java \
java/util/prefs/Preferences.java \
java/util/prefs/AbstractPreferences.java \
......
make/java/java/Makefile
浏览文件 @ 8586dc90
......@@ -345,30 +345,35 @@ $(GENSRCDIR)/java/lang/CharacterDataLatin1.java \
-template $(CHARACTERDATA)/CharacterDataLatin1.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterDataLatin1.java -string \
-usecharforbyte -latin1 8
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 0 \
-template $(CHARACTERDATA)/CharacterData00.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData00.java -string \
-usecharforbyte 11 4 1
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 1 \
-template $(CHARACTERDATA)/CharacterData01.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData01.java -string \
-usecharforbyte 11 4 1
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 2 \
-template $(CHARACTERDATA)/CharacterData02.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData02.java -string \
-usecharforbyte 11 4 1
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 14 \
-template $(CHARACTERDATA)/CharacterData0E.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData0E.java -string \
-usecharforbyte 11 4 1
......
make/java/management/Makefile
浏览文件 @ 8586dc90
......@@ -63,6 +63,20 @@ else # PLATFORM (i.e. solaris & linux)
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
#
......
make/java/management/mapfile-vers
浏览文件 @ 8586dc90
......@@ -32,7 +32,9 @@ SUNWprivate_1.1 {
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;
......
make/java/nio/FILES_java.gmk
浏览文件 @ 8586dc90
......@@ -71,6 +71,7 @@ FILES_src = \
java/nio/charset/CoderMalfunctionError.java \
java/nio/charset/CodingErrorAction.java \
java/nio/charset/MalformedInputException.java \
java/nio/charset/StandardCharset.java \
java/nio/charset/UnmappableCharacterException.java \
\
java/nio/charset/spi/CharsetProvider.java \
......
make/java/nio/mapfile-linux
浏览文件 @ 8586dc90
......@@ -44,7 +44,6 @@ SUNWprivate_1.1 {
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent;
Java_sun_nio_ch_EPoll_init;
Java_sun_nio_ch_EPoll_eventSize;
Java_sun_nio_ch_EPoll_eventsOffset;
Java_sun_nio_ch_EPoll_dataOffset;
......@@ -129,7 +128,6 @@ SUNWprivate_1.1 {
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
Java_sun_nio_fs_LinuxWatchService_init;
Java_sun_nio_fs_LinuxWatchService_eventSize;
Java_sun_nio_fs_LinuxWatchService_eventOffsets;
Java_sun_nio_fs_LinuxWatchService_inotifyInit;
......
make/java/security/Makefile
浏览文件 @ 8586dc90
#
# Copyright (c) 1996, 2011 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1996, 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
......@@ -44,11 +44,9 @@ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris
else # PLATFORM
# Register Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
# Register Microsoft CryptoAPI provider only on Windows platform.
ifeq ($(PLATFORM), windows)
ifneq ($(ARCH_DATA_MODEL), 64)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
endif
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
endif
endif # PLATFORM
......
make/jpda/jdwp/jdwp.spec
浏览文件 @ 8586dc90
......@@ -2190,7 +2190,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Out
(byte eventKind "Event kind to request. "
"See <a href=\"#JDWP_EventKind\">JDWP.EventKind</a> "
"for a complete list of events that can be requested. "
"for a complete list of events that can be requested; "
"some events may require a capability in order to be requested. "
)
(byte suspendPolicy
"What threads are suspended when this event occurs? "
......@@ -2732,6 +2733,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Alt MonitorContendedEnter=JDWP.EventKind.MONITOR_CONTENDED_ENTER
"Notification that a thread in the target VM is attempting "
"to enter a monitor that is already acquired by another thread. "
"Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>Since JDWP version 1.6. "
(int requestID
......@@ -2743,6 +2746,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Alt MonitorContendedEntered=JDWP.EventKind.MONITOR_CONTENDED_ENTERED
"Notification of a thread in the target VM is entering a monitor "
"after waiting for it to be released by another thread. "
"Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>Since JDWP version 1.6. "
(int requestID
......@@ -2753,6 +2758,8 @@ JDWP "Java(tm) Debug Wire Protocol"
)
(Alt MonitorWait=JDWP.EventKind.MONITOR_WAIT
"Notification of a thread about to wait on a monitor object. "
"Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>Since JDWP version 1.6. "
(int requestID
......@@ -2764,6 +2771,8 @@ JDWP "Java(tm) Debug Wire Protocol"
)
(Alt MonitorWaited=JDWP.EventKind.MONITOR_WAITED
"Notification that a thread in the target VM has finished waiting on "
"Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"a monitor object. "
"<p>Since JDWP version 1.6. "
......@@ -3050,9 +3059,9 @@ JDWP "Java(tm) Debug Wire Protocol"
(Constant METHOD_EXIT =41 )
(Constant METHOD_EXIT_WITH_RETURN_VALUE =42 )
(Constant MONITOR_CONTENDED_ENTER =43 )
(Constant MONITOR_CONTENDED_ENTERED =44 )
(Constant MONITOR_WAIT =45 )
(Constant MONITOR_WAITED =46 )
(Constant MONITOR_CONTENDED_ENTERED =44 )
(Constant MONITOR_WAIT =45 )
(Constant MONITOR_WAITED =46 )
(Constant VM_START =90 )
(Constant VM_INIT =90 "obsolete - was used in jvmdi")
(Constant VM_DEATH =99 )
......
make/sun/javazic/tzdata/VERSION
浏览文件 @ 8586dc90
......@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2011e
tzdata2011g
make/sun/javazic/tzdata/africa
浏览文件 @ 8586dc90
......@@ -234,7 +234,21 @@ Rule Egypt 1989 only - May 6 1:00 1:00 S
Rule Egypt 1990 1994 - May 1 1:00 1:00 S
# IATA (after 1990) says transitions are at 0:00.
# Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
Rule Egypt 1995 max - Apr lastFri 0:00s 1:00 S
# From Alexander Krivenyshev (2011-04-20):
# "...Egypt's interim cabinet decided on Wednesday to cancel daylight
# saving time after a poll posted on its website showed the majority of
# Egyptians would approve the cancellation."
#
# Egypt to cancel daylight saving time
# <a href="http://www.almasryalyoum.com/en/node/407168">
# http://www.almasryalyoum.com/en/node/407168
# </a>
# or
# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html">
# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
# </a>
Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S
Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 -
# From Steffen Thorsen (2006-09-19):
# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
......@@ -335,7 +349,7 @@ Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
Rule Egypt 2009 only - Aug 20 23:00s 0 -
Rule Egypt 2010 only - Aug 11 0:00 0 -
Rule Egypt 2010 only - Sep 10 0:00 1:00 S
Rule Egypt 2010 max - Sep lastThu 23:00s 0 -
Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Cairo 2:05:00 - LMT 1900 Oct
......
make/sun/javazic/tzdata/europe
浏览文件 @ 8586dc90
......@@ -168,7 +168,7 @@
# A monument to Willett was unveiled on 1927-05-21, in an open space in
# a 45-acre wood near Chislehurst, Kent that was purchased by popular
# subscription and open to the public. On the south face of the monolith,
# designed by G. W. Miller, is the the William Willett Memorial Sundial,
# designed by G. W. Miller, is the...William Willett Memorial Sundial,
# which is permanently set to Summer Time.
# From Winston Churchill (1934-04-28):
......@@ -1808,7 +1808,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1
#
# All these events predate our cutoff date of 1970. Unless we can
# come up with more definitive info about the timekeeping during the
# war years it's probably best just do do the following for now:
# war years it's probably best just do...the following for now:
Link Europe/Oslo Arctic/Longyearbyen
# Poland
......
make/sun/javazic/tzdata/southamerica
浏览文件 @ 8586dc90
......@@ -767,7 +767,7 @@ Zone America/La_Paz -4:32:36 - LMT 1890
#
# As a result of the above Decree I believe the America/Rio_Branco
# timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
# be created to represent the the west side of the Para State. I
# be created to represent the...west side of the Para State. I
# suggest this new timezone be called Santarem as the most
# important/populated city in the affected area.
#
......@@ -1365,6 +1365,24 @@ Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
# For now, we'll just record the time in Stanley, since we have no
# better info.
# From Steffen Thorsen (2011-04-01):
# The Falkland Islands will not turn back clocks this winter, but stay on
# daylight saving time.
#
# One source:
# <a href="http://www.falklandnews.com/public/story.cfm?get=5914&source=3">
# http://www.falklandnews.com/public/story.cfm?get=5914&source=3
# </a>
#
# We have gotten this confirmed by a clerk of the legislative assembly:
# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the
# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3
# hours) on the first Sunday of September at 0200hrs.
#
# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands
# will not revert to local mean time, but clocks will remain on Summer
# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term
# change to local time following the trial period will be notified.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S
Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
......@@ -1376,7 +1394,8 @@ Rule Falk 1984 1985 - Apr lastSun 0:00 0 -
Rule Falk 1984 only - Sep 16 0:00 1:00 S
Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S
Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 -
Rule Falk 2001 max - Apr Sun>=15 2:00 0 -
Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 -
Rule Falk 2012 max - Apr Sun>=15 2:00 0 -
Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Atlantic/Stanley -3:51:24 - LMT 1890
......
make/sun/security/Makefile
浏览文件 @ 8586dc90
#
# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1996, 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
......@@ -52,12 +52,10 @@ ifeq ($(ARCH_DATA_MODEL), 64)
endif
endif
# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
# Build Microsoft CryptoAPI provider only on Windows platform.
MSCAPI =
ifeq ($(PLATFORM), windows)
ifneq ($(ARCH_DATA_MODEL), 64)
MSCAPI = mscapi
endif
MSCAPI = mscapi
endif
# Build in-tree elliptic curve crypto provider only when
......
make/tools/GenerateCharacter/CharacterData00.java.template
浏览文件 @ 8586dc90
......@@ -73,11 +73,37 @@ class CharacterData00 extends CharacterData {
return props;
}
int getPropertiesEx(int ch) {
char offset = (char)ch;
int props = $$LookupEx(offset);
return props;
}
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
}
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0;
}
boolean isIdeographic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskIdeographic) != 0;
}
boolean isJavaIdentifierStart(int ch) {
int props = getProperties(ch);
return ((props & $$maskIdentifierInfo) >= $$lowJavaStart);
......
make/tools/GenerateCharacter/CharacterData01.java.template
浏览文件 @ 8586dc90
......@@ -72,11 +72,37 @@ class CharacterData01 extends CharacterData {
return props;
}
int getPropertiesEx(int ch) {
char offset = (char)ch;
int props = $$LookupEx(offset);
return props;
}
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
}
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0;
}
boolean isIdeographic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskIdeographic) != 0;
}
boolean isJavaIdentifierStart(int ch) {
int props = getProperties(ch);
return ((props & $$maskIdentifierInfo) >= $$lowJavaStart);
......
make/tools/GenerateCharacter/CharacterData02.java.template
浏览文件 @ 8586dc90
......@@ -66,11 +66,37 @@ class CharacterData02 extends CharacterData {
*/
int getProperties(int ch) {
char offset = (char)ch;
char offset = (char)ch;
int props = $$Lookup(offset);
return props;
}
int getPropertiesEx(int ch) {
char offset = (char)ch;
int props = $$LookupEx(offset);
return props;
}
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0;
}
boolean isIdeographic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskIdeographic) != 0;
}
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
......
make/tools/GenerateCharacter/CharacterData0E.java.template
浏览文件 @ 8586dc90
......@@ -66,11 +66,37 @@ class CharacterData0E extends CharacterData {
*/
int getProperties(int ch) {
char offset = (char)ch;
char offset = (char)ch;
int props = $$Lookup(offset);
return props;
}
int getPropertiesEx(int ch) {
char offset = (char)ch;
int props = $$LookupEx(offset);
return props;
}
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0;
}
boolean isIdeographic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskIdeographic) != 0;
}
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
......
make/tools/GenerateCharacter/CharacterDataLatin1.java.template
浏览文件 @ 8586dc90
......@@ -67,11 +67,37 @@ class CharacterDataLatin1 extends CharacterData {
*/
int getProperties(int ch) {
char offset = (char)ch;
char offset = (char)ch;
int props = $$Lookup(offset);
return props;
}
int getPropertiesEx(int ch) {
char offset = (char)ch;
int props = $$LookupEx(offset);
return props;
}
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0;
}
boolean isIdeographic(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskIdeographic) != 0;
}
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
......
make/tools/UnicodeData/PropList.txt 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
浏览文件 @ 8586dc90
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
......@@ -34,6 +33,7 @@ import java.io.PrintWriter;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.File;
import java.util.List;
import build.tools.generatecharacter.CharacterName;
......@@ -68,18 +68,17 @@ public class GenerateCharacter {
final static boolean DEBUG = false;
final static int MAX_UNICODE_VALUE = 0xFFFF;
final static String commandMarker = "$$";
static String ROOT = "";
static String DefaultUnicodeSpecFileName = ROOT + "UnicodeData.txt";
static String DefaultSpecialCasingFileName = ROOT + "SpecialCasing.txt";
static String DefaultPropListFileName = ROOT + "PropList.txt";
static String DefaultJavaTemplateFileName = ROOT + "Character.java.template";
static String DefaultJavaOutputFileName = ROOT + "Character.java";
static String DefaultCTemplateFileName = ROOT + "Character.c.template";
static String DefaultCOutputFileName = ROOT + "Character.c";
static String CharacterDataClassName = "CharacterData";
static int plane = 0;
static int plane = 0;
/* The overall idea is that, in the generated Character class source code,
most character property data is stored in a special multi-level table whose
......@@ -105,7 +104,11 @@ public class GenerateCharacter {
entries are short rather than byte).
*/
/* The character properties are currently encoded into 32 bits in the following manner:
/* The character properties are currently encoded into A (32 bits)and B (16 bits)
two parts.
A: the low 32 bits are defined in the following manner:
1 bit Mirrored property.
4 bits Bidirectional category (see below) (unused if -nobidi switch specified)
9 bits A signed offset used for converting case .
......@@ -148,6 +151,14 @@ public class GenerateCharacter {
will produce the desired numeric value.
5 bits The digit offset (see description of previous field)
5 bits Character type (see below)
B: the high 16 bits are defined as:
1 bit Other_Lowercase property
1 bit Other_Uppercase property
1 bit Other_Alphabetic property
1 bit Other_Math property
1 bit Ideographic property
1 bit Noncharacter codepoint property
*/
......@@ -173,9 +184,22 @@ public class GenerateCharacter {
// case offset are 9 bits
maskCase = 0x01FF,
shiftBidi = 27, maskBidi = 0x78000000,
shiftMirrored = 31, maskMirrored = 0x80000000,
shiftMirrored = 31, //maskMirrored = 0x80000000,
shiftPlane = 16, maskPlane = 0xFF0000;
// maskMirrored needs to be long, if up 16-bit
private static final long maskMirrored = 0x80000000L;
// bit masks identify the 16-bit priperty field described above, in B
// table
private static final long
maskOtherLowercase = 0x100000000L,
maskOtherUppercase = 0x200000000L,
maskOtherAlphabetic = 0x400000000L,
maskOtherMath = 0x800000000L,
maskIdeographic = 0x1000000000L,
maskNoncharacterCP = 0x2000000000L;
// Can compare masked values with these to determine
// numeric or lexical types.
public static int
......@@ -258,7 +282,7 @@ public class GenerateCharacter {
* The specification file is assumed to contain its data in sorted order by
* character code; as a result, the array passed as an argument to this method
* has its components in the same sorted order, with one entry for each defined
* Unicode character or character range. (A range is indicated by two consecutive
* Unicode character or character range. (A range is indicated by two consecutive
* entries, such that the name of the first entry begins with "<" and ends with
* "First>" and the second entry begins with "<" and ends with "Last>".) This is
* therefore a sparse representation of the character property data.
......@@ -282,7 +306,8 @@ public class GenerateCharacter {
* @see GenerateCharacter#buildOne
*/
static long[] buildMap(UnicodeSpec[] data, SpecialCaseMap[] specialMaps) {
static long[] buildMap(UnicodeSpec[] data, SpecialCaseMap[] specialMaps, PropList propList)
{
long[] result;
if (bLatin1 == true) {
result = new long[256];
......@@ -290,13 +315,13 @@ public class GenerateCharacter {
result = new long[1<<16];
}
int k=0;
int codePoint = plane<<16;
int codePoint = plane<<16;
UnicodeSpec nonCharSpec = new UnicodeSpec();
for (int j = 0; j < data.length && k < result.length; j++) {
if (data[j].codePoint == codePoint) {
result[k] = buildOne(codePoint, data[j], specialMaps);
++k;
++codePoint;
++codePoint;
}
else if(data[j].codePoint > codePoint) {
if (data[j].name.endsWith("Last>")) {
......@@ -304,7 +329,7 @@ public class GenerateCharacter {
while (codePoint < data[j].codePoint && k < result.length) {
result[k] = buildOne(codePoint, data[j], specialMaps);
++k;
++codePoint;
++codePoint;
}
}
else {
......@@ -312,15 +337,14 @@ public class GenerateCharacter {
while (codePoint < data[j].codePoint && k < result.length) {
result[k] = buildOne(codePoint, nonCharSpec, specialMaps);
++k;
++codePoint;
++codePoint;
}
}
k = data[j].codePoint & 0xFFFF;
codePoint = data[j].codePoint;
codePoint = data[j].codePoint;
result[k] = buildOne(codePoint, data[j], specialMaps);
++k;
++codePoint;
++codePoint;
}
else {
System.out.println("An error has occured during spec mapping.");
......@@ -333,8 +357,17 @@ public class GenerateCharacter {
while (k < result.length) {
result[k] = buildOne(codePoint, nonCharSpec, specialMaps);
++k;
++codePoint;
++codePoint;
}
// now add all extra supported properties from PropList, to the
// upper 16-bit
addExProp(result, propList, "Other_Lowercase", maskOtherLowercase);
addExProp(result, propList, "Other_Uppercase", maskOtherUppercase);
addExProp(result, propList, "Other_Alphabetic", maskOtherAlphabetic);
addExProp(result, propList, "Ideographic", maskIdeographic);
//addExProp(result, propList, "Other_Math", maskOtherMath);
//addExProp(result, propList, "Noncharacter_CodePoint", maskNoncharacterCP);
return result;
}
......@@ -381,15 +414,15 @@ public class GenerateCharacter {
// record the general category
resultA |= us.generalCategory;
// record the numeric properties
NUMERIC: {
// record the numeric properties
NUMERIC: {
STRANGE: {
int val = 0;
// c is A-Z
// c is A-Z
if ((c >= 0x0041) && (c <= 0x005A)) {
val = c - 0x0041;
resultA |= valueJavaSupradecimal;
// c is a-z
// c is a-z
} else if ((c >= 0x0061) && (c <= 0x007A)) {
val = c - 0x0061;
resultA |= valueJavaSupradecimal;
......@@ -428,7 +461,7 @@ public class GenerateCharacter {
resultA |= valueStrangeNumeric;
} // end NUMERIC
// record case mapping
// record case mapping
int offset = 0;
// might have a 1:M mapping
int specialMap = SpecialCaseMap.find(c, specialCaseMaps);
......@@ -458,12 +491,12 @@ public class GenerateCharacter {
}
}
if ((us.hasTitleMap() && us.titleMap != us.upperMap) ||
(bHasUpper && us.hasLowerMap())) {
(bHasUpper && us.hasLowerMap())) {
resultA |= maskTitleCase;
}
if (bHasUpper && !us.hasLowerMap() && !us.hasTitleMap() && verbose) {
System.out.println("Warning: Character " + hex4(c) + " has upper but " +
"no title case; Java won't know this");
System.out.println("Warning: Character " + hex4(c) + " has upper but " +
"no title case; Java won't know this");
}
if (offset < minOffsetSeen) minOffsetSeen = offset;
if (offset > maxOffsetSeen) maxOffsetSeen = offset;
......@@ -475,8 +508,7 @@ public class GenerateCharacter {
}
resultA |= ((offset & maskCase) << shiftCaseOffset);
// record lexical info about this character
// record lexical info about this character
if (us.generalCategory == UnicodeSpec.LOWERCASE_LETTER
|| us.generalCategory == UnicodeSpec.UPPERCASE_LETTER
|| us.generalCategory == UnicodeSpec.TITLECASE_LETTER
......@@ -539,6 +571,16 @@ public class GenerateCharacter {
return resultA;
}
static void addExProp(long[] map, PropList propList, String prop, long mask) {
List<Integer> cps = propList.codepoints(prop);
if (cps != null) {
for (Integer cp : cps) {
if (cp < map.length)
map[cp] |= mask;
}
}
}
/**
* This is the heart of the table compression strategy. The inputs are a map
* and a number of bits (size). The map is simply an array of long integer values;
......@@ -645,8 +687,8 @@ OUTER: for (int i = 0; i < n; i += m) {
*/
static void generateCharacterClass(String theTemplateFileName,
String theOutputFileName)
throws FileNotFoundException, IOException {
String theOutputFileName)
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
out.println(commentStart +
......@@ -719,6 +761,9 @@ OUTER: for (int i = 0; i < n; i += m) {
if (x.length() >= 9 && x.substring(0, 7).equals("Lookup(") &&
x.substring(x.length()-1).equals(")") )
return genAccess("A", x.substring(7, x.length()-1), (identifiers ? 2 : 32));
if (x.length() >= 11 && x.substring(0, 9).equals("LookupEx(") &&
x.substring(x.length()-1).equals(")") )
return genAccess("B", x.substring(9, x.length()-1), 16);
if (x.equals("shiftType")) return Long.toString(shiftType);
if (x.equals("shiftIdentifierInfo")) return Long.toString(shiftIdentifierInfo);
if (x.equals("maskIdentifierInfo")) return "0x" + hex8(maskIdentifierInfo);
......@@ -731,6 +776,10 @@ OUTER: for (int i = 0; i < n; i += m) {
if (x.equals("maskLowerCase")) return "0x" + hex8(maskLowerCase);
if (x.equals("maskUpperCase")) return "0x" + hex8(maskUpperCase);
if (x.equals("maskTitleCase")) return "0x" + hex8(maskTitleCase);
if (x.equals("maskOtherLowercase")) return "0x" + hex4(maskOtherLowercase >> 32);
if (x.equals("maskOtherUppercase")) return "0x" + hex4(maskOtherUppercase >> 32);
if (x.equals("maskOtherAlphabetic")) return "0x" + hex4(maskOtherAlphabetic >> 32);
if (x.equals("maskIdeographic")) return "0x" + hex4(maskIdeographic >> 32);
if (x.equals("valueIgnorable")) return "0x" + hex8(valueIgnorable);
if (x.equals("valueJavaUnicodeStart")) return "0x" + hex8(valueJavaUnicodeStart);
if (x.equals("valueJavaOnlyStart")) return "0x" + hex8(valueJavaOnlyStart);
......@@ -899,7 +948,7 @@ OUTER: for (int i = 0; i < n; i += m) {
// If we ever need more than 32 bits to represent the character properties,
// then a table "B" may be needed as well.
// genTable(result, "B", tables[n - 1], 32, 16, sizes[n - 1], false, 0, true, true, false);
genTable(result, "B", tables[n - 1], 32, 16, sizes[n - 1], false, 0, true, true, false);
totalBytes += ((((tables[n - 1].length * (identifiers ? 2 : 32)) + 31) >> 5) << 2);
result.append(commentStart);
......@@ -1080,9 +1129,9 @@ OUTER: for (int i = 0; i < n; i += m) {
*/
static void genTable(StringBuffer result, String name,
long[] table, int extract, int bits, int size,
boolean preshifted, int shift, boolean hexFormat,
boolean properties, boolean hexComment) {
long[] table, int extract, int bits, int size,
boolean preshifted, int shift, boolean hexFormat,
boolean properties, boolean hexComment) {
String atype = bits == 1 ? (Csyntax ? "unsigned long" : "int") :
bits == 2 ? (Csyntax ? "unsigned long" : "int") :
......@@ -1137,7 +1186,12 @@ OUTER: for (int i = 0; i < n; i += m) {
char ch = '\u0000';
int charsPerEntry = -entriesPerChar;
for (int j=0; j<table.length; ++j) {
long entry = table[j] >> extract;
//long entry = table[j] >> extract;
long entry;
if ("A".equals(name))
entry = (table[j] & 0xffffffffL) >> extract;
else
entry = (table[j] >> extract);
if (shiftEntries) entry <<= shift;
if (entry >= (1L << bits)) {
FAIL("Entry too big");
......@@ -1549,6 +1603,7 @@ OUTER: for (int i = 0; i < n; i += m) {
static String OutputFileName = null;
static String UnicodeSpecFileName = null; // liu
static String SpecialCasingFileName = null;
static String PropListFileName = null;
static boolean useCharForByte = false;
static int[] sizes;
static int bins = 0; // liu; if > 0, then perform search
......@@ -1668,20 +1723,28 @@ OUTER: for (int i = 0; i < n; i += m) {
SpecialCasingFileName = args[++j];
}
}
else if (args[j].equals("-plane")) {
if (j == args.length -1) {
FAIL("Plane number missing after -plane");
}
else {
plane = Integer.parseInt(args[++j]);
}
if (plane > 0) {
bLatin1 = false;
}
}
else if ("-usecharforbyte".equals(args[j])) {
useCharForByte = true;
}
else if (args[j].equals("-proplist")) {
if (j == args.length -1) {
FAIL("File name missing after -proplist");
}
else {
PropListFileName = args[++j];
}
}
else if (args[j].equals("-plane")) {
if (j == args.length -1) {
FAIL("Plane number missing after -plane");
}
else {
plane = Integer.parseInt(args[++j]);
}
if (plane > 0) {
bLatin1 = false;
}
}
else if ("-usecharforbyte".equals(args[j])) {
useCharForByte = true;
}
else if (args[j].equals("-latin1")) {
bLatin1 = true;
plane = 0;
......@@ -1728,6 +1791,10 @@ OUTER: for (int i = 0; i < n; i += m) {
SpecialCasingFileName = DefaultSpecialCasingFileName;
desc.append(" [-specialcasing " + SpecialCasingFileName + ']');
}
if (PropListFileName == null) {
PropListFileName = DefaultPropListFileName;
desc.append(" [-proplist " + PropListFileName + ']');
}
if (TemplateFileName == null) {
TemplateFileName = (Csyntax ? DefaultCTemplateFileName
: DefaultJavaTemplateFileName);
......@@ -1877,12 +1944,13 @@ OUTER: for (int i = 0; i < n; i += m) {
try {
UnicodeSpec[] data = UnicodeSpec.readSpecFile(new File(UnicodeSpecFileName), plane);
specialCaseMaps = SpecialCaseMap.readSpecFile(new File(SpecialCasingFileName), plane);
PropList propList = PropList.readSpecFile(new File(PropListFileName), plane);
if (verbose) {
System.out.println(data.length + " items read from Unicode spec file " + UnicodeSpecFileName); // liu
}
long[] map = buildMap(data, specialCaseMaps);
long[] map = buildMap(data, specialCaseMaps, propList);
if (verbose) {
System.err.println("Completed building of initial map");
}
......
make/tools/src/build/tools/generatecharacter/PropList.java 0 → 100644
浏览文件 @ 8586dc90
/*
* 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.
*/
package build.tools.generatecharacter;
import java.util.regex.*;
import java.util.*;
import java.io.*;
/**
* A PropList object contains the lists of code points that have
* the same Unicode property defined in PropList.txt
*
* @author Xueming Shen
*/
public class PropList {
public static PropList readSpecFile(File file, int plane)
throws IOException
{
return new PropList(file, plane);
}
public List<Integer> codepoints(String name) {
return propMap.get(name);
}
public Set<String> names() {
return propMap.keySet();
}
private Map<String, ArrayList<Integer>> propMap =
new LinkedHashMap<String, ArrayList<Integer>>();
private PropList(File file, int plane) throws IOException {
int i, j;
BufferedReader sbfr = new BufferedReader(new FileReader(file));
Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)\\s+#.*").matcher("");
String line = null;
int lineNo = 0;
while ((line = sbfr.readLine()) != null) {
lineNo++;
if (line.length() <= 1 || line.charAt(0) == '#') {
continue;
}
m.reset(line);
if (m.matches()) {
int start = Integer.parseInt(m.group(1), 16);
if ((start >> 16) != plane)
continue;
int end = (m.group(2)==null)?start
:Integer.parseInt(m.group(2), 16);
String name = m.group(3);
start &= 0xffff;
end &= 0xffff;
ArrayList<Integer> list = propMap.get(name);
if (list == null) {
list = new ArrayList<Integer>();
propMap.put(name, list);
}
while (start <= end)
list.add(start++);
} else {
System.out.printf("Warning: Unrecognized line %d <%s>%n", lineNo, line);
}
}
sbfr.close();
//for (String name: propMap.keySet()) {
// System.out.printf("%s %d%n", name, propMap.get(name).size());
//}
}
public static void main(String[] args) throws IOException {
readSpecFile(new File(args[0]), Integer.decode(args[1]));
}
}
src/linux/doc/man/appletviewer.1
浏览文件 @ 8586dc90
." 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,43 +19,33 @@
." 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
......
src/linux/doc/man/apt.1
浏览文件 @ 8586dc90
." 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 @@ One or more files that list source files or other options
.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 @@ Specify where to find annotation processor factories; if this option is used, th
.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 @@ Specify where to find user class files and annotation processor factories. If \f
.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
......
src/linux/doc/man/extcheck.1
浏览文件 @ 8586dc90
." 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,22 +19,16 @@
." 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
......@@ -46,8 +40,6 @@ extcheck [ \-verbose ] targetfile.jar
.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.
......@@ -62,8 +54,6 @@ If no conflict is detected, the return code is \f20\fP.
If the manifest of any jar file in the extensions directory has the same \f2Specification\-title\fP and the same or a newer \f2Specification\-version\fP number, a non\-zero error code is returned. A non\-zero error code is also returned if \f2targetfile.jar\fP does not have the \f2Specification\-title\fP or \f2Specification\-version\fP attributes in its manifest.
.LP
.SH "OPTIONS"
.LP
.LP
.RS 3
.TP 3
......@@ -76,8 +66,6 @@ Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the
.LP
.SH "SEE ALSO"
.LP
.LP
.LP
jar(1)
......
src/linux/doc/man/idlj.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/ja/appletviewer.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/apt.1
浏览文件 @ 8586dc90
." 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 @@ sourcefiles
.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 を使用した開発方法については、
......@@ -58,13 +61,6 @@ sourcefiles
\f4「apt 入門」\fP @
.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
......@@ -143,7 +139,7 @@ javac
.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
......
src/linux/doc/man/ja/extcheck.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/idlj.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jar.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jarsigner.1
浏览文件 @ 8586dc90
......@@ -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 @@ o
.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 @@ o
.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 @@ jarsigner \-keystore NONE \-storetype PKCS11 \\
\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
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 @@ bundle.jar
証明書情報を使った検証
.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 @@ bundle.jar
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 @@ JAR
.fl
この JAR には、このキーストアの別名によって署名されていない署名付きエントリが含まれています
.fl
.fl
\fP
.fi
......@@ -993,7 +993,7 @@ JAR
.nf
\f3
.fl
failure 1
failure 1
.fl
\fP
.fi
......@@ -1649,7 +1649,7 @@ o
.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
......
src/linux/doc/man/ja/java.1
浏览文件 @ 8586dc90
......@@ -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 "名前"
......
src/linux/doc/man/ja/javac.1
浏览文件 @ 8586dc90
......@@ -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 @@ o
\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 @@ o
推奨されるすべての警告を有効にします。このリリースでは、利用可能なすべての警告を有効にすることが推奨されています。
.TP 3
\-Xlint:none
Java 言語仕様では指定されていないすべての警告を無効にします。
すべての警告を無効にします。
.TP 3
\-Xlint:name
警告 \f2name\fP を有効にします。このオプションで有効にできる警告のリストについては、「\-Xlint オプションを使って有効または無効にできる警告」を参照してください。
......@@ -617,7 +613,7 @@ warning: [processing] No processor claimed any of these annotations: Anno
この問題を解決するには、クラス \f2AnnosWithoutProcessors\fP で定義および使用される注釈の名前を \f2Anno\fP から \f2NotAnno\fP に変更します。
.TP 3
rawtypes
raw 型に対する未検査操作について警告します。特にこのオプションは、型引数を持たないパラメータ化された型を使用するユーザーに対して警告します。次の文では、 \f2rawtypes\fP 警告が生成されます。
raw 型に対する未検査操作について警告します。次の文では、 \f2rawtypes\fP 警告が生成されます。
.nf
\f3
.fl
......
src/linux/doc/man/ja/javadoc.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/ja/javah.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/javap.1
浏览文件 @ 8586dc90
." 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 @@ javap \- Java
.nf
\f3
.fl
javap [ \fP\f3options\fP\f3 ] class. . .
javap [ \fP\f3options\fP\f3 ] classes
.fl
\fP
.fi
......@@ -42,7 +42,20 @@ javap [ \fP\f3options\fP\f3 ] class. . .
.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 @@ public class DocFooter extends Applet {
.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 @@ public class DocFooter extends java.applet.Applet {
.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();
.fl
public void init();
java.lang.String date;
.fl
public void paint(java.awt.Graphics);
.fl
}
java.lang.String email;
.fl
.fl
Method DocFooter()
public DocFooter();
.fl
Code:
.fl
0 aload_0
0: aload_0
.fl
1 invokespecial #1 <Method java.applet.Applet()>
1: invokespecial #1 // Method java/applet/Applet."<init>":()V
.fl
4 return
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
Code:
.fl
0 aload_1
0: aload_1
.fl
1 new #8 <Class java.lang.StringBuffer>
1: new #8 // class java/lang/StringBuilder
.fl
4 dup
4: dup
.fl
5 invokespecial #9 <Method java.lang.StringBuffer()>
5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V
.fl
8 aload_0
8: aload_0
.fl
9 getfield #5 <Field java.lang.String date>
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
25: bipush 15
.fl
27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
30 aload_1
30: aload_1
.fl
31 aload_0
31: aload_0
.fl
32 getfield #7 <Field java.lang.String email>
32: getfield #7 // Field email:Ljava/lang/String;
.fl
35 sipush 290
35: sipush 290
.fl
38 bipush 15
38: bipush 15
.fl
40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)>
40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
.fl
43 return
43: return
.fl
}
.fl
\fP
.fi
......@@ -284,22 +299,7 @@ http://java.sun.com/docs/books/vmspec/
メソッドのスタックサイズ、および \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 プラットフォームを実装するクラスです。
......@@ -308,22 +308,6 @@ http://java.sun.com/docs/books/vmspec/
インストールされた拡張機能を検索する場所をオーバーライドします。拡張機能は、デフォルトでは \f2java.ext.dirs\fP にあります。
.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
......
src/linux/doc/man/ja/javaws.1
浏览文件 @ 8586dc90
." 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 @@ Java Web Start
\f2\-Xnosplash\fP
.LP
.LP
最初のスプラッシュ画面の表示を無効にします。
初期スプラッシュ画面を表示しません。
.LP
.LP
\f2\-open <arguments>\fP
......@@ -99,7 +99,7 @@ Java Web Start
\f2\-online\fP
.LP
.LP
オンラインモードで実行します (デフォルトの動作)。
オンラインモードを使用します (デフォルトの動作)。
.LP
.LP
\f2\-wait\fP
......
src/linux/doc/man/ja/jconsole.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jdb.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jhat.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jinfo.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jmap.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jps.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jrunscript.1
浏览文件 @ 8586dc90
......@@ -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 "名前"
......
src/linux/doc/man/ja/jsadebugd.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jstack.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jstat.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jstatd.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/jvisualvm.1
浏览文件 @ 8586dc90
." 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 @@ o
.na
\f2Java VisualVM 開発者のサイト\fP @
.fi
https://visualvm.dev.java.net
http://visualvm.java.net
.TP 2
o
.na
......
src/linux/doc/man/ja/keytool.1
浏览文件 @ 8586dc90
." 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 @@ http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.ht
.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 @@ http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.ht
注: このコマンドは 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 @@ http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.ht
この場合は、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 @@ CA
.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 @@ CA
.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 @@ CN=Steve Meier, OU=Java, O=Oracle, C=US
重要: 信頼できる証明書として証明書をインポートする前に、証明書の内容を慎重に調べてください。
.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 @@ CN=Steve Meier, OU=Java, O=Oracle, C=US
次に、証明書を送信した人物に連絡し、この人物が提示したフィンガープリントと、上のコマンドで表示されたフィンガープリントとを比較します。フィンガープリントが一致すれば、送信途中でほかの何者か (攻撃者など) による証明書のすり替えが行われていないことを確認できます。送信途中でこの種の攻撃が行われていた場合、チェックを行わずに証明書をインポートすると、攻撃者によって署名されたすべてのもの (攻撃的意図を持つクラスファイルを含んだ 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
パスワードに関する注意事項
......
src/linux/doc/man/ja/native2ascii.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/orbd.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/pack200.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/policytool.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/rmic.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/rmid.1
浏览文件 @ 8586dc90
." 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 @@ o
.LP
.LP
必要に応じてサービスを開始するように設定する詳細については、 \f2inetd\fP (Solaris) または \f2xinetd\fP (Linux) のマニュアルページを参照してください。
必要に応じてサービスを開始するように設定する詳細については、 \f2inetd\fP (Solaris の場合)、または \f2xinetd\fP (Linux) のマニュアルページを参照してください。
.LP
.SH "オプション"
.LP
......@@ -239,7 +239,7 @@ grant {
.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
......
src/linux/doc/man/ja/rmiregistry.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/schemagen.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/serialver.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/servertool.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/tnameserv.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/unpack200.1
浏览文件 @ 8586dc90
." 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 "名前"
......
src/linux/doc/man/ja/wsgen.1
浏览文件 @ 8586dc90
." 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
......
src/linux/doc/man/ja/wsimport.1
浏览文件 @ 8586dc90
." 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 @@ https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html
.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 @@ W3C \f2EndpointReferenceType\fP
.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
src/linux/doc/man/ja/xjc.1
浏览文件 @ 8586dc90
." 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
......
src/linux/doc/man/jar.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jarsigner.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/java.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/javac.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/javadoc.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/javah.1
浏览文件 @ 8586dc90
." 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,37 +19,27 @@
." 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.
......@@ -63,12 +53,7 @@ By default \f3javah\fP creates a header file for each class listed on the comman
.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
......@@ -110,11 +95,10 @@ For example:
.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.
......@@ -131,8 +115,6 @@ Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the
.LP
.SH "ENVIRONMENT VARIABLES"
.LP
.LP
.RS 3
.TP 3
......@@ -149,8 +131,6 @@ Used to provide the system a path to user\-defined classes. Directories are sepa
.LP
.SH "SEE ALSO"
.LP
.LP
.LP
javac(1), java(1), jdb(1), javap(1), javadoc(1)
......
src/linux/doc/man/javap.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/javaws.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jconsole.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jdb.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jhat.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jinfo.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jmap.1
浏览文件 @ 8586dc90
." 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,15 +19,13 @@
." 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"
jmap \- Memory Map
.LP
.SH "SYNOPSIS"
.LP
.LP
.nf
\f3
......@@ -42,8 +40,6 @@ jmap \- Memory Map
.LP
.SH "PARAMETERS"
.LP
.LP
.RS 3
.TP 3
......@@ -73,14 +69,9 @@ optional unique id, if multiple debug servers are running on the same remote hos
.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
......@@ -89,10 +80,11 @@ jmap \-J\-d64 \-heap pid
.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
......@@ -100,13 +92,11 @@ jmap \-J\-d64 \-heap pid
.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>
......
src/linux/doc/man/jps.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jrunscript.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jsadebugd.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jstack.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jstat.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jstatd.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/jvisualvm.1 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/keytool.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/native2ascii.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/orbd.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/pack200.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/policytool.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/rmic.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/rmid.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/rmiregistry.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/schemagen.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/serialver.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/servertool.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/tnameserv.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/unpack200.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/wsgen.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/wsimport.1
浏览文件 @ 8586dc90
此差异已折叠。
src/linux/doc/man/xjc.1
浏览文件 @ 8586dc90
此差异已折叠。
src/share/classes/java/io/File.java
浏览文件 @ 8586dc90
此差异已折叠。
src/share/classes/java/nio/charset/StandardCharset.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
src/share/classes/java/util/regex/UnicodeProp.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
src/share/demo/nio/zipfs/Demo.java
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/apt.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/idlj.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/jar.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/java.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/jdb.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/jhat.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/jmap.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/jps.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/jvisualvm.1 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/orbd.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/rmic.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/rmid.1
浏览文件 @ 8586dc90
此差异已折叠。
src/solaris/doc/sun/man/man1/xjc.1
浏览文件 @ 8586dc90
此差异已折叠。
test/java/awt/Component/Revalidate/Revalidate.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/awt/List/ScrollOutside/ScrollOut.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/lang/Character/CheckProp.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/lang/Character/PropList.txt 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/nio/charset/StandardCharset/Standard.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/security/spec/EllipticCurveMatch.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/util/regex/POSIX_ASCII.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/util/regex/POSIX_Unicode.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/java/util/regex/RegExTest.java
浏览文件 @ 8586dc90
此差异已折叠。
test/javax/swing/JFileChooser/7036025/bug7036025.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/javax/swing/JFileChooser/7036025/security.policy 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/nio/cs/StrCodingBenchmarkUTF8.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/nio/cs/TestStringCodingUTF8.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/nio/cs/TestUTF8.java
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/jgss/spnego/NegTokenTargFields.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/krb5/auto/DynamicKeytab.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/krb5/auto/KeyTabCompat.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/krb5/auto/SPNEGO.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/krb5/auto/TwoPrinces.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/mscapi/PublicKeyInterop.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/mscapi/PublicKeyInterop.sh 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/mscapi/SignUsingNONEwithRSA.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/mscapi/SignUsingNONEwithRSA.sh 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/mscapi/SignUsingSHA2withRSA.java 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
test/sun/security/mscapi/SignUsingSHA2withRSA.sh 0 → 100644
浏览文件 @ 8586dc90
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或